Began matching only the first subexpression of the definition regexp.

Removed the {} bracket override from the keywords.

diff --git a/nagios-mode.el b/nagios-mode.el
index f8ea84270a3bb56893e728610e5d44deabaf784b..6b1bd3beac87315bcb43ce67fdcdb3271af18e5e 100644 (file)
--- a/nagios-mode.el
+++ b/nagios-mode.el
@@ -276,14 +276,7 @@
    (cons nagios-special font-lock-keyword-face)
    (cons nagios-directives font-lock-variable-name-face)
    (cons nagios-macros font-lock-constant-face)
-   (cons nagios-definitions font-lock-function-name-face)
-
-   ;; We have to (override) un-color the curly braces here because it's
-   ;; possible for them to become colored along with a definition
-   ;; if there is no space between the definition and the open
-   ;; brace. This has to come after the nagios-definitions, otherwise
-   ;; the font-locking will miss the definitions that end with a brace.
-   (cons "[{}]" '(0 nil t))
+   (cons nagios-definitions '(1 font-lock-function-name-face))
 
   ;; And comments take precedence over everything else.
    (cons nagios-comments '(0 font-lock-comment-delimiter-face t)))