summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorLars Hansen <larsh@soem.dk>2004-11-11 19:02:56 +0000
committerLars Hansen <larsh@soem.dk>2004-11-11 19:02:56 +0000
commitaf61551b5edda43931b5cadc7e63114ccc2c75d0 (patch)
tree42d6625d12f4ff95777dba2918ad09d469626160 /lisp
parentde0234ea3d9d94d005e8ec0e6307f0a5591e2c98 (diff)
downloademacs-af61551b5edda43931b5cadc7e63114ccc2c75d0.tar.gz
emacs-af61551b5edda43931b5cadc7e63114ccc2c75d0.tar.bz2
emacs-af61551b5edda43931b5cadc7e63114ccc2c75d0.zip
(desktop-buffer-mode-handlers, desktop-after-read-hook,
desktop-clear-preserve-buffers-regexp, desktop-file-name-format, desktop-globals-to-clear, desktop-no-desktop-file-hook, desktop-path, desktop-save): Add :version.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/desktop.el24
2 files changed, 23 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a581107e08..47fa7ea6cda 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-11 Lars Hansen <larsh@math.ku.dk>
+
+ * desktop.el (desktop-buffer-mode-handlers, desktop-after-read-hook,
+ desktop-clear-preserve-buffers-regexp, desktop-file-name-format,
+ desktop-globals-to-clear, desktop-no-desktop-file-hook, desktop-path,
+ desktop-save): Add :version.
+
2004-11-11 Stefan Monnier <monnier@iro.umontreal.ca>
* printing.el (pr-get-symbol): Don't downcase.
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 64e8770ffd0..0a423aa7c42 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -129,7 +129,8 @@ determine where the desktop is saved."
(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)
+ :group 'desktop
+ :version "21.4")
(defcustom desktop-base-file-name
(convert-standard-filename ".emacs.desktop")
@@ -142,7 +143,8 @@ determine where the desktop is saved."
"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)
+ :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,19 +153,22 @@ 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)
+ :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)
+ :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)
+ :group 'desktop
+ :version "21.4")
(defcustom desktop-save-hook nil
"Normal hook run before the desktop is saved in a desktop file.
@@ -198,14 +203,16 @@ 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)
+ :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)
+ :group 'desktop
+ :version "21.4")
(defcustom desktop-clear-preserve-buffers nil
"*List of buffer names that `desktop-clear' should not delete.
@@ -257,7 +264,8 @@ Possible values are:
tilde -- Relative to ~.
local -- Relative to directory of desktop file."
:type '(choice (const absolute) (const tilde) (const local))
- :group 'desktop)
+ :group 'desktop
+ :version "21.4")
;;;###autoload
(defvar desktop-save-buffer nil