Commit bd382a27 authored by Lars Hansen's avatar Lars Hansen
Browse files

(desktop-locals-to-save): Add buffer-file-coding-system.

(desktop-buffer-file): Use saved buffer-file-coding-system
for file reading.  Set auto-insert to nil to prevent automatic
insertion into restored empty files.
parent c6177909
2003-11-05 Juri Linkov <juri@jurta.org>
* desktop.el (desktop-locals-to-save): Add buffer-file-coding-system.
(desktop-buffer-file): Use saved buffer-file-coding-system
for file reading. Set auto-insert to nil to prevent automatic
insertion into restored empty files.
2003-11-04 Luc Teirlinck <teirllm@auburn.edu> 2003-11-04 Luc Teirlinck <teirllm@auburn.edu>
* files.el (risky-local-variable-p): Make second argument optional. * files.el (risky-local-variable-p): Make second argument optional.
......
...@@ -227,7 +227,8 @@ This variable is maintained for backward compatibility only. Use ...@@ -227,7 +227,8 @@ This variable is maintained for backward compatibility only. Use
fill-column fill-column
overwrite-mode overwrite-mode
change-log-default-name change-log-default-name
line-number-mode) line-number-mode
buffer-file-coding-system)
"List of local variables to save for each buffer. "List of local variables to save for each buffer.
The variables are saved only when they really are local." The variables are saved only when they really are local."
:type '(repeat symbol) :type '(repeat symbol)
...@@ -872,7 +873,12 @@ directory DIRNAME." ...@@ -872,7 +873,12 @@ directory DIRNAME."
(y-or-n-p (format (y-or-n-p (format
"File \"%s\" no longer exists. Re-create? " "File \"%s\" no longer exists. Re-create? "
desktop-buffer-file-name)))) desktop-buffer-file-name))))
(let ((buf (find-file-noselect desktop-buffer-file-name))) (let* ((auto-insert nil) ; Disable auto insertion
(coding-system-for-read
(or coding-system-for-read
(cdr (assq 'buffer-file-coding-system
desktop-buffer-locals))))
(buf (find-file-noselect desktop-buffer-file-name)))
(condition-case nil (condition-case nil
(switch-to-buffer buf) (switch-to-buffer buf)
(error (pop-to-buffer buf))) (error (pop-to-buffer buf)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment