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

[Juanma Barranquero]

Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.85 emacs/lisp/desktop.el:1.86
*** emacs/lisp/desktop.el:1.85  Tue Jul 12 18:05:09 2005
--- emacs/lisp/desktop.el       Tue Jul 19 09:52:55 2005
***************
*** 107,113 ****
  
  ;; Maintained for backward compatibility
  (defvaralias 'desktop-enable 'desktop-save-mode)
! (make-obsolete-variable 'desktop-enable 'desktop-save-mode)
  
  (defcustom desktop-save 'ask-if-new
    "*Specifies whether the desktop should be saved when it is killed.
--- 107,113 ----
  
  ;; Maintained for backward compatibility
  (defvaralias 'desktop-enable 'desktop-save-mode)
! (make-obsolete-variable 'desktop-enable 'desktop-save-mode "22.1")
  
  (defcustom desktop-save 'ask-if-new
    "*Specifies whether the desktop should be saved when it is killed.
***************
*** 120,126 ****
     if-exists     -- save if desktop file exists, otherwise don't save.
     nil           -- never save.
  The desktop is never saved when `desktop-save-mode' is nil.
! The variables `desktop-directory' and `desktop-base-file-name'
  determine where the desktop is saved."
    :type '(choice
      (const :tag "Always save" t)
--- 120,126 ----
     if-exists     -- save if desktop file exists, otherwise don't save.
     nil           -- never save.
  The desktop is never saved when `desktop-save-mode' is nil.
! The variables `desktop-dirname' and `desktop-base-file-name'
  determine where the desktop is saved."
    :type '(choice
      (const :tag "Always save" t)
***************
*** 200,207 ****
      regexp-search-ring-yank-pointer)
    "List of global variables that `desktop-clear' will clear.
  An element may be variable name (a symbol) or a cons cell of the form
! \(VAR . FORM). Symbols are set to nil and for cons cells VAR is set
! to the value obtained by evaluateing FORM."
    :type '(repeat (restricted-sexp :match-alternatives (symbolp consp)))
    :group 'desktop
    :version "22.1")
--- 200,207 ----
      regexp-search-ring-yank-pointer)
    "List of global variables that `desktop-clear' will clear.
  An element may be variable name (a symbol) or a cons cell of the form
! \(VAR . FORM).  Symbols are set to nil and for cons cells VAR is set
! to the value obtained by evaluating FORM."
    :type '(repeat (restricted-sexp :match-alternatives (symbolp consp)))
    :group 'desktop
    :version "22.1")
***************
*** 305,313 ****
  DESKTOP-BUFFER-MISC.")
  (make-variable-buffer-local 'desktop-save-buffer)
  (make-obsolete-variable 'desktop-buffer-modes-to-save
!                         'desktop-save-buffer)
  (make-obsolete-variable 'desktop-buffer-misc-functions
!                         'desktop-save-buffer)
  
  (defcustom desktop-buffer-mode-handlers
    '((dired-mode . dired-restore-desktop-buffer)
--- 305,313 ----
  DESKTOP-BUFFER-MISC.")
  (make-variable-buffer-local 'desktop-save-buffer)
  (make-obsolete-variable 'desktop-buffer-modes-to-save
!                         'desktop-save-buffer "22.1")
  (make-obsolete-variable 'desktop-buffer-misc-functions
!                         'desktop-save-buffer "22.1")
  
  (defcustom desktop-buffer-mode-handlers
    '((dired-mode . dired-restore-desktop-buffer)
***************
*** 315,321 ****
      (mh-folder-mode . mh-restore-desktop-buffer)
      (Info-mode . Info-restore-desktop-buffer))
    "Alist of major mode specific functions to restore a desktop buffer.
! Functions are called by `desktop-read'. List elements must have the form
  \(MAJOR-MODE . RESTORE-BUFFER-FUNCTION).
  
  Buffers with a major mode not specified here, are restored by the default
--- 315,321 ----
      (mh-folder-mode . mh-restore-desktop-buffer)
      (Info-mode . Info-restore-desktop-buffer))
    "Alist of major mode specific functions to restore a desktop buffer.
! Functions are called by `desktop-read'.  List elements must have the form
  \(MAJOR-MODE . RESTORE-BUFFER-FUNCTION).
  
  Buffers with a major mode not specified here, are restored by the default
***************
*** 342,348 ****
  
  (put 'desktop-buffer-mode-handlers 'risky-local-variable t)
  (make-obsolete-variable 'desktop-buffer-handlers
!                         'desktop-buffer-mode-handlers)
  
  (defcustom desktop-minor-mode-table
    '((auto-fill-function auto-fill-mode)
--- 342,348 ----
  
  (put 'desktop-buffer-mode-handlers 'risky-local-variable t)
  (make-obsolete-variable 'desktop-buffer-handlers
!                         'desktop-buffer-mode-handlers "22.1")
  
  (defcustom desktop-minor-mode-table
    '((auto-fill-function auto-fill-mode)
***************
*** 432,438 ****
      (condition-case err
        (desktop-save desktop-dirname)
        (file-error
!         (unless (yes-or-no-p "Error while saving the desktop. Ignore? ")
            (signal (car err) (cdr err)))))))
  
  ;; 
----------------------------------------------------------------------------
--- 432,438 ----
      (condition-case err
        (desktop-save desktop-dirname)
        (file-error
!         (unless (yes-or-no-p "Error while saving the desktop.  Ignore? ")
            (signal (car err) (cdr err)))))))
  
  ;; 
----------------------------------------------------------------------------
***************
*** 711,717 ****
    "Read and process the desktop file in directory DIRNAME.
  Look for a desktop file in DIRNAME, or if DIRNAME is omitted, look in
  directories listed in `desktop-path'.  If a desktop file is found, it
! is processed and `desktop-after-read-hook' is run. If no desktop file
  is found, clear the desktop and run `desktop-no-desktop-file-hook'.
  This function is a no-op when Emacs is running in batch mode.
  It returns t if a desktop file was loaded, nil otherwise."
--- 711,717 ----
    "Read and process the desktop file in directory DIRNAME.
  Look for a desktop file in DIRNAME, or if DIRNAME is omitted, look in
  directories listed in `desktop-path'.  If a desktop file is found, it
! is processed and `desktop-after-read-hook' is run.  If no desktop file
  is found, clear the desktop and run `desktop-no-desktop-file-hook'.
  This function is a no-op when Emacs is running in batch mode.
  It returns t if a desktop file was loaded, nil otherwise."
***************
*** 781,787 ****
        (progn
        (load "default" t t)
        (setq inhibit-default-init t))))
! (make-obsolete 'desktop-load-default 'desktop-save-mode)
  
  ;; 
----------------------------------------------------------------------------
  ;;;###autoload
--- 781,787 ----
        (progn
        (load "default" t t)
        (setq inhibit-default-init t))))
! (make-obsolete 'desktop-load-default 'desktop-save-mode "22.1")
  
  ;; 
----------------------------------------------------------------------------
  ;;;###autoload
***************
*** 958,964 ****
                               (cons 'overwrite-mode (car mim)))))
  
  (defun desktop-append-buffer-args (&rest args)
!   "Append ARGS at end of `desktop-buffer-args-list'
  ARGS must be an argument list for `desktop-create-buffer'."
    (setq desktop-buffer-args-list (nconc desktop-buffer-args-list (list args)))
    (unless desktop-lazy-timer
--- 958,964 ----
                               (cons 'overwrite-mode (car mim)))))
  
  (defun desktop-append-buffer-args (&rest args)
!   "Append ARGS at end of `desktop-buffer-args-list'.
  ARGS must be an argument list for `desktop-create-buffer'."
    (setq desktop-buffer-args-list (nconc desktop-buffer-args-list (list args)))
    (unless desktop-lazy-timer