Aliases to defcustoms must come before the defcustom.

* strokes.el (strokes-modeline-string):
* emulation/crisp.el (crisp-mode-modeline-string):
* eshell/esh-mode.el (eshell-status-in-modeline):
Aliases to defcustoms must come before the defcustom.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2cda6f9f6abdbd3329b6c43431b95295b73d908..07f68f155c32b089cd859415adc23259ac589d7f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2012-10-06  Glenn Morris  <rgm@gnu.org>
 
+       * strokes.el (strokes-modeline-string):
+       * emulation/crisp.el (crisp-mode-modeline-string):
+       * eshell/esh-mode.el (eshell-status-in-modeline):
+       Aliases to defcustoms must come before the defcustom.
+
        * calendar/cal-tex.el (cal-tex-diary, cal-tex-cursor-week)
        (cal-tex-cursor-week2, cal-tex-cursor-week-iso)
        (cal-tex-cursor-week-monday): Doc fixes.

diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index c9822b7ec27e82e582c58e801ecc06629ebf16dd..01d202f87b5b69921a7eef017c89bad48a8176a1 100644 (file)
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -171,14 +171,14 @@
 All the bindings are done here instead of globally to try and be
 nice to the world.")
 
+(define-obsolete-variable-alias 'crisp-mode-modeline-string
+  'crisp-mode-mode-line-string "24.3")
+
 (defcustom crisp-mode-mode-line-string " *CRiSP*"
   "String to display in the mode line when CRiSP emulation mode is enabled."
   :type 'string
   :group 'crisp)
 
-(define-obsolete-variable-alias 'crisp-mode-modeline-string
-  'crisp-mode-mode-line-string "24.3")
-
 ;;;###autoload
 (defcustom crisp-mode nil
   "Track status of CRiSP emulation mode.

diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 8a9107e54703a84edc97b10f7761dcd06b6dfb4f..673632400f298bc38c42e5b5d0c4a72c8426b420 100644 (file)
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -193,14 +193,14 @@ This is used by `eshell-watch-for-password-prompt'."
   :type '(choice (const nil) function)
   :group 'eshell-mode)
 
+(define-obsolete-variable-alias 'eshell-status-in-modeline
+  'eshell-status-in-mode-line "24.3")
+
 (defcustom eshell-status-in-mode-line t
   "If non-nil, let the user know a command is running in the mode line."
   :type 'boolean
   :group 'eshell-mode)
 
-(define-obsolete-variable-alias 'eshell-status-in-modeline
-  'eshell-status-in-mode-line "24.3")
-
 (defvar eshell-first-time-p t
   "A variable which is non-nil the first time Eshell is loaded.")
 

diff --git a/lisp/strokes.el b/lisp/strokes.el
index 62a8528f25dd6871962dac99c6060a5f3206031a..9a3a7608d2bcc8a06295ccfd256d0dcc4cae392e 100644 (file)
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -212,13 +212,14 @@ static char * stroke_xpm[] = {
   :link '(emacs-commentary-link "strokes")
   :group 'mouse)
 
+(define-obsolete-variable-alias 'strokes-modeline-string 'strokes-lighter
+  "24.3")
+
 (defcustom strokes-lighter " Strokes"
   "Mode line identifier for Strokes mode."
   :type 'string
   :group 'strokes)
 
-(define-obsolete-variable-alias 'strokes-modeline-string 'strokes-lighter "24.3")
-
 (defcustom strokes-character ?@
   "Character used when drawing strokes in the strokes buffer.
 \(The default is `@', which works well.\)"