diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-09-06 12:38:03 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-09-06 12:38:03 -0400 |
| commit | 1099930585662f32278796f9943ac8b50a1179f1 (patch) | |
| tree | 9f448d991fdb0d5a045f4713d59342151695773a /lisp/desktop.el | |
| parent | ed96ace9289c2e04db3e8fc63321fde248c3f3f8 (diff) | |
| parent | 9c405a86c6d6ee1034252d653c246ef509145000 (diff) | |
| download | emacs-1099930585662f32278796f9943ac8b50a1179f1.tar.gz | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index 8f0b8075cdf..b4d3dfd55c8 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -226,7 +226,7 @@ the normal hook `desktop-not-loaded-hook' is run." 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. |