From: Lars Hansen Date: Wed, 5 Nov 2003 13:28:48 +0000 (+0000) Subject: (desktop-locals-to-save): Add buffer-file-coding-system. X-Git-Tag: ttn-vms-21-2-B4~8418 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bd382a27557edf74d24574ce6ec45d04b0ecd744;p=emacs.git (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. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 534798f1686..1023634b470 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2003-11-05 Juri Linkov + + * 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 * files.el (risky-local-variable-p): Make second argument optional. diff --git a/lisp/desktop.el b/lisp/desktop.el index 73fef5c44b7..0cff5e5a21f 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -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)))