[Emacs-diffs] /srv/bzr/emacs/trunk r110392: Aliases to defcustoms must come before the defcustom.

[Glenn Morris]

------------------------------------------------------------
revno: 110392
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-06 12:55:47 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/emulation/crisp.el
  lisp/eshell/esh-mode.el
  lisp/strokes.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-06 19:50:29 +0000
+++ b/lisp/ChangeLog    2012-10-06 19:55:47 +0000
@@ -1,5 +1,10 @@
 2012-10-06  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/emulation/crisp.el'
--- a/lisp/emulation/crisp.el   2012-08-15 16:29:11 +0000
+++ b/lisp/emulation/crisp.el   2012-10-06 19:55:47 +0000
@@ -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.

=== modified file 'lisp/eshell/esh-mode.el'
--- a/lisp/eshell/esh-mode.el   2012-08-15 16:29:11 +0000
+++ b/lisp/eshell/esh-mode.el   2012-10-06 19:55:47 +0000
@@ -193,14 +193,14 @@
   :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.")
 

=== modified file 'lisp/strokes.el'
--- a/lisp/strokes.el   2012-09-17 05:41:04 +0000
+++ b/lisp/strokes.el   2012-10-06 19:55:47 +0000
@@ -212,13 +212,14 @@
   :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.\)"