From: Eli Zaretskii Date: Mon, 23 May 2022 13:32:47 +0000 (+0300) Subject: Fix saveplace.el when desktop.el restores non-ASCII buffers X-Git-Tag: emacs-29.0.90~1910^2~478 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aab560f0c1955bae57cc35a71be95b5bfa2ab525;p=emacs.git 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) --- 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'." ;; 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"