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

[Juanma Barranquero]

Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.88 emacs/lisp/desktop.el:1.89
*** emacs/lisp/desktop.el:1.88  Thu Jul 21 11:49:32 2005
--- emacs/lisp/desktop.el       Fri Jul 29 10:22:19 2005
***************
*** 106,112 ****
    :group 'desktop)
  
  ;; Maintained for backward compatibility
! (define-obsolete-variable-alias 'desktop-enable 'desktop-save-mode "22.1")
  
  (defcustom desktop-save 'ask-if-new
    "*Specifies whether the desktop should be saved when it is killed.
--- 106,113 ----
    :group 'desktop)
  
  ;; Maintained for backward compatibility
! (define-obsolete-variable-alias 'desktop-enable
!                                 'desktop-save-mode "22.1")
  
  (defcustom desktop-save 'ask-if-new
    "*Specifies whether the desktop should be saved when it is killed.
***************
*** 136,142 ****
    "Name of file for Emacs desktop, excluding the directory part."
    :type 'file
    :group 'desktop)
! (define-obsolete-variable-alias 'desktop-basefilename 'desktop-base-file-name 
"22.1")
  
  (defcustom desktop-path '("." "~")
    "List of directories to search for the desktop file.
--- 137,144 ----
    "Name of file for Emacs desktop, excluding the directory part."
    :type 'file
    :group 'desktop)
! (define-obsolete-variable-alias 'desktop-basefilename
!                                 'desktop-base-file-name "22.1")
  
  (defcustom desktop-path '("." "~")
    "List of directories to search for the desktop file.
***************
*** 292,299 ****
    "When non-nil, save buffer status in desktop file.
  This variable becomes buffer local when set.
  
! If the value is a function, it called by `desktop-save' with argument
! DESKTOP-DIRNAME to obtain auxiliary information to saved in the desktop
  file along with the state of the buffer for which it was called.
  
  When file names are returned, they should be formatted using the call
--- 294,301 ----
    "When non-nil, save buffer status in desktop file.
  This variable becomes buffer local when set.
  
! If the value is a function, it is called by `desktop-save' with argument
! DESKTOP-DIRNAME to obtain auxiliary information to save in the desktop
  file along with the state of the buffer for which it was called.
  
  When file names are returned, they should be formatted using the call
***************
*** 776,786 ****
  (defun desktop-load-default ()
    "Load the `default' start-up library manually.
  Also inhibit further loading of it."
!   (if (not inhibit-default-init)      ; safety check
!       (progn
!       (load "default" t t)
!       (setq inhibit-default-init t))))
! (make-obsolete 'desktop-load-default 'desktop-save-mode "22.1")
  
  ;; 
----------------------------------------------------------------------------
  ;;;###autoload
--- 778,788 ----
  (defun desktop-load-default ()
    "Load the `default' start-up library manually.
  Also inhibit further loading of it."
!   (unless inhibit-default-init                ; safety check
!     (load "default" t t)
!     (setq inhibit-default-init t)))
! (make-obsolete 'desktop-load-default
!                'desktop-save-mode "22.1")
  
  ;; 
----------------------------------------------------------------------------
  ;;;###autoload
***************
*** 801,807 ****
    "Save the desktop in directory `desktop-dirname'."
    (interactive)
    (if desktop-dirname
!     (desktop-save desktop-dirname)
      (call-interactively 'desktop-save))
    (message "Desktop saved in %s" desktop-dirname))
  
--- 803,809 ----
    "Save the desktop in directory `desktop-dirname'."
    (interactive)
    (if desktop-dirname
!       (desktop-save desktop-dirname)
      (call-interactively 'desktop-save))
    (message "Desktop saved in %s" desktop-dirname))