aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Pfeiffer2005-05-05 19:07:39 +0000
committerDaniel Pfeiffer2005-05-05 19:07:39 +0000
commit10f518f703a7e78918ebe96cefcf40ecd54f234a (patch)
treec15ed89207f9b6c4cc2d95d70a9df25e50cad7a0
parenteb6121fce5d47678001a3eb32ea54e1ea1f38727 (diff)
downloademacs-10f518f703a7e78918ebe96cefcf40ecd54f234a.tar.gz
emacs-10f518f703a7e78918ebe96cefcf40ecd54f234a.zip
(makefile-font-lock-keywords): Use font-lock-negation-char-face.
-rw-r--r--lisp/ChangeLog13
-rw-r--r--lisp/progmodes/make-mode.el5
2 files changed, 17 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e888712a4c2..82dbac5557e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
12005-05-05 Daniel Pfeiffer <occitan@esperanto.org>
2
3 * font-lock.el (font-lock-negation-char-face): New face and
4 variable.
5
6 * progmodes/cc-fonts.el (c-cpp-matchers): Use it.
7
8 * progmodes/sh-script.el (sh-font-lock-keywords): Use it.
9
10 * progmodes/cperl-mode.el (cperl-init-faces): Use it.
11
12 * progmodes/make-mode.el (makefile-font-lock-keywords): Use it.
13
12005-05-05 Juanma Barranquero <lekktu@gmail.com> 142005-05-05 Juanma Barranquero <lekktu@gmail.com>
2 15
3 * emacs-lisp/byte-run.el (define-obsolete-function-alias): Fix 16 * emacs-lisp/byte-run.el (define-obsolete-function-alias): Fix
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 99138444f7c..7c1ccb25fb0 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -47,7 +47,7 @@
47;; prerequisites. 47;; prerequisites.
48;; 48;;
49;; The command C-c C-b pops up a browser window listing all target and 49;; The command C-c C-b pops up a browser window listing all target and
50;; macro names. You can mark or unmark items wit C-c SPC, and insert 50;; macro names. You can mark or unmark items with C-c SPC, and insert
51;; all marked items back in the Makefile with C-c TAB. 51;; all marked items back in the Makefile with C-c TAB.
52;; 52;;
53;; The command C-c TAB in the makefile buffer inserts a GNU make builtin. 53;; The command C-c TAB in the makefile buffer inserts a GNU make builtin.
@@ -284,6 +284,9 @@ not be enclosed in { } or ( )."
284 "\\>[ \t]*\\([^: \t\n#]*\\)") 284 "\\>[ \t]*\\([^: \t\n#]*\\)")
285 '(1 font-lock-keyword-face) '(2 font-lock-variable-name-face)) 285 '(1 font-lock-keyword-face) '(2 font-lock-variable-name-face))
286 286
287 '("^\\(?: [ \t]*\\)?if\\(n\\)\\(?:def\\|eq\\)\\>"
288 1 font-lock-negation-char-face prepend)
289
287 ;; Highlight lines that contain just whitespace. 290 ;; Highlight lines that contain just whitespace.
288 ;; They can cause trouble, especially if they start with a tab. 291 ;; They can cause trouble, especially if they start with a tab.
289 '("^[ \t]+$" . makefile-space-face) 292 '("^[ \t]+$" . makefile-space-face)