[Emacs-diffs] Changes to emacs/lisp/progmodes/make-mode.el

[Juanma Barranquero]

Index: emacs/lisp/progmodes/make-mode.el
diff -c emacs/lisp/progmodes/make-mode.el:1.79 
emacs/lisp/progmodes/make-mode.el:1.80
*** emacs/lisp/progmodes/make-mode.el:1.79      Tue Feb  4 08:24:35 2003
--- emacs/lisp/progmodes/make-mode.el   Tue Feb 11 18:45:21 2003
***************
*** 268,280 ****
     ;; 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:
     '("\\$[({]\\([-a-zA-Z0-9_.]+\\)[}):]" 1 font-lock-constant-face prepend)
  
!    ;; Automatic variable references.
!    '("\\$\\(address@hidden<?^+*]\\)" 1 font-lock-reference-face prepend)
     '("\\$[({]\\(address@hidden<?^+*][FD]?\\)[}):]" 1 font-lock-reference-face 
prepend)
  
     ;; Fontify conditionals and includes.
     ;; Note that plain `if' is an automake conditional, and not a bug.
     (list
--- 268,283 ----
     ;; 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.
     '("\\$[({]\\([-a-zA-Z0-9_.]+\\)[}):]" 1 font-lock-constant-face prepend)
  
!    ;; Automatic variable references and single character variable 
references...
!    '("\\$\\(address@hidden<?^+*_]\\|[a-zA-Z0-9]\\>\\)" 1 
font-lock-reference-face prepend)
     '("\\$[({]\\(address@hidden<?^+*][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,592 ****
        ;; 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))
  
    ;; Add-log.
    (make-local-variable 'add-log-current-defun-function)
--- 589,595 ----
        ;; 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 ((?$ . ".")) 
backward-paragraph))
  
    ;; Add-log.
    (make-local-variable 'add-log-current-defun-function)