* lisp/hi-lock.el (hi-lock-face-defaults): Move obsolete before definition.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3c2426620e66908eecf0d841e9d03fd7b62e482..c7775422417b65ca66a9e2e83168d300e10e02d5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-05-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * hi-lock.el (hi-lock-face-defaults): Move obsolete before definition.
+
        * progmodes/compile.el (compilation-error-regexp-alist-alist):
        Simplify Maven regexp, and make sure the file can't start with a space
        (bug#11517).
@@ -18,10 +20,11 @@
 
        * calc/calc.el (calc-ensure-consistent-units): New variable.
 
-       * calc/calc-units.el (math-consistent-units-p, math-check-unit-consistency):
-       New functions.
-       (calc-quick-units, calc-convert-units): Use `math-check-unit-consistency' when
-       `calc-ensure-consistent-units' is non-nil.
+       * calc/calc-units.el (math-consistent-units-p)
+       (math-check-unit-consistency): New functions.
+       (calc-quick-units, calc-convert-units):
+       Use `math-check-unit-consistency' when `calc-ensure-consistent-units'
+       is non-nil.
        (calc-extract-units): Fix typo.
 
 2012-05-18  Stefan Monnier  <monnier@iro.umontreal.ca>

diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 32a041e6c09c3cfc77a76abbb809105000fc770e..2c2d08e19ccc62e3dce371cf734e08b6f4d477a5 100644 (file)
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -204,16 +204,15 @@ patterns."
 (defvar hi-lock-interactive-patterns nil
   "Patterns provided to hi-lock by user.  Should not be changed.")
 
+(define-obsolete-variable-alias 'hi-lock-face-history
+                                'hi-lock-face-defaults "23.1")
 (defvar hi-lock-face-defaults
   '("hi-yellow" "hi-pink" "hi-green" "hi-blue" "hi-black-b"
     "hi-blue-b" "hi-red-b" "hi-green-b" "hi-black-hb")
   "Default faces for hi-lock interactive functions.")
 
-;(dolist (f hi-lock-face-defaults) (unless (facep f) (error "%s not a face" f)))
-
-(define-obsolete-variable-alias 'hi-lock-face-history
-                                'hi-lock-face-defaults
-                                "23.1")
+;;(dolist (f hi-lock-face-defaults)
+;;  (unless (facep f) (error "%s not a face" f)))
 
 (define-obsolete-variable-alias 'hi-lock-regexp-history
                                 'regexp-history