X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/6b8bc570715801cb194dc4273370eab87628e8bf..9e16c3b44bcf407678563f0bd679c0887ec3011c:/lisp/saveplace.el

diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 2d1586d895..baa6b794fc 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -1,6 +1,6 @@
 ;;; saveplace.el --- automatically save place in files
 
-;; Copyright (C) 1993-1994, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2013 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Maintainer: FSF
@@ -56,13 +56,12 @@ 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)
@@ -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)
@@ -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,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")
@@ -159,20 +169,22 @@ 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)))))))
+  (when (and buffer-file-name
+	     (or (not save-place-ignore-files-regexp)
+		 (not (string-match save-place-ignore-files-regexp
+				    buffer-file-name))))
+    (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))))))
 
 (defun save-place-forget-unreadable-files ()
   "Remove unreadable files from `save-place-alist'.