/[emacs]/emacs/lisp/desktop.el
ViewVC logotype

Diff of /emacs/lisp/desktop.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.49.2.2 by miles, Tue Oct 14 23:50:54 2003 UTC revision 1.49.2.3 by miles, Fri Nov 21 00:36:02 2003 UTC
# Line 227  This variable is maintained for backward Line 227  This variable is maintained for backward
227    fill-column    fill-column
228    overwrite-mode    overwrite-mode
229    change-log-default-name    change-log-default-name
230    line-number-mode)    line-number-mode
231      buffer-file-coding-system)
232    "List of local variables to save for each buffer.    "List of local variables to save for each buffer.
233  The variables are saved only when they really are local."  The variables are saved only when they really are local."
234    :type '(repeat symbol)    :type '(repeat symbol)
# Line 872  directory DIRNAME." Line 873  directory DIRNAME."
873                     (y-or-n-p (format                     (y-or-n-p (format
874                                "File \"%s\" no longer exists. Re-create? "                                "File \"%s\" no longer exists. Re-create? "
875                                desktop-buffer-file-name))))                                desktop-buffer-file-name))))
876            (let ((buf (find-file-noselect desktop-buffer-file-name)))            (let* ((auto-insert nil) ; Disable auto insertion
877                     (coding-system-for-read
878                      (or coding-system-for-read
879                          (cdr (assq 'buffer-file-coding-system
880                                     desktop-buffer-locals))))
881                     (buf (find-file-noselect desktop-buffer-file-name)))
882              (condition-case nil              (condition-case nil
883                  (switch-to-buffer buf)                  (switch-to-buffer buf)
884                (error (pop-to-buffer buf)))                (error (pop-to-buffer buf)))

Legend:
Removed from v.1.49.2.2  
changed lines
  Added in v.1.49.2.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26