X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/362b9d483c714a8fd87966ddbd8686850f870e34..4a88129ae4332cbf3833c00f79100610ca2e576d:/lisp/saveplace.el diff --git a/lisp/saveplace.el b/lisp/saveplace.el index ee1107e339..2ddac6d6c4 100644 --- a/lisp/saveplace.el +++ b/lisp/saveplace.el @@ -1,7 +1,6 @@ ;;; saveplace.el --- automatically save place in files -;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2013 Free Software Foundation, Inc. ;; Author: Karl Fogel ;; Maintainer: FSF @@ -57,20 +56,19 @@ This means when you visit a file, point goes to the last place where it was when you previously visited the same file. This variable is automatically buffer-local. -If you wish your place in any file to always be automatically saved, -simply put this in your `~/.emacs' file: +If you wish your place in any file to always be automatically +saved, set this to t using the Customize facility, or put the +following code in your init file: \(setq-default save-place t) -\(require 'saveplace) - -or else use the Custom facility to set this option." +\(require 'saveplace)" :type 'boolean :require 'saveplace :group 'save-place) (make-variable-buffer-local 'save-place) -(defcustom save-place-file (convert-standard-filename "~/.emacs-places") +(defcustom save-place-file (locate-user-emacs-file "places" ".emacs-places") "Name of the file that records `save-place-alist' value." :type 'file :group 'save-place) @@ -90,8 +88,9 @@ value of `version-control'." (defvar save-place-loaded nil "Non-nil means that the `save-place-file' has been loaded.") -(defcustom save-place-limit nil +(defcustom save-place-limit 400 "Maximum number of entries to retain in the list; nil means no limit." + :version "24.1" ; nil -> 400 :type '(choice (integer :tag "Entries" :value 1) (const :tag "No Limit" nil)) :group 'save-place) @@ -130,6 +129,15 @@ Files for which such a check may be inconvenient include those on removable and network volumes." :type 'regexp :group 'save-place) +(defcustom save-place-ignore-files-regexp + "\\(?:COMMIT_EDITMSG\\|hg-editor-[[:alnum:]]+\\.txt\\|svn-commit\\.tmp\\|bzr_log\\.[[:alnum:]]+\\)$" + "Regexp matching files for which no position should be recorded. +Useful for temporary file such as commit message files that are +automatically created by the VCS. If set to nil, this feature is +disabled, i.e., the position is recorded for all files." + :version "24.1" + :type 'regexp :group 'save-place) + (defun toggle-save-place (&optional parg) "Toggle whether to save your place in this file between sessions. If this mode is enabled, point is recorded when you kill the buffer @@ -139,7 +147,8 @@ even in a later Emacs session. If called with a prefix arg, the mode is enabled if and only if the argument is positive. -To save places automatically in all files, put this in your `.emacs' file: +To save places automatically in all files, put this in your init +file: \(setq-default save-place t\)" (interactive "P") @@ -160,20 +169,24 @@ To save places automatically in all files, put this in your `.emacs' file: ;; file. If not, do so, then feel free to modify the alist. It ;; will be saved again when Emacs is killed. (or save-place-loaded (load-save-place-alist-from-file)) - (if buffer-file-name - (progn - (let ((cell (assoc buffer-file-name save-place-alist)) - (position (if (not (eq major-mode 'hexl-mode)) - (point) - (with-no-warnings - (1+ (hexl-current-address)))))) - (if cell - (setq save-place-alist (delq cell save-place-alist))) - (if (and save-place - (not (= position 1))) ;; Optimize out the degenerate case. - (setq save-place-alist - (cons (cons buffer-file-name position) - save-place-alist))))))) + (let ((item (or buffer-file-name + (and dired-directory (expand-file-name dired-directory))))) + (when (and item + (or (not save-place-ignore-files-regexp) + (not (string-match save-place-ignore-files-regexp + item)))) + (let ((cell (assoc item save-place-alist)) + (position (if (not (eq major-mode 'hexl-mode)) + (point) + (with-no-warnings + (1+ (hexl-current-address)))))) + (if cell + (setq save-place-alist (delq cell save-place-alist))) + (if (and save-place + (not (= position 1))) ;; Optimize out the degenerate case. + (setq save-place-alist + (cons (cons item position) + save-place-alist))))))) (defun save-place-forget-unreadable-files () "Remove unreadable files from `save-place-alist'. @@ -213,9 +226,7 @@ may have changed\) back to `save-place-alist'." (symbol-name coding-system-for-write))) (let ((print-length nil) (print-level nil)) - (pp (sort save-place-alist - (lambda (a b) (string< (car a) (car b)))) - (current-buffer))) + (pp save-place-alist (current-buffer))) (let ((version-control (cond ((null save-place-version-control) nil) @@ -286,11 +297,22 @@ may have changed\) back to `save-place-alist'." (let ((cell (assoc buffer-file-name save-place-alist))) (if cell (progn - (or after-find-file-from-revert-buffer + (or revert-buffer-in-progress-p (goto-char (cdr cell))) ;; and make sure it will be saved again for later (setq save-place t))))) +(defun save-place-dired-hook () + "Position the point in a dired buffer." + (or save-place-loaded (load-save-place-alist-from-file)) + (let ((cell (assoc (expand-file-name dired-directory) save-place-alist))) + (if cell + (progn + (or revert-buffer-in-progress-p + (goto-char (cdr cell))) + ;; and make sure it will be saved again for later + (setq save-place t))))) + (defun save-place-kill-emacs-hook () ;; First update the alist. This loads the old save-place-file if nec. (save-places-to-alist) @@ -301,11 +323,12 @@ may have changed\) back to `save-place-alist'." (add-hook 'find-file-hook 'save-place-find-file-hook t) -(add-hook 'kill-emacs-hook 'save-place-kill-emacs-hook) +(add-hook 'dired-initial-point-hook 'save-place-dired-hook) +(unless noninteractive + (add-hook 'kill-emacs-hook 'save-place-kill-emacs-hook)) (add-hook 'kill-buffer-hook 'save-place-to-alist) (provide 'saveplace) ; why not... -;; arch-tag: 3c2ef47b-0a22-4558-b116-118c9ef454a0 ;;; saveplace.el ends here