aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/desktop.el
diff options
context:
space:
mode:
authorKim F. Storm <[email protected]>2005-02-09 15:50:47 +0000
committerKim F. Storm <[email protected]>2005-02-09 15:50:47 +0000
commitbf247b6ed0b5e96845e785302bdaa97fcf6a8b84 (patch)
tree3e5225520dfe10e9394f68088de2fe22027aa53f /lisp/desktop.el
parent1de0ae85b33c8d8cb77ab839f66d2df4f9aa7b94 (diff)
Change release version from 21.4 to 22.1 throughout.
Change development version from 21.3.50 to 22.0.50.
Diffstat (limited to 'lisp/desktop.el')
-rw-r--r--lisp/desktop.el24
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el
index aaa2487457..6ec81fcac7 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -130,7 +130,7 @@ determine where the desktop is saved."
(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 @@ determine where the desktop is saved."
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 @@ Also pause for a moment to display message about errors signaled in
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 @@ An element may be variable name (a symbol) or a cons cell of the form
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 @@ to the value obtained by evaluateing FORM."
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 @@ Possible values are:
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 @@ Remaining buffers are restored lazily (when Emacs is idle).
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 @@ directory DIRNAME."
(desktop-kill)
(desktop-clear)
(desktop-read dirname))
-
+
;; ----------------------------------------------------------------------------
;;;###autoload
(defun desktop-save-in-desktop-dir ()