Commit 61bc75ab authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

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

protect shell variables references.
(makefile-mode): Make `$' be punctuation in font-lock-defaults.
parent c47a201a
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> 2003-02-12 Ami Fischman <ami@fischman.org>
   
Face markup of calendar and diary displays: Any entry line that Face markup of calendar and diary displays: Any entry line that
...@@ -18,8 +25,8 @@ ...@@ -18,8 +25,8 @@
(mark-visible-calendar-date): Add the ability to pass face (mark-visible-calendar-date): Add the ability to pass face
attribute/value pairs in the mark argument. Handle the mark. attribute/value pairs in the mark argument. Handle the mark.
   
* diary-lib.el (diary-attrtype-convert): Convert an attribute * calendar/diary-lib.el (diary-attrtype-convert): Convert an
value string to the desired type. attribute value string to the desired type.
(diary-pull-attrs): New function that pulls the attributes off a (diary-pull-attrs): New function that pulls the attributes off a
diary entry, merges with file-global attributes, and returns diary entry, merges with file-global attributes, and returns
the (possibly modified) entry and a list of attribute/values using the (possibly modified) entry and a list of attribute/values using
......
...@@ -268,13 +268,16 @@ not be enclosed in { } or ( )." ...@@ -268,13 +268,16 @@ not be enclosed in { } or ( )."
;; Do dependencies. These get the function name face. ;; Do dependencies. These get the function name face.
(list makefile-dependency-regex 1 'font-lock-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) '("\\$[({]\\([-a-zA-Z0-9_.]+\\)[}):]" 1 font-lock-constant-face prepend)
;; Automatic variable references. ;; Automatic variable references and single character variable references...
'("\\$\\([@%<?^+*]\\)" 1 font-lock-reference-face prepend) '("\\$\\([@%<?^+*_]\\|[a-zA-Z0-9]\\>\\)" 1 font-lock-reference-face prepend)
'("\\$[({]\\([@%<?^+*][FD]?\\)[}):]" 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. ;; Fontify conditionals and includes.
;; Note that plain `if' is an automake conditional, and not a bug. ;; Note that plain `if' is an automake conditional, and not a bug.
(list (list
...@@ -586,7 +589,7 @@ Makefile mode can be configured by modifying the following variables: ...@@ -586,7 +589,7 @@ Makefile mode can be configured by modifying the following variables:
;; SYNTAX-BEGIN set to backward-paragraph to avoid slow-down ;; SYNTAX-BEGIN set to backward-paragraph to avoid slow-down
;; near the end of a large buffer, due to parse-partial-sexp's ;; near the end of a large buffer, due to parse-partial-sexp's
;; trying to parse all the way till the beginning of buffer. ;; 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. ;; Add-log.
(make-local-variable 'add-log-current-defun-function) (make-local-variable 'add-log-current-defun-function)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment