Merge from emacs-24; up to 2012-04-24T21:47:24Z!michael.albinus@gmx.de

[gnu-emacs] / lisp / desktop.el

diff --git a/lisp/desktop.el b/lisp/desktop.el
index ce3efb09a743730262ec06d5041955a5f2cb272f..5d9982940bff8103349256cee4fbb1a63cdda514 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -145,6 +145,8 @@ backward compatibility.")
   "Save status of Emacs when you exit."
   :group 'frames)
 
+;; Maintained for backward compatibility
+(define-obsolete-variable-alias 'desktop-enable 'desktop-save-mode "22.1")
 ;;;###autoload
 (define-minor-mode desktop-save-mode
   "Toggle desktop saving (Desktop Save mode).
@@ -158,10 +160,6 @@ one session to another.  See variable `desktop-save' and function
   :global t
   :group 'desktop)
 
-;; Maintained for backward compatibility
-(define-obsolete-variable-alias 'desktop-enable
-                                'desktop-save-mode "22.1")
-
 (defun desktop-save-mode-off ()
   "Disable `desktop-save-mode'.  Provided for use in hooks."
   (desktop-save-mode 0))