X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=nagios-mode.el;h=f94940ff6e07fcb4ee4f9e3883d3789d293ef86f;hb=2a12df1d1c28723c5fef38160bba277136c0a551;hp=126cb45fc4922169e674f389e24093ae4f0a99cf;hpb=0355f91c8ed69043beedfcbb83e514152560be96;p=nagios-mode.git

diff --git a/nagios-mode.el b/nagios-mode.el
index 126cb45..f94940f 100644
--- a/nagios-mode.el
+++ b/nagios-mode.el
@@ -195,8 +195,8 @@
        "dependent_service_description" "email" "event_handler"
        "event_handler_enabled" "execution_failure_criteria"
        "failure_prediction_enabled" "first_notification"
-       "flap_detection_enabled" "freshness_threshold" "friday"
-       "high_flap_threshold" "host_name" "host_notification_commands"
+       "first_notification_delay" "flap_detection_enabled" "freshness_threshold"
+       "friday" "high_flap_threshold" "host_name" "host_notification_commands"
        "host_notification_options" "host_notification_period"
        "host_notifications_enabled" "hostgroup_name" "hostgroups"
        "is_volatile" "last_notification" "low_flap_threshold"
@@ -268,25 +268,28 @@
 
 
 
+(defconst nagios-string
+  (eval-when-compile
+    "\\(\".*?\"\\)"))
+
+
 ;; The One True Font Locking Variable
 
 (defvar nagios-font-lock-keywords
   (list
 
+   ;; Font lock the comments first.
+   (cons nagios-comments font-lock-comment-delimiter-face)
+
+   ;; Strings have the highest priority. For now, this is broken,
+   ;; but I guess I would rather have strings miscolored within
+   ;; comments than the other way around.
+   (cons nagios-string '(0 font-lock-string-face t))
+
    (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))
-
-  ;; And comments take precedence over everything else.
-   (cons nagios-comments '(0 font-lock-comment-delimiter-face t)))
+   (cons nagios-definitions '(1 font-lock-function-name-face)))
 
   "Rules for highlighting Nagios configuration files."
   )
@@ -313,7 +316,7 @@
   ;; Configure font locking. Set the defaults to something
   ;; sensible, defined earlier.
   (make-local-variable 'font-lock-defaults)
-  (setq font-lock-defaults '(nagios-font-lock-keywords nil t))
+  (setq font-lock-defaults '(nagios-font-lock-keywords t t))
 
   ;; Keyboard Mapping
   (use-local-map nagios-mode-map)