[Emacs-diffs] trunk r114172: * lisp/saveplace.el (load-save-place-alist-from-file): Demote errors.

[Glenn Morris]

------------------------------------------------------------
revno: 114172
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15305
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2013-09-08 16:15:17 -0700
message:
  * lisp/saveplace.el (load-save-place-alist-from-file): Demote errors.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/saveplace.el              
saveplace.el-20091113204419-o5vbwnq5f7feedwu-622

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-08 15:04:10 +0000
+++ b/lisp/ChangeLog    2013-09-08 23:15:17 +0000
@@ -1,3 +1,8 @@
+2013-09-08  Glenn Morris  <address@hidden>
+
+       * saveplace.el (load-save-place-alist-from-file):
+       Demote errors.  (Bug#15305)
+
 2013-09-08  Michael Albinus  <address@hidden>
 
        Improve compatibility with older Emacsen, and XEmacs.

=== modified file 'lisp/saveplace.el'
--- a/lisp/saveplace.el 2013-06-14 09:32:01 +0000
+++ b/lisp/saveplace.el 2013-09-08 23:15:17 +0000
@@ -255,8 +255,13 @@
                 (insert-file-contents file)
                 (goto-char (point-min))
                 (setq save-place-alist
-                      (car (read-from-string
-                            (buffer-substring (point-min) (point-max)))))
+                      ;; This is with-demoted-errors, but we want to
+                      ;; mention save-place in any error message.
+                      (condition-case err
+                        (car (read-from-string
+                              (buffer-substring (point-min) (point-max))))
+                        (error (message "Error reading save-place-file: %S" 
err)
+                               nil)))
 
                 ;; If there is a limit, and we're over it, then we'll
                 ;; have to truncate the end of the list: