aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2022-05-23 16:32:47 +0300
committerEli Zaretskii2022-05-23 16:32:47 +0300
commitaab560f0c1955bae57cc35a71be95b5bfa2ab525 (patch)
treed2bf692ea4c3816cbf22e3bad2550a84d0b0d2ff
parent6ac6919f74c2de91b2eb03de3aab326dcd3c5273 (diff)
downloademacs-aab560f0c1955bae57cc35a71be95b5bfa2ab525.tar.gz
emacs-aab560f0c1955bae57cc35a71be95b5bfa2ab525.zip
Fix saveplace.el when desktop.el restores non-ASCII buffers
* 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)
-rw-r--r--lisp/saveplace.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 4d13ad3959c..a23454b0bb4 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -290,7 +290,11 @@ may have changed) back to `save-place-alist'."
290 ;; adding hooks to it. 290 ;; adding hooks to it.
291 (with-current-buffer (get-buffer-create " *Saved Places*") 291 (with-current-buffer (get-buffer-create " *Saved Places*")
292 (delete-region (point-min) (point-max)) 292 (delete-region (point-min) (point-max))
293 (insert-file-contents file) 293 ;; Make sure our 'coding:' cookie in the save-place
294 ;; file will take effect, in case the caller binds
295 ;; coding-system-for-read.
296 (let (coding-system-for-read)
297 (insert-file-contents file))
294 (goto-char (point-min)) 298 (goto-char (point-min))
295 (setq save-place-alist 299 (setq save-place-alist
296 (with-demoted-errors "Error reading save-place-file: %S" 300 (with-demoted-errors "Error reading save-place-file: %S"