* progmodes/verilog-mode.el (verilog-type-font-keywords): Use

font-lock-constant-face, not obsolete font-lock-reference-face.

* htmlfontify.el (hfy-face-resolve-face): New function.
(hfy-face-to-style): Use it (Bug#6279).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed5d215a9533258f9086556abfc29d7d39ef2475..63a2d0bc027356d55e7fb4c0d8741db24f187e84 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2010-05-27  Chong Yidong  <cyd@stupidchicken.com>
+
+       * progmodes/verilog-mode.el (verilog-type-font-keywords): Use
+       font-lock-constant-face, not obsolete font-lock-reference-face.
+
+2010-05-27  Masatake YAMATO  <yamato@redhat.com>
+
+       * htmlfontify.el (hfy-face-resolve-face): New function.
+       (hfy-face-to-style): Use it (Bug#6279).
+
 2010-05-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * epa.el (epa--select-keys): Don't explicitly delete the window since

diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 19aae590cb278339ab79f0b1cf9cd11a11e6714c..b363156c311ce13980d2a5a502af80a511d13bf3 100644 (file)
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1059,14 +1059,25 @@ haven't encountered them yet.  Returns a `hfy-style-assoc'."
     (setq  n (apply '* m))
     (nconc r (hfy-size (if x (round n) (* n 1.0)))) ))
 
+(defun hfy-face-resolve-face (fn)
+  (cond
+   ((facep fn)
+    (hfy-face-attr-for-class fn hfy-display-class))
+   ((and (symbolp fn)
+        (facep (symbol-value fn)))
+    ;; Obsolete faces like `font-lock-reference-face' are defined as
+    ;; aliases for another face.
+    (hfy-face-attr-for-class (symbol-value fn) hfy-display-class))
+   (t nil)))
+
+
 (defun hfy-face-to-style (fn)
   "Take FN, a font or `defface' style font specification,
 \(as returned by `face-attr-construct' or `hfy-face-attr-for-class')
 and return a `hfy-style-assoc'.\n
 See also `hfy-face-to-style-i', `hfy-flatten-style'."
   ;;(message "hfy-face-to-style");;DBUG
-  (let ((face-def (if (facep fn)
-                      (hfy-face-attr-for-class fn hfy-display-class) fn))
+  (let ((face-def (hfy-face-resolve-face fn))
         (final-style nil))
 
     (setq final-style (hfy-flatten-style (hfy-face-to-style-i face-def)))

diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index e391216796b96f48b6a0c55e3d074799594ea46a..4a704b0416cf1e57dc1d3d58aef1f35ddfcca63c 100644 (file)
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -2425,12 +2425,12 @@ See also `verilog-font-lock-extra-types'.")
                 (list
                  (concat "\\<function\\>\\s-+\\(integer\\|real\\(time\\)?\\|time\\)\\s-+\\(\\sw+\\)" )
                       '(1 font-lock-keyword-face)
-                      '(3 font-lock-reference-face prepend))
+                      '(3 font-lock-constant-face prepend))
                 '("\\<function\\>\\s-+\\(\\[[^]]+\\]\\)\\s-+\\(\\sw+\\)"
                   (1 font-lock-keyword-face)
-                  (2 font-lock-reference-face append))
+                  (2 font-lock-constant-face append))
                 '("\\<function\\>\\s-+\\(\\sw+\\)"
-                  1 'font-lock-reference-face append))))
+                  1 'font-lock-constant-face append))))
 
   (setq verilog-font-lock-keywords-2
        (append verilog-font-lock-keywords-1