[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/desktop.el
From: |
Lars Hansen |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/desktop.el |
Date: |
Wed, 05 Nov 2003 08:28:18 -0500 |
Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.65 emacs/lisp/desktop.el:1.66
*** emacs/lisp/desktop.el:1.65 Tue Sep 30 03:22:22 2003
--- emacs/lisp/desktop.el Wed Nov 5 08:28:17 2003
***************
*** 227,233 ****
fill-column
overwrite-mode
change-log-default-name
! line-number-mode)
"List of local variables to save for each buffer.
The variables are saved only when they really are local."
:type '(repeat symbol)
--- 227,234 ----
fill-column
overwrite-mode
change-log-default-name
! 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,878 ****
(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)))
(condition-case nil
(switch-to-buffer buf)
(error (pop-to-buffer buf)))
--- 873,884 ----
(y-or-n-p (format
"File \"%s\" no longer exists. Re-create? "
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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/desktop.el,
Lars Hansen <=