Mercurial > emacs

diff lisp/desktop.el @ 112069:17134f58ba8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge emacs-23
author Kenichi Handa <handa@m17n.org>
date Wed, 13 Oct 2010 22:40:51 +0900
parents 941667e2cb4c
children 6c9f59d296d3 376148b31b5e
line wrap: on
line diff
--- a/lisp/desktop.el	Sun Aug 29 14:22:52 2010 +0900
+++ b/lisp/desktop.el	Wed Oct 13 22:40:51 2010 +0900
@@ -226,7 +226,7 @@
 The base name of the file is specified in `desktop-base-file-name'."
   :type '(repeat directory)
   :group 'desktop
-  :version "22.1")
+  :version "23.2")                      ; user-emacs-directory added
 
 (defcustom desktop-missing-file-warning nil
   "If non-nil, offer to recreate the buffer of a deleted file.