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

[Miles Bader]

Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.60.2.4 emacs/lisp/desktop.el:1.60.2.5
*** emacs/lisp/desktop.el:1.60.2.4      Wed Sep 15 08:59:55 2004
--- emacs/lisp/desktop.el       Fri Nov 12 02:52:46 2004
***************
*** 129,135 ****
      (const :tag "Ask if desktop file exists, else don't save" ask-if-exists)
      (const :tag "Save if desktop file exists, else don't" if-exists)
      (const :tag "Never save" nil))
!   :group 'desktop)
  
  (defcustom desktop-base-file-name
    (convert-standard-filename ".emacs.desktop")
--- 129,136 ----
      (const :tag "Ask if desktop file exists, else don't save" ask-if-exists)
      (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")
***************
*** 142,148 ****
    "List of directories to search for the desktop file.
  The base name of the file is specified in `desktop-base-file-name'."
    :type '(repeat directory)
!   :group 'desktop)
  
  (defcustom desktop-missing-file-warning nil
    "*If non-nil then `desktop-read' asks if a non-existent file should be 
recreated.
--- 143,150 ----
    "List of directories to search for the desktop file.
  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.
***************
*** 151,169 ****
  
  If nil, just print error messages in the message buffer."
    :type 'boolean
!   :group 'desktop)
  
  (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)
  
  (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)
  
  (defcustom desktop-save-hook nil
    "Normal hook run before the desktop is saved in a desktop file.
--- 153,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.
***************
*** 198,211 ****
  \(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)
  
  (defcustom desktop-clear-preserve-buffers-regexp
    "^\\(\\*scratch\\*\\|\\*Messages\\*\\|\\*tramp/.+\\*\\)$"
    "Regexp identifying buffers that `desktop-clear' should not delete.
  See also `desktop-clear-preserve-buffers'."
    :type 'regexp
!   :group 'desktop)
  
  (defcustom desktop-clear-preserve-buffers nil
    "*List of buffer names that `desktop-clear' should not delete.
--- 203,218 ----
  \(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 "21.4")
  
  (defcustom desktop-clear-preserve-buffers-regexp
    "^\\(\\*scratch\\*\\|\\*Messages\\*\\|\\*tramp/.+\\*\\)$"
    "Regexp identifying buffers that `desktop-clear' should not delete.
  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.
***************
*** 257,263 ****
     tilde    -- Relative to ~.
     local    -- Relative to directory of desktop file."
    :type '(choice (const absolute) (const tilde) (const local))
!   :group 'desktop)
  
  ;;;###autoload
  (defvar desktop-save-buffer nil
--- 264,271 ----
     tilde    -- Relative to ~.
     local    -- Relative to directory of desktop file."
    :type '(choice (const absolute) (const tilde) (const local))
!   :group 'desktop
!   :version "21.4")
  
  ;;;###autoload
  (defvar desktop-save-buffer nil