X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/a57471f93507c55b55ee9e28c493ba78b46796e3..refs/heads/wip:/lisp/saveplace.el diff --git a/lisp/saveplace.el b/lisp/saveplace.el index 2d1586d895..a25dba2e39 100644 --- a/lisp/saveplace.el +++ b/lisp/saveplace.el @@ -1,9 +1,9 @@ ;;; saveplace.el --- automatically save place in files -;; Copyright (C) 1993-1994, 2001-2011 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2014 Free Software Foundation, Inc. ;; Author: Karl Fogel -;; Maintainer: FSF +;; Maintainer: emacs-devel@gnu.org ;; Created: July, 1993 ;; Keywords: bookmarks, placeholders @@ -54,23 +54,22 @@ This alist is saved between Emacs sessions.") "Non-nil means automatically save place in each file. 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." + :version "24.4" ; added locate-user-emacs-file :type 'file :group 'save-place) @@ -89,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) @@ -100,7 +100,7 @@ value of `version-control'." The filenames in `save-place-alist' that do not match `save-place-skip-check-regexp' are filtered through -`file-readable-p'. if nil, their alist entries are removed. +`file-readable-p'. If nil, their alist entries are removed. You may do this anytime by calling the complementary function, `save-place-forget-unreadable-files'. When this option is turned on, @@ -129,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 @@ -138,18 +147,22 @@ 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\)" +\(setq-default save-place t)" (interactive "P") - (if (not buffer-file-name) - (message "Buffer `%s' not visiting a file" (buffer-name)) - (if (and save-place (or (not parg) (<= parg 0))) - (progn - (message "No place will be saved in this file") - (setq save-place nil)) - (message "Place will be saved") - (setq save-place t)))) + (if (not (or buffer-file-name (and (derived-mode-p 'dired-mode) + dired-directory))) + (message "Buffer `%s' not visiting a file or directory" (buffer-name)) + (setq save-place (if parg + (> (prefix-numeric-value parg) 0) + (not save-place))) + (message (if save-place + "Place will be saved" + "No place will be saved in this file")))) + +(declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep)) (defun save-place-to-alist () ;; put filename and point in a cons box and then cons that onto the @@ -159,26 +172,41 @@ 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 (derived-mode-p 'dired-mode) + dired-directory + (expand-file-name (if (consp dired-directory) + (car dired-directory) + 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 (cond ((eq major-mode 'hexl-mode) + (with-no-warnings + (1+ (hexl-current-address)))) + ((and (derived-mode-p 'dired-mode) + dired-directory) + (let ((filename (dired-get-filename nil t))) + (if filename + `((dired-filename . ,filename)) + (point)))) + (t (point))))) + (if cell + (setq save-place-alist (delq cell save-place-alist))) + (if (and save-place + (not (and (integerp position) + (= 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'. For each entry in the alist, if `file-readable-p' returns nil for the -filename, remove the entry. Save the new alist \(as the first pair -may have changed\) back to `save-place-alist'." +filename, remove the entry. Save the new alist (as the first pair +may have changed) back to `save-place-alist'." (interactive) ;; the following was adapted from an in-place filtering function, ;; `filter-mod', used in the original. @@ -212,9 +240,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) @@ -243,8 +269,9 @@ may have changed\) back to `save-place-alist'." (insert-file-contents file) (goto-char (point-min)) (setq save-place-alist - (car (read-from-string - (buffer-substring (point-min) (point-max))))) + (with-demoted-errors "Error reading save-place-file: %S" + (car (read-from-string + (buffer-substring (point-min) (point-max)))))) ;; If there is a limit, and we're over it, then we'll ;; have to truncate the end of the list: @@ -277,7 +304,9 @@ may have changed\) back to `save-place-alist'." (with-current-buffer (car buf-list) ;; save-place checks buffer-file-name too, but we can avoid ;; overhead of function call by checking here too. - (and buffer-file-name (save-place-to-alist)) + (and (or buffer-file-name (and (derived-mode-p 'dired-mode) + dired-directory)) + (save-place-to-alist)) (setq buf-list (cdr buf-list)))))) (defun save-place-find-file-hook () @@ -286,7 +315,29 @@ may have changed\) back to `save-place-alist'." (if cell (progn (or revert-buffer-in-progress-p - (goto-char (cdr cell))) + (and (integerp (cdr cell)) + (goto-char (cdr cell)))) + ;; and make sure it will be saved again for later + (setq save-place t))))) + +(declare-function dired-goto-file "dired" (file)) + +(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 (and (derived-mode-p 'dired-mode) + dired-directory + (expand-file-name (if (consp dired-directory) + (car dired-directory) + dired-directory))) + save-place-alist))) + (if cell + (progn + (or revert-buffer-in-progress-p + (if (integerp (cdr cell)) + (goto-char (cdr cell)) + (and (assq 'dired-filename (cdr cell)) + (dired-goto-file (cdr (assq 'dired-filename (cdr cell))))))) ;; and make sure it will be saved again for later (setq save-place t))))) @@ -300,6 +351,8 @@ may have changed\) back to `save-place-alist'." (add-hook 'find-file-hook 'save-place-find-file-hook t) +(add-hook 'dired-initial-position-hook 'save-place-dired-hook) + (unless noninteractive (add-hook 'kill-emacs-hook 'save-place-kill-emacs-hook))