diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-09-11 22:32:57 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-09-11 22:32:57 -0700 |
| commit | 30213927b6eebe291cd425d5863f54bffe0b8a83 (patch) | |
| tree | a66f7b728c1ba3723a02d2b242cecf3660053bc4 /lisp/saveplace.el | |
| parent | 170266d096bc4d0952bee907532d14503e882bf6 (diff) | |
| download | emacs-30213927b6eebe291cd425d5863f54bffe0b8a83.tar.gz emacs-30213927b6eebe291cd425d5863f54bffe0b8a83.tar.bz2 emacs-30213927b6eebe291cd425d5863f54bffe0b8a83.zip | |
Use with-demoted-errors now that it can format any error messages
* dframe.el (dframe-timer-fn):
* files.el (dir-locals-read-from-file):
* mpc.el (mpc--status-timer-run, mpc--status-idle-timer-run, mpc-format):
* reveal.el (reveal-post-command):
* saveplace.el (load-save-place-alist-from-file):
* shell.el (shell-resync-dirs):
* w32-common-fns.el (x-get-selection-value):
* emacs-lisp/copyright.el (copyright-find-copyright):
* emacs-lisp/eldoc.el (eldoc-print-current-symbol-info):
* emulation/tpu-edt.el (tpu-copy-keyfile):
* play/bubbles.el (bubbles--mark-neighbourhood):
* progmodes/executable.el (executable-make-buffer-file-executable-if-script-p):
* term/pc-win.el (x-get-selection-value): Use with-demoted-errors.
Diffstat (limited to 'lisp/saveplace.el')
| -rw-r--r-- | lisp/saveplace.el | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lisp/saveplace.el b/lisp/saveplace.el index e9dc12b00fe..e070a7da489 100644 --- a/lisp/saveplace.el +++ b/lisp/saveplace.el @@ -255,13 +255,9 @@ may have changed\) back to `save-place-alist'." (insert-file-contents file) (goto-char (point-min)) (setq save-place-alist - ;; This is with-demoted-errors, but we want to - ;; mention save-place in any error message. - (condition-case err + (with-demoted-errors "Error reading save-place-file: %S" (car (read-from-string - (buffer-substring (point-min) (point-max)))) - (error (message "Error reading save-place-file: %S" err) - nil))) + (buffer-substring (point-min) (point-max)))))) ;; If there is a limit, and we're over it, then we'll ;; have to truncate the end of the list: |