diff options
| author | Glenn Morris | 2010-09-01 22:38:30 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-09-01 22:38:30 -0700 |
| commit | a3b337cd0d96715741366294a61d94182413343a (patch) | |
| tree | 9e26a0d2a5c99e4bd2d5f8df6ca004bcbdd13119 /lisp | |
| parent | d419e1d94e885388b86f8753d741befa1855d333 (diff) | |
| download | emacs-a3b337cd0d96715741366294a61d94182413343a.tar.gz emacs-a3b337cd0d96715741366294a61d94182413343a.zip | |
* desktop.el (desktop-path): Bump :version after 2009-09-15 change.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/desktop.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d61a8c565a8..6b0c2e77465 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-09-02 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * desktop.el (desktop-path): Bump :version after 2009-09-15 change. | ||
| 4 | |||
| 1 | 2010-08-31 Kenichi Handa <handa@m17n.org> | 5 | 2010-08-31 Kenichi Handa <handa@m17n.org> |
| 2 | 6 | ||
| 3 | * international/mule-cmds.el (standard-display-european-internal): | 7 | * international/mule-cmds.el (standard-display-european-internal): |
diff --git a/lisp/desktop.el b/lisp/desktop.el index 60bc044696b..c247565af20 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el | |||
| @@ -226,7 +226,7 @@ the normal hook `desktop-not-loaded-hook' is run." | |||
| 226 | The base name of the file is specified in `desktop-base-file-name'." | 226 | The base name of the file is specified in `desktop-base-file-name'." |
| 227 | :type '(repeat directory) | 227 | :type '(repeat directory) |
| 228 | :group 'desktop | 228 | :group 'desktop |
| 229 | :version "22.1") | 229 | :version "23.2") ; user-emacs-directory added |
| 230 | 230 | ||
| 231 | (defcustom desktop-missing-file-warning nil | 231 | (defcustom desktop-missing-file-warning nil |
| 232 | "If non-nil, offer to recreate the buffer of a deleted file. | 232 | "If non-nil, offer to recreate the buffer of a deleted file. |