2 files changed, 12 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 40a36719a1a..a7cb40fee60 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-08  Glenn Morris  <rgm@gnu.org>
+
+        * saveplace.el (load-save-place-alist-from-file):
+        Demote errors.  (Bug#15305)
+
 2013-09-08  Michael Albinus  <michael.albinus@gmx.de>
 
         Improve compatibility with older Emacsen, and XEmacs.
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 2ddac6d6c43..e9dc12b00fe 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -255,8 +255,13 @@ 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)))))
+                      ;; 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: