[Emacs-diffs] Changes to emacs/lisp/desktop.el

[Richard M. Stallman]

Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.48 emacs/lisp/desktop.el:1.49
*** emacs/lisp/desktop.el:1.48  Fri Nov 16 09:32:38 2001
--- emacs/lisp/desktop.el       Mon Mar 11 04:15:27 2002
***************
*** 241,247 ****
  variables `desktop-buffer-major-mode', `desktop-buffer-file-name',
  `desktop-buffer-name'.
  If one function returns non-nil, no further functions are called.
! If the function returns t then the buffer is considered created."
    :type '(repeat function)
    :group 'desktop)
  
--- 241,248 ----
  variables `desktop-buffer-major-mode', `desktop-buffer-file-name',
  `desktop-buffer-name'.
  If one function returns non-nil, no further functions are called.
! If the function returns a buffer, then the saved mode settings
! and variable values for that buffer are copied into it."
    :type '(repeat function)
    :group 'desktop)
  
***************
*** 669,675 ****
          (let ((buf (find-file-noselect desktop-buffer-file-name)))
            (condition-case nil
                (switch-to-buffer buf)
!             (error (pop-to-buffer buf))))
        'ignored)))
  ;; 
----------------------------------------------------------------------------
  ;; Create a buffer, load its file, set is mode, ...;  called from Desktop file
--- 670,677 ----
          (let ((buf (find-file-noselect desktop-buffer-file-name)))
            (condition-case nil
                (switch-to-buffer buf)
!             (error (pop-to-buffer buf)))
!           buf)
        'ignored)))
  ;; 
----------------------------------------------------------------------------
  ;; Create a buffer, load its file, set is mode, ...;  called from Desktop file