Mercurial > emacs

diff lisp/desktop.el @ 110236:6c9f59d296d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes from emacs-23 branch.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 06 Sep 2010 12:38:03 -0400
parents d418516def73 941667e2cb4c
children 417b1e4d63cd
line wrap: on
line diff
--- a/lisp/desktop.el	Mon Sep 06 02:09:42 2010 +0000
+++ b/lisp/desktop.el	Mon Sep 06 12:38:03 2010 -0400
@@ -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.