mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-24 19:03:29 +00:00
Code Issues Releases Activity

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

Browse Source 
(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.
This commit is contained in:
Lars Hansen 2003-11-05 13:28:48 +00:00
parent c617790907
commit bd382a2755
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -1,3 +1,10 @@
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>
* files.el (risky-local-variable-p): Make second argument optional.

10
lisp/desktop.el
View File

@ -227,7 +227,8 @@ This variable is maintained for backward compatibility only. Use
fill-column
overwrite-mode
change-log-default-name
line-number-mode)
line-number-mode
buffer-file-coding-system)
"List of local variables to save for each buffer.
The variables are saved only when they really are local."
:type '(repeat symbol)
@ -872,7 +873,12 @@ directory DIRNAME."
(y-or-n-p (format
"File \"%s\" no longer exists. Re-create? "
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
(switch-to-buffer buf)
(error (pop-to-buffer buf)))