X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=nagios-mode.el;h=882933f0c33d162779694a829947079709afaf66;hb=88f78f5858ee66ec81acfbb2cdefb6ae2af072b6;hp=71cc5a008f9480cbdf11a33ce0970e4198008284;hpb=05efadf89278ffc7a715fcd77e38babcd4ccac64;p=nagios-mode.git

diff --git a/nagios-mode.el b/nagios-mode.el
index 71cc5a0..882933f 100644
--- a/nagios-mode.el
+++ b/nagios-mode.el
@@ -119,7 +119,7 @@
   "True if the character at position pos is commented, nil otherwise."
   (save-excursion
     (goto-char pos)
-    (re-search-backward "#" (nagios-beginning-of-line-pos) t)
+    (re-search-backward "\\(#\\|;\\)" (nagios-beginning-of-line-pos) t)
   )
 )
 
@@ -329,6 +329,7 @@
        "$HOSTACTIONURL$"
        "$HOSTADDRESS$"
        "$HOSTALIAS$"
+       "$HOSTANDSERVICESIMPORTANCE$"
        "$HOSTATTEMPT$"
        "$HOSTCHECKCOMMAND$"
        "$HOSTCHECKTYPE$"
@@ -340,17 +341,22 @@
        "$HOSTEXECUTIONTIME$"
        "$HOSTGROUPACTIONURL$"
        "$HOSTGROUPALIAS$"
+       "$HOSTGROUPMEMBERADDRESSES$"
        "$HOSTGROUPMEMBERS$"
        "$HOSTGROUPNAME$"
        "$HOSTGROUPNAMES$"
        "$HOSTGROUPNOTES$"
        "$HOSTGROUPNOTESURL$"
+       "$HOSTIMPORTANCE$"
+       "$HOSTINFOURL$"
        "$HOSTLATENCY$"
        "$HOSTNAME$"
        "$HOSTNOTES$"
        "$HOSTNOTESURL$"
+       "$HOSTNOTIFICATIONENABLED$"
        "$HOSTNOTIFICATIONID$"
        "$HOSTNOTIFICATIONNUMBER$"
+       "$HOSTNOTIFICATIONPERIOD$"
        "$HOSTOUTPUT$"
        "$HOSTPERCENTCHANGE$"
        "$HOSTPERFDATA$"
@@ -421,12 +427,16 @@
        "$SERVICEGROUPNAMES$"
        "$SERVICEGROUPNOTES$"
        "$SERVICEGROUPNOTESURL$"
+       "$SERVICEIMPORTANCE$"
+       "$SERVICEINFOURL$"
        "$SERVICEISVOLATILE$"
        "$SERVICELATENCY$"
        "$SERVICENOTES$"
        "$SERVICENOTESURL$"
+       "$SERVICENOTIFICATIONENABLED$"
        "$SERVICENOTIFICATIONID$"
        "$SERVICENOTIFICATIONNUMBER$"
+       "$SERVICENOTIFICATIONPERIOD$"
        "$SERVICEOUTPUT$"
        "$SERVICEPERCENTCHANGE$"
        "$SERVICEPERFDATA$"
@@ -739,7 +749,6 @@
 	       "define hostescalation"
 	       "define hostextinfo"
 	       "define hostgroup"
-	       "define hostgroupescalation"
 	       "define null"
 	       "define service"
 	       "define servicedependency"