Changed font-lock-reference-face to font-lock-constant-face.

26 files changed, 58 insertions, 56 deletions

diff --git a/lisp/add-log.el b/lisp/add-log.el
index 62b2ef4885..2d37293d3d 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -106,7 +106,7 @@ for file A.
     ("^\\sw.........[0-9: ]*"
      (0 font-lock-string-face)
      ("\\([^<]+\\)<\\([A-Za-z0-9_.-]+@[A-Za-z0-9_.-]+\\)>" nil nil
-      (1 font-lock-reference-face)
+      (1 font-lock-constant-face)
       (2 font-lock-variable-name-face)))
     ;;
     ;; File names.
diff --git a/lisp/dired.el b/lisp/dired.el
index 6c37eccfb9..82e5c2d133 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -259,7 +259,7 @@ Subexpression 2 must end right before the \\n or \\r.")
    ;;
    ;; Dired marks.
    (list dired-re-mark
-	 '(0 font-lock-reference-face)
+	 '(0 font-lock-constant-face)
 	 '(".+" (dired-move-to-filename) nil (0 font-lock-warning-face)))
    ;; People who are paranoid about security would consider this more
    ;; important than other things such as whether it is a directory.
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 31e090d33f..38b78f4e21 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1680,7 +1680,7 @@ This function returns non-nil if the text was replaced."
 (defvar checkdoc-output-font-lock-keywords
   '(("\\(\\w+\\.el\\):" 1 font-lock-function-name-face)
     ("style check: \\(\\w+\\)" 1 font-lock-comment-face)
-    ("^\\([0-9]+\\):" 1 font-lock-reference-face))
+    ("^\\([0-9]+\\):" 1 font-lock-constant-face))
   "Keywords used to highlight a checkdoc diagnostic buffer.")
 
 (defvar checkdoc-output-mode-map nil
diff --git a/lisp/help.el b/lisp/help.el
index 48eaba0b7e..86c2f75b85 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -104,10 +104,10 @@
        ;;
        ;; Words inside `' which tend to be symbol names.
        (list (concat "`\\(" sym-char sym-char "+\\)'")
-	     1 'font-lock-reference-face t)
+	     1 'font-lock-constant-face t)
        ;;
-       ;; CLisp `:' keywords as references.
-       (list (concat "\\<:" sym-char "+\\>") 0 'font-lock-reference-face t))))
+       ;; CLisp `:' keywords as builtins.
+       (list (concat "\\<:" sym-char "+\\>") 0 'font-lock-builtin-face t))))
   "Default expressions to highlight in Help mode.")
 
 (defun help-mode ()
diff --git a/lisp/ielm.el b/lisp/ielm.el
index 83fc9e1eea..d891ec7945 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -130,7 +130,9 @@ This variable is buffer-local.")
 (defvar ielm-font-lock-keywords
   (list 
    (cons (concat "^" (regexp-quote ielm-prompt)) 'font-lock-keyword-face)
-   '("\\(^\\*\\*\\*[^*]+\\*\\*\\*\\)\\(.*$\\)" (1 font-lock-comment-face) (2 font-lock-reference-face)))
+   '("\\(^\\*\\*\\*[^*]+\\*\\*\\*\\)\\(.*$\\)"
+     (1 font-lock-comment-face)
+     (2 font-lock-constant-face)))
   "Additional expressions to highlight in ielm buffers.")
 	
 ;;; Completion stuff
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index d55e11dbb0..ef55e63dda 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -286,7 +286,7 @@ by substituting the new message number into the existing list.")
 			"\\(" cite-chars "[ \t]*\\)\\)+"
 			"\\(.*\\)")
 	       (beginning-of-line) (end-of-line)
-	       (2 font-lock-reference-face nil t)
+	       (2 font-lock-constant-face nil t)
 	       (4 font-lock-comment-face nil t)))
 	    '("^\\(X-[A-Za-z0-9-]+\\|In-reply-to\\|Date\\):.*$"
 	      . font-lock-string-face))))
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 33795b0b5b..8d93200c26 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -239,7 +239,7 @@ actually occur.")
 			"\\(" cite-chars "[ \t]*\\)\\)+"
 			"\\(.*\\)")
 	       (beginning-of-line) (end-of-line)
-	       (2 font-lock-reference-face nil t)
+	       (2 font-lock-constant-face nil t)
 	       (4 font-lock-comment-face nil t)))
 	    '("^\\(X-[A-Za-z0-9-]+\\|In-reply-to\\):.*"
 	      . font-lock-string-face))))
diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el
index f7d07ae13f..307ac0d173 100644
--- a/lisp/play/decipher.el
+++ b/lisp/play/decipher.el
@@ -116,7 +116,7 @@ the tail of the list.")
 (defvar decipher-font-lock-keywords
   '(("^:.*"  . font-lock-keyword-face)
     ("^>.*"  . font-lock-string-face)
-    ("^%!.*" . font-lock-reference-face)
+    ("^%!.*" . font-lock-constant-face)
     ("^%.*"  . font-lock-comment-face)
     ("\\`(\\([a-z]+\\) +\\([A-Z]+\\)"
      (1 font-lock-string-face)
@@ -128,7 +128,7 @@ the tail of the list.")
 
 Ciphertext uses `font-lock-keyword-face', plaintext uses
 `font-lock-string-face', comments use `font-lock-comment-face', and
-checkpoints use `font-lock-reference-face'.  You can customize the
+checkpoints use `font-lock-constant-face'.  You can customize the
 display by changing these variables.  For best results, I recommend
 that all faces use the same background color.
 
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index c248227190..8614ca4421 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -3797,10 +3797,10 @@ If that is the case remember the name of that function."
     (list (concat "\\<\\(goto\\|raise\\|use\\|with\\)\\>" ; "when" removed
                   ; "[ \t]*\\(\\sw+\\(\\.\\sw*\\)*\\)?") ; RE
                   "[ \t]*\\([a-zA-Z0-9_\\.\\|, ]+\\)\\W")
-          '(1 font-lock-keyword-face) '(2 font-lock-reference-face nil t))
+          '(1 font-lock-keyword-face) '(2 font-lock-constant-face nil t))
     ;;
     ;; Goto tags.
-    '("<<\\(\\sw+\\)>>" 1 font-lock-reference-face)
+    '("<<\\(\\sw+\\)>>" 1 font-lock-constant-face)
     ))
   "Gaudy level highlighting for Ada mode.")
 
diff --git a/lisp/progmodes/awk-mode.el b/lisp/progmodes/awk-mode.el
index 67ec6dedfb..06fcef0f10 100644
--- a/lisp/progmodes/awk-mode.el
+++ b/lisp/progmodes/awk-mode.el
@@ -103,7 +103,7 @@
      (cons (mapconcat 'identity
 		      '("&&" "||" "<=" "<" ">=" ">" "==" "!=" "!~" "~")
 		      "\\|")
-	   'font-lock-reference-face)
+	   'font-lock-constant-face)
      ))
  "Default expressions to highlight in AWK mode.")
 
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 6285af4b45..8dee6a6dfe 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -2324,7 +2324,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 		  (setq tag (buffer-substring b1 e1)
 			qtag (regexp-quote tag))
 		  (cond (cperl-pod-here-fontify 
-			 (put-text-property b1 e1 'face font-lock-reference-face)
+			 (put-text-property b1 e1 'face font-lock-constant-face)
 			 (cperl-put-do-not-fontify b1 e1)))
 		  (forward-line)
 		  (setq b (point))
@@ -2332,7 +2332,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 			 (if cperl-pod-here-fontify 
 			     (progn
 			       (put-text-property (match-beginning 0) (match-end 0) 
-						  'face font-lock-reference-face)
+						  'face font-lock-constant-face)
 			       (cperl-put-do-not-fontify b (match-end 0))
 			       ;;(put-text-property (max (point-min) (1- b))
 			       ;;		      (min (point-max)
@@ -2628,7 +2628,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 ;;;	      (setq tag (buffer-substring b1 e1)
 ;;;		    qtag (regexp-quote tag))
 ;;;	      (cond (cperl-pod-here-fontify 
-;;;		     (put-text-property b1 e1 'face font-lock-reference-face)
+;;;		     (put-text-property b1 e1 'face font-lock-constant-face)
 ;;;		     (cperl-put-do-not-fontify b1 e1)))
 ;;;	      (forward-line)
 ;;;	      (setq b (point))
@@ -2636,7 +2636,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 ;;;		     (if cperl-pod-here-fontify 
 ;;;			 (progn
 ;;;			   (put-text-property (match-beginning 0) (match-end 0) 
-;;;					      'face font-lock-reference-face)
+;;;					      'face font-lock-constant-face)
 ;;;			   (cperl-put-do-not-fontify b (match-end 0))
 ;;;			   ;;(put-text-property (max (point-min) (1- b))
 ;;;			   ;;		      (min (point-max)
@@ -3294,9 +3294,9 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	    '("[ \t{,(]\\(-?[a-zA-Z0-9_:]+\\)[ \t]*=>" 1
 	      font-lock-string-face t)
 	    '("^[ \t]*\\([a-zA-Z0-9_]+[ \t]*:\\)[ \t]*\\($\\|{\\|\\<\\(until\\|while\\|for\\(each\\)?\\|do\\)\\>\\)" 1 
-	      font-lock-reference-face) ; labels
+	      font-lock-constant-face) ; labels
 	    '("\\<\\(continue\\|next\\|last\\|redo\\|goto\\)\\>[ \t]+\\([a-zA-Z0-9_:]+\\)" ; labels as targets
-	      2 font-lock-reference-face)
+	      2 font-lock-constant-face)
 	    (cond ((featurep 'font-lock-extra)
 		   '("^[ \t]*\\(my\\|local\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)\\([ \t]*,\\)?"
 		     (3 font-lock-variable-name-face)
@@ -3394,7 +3394,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
 		    nil
 		    [nil		nil		t		t	t]
 		    )
-	      (list 'font-lock-reference-face
+	      (list 'font-lock-constant-face
 		    ["CadetBlue"	"Aquamarine" 	"Gray50"	"LightGray"]
 		    nil
 		    [nil		nil		t		t	t]
@@ -3432,7 +3432,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
 		      ((fboundp 'valid-color-name-p) 'valid-color-name-p)
 		      ;; XEmacs 19.11
 		      (t 'x-valid-color-name-p))))
-	  (defvar font-lock-reference-face 'font-lock-reference-face)
+	  (defvar font-lock-constant-face 'font-lock-constant-face)
 	  (defvar font-lock-variable-name-face 'font-lock-variable-name-face)
 	  (or (boundp 'font-lock-type-face)
 	      (defconst font-lock-type-face
@@ -3572,8 +3572,8 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	       (t (set-face-background 'font-lock-emphasized-face "gray90"))))
 	    (if (is-face 'font-lock-variable-name-face) nil
 	      (copy-face 'italic 'font-lock-variable-name-face))
-	    (if (is-face 'font-lock-reference-face) nil
-	      (copy-face 'italic 'font-lock-reference-face))))
+	    (if (is-face 'font-lock-constant-face) nil
+	      (copy-face 'italic 'font-lock-constant-face))))
 	(setq cperl-faces-init t))
     (error nil)))
 
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 85d0901dab..c851f2091e 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -388,21 +388,21 @@ whether to blink the matching beginning."
 	 (1 font-lock-type-face) (4 font-lock-variable-name-face))
        ;; do, if, select, where, and forall constructs
        '("\\<\\(end[ \t]*\\(do\\|if\\|select\\|forall\\|where\\)\\)\\>\\([ \t]+\\(\\sw+\\)\\)?"
-	 (1 font-lock-keyword-face) (3 font-lock-reference-face nil t))
+	 (1 font-lock-keyword-face) (3 font-lock-constant-face nil t))
        '("^[ \t0-9]*\\(\\(\\sw+\\)[ \t]*:[ \t]*\\)?\\(\\(if\\|do\\([ \t]*while\\)?\\|select[ \t]*case\\|where\\|forall\\)\\)\\>"
-	 (2 font-lock-reference-face nil t) (3 font-lock-keyword-face))
+	 (2 font-lock-constant-face nil t) (3 font-lock-keyword-face))
        ;; implicit declaration
        '("\\<\\(implicit\\)[ \t]*\\(real\\|integer\\|c\\(haracter\\|omplex\\)\\|logical\\|type[ \t]*(\\sw+)\\|none\\)\\>" (1 font-lock-keyword-face) (2 font-lock-type-face))
-       '("\\<\\(namelist\\|common\\)[ \t]*\/\\(\\sw+\\)?\/" (1 font-lock-keyword-face) (2 font-lock-reference-face nil t))
+       '("\\<\\(namelist\\|common\\)[ \t]*\/\\(\\sw+\\)?\/" (1 font-lock-keyword-face) (2 font-lock-constant-face nil t))
        "\\<else\\([ \t]*if\\|where\\)?\\>"
        "\\<\\(then\\|continue\\|format\\|include\\|stop\\|return\\)\\>"
        '("\\<\\(exit\\|cycle\\)[ \t]*\\(\\sw+\\)?\\>" 
-	 (1 font-lock-keyword-face) (2 font-lock-reference-face nil t))
+	 (1 font-lock-keyword-face) (2 font-lock-constant-face nil t))
        '("\\<\\(case\\)[ \t]*\\(default\\|(\\)" . 1)
        '("\\<\\(do\\|go *to\\)\\>[ \t]*\\([0-9]+\\)"
-	 (1 font-lock-keyword-face) (2 font-lock-reference-face))
+	 (1 font-lock-keyword-face) (2 font-lock-constant-face))
        ;; line numbers (lines whose first character after number is letter)
-       '("^[ \t]*\\([0-9]+\\)[ \t]*[a-z]+" (1 font-lock-reference-face t))))
+       '("^[ \t]*\\([0-9]+\\)[ \t]*[a-z]+" (1 font-lock-constant-face t))))
   "Highlights declarations, do-loops and other constructions")
 
 (defvar f90-font-lock-keywords-3
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 58495fbf54..253134636d 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -326,8 +326,8 @@ style.")
      ;; Fontify do/goto keywords and targets, and goto tags.
      (list "\\<\\(do\\|go *to\\)\\>[ \t]*\\([0-9]+\\)?"
 	   '(1 font-lock-keyword-face)
-	   '(2 font-lock-reference-face nil t))
-     (cons "^ *\\([0-9]+\\)" 'font-lock-reference-face))))
+	   '(2 font-lock-constant-face nil t))
+     (cons "^ *\\([0-9]+\\)" 'font-lock-constant-face))))
 
   (setq fortran-font-lock-keywords-3
    (append
@@ -354,7 +354,7 @@ style.")
      ;;
      ;; Fontify goto-like `err=label'/`end=label' in read/write statements.
      '(", *\\(e\\(nd\\|rr\\)\\)\\> *\\(= *\\([0-9]+\\)\\)?"
-       (1 font-lock-keyword-face) (4 font-lock-reference-face nil t))
+       (1 font-lock-keyword-face) (4 font-lock-constant-face nil t))
      ;;
      ;; Highlight standard continuation character and in a TAB-formatted line.
      '("^     \\([^ 0]\\)" 1 font-lock-string-face)
diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el
index 2dbd9a3a72..dc72fbe07f 100644
--- a/lisp/progmodes/icon.el
+++ b/lisp/progmodes/icon.el
@@ -659,7 +659,7 @@ Returns nil if line starts inside a string, t if in a comment."
 	  "&progname" "&random" "&rdrag" "&regions" "&resize" "&row" 
 	  "&rpress" "&rrelease" "&shift" "&source" "&storage" "&subject" 
 	  "&time" "&trace" "&ucase" "&version" "&window" "&x" "&y") t)
-       'font-lock-reference-face)
+       'font-lock-constant-face)
       (cons      ;; global local static declarations and link files
        (concat 
 	"^[ \t]*"
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index a00b7aa7c9..f7b51ad1fa 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -263,7 +263,7 @@ not be enclosed in { } or ( )."
    (list makefile-dependency-regex 1 'font-lock-function-name-face)
    ;;
    ;; Variable references even in targets/strings/comments:
-   '("\\$[({]\\([-a-zA-Z0-9_.]+\\)[}):]" 1 font-lock-reference-face prepend)
+   '("\\$[({]\\([-a-zA-Z0-9_.]+\\)[}):]" 1 font-lock-constant-face prepend)
 
    ;; Highlight lines that contain just whitespace.
    ;; They can cause trouble, especially if they start with a tab.
diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el
index f5df9bfec6..fff1a39e7a 100644
--- a/lisp/progmodes/meta-mode.el
+++ b/lisp/progmodes/meta-mode.el
@@ -245,10 +245,10 @@
          (cons (concat "\\<" input-keywords "\\>"
                        "[ \t]+\\(\\sw+\\)")
                '((1 font-lock-keyword-face)
-                 (2 font-lock-reference-face)))
+                 (2 font-lock-constant-face)))
          ;; embedded Metafont/MetaPost code in comments
          (cons "|\\([^|]+\\)|" 
-               '(1 font-lock-reference-face t))
+               '(1 font-lock-constant-face t))
      ))
   "Default expressions to highlight in Metafont or MetaPost mode.")
 
diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index a21a5f5d7d..da67a7850a 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -171,7 +171,7 @@ followed by the first character of the construct.
      (1 font-lock-keyword-face)
      (font-lock-match-c-style-declaration-item-and-skip-to-next
       nil (goto-char (match-end 0))
-      (1 font-lock-reference-face)))
+      (1 font-lock-constant-face)))
     ;;
     ;; Pragmas as warnings.
     ;; Spencer Allain <[email protected]> says do them as comments...
@@ -224,7 +224,7 @@ followed by the first character of the construct.
 	   (1 font-lock-function-name-face)))
 	;;
 	;; Fontify constants as references.
-	'("\\<\\(FALSE\\|NIL\\|NULL\\|TRUE\\)\\>" . font-lock-reference-face)
+	'("\\<\\(FALSE\\|NIL\\|NULL\\|TRUE\\)\\>" . font-lock-constant-face)
 	))))
   "Gaudy level highlighting for Modula-3 modes.")
 
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index b53794280e..e8f3724689 100644
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -175,7 +175,7 @@ parenthetical grouping.")
 	 'font-lock-keyword-face)
    ;; Fontify all builtin operators.
    (cons "\\(&\\||\\|<=\\|>=\\|==\\|<\\|>\\|!=\\|!\\)"
-	 'font-lock-reference-face)
+	 'font-lock-builtin-face)
    ;; Fontify all builtin variables.
    (cons (concat "\\<\\("
 		 (mapconcat 'identity octave-variables "\\|")
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index d2ef2d2b28..11ebe75b66 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -164,7 +164,7 @@
    (cons (concat "\\<\\(array\\|boolean\\|c\\(har\\|onst\\)\\|file\\|"
 		 "integer\\|re\\(al\\|cord\\)\\|type\\|var\\)\\>")
 	 'font-lock-type-face)
-   '("\\<\\(label\\|external\\|forward\\)\\>" . font-lock-reference-face)
+   '("\\<\\(label\\|external\\|forward\\)\\>" . font-lock-constant-face)
    '("\\<\\([0-9]+\\)[ \t]*:" 1 font-lock-function-name-face)
 ;   ("of" "to" "for" "if" "then" "else" "case" "while"
 ;    "do" "until" "and" "or" "not" "in" "with" "repeat" "begin" "end")
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 42eecbde7c..b0b5a74cbe 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -171,15 +171,15 @@ The expansion is entirely correct because it uses the C preprocessor."
     ("^#[ \t]*define[ \t]+\\(\\sw+\\)(" 1 font-lock-function-name-face)
     ("^#[ \t]*if\\>"
      ("\\<\\(defined\\)\\>[ \t]*(?\\(\\sw+\\)?" nil nil
-      (1 font-lock-reference-face) (2 font-lock-variable-name-face nil t)))
+      (1 font-lock-constant-face) (2 font-lock-variable-name-face nil t)))
     ("^#[ \t]*\\(\\sw+\\)\\>[ \t]*\\(\\sw+\\)?"
-     (1 font-lock-reference-face) (2 font-lock-variable-name-face nil t))
+     (1 font-lock-constant-face) (2 font-lock-variable-name-face nil t))
     ;;
     ;; Fontify function and package names in declarations.
     ("\\<\\(package\\|sub\\)\\>[ \t]*\\(\\sw+\\)?"
      (1 font-lock-keyword-face) (2 font-lock-function-name-face nil t))
     ("\\<\\(import\\|no\\|require\\|use\\)\\>[ \t]*\\(\\sw+\\)?"
-     (1 font-lock-keyword-face) (2 font-lock-reference-face nil t)))
+     (1 font-lock-keyword-face) (2 font-lock-constant-face nil t)))
   "Subdued level highlighting for Perl mode.")
 
 (defconst perl-font-lock-keywords-2
@@ -206,12 +206,12 @@ The expansion is entirely correct because it uses the C preprocessor."
     '("[$*]{?\\(\\sw+\\)" 1 font-lock-variable-name-face)
     '("\\([@%]\\|\\$#\\)\\(\\sw+\\)"
       (2 (cons font-lock-variable-name-face '(underline))))
-    '("<\\(\\sw+\\)>" 1 font-lock-reference-face)
+    '("<\\(\\sw+\\)>" 1 font-lock-constant-face)
     ;;
     ;; Fontify keywords with/and labels as we do in `c++-font-lock-keywords'.
     '("\\<\\(continue\\|goto\\|last\\|next\\|redo\\)\\>[ \t]*\\(\\sw+\\)?"
-      (1 font-lock-keyword-face) (2 font-lock-reference-face nil t))
-    '("^[ \t]*\\(\\sw+\\)[ \t]*:[^:]" 1 font-lock-reference-face)))
+      (1 font-lock-keyword-face) (2 font-lock-constant-face nil t))
+    '("^[ \t]*\\(\\sw+\\)[ \t]*:[^:]" 1 font-lock-constant-face)))
   "Gaudy level highlighting for Perl mode.")
 
 (defvar perl-font-lock-keywords perl-font-lock-keywords-1
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index 4342b42017..302f634362 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -345,7 +345,7 @@ if that value is non-nil and inserts the value of
      '("(\\(element\\)\\>[ 	]*(\\(\\S)+\\))"
        (1 font-lock-keyword-face)
        (2 font-lock-type-face))
-     '("\\<\\sw+:\\>" . font-lock-reference-face) ; trailing `:' c.f. scheme
+     '("\\<\\sw+:\\>" . font-lock-constant-face) ; trailing `:' c.f. scheme
      ;; SGML markup (from sgml-mode) :
      '("<\\([!?][-a-z0-9]+\\)" 1 font-lock-keyword-face)
      '("<\\(/?[-a-z0-9]+\\)" 1 font-lock-function-name-face)))
diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el
index c329e8b554..33817300b1 100644
--- a/lisp/progmodes/simula.el
+++ b/lisp/progmodes/simula.el
@@ -141,7 +141,7 @@ for SIMULA mode to function correctly.")
      (if (match-beginning 1) font-lock-string-face font-lock-comment-face))
    ;;
    ;; Compiler directives.
-   '("^%\\([^ \t\n].*\\)" 1 font-lock-reference-face)
+   '("^%\\([^ \t\n].*\\)" 1 font-lock-constant-face)
    ;;
    ;; Class and procedure names.
    '("\\<\\(class\\|procedure\\)\\>[ \t]*\\(\\sw+\\)?"
@@ -153,8 +153,8 @@ for SIMULA mode to function correctly.")
   (append simula-font-lock-keywords-1
    (list
     ;;
-    ;; Constants as references.
-    '("\\<\\(false\\|none\\|notext\\|true\\)\\>" . font-lock-reference-face)
+    ;; Constants.
+    '("\\<\\(false\\|none\\|notext\\|true\\)\\>" . font-lock-constant-face)
     ;;
     ;; Keywords.
     (concat "\\<\\("
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 4af13e9423..1228a464db 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1278,7 +1278,7 @@ This applies to generating PostScript."
 (defcustom ps-underlined-faces
   (unless ps-print-color-p
     '(font-lock-function-name-face
-      font-lock-reference-face
+      font-lock-constant-face
       font-lock-warning-face))
   "*A list of the \(non-underlined\) faces that should be printed underlined.
 This applies to generating PostScript."
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 6b01e84866..2020d6e2fd 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -1118,7 +1118,7 @@ the value of `bibtex-text-indentation', minus 2."
    ;; reference type and reference label
    (list bibtex-reference-maybe-empty-head
          (list bibtex-type-in-head 'font-lock-function-name-face)
-         (list bibtex-key-in-head 'font-lock-reference-face nil t))
+         (list bibtex-key-in-head 'font-lock-constant-face nil t))
    ;; comments
    (list 
     (concat "^\\([ \t]*" bibtex-comment-start ".*\\)$")
diff --git a/lisp/textmodes/outline.el b/lisp/textmodes/outline.el
index 3debce3e18..07b704cc2d 100644
--- a/lisp/textmodes/outline.el
+++ b/lisp/textmodes/outline.el
@@ -156,7 +156,7 @@ in the file it applies to."
 				      (3 . font-lock-keyword-face)
 				      (4 . font-lock-builtin-face)
 				      (5 . font-lock-comment-face)
-				      (6 . font-lock-reference-face)
+				      (6 . font-lock-constant-face)
 				      (7 . font-lock-type-face)
 				      (8 . font-lock-string-face))))
 			 font-lock-warning-face)
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 7668381c31..7ef86a5af6 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -2699,7 +2699,7 @@ When called with 2 C-u prefix args, disable magic word recognition."
              (- (point) (length label)) (point)
              'face (if comment
                        'font-lock-comment-face
-                     'font-lock-reference-face)))
+                     'font-lock-constant-face)))
 
           (insert (if counter (format " (%d) " cnt) "")
                   (if comment " LABEL IS COMMENTED OUT " "")
@@ -4114,7 +4114,7 @@ started with the command \\[reftex-citation].")
                          authors)
       (put-text-property 0 (length title)   'face 'font-lock-comment-face
                          title)
-      (put-text-property 0 (length extra)   'face 'font-lock-reference-face
+      (put-text-property 0 (length extra)   'face 'font-lock-constant-face
                          extra))
     (concat key "\n     " authors " " year " " extra "\n     " title "\n\n")))