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

[Juanma Barranquero]

Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.51 emacs/lisp/desktop.el:1.52
*** emacs/lisp/desktop.el:1.51  Tue Apr  8 21:37:56 2003
--- emacs/lisp/desktop.el       Thu Apr 10 12:26:12 2003
***************
*** 832,838 ****
        'ignored)))
  
  ;; 
----------------------------------------------------------------------------
! (defun desktop-buffer-file () "Load a file."
    (if desktop-buffer-file-name
        (if (or (file-exists-p desktop-buffer-file-name)
              (and desktop-missing-file-warning
--- 832,839 ----
        'ignored)))
  
  ;; 
----------------------------------------------------------------------------
! (defun desktop-buffer-file ()
!   "Load a file."
    (if desktop-buffer-file-name
        (if (or (file-exists-p desktop-buffer-file-name)
              (and desktop-missing-file-warning
***************
*** 843,848 ****
--- 844,852 ----
            (condition-case nil
                (switch-to-buffer buf)
              (error (pop-to-buffer buf)))
+           (and (not (eq major-mode desktop-buffer-major-mode))
+                (functionp desktop-buffer-major-mode)
+                (funcall desktop-buffer-major-mode))
            buf)
        'ignored)))
  
***************
*** 940,946 ****
                               (cons 'case-fold-search cfs)
                               (cons 'case-replace cr)
                               (cons 'overwrite-mode (car mim)))))
!                                
  ;; 
----------------------------------------------------------------------------
  ;; When `desktop-enable' is non-nil and "--no-desktop" is not specified on the
  ;; command line, we do the rest of what it takes to use desktop, but do it
--- 944,950 ----
                               (cons 'case-fold-search cfs)
                               (cons 'case-replace cr)
                               (cons 'overwrite-mode (car mim)))))
! 
  ;; 
----------------------------------------------------------------------------
  ;; When `desktop-enable' is non-nil and "--no-desktop" is not specified on the
  ;; command line, we do the rest of what it takes to use desktop, but do it