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

Fix saveplace.el when desktop.el restores non-ASCII buffers

Browse source 
* lisp/saveplace.el (load-save-place-alist-from-file): Bind
'coding-system-for-read' to nil, so that the 'coding:' cookie in
the save-place file takes effect.  (Bug#55592)
This commit is contained in:
Eli Zaretskii 2022-05-23 16:32:47 +03:00
parent 6ac6919f74
commit aab560f0c1
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/saveplace.el
View file

@ -290,7 +290,11 @@ may have changed) back to `save-place-alist'."
;; adding hooks to it.
(with-current-buffer (get-buffer-create " *Saved Places*")
(delete-region (point-min) (point-max))
(insert-file-contents file)
;; Make sure our 'coding:' cookie in the save-place
;; file will take effect, in case the caller binds
;; coding-system-for-read.
(let (coding-system-for-read)
(insert-file-contents file))
(goto-char (point-min))
(setq save-place-alist
(with-demoted-errors "Error reading save-place-file: %S"