(makefile-font-lock-keywords): Fontify single character variable references, but

protect shell variables references.
(makefile-mode): Make `$' be punctuation in font-lock-defaults.

2 files changed, 16 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 661f697c045..9be8850740b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-12  Simon Marshall  <simon@gnu.org>
+
+        * progmodes/make-mode.el (makefile-font-lock-keywords): Fontify
+        single character variable references, but protect shell variables
+        references.
+        (makefile-mode): Make `$' be punctuation in font-lock-defaults.
+
 2003-02-12  Ami Fischman  <ami@fischman.org>
 
         Face markup of calendar and diary displays: Any entry line that
@@ -18,8 +25,8 @@
         (mark-visible-calendar-date): Add the ability to pass face
         attribute/value pairs in the mark argument.  Handle the mark.
 
-        * diary-lib.el (diary-attrtype-convert): Convert an attribute
-        value string to the desired type.
+        * calendar/diary-lib.el (diary-attrtype-convert): Convert an
+        attribute value string to the desired type.
         (diary-pull-attrs): New function that pulls the attributes off a
         diary entry, merges with file-global attributes, and returns
         the (possibly modified) entry and a list of attribute/values using
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 4d825f83239..98a3d460884 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -268,13 +268,16 @@ not be enclosed in { } or ( )."
    ;; Do dependencies.  These get the function name face.
    (list makefile-dependency-regex 1 'font-lock-function-name-face)
 
-   ;; Variable references even in targets/strings/comments:
+   ;; Variable references even in targets/strings/comments.
    '("\\$[({]\\([-a-zA-Z0-9_.]+\\)[}):]" 1 font-lock-constant-face prepend)
 
-   ;; Automatic variable references.
-   '("\\$\\([@%<?^+*]\\)" 1 font-lock-reference-face prepend)
+   ;; Automatic variable references and single character variable references...
+   '("\\$\\([@%<?^+*_]\\|[a-zA-Z0-9]\\>\\)" 1 font-lock-reference-face prepend)
    '("\\$[({]\\([@%<?^+*][FD]?\\)[}):]" 1 font-lock-reference-face prepend)
 
+   ;; ...but not shell variables references.
+   '("\\$\\$\\(\\sw+\\)" 1 'default t)
+
    ;; Fontify conditionals and includes.
    ;; Note that plain `if' is an automake conditional, and not a bug.
    (list
@@ -586,7 +589,7 @@ Makefile mode can be configured by modifying the following variables:
         ;; SYNTAX-BEGIN set to backward-paragraph to avoid slow-down
         ;; near the end of a large buffer, due to parse-partial-sexp's
         ;; trying to parse all the way till the beginning of buffer.
-        '(makefile-font-lock-keywords nil nil nil backward-paragraph))
+        '(makefile-font-lock-keywords nil nil ((?$ . ".")) backward-paragraph))
 
   ;; Add-log.
   (make-local-variable 'add-log-current-defun-function)