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

[Kim F . Storm]

Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.80 emacs/lisp/desktop.el:1.81
*** emacs/lisp/desktop.el:1.80  Wed Jan 12 00:51:17 2005
--- emacs/lisp/desktop.el       Wed Feb  9 15:50:43 2005
***************
*** 130,136 ****
      (const :tag "Save if desktop file exists, else don't" if-exists)
      (const :tag "Never save" nil))
    :group 'desktop
!   :version "21.4")
  
  (defcustom desktop-base-file-name
    (convert-standard-filename ".emacs.desktop")
--- 130,136 ----
      (const :tag "Save if desktop file exists, else don't" if-exists)
      (const :tag "Never save" nil))
    :group 'desktop
!   :version "22.1")
  
  (defcustom desktop-base-file-name
    (convert-standard-filename ".emacs.desktop")
***************
*** 144,150 ****
  The base name of the file is specified in `desktop-base-file-name'."
    :type '(repeat directory)
    :group 'desktop
!   :version "21.4")
  
  (defcustom desktop-missing-file-warning nil
    "*If non-nil then `desktop-read' asks if a non-existent file should be 
recreated.
--- 144,150 ----
  The base name of the file is specified in `desktop-base-file-name'."
    :type '(repeat directory)
    :group 'desktop
!   :version "22.1")
  
  (defcustom desktop-missing-file-warning nil
    "*If non-nil then `desktop-read' asks if a non-existent file should be 
recreated.
***************
*** 154,174 ****
  If nil, just print error messages in the message buffer."
    :type 'boolean
    :group 'desktop
!   :version "21.4")
  
  (defcustom desktop-no-desktop-file-hook nil
    "Normal hook run when `desktop-read' can't find a desktop file.
  May e.g. be used to show a dired buffer."
    :type 'hook
    :group 'desktop
!   :version "21.4")
  
  (defcustom desktop-after-read-hook nil
    "Normal hook run after a successful `desktop-read'.
  May e.g. be used to show a buffer list."
    :type 'hook
    :group 'desktop
!   :version "21.4")
  
  (defcustom desktop-save-hook nil
    "Normal hook run before the desktop is saved in a desktop file.
--- 154,174 ----
  If nil, just print error messages in the message buffer."
    :type 'boolean
    :group 'desktop
!   :version "22.1")
  
  (defcustom desktop-no-desktop-file-hook nil
    "Normal hook run when `desktop-read' can't find a desktop file.
  May e.g. be used to show a dired buffer."
    :type 'hook
    :group 'desktop
!   :version "22.1")
  
  (defcustom desktop-after-read-hook nil
    "Normal hook run after a successful `desktop-read'.
  May e.g. be used to show a buffer list."
    :type 'hook
    :group 'desktop
!   :version "22.1")
  
  (defcustom desktop-save-hook nil
    "Normal hook run before the desktop is saved in a desktop file.
***************
*** 204,210 ****
  to the value obtained by evaluateing FORM."
    :type '(repeat (restricted-sexp :match-alternatives (symbolp consp)))
    :group 'desktop
!   :version "21.4")
  
  (defcustom desktop-clear-preserve-buffers-regexp
    "^\\(\\*scratch\\*\\|\\*Messages\\*\\|\\*tramp/.+\\*\\)$"
--- 204,210 ----
  to the value obtained by evaluateing FORM."
    :type '(repeat (restricted-sexp :match-alternatives (symbolp consp)))
    :group 'desktop
!   :version "22.1")
  
  (defcustom desktop-clear-preserve-buffers-regexp
    "^\\(\\*scratch\\*\\|\\*Messages\\*\\|\\*tramp/.+\\*\\)$"
***************
*** 212,218 ****
  See also `desktop-clear-preserve-buffers'."
    :type 'regexp
    :group 'desktop
!   :version "21.4")
  
  (defcustom desktop-clear-preserve-buffers nil
    "*List of buffer names that `desktop-clear' should not delete.
--- 212,218 ----
  See also `desktop-clear-preserve-buffers'."
    :type 'regexp
    :group 'desktop
!   :version "22.1")
  
  (defcustom desktop-clear-preserve-buffers nil
    "*List of buffer names that `desktop-clear' should not delete.
***************
*** 265,271 ****
     local    -- Relative to directory of desktop file."
    :type '(choice (const absolute) (const tilde) (const local))
    :group 'desktop
!   :version "21.4")
  
  (defcustom desktop-restore-eager t
    "Number of buffers to restore immediately.
--- 265,271 ----
     local    -- Relative to directory of desktop file."
    :type '(choice (const absolute) (const tilde) (const local))
    :group 'desktop
!   :version "22.1")
  
  (defcustom desktop-restore-eager t
    "Number of buffers to restore immediately.
***************
*** 273,292 ****
  If value is t, all buffers are restored immediately."
    :type '(choice (const t) integer)
    :group 'desktop
!   :version "21.4")
  
  (defcustom desktop-lazy-verbose t
    "Verbose reporting of lazily created buffers."
    :type 'boolean
    :group 'desktop
!   :version "21.4")
  
  (defcustom desktop-lazy-idle-delay 5
    "Idle delay before starting to create buffers.
  See `desktop-restore-eager'."
    :type 'integer
    :group 'desktop
!   :version "21.4")
  
  ;;;###autoload
  (defvar desktop-save-buffer nil
--- 273,292 ----
  If value is t, all buffers are restored immediately."
    :type '(choice (const t) integer)
    :group 'desktop
!   :version "22.1")
  
  (defcustom desktop-lazy-verbose t
    "Verbose reporting of lazily created buffers."
    :type 'boolean
    :group 'desktop
!   :version "22.1")
  
  (defcustom desktop-lazy-idle-delay 5
    "Idle delay before starting to create buffers.
  See `desktop-restore-eager'."
    :type 'integer
    :group 'desktop
!   :version "22.1")
  
  ;;;###autoload
  (defvar desktop-save-buffer nil
***************
*** 795,801 ****
    (desktop-kill)
    (desktop-clear)
    (desktop-read dirname))
!   
  ;; 
----------------------------------------------------------------------------
  ;;;###autoload
  (defun desktop-save-in-desktop-dir ()
--- 795,801 ----
    (desktop-kill)
    (desktop-clear)
    (desktop-read dirname))
! 
  ;; 
----------------------------------------------------------------------------
  ;;;###autoload
  (defun desktop-save-in-desktop-dir ()