From: Juanma Barranquero <lekktu@gmail.com>
Date: Sat, 27 Oct 2007 17:14:37 +0000 (+0000)
Subject: (desktop-load-locked-desktop, desktop-base-lock-name, desktop-not-loaded-hook):
X-Git-Tag: emacs-pretest-23.0.90~10037
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8f3f313d137a36fdee61339d551d75c47f460128;p=emacs.git

(desktop-load-locked-desktop, desktop-base-lock-name, desktop-not-loaded-hook):
Fix :version tags.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 168d2e0e232..d91d92609e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-27  Juanma Barranquero  <lekktu@gmail.com>
+
+	* desktop.el (desktop-load-locked-desktop, desktop-base-lock-name)
+	(desktop-not-loaded-hook): Fix :version tags.
+
 2007-10-27  Michael Albinus  <michael.albinus@gmx.de>
 
 	* 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."
     (const :tag "Don't load" nil)
     (const :tag "Ask the user" ask))
   :group 'desktop
-  :version "23.1")
+  :version "22.2")
 
 (defcustom desktop-base-file-name
   (convert-standard-filename ".emacs.desktop")
@@ -219,7 +219,7 @@ the normal hook `desktop-not-loaded-hook' is run."
   "Name of lock file for Emacs desktop, excluding the directory part."
   :type 'file
   :group 'desktop
-  :version "23.1")
+  :version "22.2")
 
 (defcustom desktop-path '("." "~")
   "List of directories to search for the desktop file.
@@ -253,7 +253,7 @@ May be used to deal with accidental multiple Emacs jobs."
   :type 'hook
   :group 'desktop
   :options '(desktop-save-mode-off save-buffers-kill-emacs)
-  :version "23.1")
+  :version "22.2")
 
 (defcustom desktop-after-read-hook nil
   "Normal hook run after a successful `desktop-read'.