diff lisp/desktop.el @ 90103:3ebd9bdb4fe5

Revision: [e-mail]--gnu-2005/emacs--unicode--0--patch-13 Merge from emacs--cvs-trunk--0 Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-83 - [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-89 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-90 Update from CVS: man/calc.texi: Add macro for LaTeX for info output. * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-91 - [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-94 Update from CVS

--- a/lisp/desktop.el	Sun Feb 13 00:40:20 2005 +0000
+++ b/lisp/desktop.el	Sun Feb 13 07:19:08 2005 +0000
@@ -130,7 +130,7 @@
     (const :tag "Save if desktop file exists, else don't" if-exists)
     (const :tag "Never save" nil))
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-base-file-name
   (convert-standard-filename ".emacs.desktop")
@@ -144,7 +144,7 @@
 The base name of the file is specified in `desktop-base-file-name'."
   :type '(repeat directory)
   :group 'desktop
-  :version "21.4")
+  :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,21 +154,21 @@
 If nil, just print error messages in the message buffer."
   :type 'boolean
   :group 'desktop
-  :version "21.4")
+  :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 "21.4")
+  :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 "21.4")
+  :version "22.1")
 
 (defcustom desktop-save-hook nil
   "Normal hook run before the desktop is saved in a desktop file.
@@ -204,7 +204,7 @@
 to the value obtained by evaluateing FORM."
   :type '(repeat (restricted-sexp :match-alternatives (symbolp consp)))
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-clear-preserve-buffers-regexp
   "^\\(\\*scratch\\*\\|\\*Messages\\*\\|\\*tramp/.+\\*\\)$"
@@ -212,7 +212,7 @@
 See also `desktop-clear-preserve-buffers'."
   :type 'regexp
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-clear-preserve-buffers nil
   "*List of buffer names that `desktop-clear' should not delete.
@@ -265,7 +265,7 @@
    local    -- Relative to directory of desktop file."
   :type '(choice (const absolute) (const tilde) (const local))
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-restore-eager t
   "Number of buffers to restore immediately.
@@ -273,20 +273,20 @@
 If value is t, all buffers are restored immediately."
   :type '(choice (const t) integer)
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-lazy-verbose t
   "Verbose reporting of lazily created buffers."
   :type 'boolean
   :group 'desktop
-  :version "21.4")
+  :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 "21.4")
+  :version "22.1")
 
 ;;;###autoload
 (defvar desktop-save-buffer nil
@@ -795,7 +795,7 @@
   (desktop-kill)
   (desktop-clear)
   (desktop-read dirname))
-  
+
 ;; ----------------------------------------------------------------------------
 ;;;###autoload
 (defun desktop-save-in-desktop-dir ()