aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-10-27 17:14:37 +0000
committerJuanma Barranquero2007-10-27 17:14:37 +0000
commit8f3f313d137a36fdee61339d551d75c47f460128 (patch)
treeb901dcfe28e714c9121684b6e29ddf37384fd30d
parent9db0c29b2689d1604bb12bf040bb9b7b198b6120 (diff)
downloademacs-8f3f313d137a36fdee61339d551d75c47f460128.tar.gz
emacs-8f3f313d137a36fdee61339d551d75c47f460128.zip
(desktop-load-locked-desktop, desktop-base-lock-name, desktop-not-loaded-hook):
Fix :version tags.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/desktop.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 168d2e0e232..d91d92609e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-10-27 Juanma Barranquero <lekktu@gmail.com>
2
3 * desktop.el (desktop-load-locked-desktop, desktop-base-lock-name)
4 (desktop-not-loaded-hook): Fix :version tags.
5
12007-10-27 Michael Albinus <michael.albinus@gmx.de> 62007-10-27 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp. 8 * net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
diff --git a/lisp/desktop.el b/lisp/desktop.el
index bddba82a965..0fa38ed3c91 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -204,7 +204,7 @@ the normal hook `desktop-not-loaded-hook' is run."
204 (const :tag "Don't load" nil) 204 (const :tag "Don't load" nil)
205 (const :tag "Ask the user" ask)) 205 (const :tag "Ask the user" ask))
206 :group 'desktop 206 :group 'desktop
207 :version "23.1") 207 :version "22.2")
208 208
209(defcustom desktop-base-file-name 209(defcustom desktop-base-file-name
210 (convert-standard-filename ".emacs.desktop") 210 (convert-standard-filename ".emacs.desktop")
@@ -219,7 +219,7 @@ the normal hook `desktop-not-loaded-hook' is run."
219 "Name of lock file for Emacs desktop, excluding the directory part." 219 "Name of lock file for Emacs desktop, excluding the directory part."
220 :type 'file 220 :type 'file
221 :group 'desktop 221 :group 'desktop
222 :version "23.1") 222 :version "22.2")
223 223
224(defcustom desktop-path '("." "~") 224(defcustom desktop-path '("." "~")
225 "List of directories to search for the desktop file. 225 "List of directories to search for the desktop file.
@@ -253,7 +253,7 @@ May be used to deal with accidental multiple Emacs jobs."
253 :type 'hook 253 :type 'hook
254 :group 'desktop 254 :group 'desktop
255 :options '(desktop-save-mode-off save-buffers-kill-emacs) 255 :options '(desktop-save-mode-off save-buffers-kill-emacs)
256 :version "23.1") 256 :version "22.2")
257 257
258(defcustom desktop-after-read-hook nil 258(defcustom desktop-after-read-hook nil
259 "Normal hook run after a successful `desktop-read'. 259 "Normal hook run after a successful `desktop-read'.