* saveplace.el (save-place-to-alist)

 (save-place-ignore-files-regexp): Allow value nil to disable this
 feature.

2 files changed, 12 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 12488b0cd52..26d2c1746a2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-04  Tassilo Horn  <tassilo@member.fsf.org>
+
+        * saveplace.el (save-place-to-alist)
+        (save-place-ignore-files-regexp): Allow value nil to disable this
+        feature.
+
 2012-03-04  Chong Yidong  <cyd@gnu.org>
 
         * faces.el (face-spec-reset-face): For the default face, reset the
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 9c3ce077b7a..43dad63a140 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -132,9 +132,10 @@ removable and network volumes."
 
 (defcustom save-place-ignore-files-regexp
   "\\(?:COMMIT_EDITMSG\\|hg-editor-[[:alnum:]]+\\.txt\\|svn-commit\\.tmp\\|bzr_log\\.[[:alnum:]]+\\)$"
-  "Regexp matching files for which no location should be recorded.
+  "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."
+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)
 
@@ -169,8 +170,9 @@ To save places automatically in all files, put this in your `.emacs' file:
   ;; will be saved again when Emacs is killed.
   (or save-place-loaded (load-save-place-alist-from-file))
   (when (and buffer-file-name
-             (not (string-match save-place-ignore-files-regexp
-                                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)