Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-420

Fix cperl-mode font-lock problem

2005-06-15  Miles Bader  <miles@gnu.org>

   * lisp/progmodes/cperl-mode.el (cperl-init-faces): Use literal cperl
   faces instead of (non-existent) variables.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 884b9e0..83e92a7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-15  Miles Bader  <miles@gnu.org>
+
+       * progmodes/cperl-mode.el (cperl-init-faces): Use literal cperl
+       faces instead of (non-existent) variables.
+
 2005-06-14  Miles Bader  <miles@gnu.org>
 
        * progmodes/ld-script.el (ld-script-location-counter):

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index d81ee1a..9826c99 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -4779,15 +4779,15 @@ indentation and initial hashes.  Behaves usually outside of comment."
                '(
                  ("\\(\\([@%]\\|\$#\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)" 1
                   (if (eq (char-after (match-beginning 2)) ?%)
-                      cperl-hash-face
-                    cperl-array-face)
+                      'cperl-hash
+                    'cperl-array)
                   t)                   ; arrays and hashes
                  ("\\(\\([$@]+\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)[ \t]*\\([[{]\\)"
                   1
                   (if (= (- (match-end 2) (match-beginning 2)) 1)
                       (if (eq (char-after (match-beginning 3)) ?{)
-                          cperl-hash-face
-                        cperl-array-face) ; arrays and hashes
+                          'cperl-hash
+                        'cperl-array) ; arrays and hashes
                     font-lock-variable-name-face) ; Just to put something
                   t)
                  ;;("\\([smy]\\|tr\\)\\([^a-z_A-Z0-9]\\)\\(\\([^\n\\]*||\\)\\)\\2")