procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/saveplace.el (load-save-place-alist-from-file): Demote errors.

Browse source 
Fixes: debbugs:15305
This commit is contained in:
Glenn Morris 2013-09-08 16:15:17 -07:00
parent eb31a86cb2
commit 144e38fe18
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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.

9
lisp/saveplace.el
View file

@ -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: