X-Git-Url: http://gitweb.michael.orlitzky.com/?p=nagios-mode.git;a=blobdiff_plain;f=nagios-mode.el;h=097e331e6aef5f628dbb24ddf844c084c3b7dc76;hp=a284c621ae9963448ef533c3110cab14f52d4d2f;hb=HEAD;hpb=60bd3688e6a238c56f1eaf94aba651023786d40c
diff --git a/nagios-mode.el b/nagios-mode.el
index a284c62..0dd0773 100644
--- a/nagios-mode.el
+++ b/nagios-mode.el
@@ -1,23 +1,18 @@
-;;
-;; nagios-mode, an Emacs mode for Nagios
-;; configuration files.
-;;
-;; Copyright Michael Orlitzky
-;;
-;; http://michael.orlitzky.com/
+;; nagios-mode: an emacs mode for nagios configuration files
+;; Copyright (C) 2024 Michael Orlitzky
;;
;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
+;; it under the terms of the GNU Affero General Public License as
+;; published by the Free Software Foundation, either version 3 of the
+;; License, or (at your option) any later version.
;;
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-;;
-;; http://www.fsf.org/licensing/licenses/gpl.html
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU Affero General Public License for more details.
;;
+;; You should have received a copy of the GNU Affero General Public License
+;; along with this program. If not, see .
(require 'font-lock)
(require 'regexp-opt)
@@ -36,99 +31,183 @@
(defun nagios-indent-line(&optional flag)
"Indents a line, taking nesting into account."
+ (interactive)
(nagios-indent-to (nagios-calculate-indent))
)
+(defun nagios-beginning-of-line-pos()
+ ;; Return the point position corresponding to the beginning
+ ;; of the current line.
+ (save-excursion
+ (beginning-of-line)
+ (point)
+ )
+)
+
+(defun nagios-end-of-line-pos()
+ ;; Return the point position corresponding to the end
+ ;; of the current line.
+ (save-excursion
+ (end-of-line)
+ (point)
+ )
+)
+
+(defun nagios-point-offset()
+ ;; How far are we from the beginning of the line?
+ (- (point) (nagios-beginning-of-line-pos))
+)
+
+(defun nagios-first-char-offset()
+ ;; How far is the first character on this line
+ ;; from the beginning of the line?
+ (save-excursion
+ (beginning-of-line)
+ (skip-chars-forward " \t")
+ )
+)
+
+(defun nagios-first-char-pos()
+ ;; What's the position of the first character on this line?
+ (+ (nagios-beginning-of-line-pos) (nagios-first-char-offset))
+)
(defun nagios-indent-to(indent-column)
"Indent the current line to column indent-column."
- (setq pos (point))
- (beginning-of-line)
- (setq bol (point))
- (setq pos-offset (- pos bol))
+ ;; Store the point in orig-pos.
+ (let ((orig-point (point)))
+
+ ;; And store the offset of the first character (with respect to the
+ ;; beginning of the line) in orig-first-char-offset.
+ (let ((orig-first-char-offset (nagios-first-char-offset)))
+
+ ;; Delete any leading whitespace, and move the point to the
+ ;; beginning of the line.
+ (delete-region (nagios-beginning-of-line-pos) (nagios-first-char-pos))
+ (beginning-of-line)
+
+ ;; Now insert indent-column spaces.
+ (let ((indent-remaining indent-column))
+ (while (< 0 indent-remaining)
+ (insert " ")
+ (setq indent-remaining (- indent-remaining 1)))
+ )
+
+ ;; The text on the current line just moved left/right some amount;
+ ;; call it text-delta. We want to move the point that same distance.
+ (let ((text-delta (- (nagios-first-char-offset) orig-first-char-offset)))
+ (goto-char (+ orig-point text-delta))
+ )
+
+ ;; The point should never wind up to the left of indent-column, so
+ ;; if it's there, move it over to indent-column.
+ (if (< (nagios-point-offset) indent-column)
+ (goto-char (+ (nagios-beginning-of-line-pos) indent-column))
+ )
+ )
+ )
+)
- (setq first-char-offset
- (skip-chars-forward " \t"))
- (setq first-char-pos
- (+ bol first-char-offset))
-
- (kill-region bol first-char-pos)
-
- (beginning-of-line)
+(defun nagios-char-is-commented(pos)
+ "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)
+ )
+)
- (setq pos-change (- indent-column first-char-offset))
- (setq pos-offset (+ pos-offset pos-change))
+(defun nagios-char-is-commented-and-valid(pos)
+ "True if the character at position pos is commented and non-nil.
+ Nil otherwise."
+ (if (eq nil pos)
+ nil
+ (nagios-char-is-commented pos)
+ )
+)
- (if (<= pos-offset indent-column)
- (setq pos-offset indent-column))
-
- (while (< 0 indent-column)
- (insert " ")
- (setq indent-column (- indent-column 1)))
- (goto-char (+ bol pos-offset))
+(defun nagios-last-opening-brace()
+ "Returns the position of the last opening brace, with
+ respect to the current point. Ignores braces which
+ are commented out."
+ (save-excursion
+ (let ((lob (re-search-backward "{" nil t)))
+ (while (nagios-char-is-commented-and-valid lob)
+ (goto-char lob)
+ (setq lob (re-search-backward "{" nil t))
+ )
+
+ (if lob
+ lob
+ -1)
+ )
)
+)
+(defun nagios-last-closing-brace()
+ "Get the position of the last closing brace, with
+ respect to the current point. Ignores braces which
+ are commented out."
+ (save-excursion
+ (let ((lcb (re-search-backward "}" nil t)))
-(defun nagios-in-block()
- "Determine if the point is inside of a {} block."
+ (while (nagios-char-is-commented-and-valid lcb)
+ (goto-char lcb)
+ (setq lcb (re-search-backward "}" nil t))
+ )
- (setq pos (point))
-
- ;; Get the position of the last opening and closing braces, with
- ;; respect to the current point
- (setq last-opening-brace (re-search-backward "{" nil t))
- (goto-char pos)
-
- (setq last-closing-brace (re-search-backward "}" nil t))
- (goto-char pos)
+ (if lcb
+ lcb
+ -1)
+ )
+ )
+)
- ;; If either is nil (not found) just set it to -1, so the comparison
- ;; doesn't die.
- (if (not last-opening-brace)
- (setq last-opening-brace -1))
-
- (if (not last-closing-brace)
- (setq last-closing-brace -1))
+(defun nagios-in-block()
+ "Determine if the point is inside of a {} block."
;; If the last brace seen in the buffer is an opening brace, we're
;; in a block. Otherwise, we aren't.
- (if (>= last-closing-brace last-opening-brace)
+ (if (>= (nagios-last-closing-brace) (nagios-last-opening-brace))
nil
- t)
- )
+ t)
+)
+
+(defun nagios-brace-on-line()
+ ;; Is there a curly brace on this line?
+ (save-excursion
+ (beginning-of-line)
+ (re-search-forward "[{}]" (nagios-end-of-line-pos) t)
+ )
+)
(defun nagios-calculate-indent()
"Calculate the level of indentation."
- ;; We're either inside a block, or we aren't.
- (setq indent 0)
-
- (if (nagios-in-block)
- (setq indent nagios-indent-level))
-
- (setq pos (point))
- (end-of-line)
- (setq eol (point))
- (beginning-of-line)
- (setq bol (point))
-
- ;; Set the indentation level to 0 if we find either brace on this
- ;; line.
- (if (re-search-forward "[{}]" eol t)
- (setq indent 0))
-
- (goto-char pos)
-
- indent
+ ;; We're either inside a block, or we aren't.
+ ;; Initialize the indent variable to either nagios-indent-level
+ ;; or 0 depending on whether or not we're in a block.
+ (let ((indent (if (nagios-in-block)
+ nagios-indent-level
+ 0)
+ )
+ )
+
+ ;; Set the indentation level to 0 if we find either brace on this
+ ;; line and.
+ (if (and (nagios-brace-on-line)
+ (not (nagios-char-is-commented (nagios-brace-on-line))))
+ 0
+ indent
+ )
)
-
+)
;; Keymaps
@@ -150,26 +229,6 @@
(read-kbd-macro "}")
'nagios-insert-right-brace-and-indent)
)
-
-
-
-;; Regular Expression Transformations
-
-(defun regexp-alt-raw(element-list)
- "Takes a list of elements, and returns the string '\\(element1\\|element2...\\)'"
-
- ;; This is necessary since regexp-opt does not accept regular
- ;; expressions as arguments. We use regexp-opt when we can, of
- ;; course.
-
- (let ((regexp "\\("))
- (mapcar (lambda(elem)
- (setq regexp (concat regexp "\\(" elem "\\)" "\\|")))
- element-list)
- (concat (substring regexp 0 -2) ; Cut the last "\\|"
- "\\)")
- )
- )
@@ -178,31 +237,124 @@
(concat "^[ \t\r\n]*"
(regexp-opt
- '("active_checks_enabled" "address" "alias" "check_command"
- "check_freshness" "check_interval" "check_period" "checks_enabled"
- "command_line" "command_name" "contactgroups" "contact_groups"
- "contactgroup_members" "contact_name" "contactgroup_name" "contacts"
- "dependent_host_name" "dependent_service_description" "email"
- "event_handler" "event_handler_enabled" "execution_failure_criteria"
- "failure_prediction_enabled" "first_notification"
- "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"
- "max_check_attempts" "members" "monday" "normal_check_interval"
- "notes" "notification_failure_criteria"
- "notification_interval" "notification_options"
- "notification_period" "notifications_enabled"
- "obsess_over_service" "pager" "parallelize_check"
- "parents" "passive_checks_enabled"
- "process_perf_data" "retain_nonstatus_information"
- "retain_status_information" "retry_check_interval"
- "retry_interval" "saturday" "service_description"
- "service_notification_commands" "service_notification_options"
- "service_notification_period" "service_notifications_enabled"
- "servicegroup_name" "stalking_options"
- "sunday" "thursday" "timeperiod_name" "tuesday" "wednesday") t)
+ '("action_url"
+ "active_checks_enabled"
+ "address"
+ "alias"
+ "can_submit_commands"
+ "check_command"
+ "check_freshness"
+ "check_interval"
+ "check_period"
+ "checks_enabled"
+ "command_line"
+ "command_name"
+ "contact_groups"
+ "contact_name"
+ "contactgroup_members"
+ "contactgroup_name"
+ "contactgroups"
+ "contacts"
+ "dependency_period"
+ "dependent_description"
+ "dependent_host"
+ "dependent_host_name"
+ "dependent_hostgroup"
+ "dependent_hostgroup_name"
+ "dependent_hostgroups"
+ "dependent_service_description"
+ "dependent_servicegroup"
+ "dependent_servicegroup_name"
+ "dependent_servicegroups"
+ "description"
+ "display_name"
+ "email"
+ "escalation_options"
+ "escalation_period"
+ "event_handler"
+ "event_handler_enabled"
+ "exclude"
+ "execution_failure_criteria"
+ "execution_failure_options"
+ "failure_prediction_enabled"
+ "failure_prediction_options"
+ "first_notification"
+ "first_notification_delay"
+ "flap_detection_enabled"
+ "flap_detection_options"
+ "freshness_threshold"
+ "friday"
+ "high_flap_threshold"
+ "host"
+ "host_groups"
+ "host_name"
+ "host_notification_commands"
+ "host_notification_options"
+ "host_notification_period"
+ "host_notifications_enabled"
+ "hostgroup"
+ "hostgroup_members"
+ "hostgroup_name"
+ "hostgroups"
+ "hosts"
+ "hourly_value"
+ "icon_image"
+ "icon_image_alt"
+ "importance"
+ "inherits_parent"
+ "initial_state"
+ "is_volatile"
+ "last_notification"
+ "low_flap_threshold"
+ "master_description"
+ "master_host"
+ "master_host_name"
+ "master_service_description"
+ "max_check_attempts"
+ "members"
+ "minimum_importance"
+ "minimum_value"
+ "monday"
+ "normal_check_interval"
+ "notes"
+ "notes_url"
+ "notification_failure_criteria"
+ "notification_failure_options"
+ "notification_interval"
+ "notification_options"
+ "notification_period"
+ "notifications_enabled"
+ "obsess"
+ "obsess_over_host"
+ "obsess_over_service"
+ "pager"
+ "parallelize_check"
+ "parents"
+ "passive_checks_enabled"
+ "process_perf_data"
+ "retain_nonstatus_information"
+ "retain_status_information"
+ "retry_check_interval"
+ "retry_interval"
+ "saturday"
+ "service_description"
+ "service_groups"
+ "service_notification_commands"
+ "service_notification_options"
+ "service_notification_period"
+ "service_notifications_enabled"
+ "servicegroup"
+ "servicegroup_members"
+ "servicegroup_name"
+ "servicegroups"
+ "stalking_options"
+ "statusmap_image"
+ "sunday"
+ "thursday"
+ "timeperiod_name"
+ "tuesday"
+ "vrml_image"
+ "wednesday") t)
"[ \r\n\t]+")
)
@@ -212,17 +364,458 @@
(defconst nagios-macros
(eval-when-compile
- (regexp-alt-raw
- '("\\$CONTACT\\(NAME\\|ALIAS\\|EMAIL\\|PAGER\\)\\$"
- "\\$HOST\\(NAME\\|ALIAS\\|ADDRESS\\|STATE\\)\\$"
- "\\$\\(ARG\\|USER\\)\\([1-9]\\|[1-2][0-9]\\|3[0-2]\\)\\$"
- "\\$SERVICE\\(DESC\\|STATE\\)\\$"
- "\\$\\(OUTPUT\\|PERFDATA\\|EXECUTIONTIME\\|LATENCY\\)\\$"
- "\\$NOTIFICATION\\(TYPE\\|NUMBER\\)\\$"
- "\\$\\(\\(SHORT\\)?DATETIME\\|DATE\\|TIME\\|TIMET\\)\\$"
- "\\$\\(LASTSTATECHANGE\\|STATETYPE\\)\\$"
- "\\$ADMIN\\(EMAIL\\|PAGER\\)\\$"
- "\\$\\(SERVICE\\|HOST\\)ATTEMPT\\$")))
+ (regexp-opt
+ '("$ADMINEMAIL$"
+ "$ADMINPAGER$"
+ "$ARG1$"
+ "$ARG10$"
+ "$ARG11$"
+ "$ARG12$"
+ "$ARG13$"
+ "$ARG14$"
+ "$ARG15$"
+ "$ARG16$"
+ "$ARG17$"
+ "$ARG18$"
+ "$ARG19$"
+ "$ARG2$"
+ "$ARG20$"
+ "$ARG21$"
+ "$ARG22$"
+ "$ARG23$"
+ "$ARG24$"
+ "$ARG25$"
+ "$ARG26$"
+ "$ARG27$"
+ "$ARG28$"
+ "$ARG29$"
+ "$ARG3$"
+ "$ARG30$"
+ "$ARG31$"
+ "$ARG32$"
+ "$ARG4$"
+ "$ARG5$"
+ "$ARG6$"
+ "$ARG7$"
+ "$ARG8$"
+ "$ARG9$"
+ "$COMMANDFILE$"
+ "$CONTACTALIAS$"
+ "$CONTACTEMAIL$"
+ "$CONTACTGROUPALIAS$"
+ "$CONTACTGROUPMEMBERS$"
+ "$CONTACTGROUPNAME$"
+ "$CONTACTGROUPNAMES$"
+ "$CONTACTNAME$"
+ "$CONTACTPAGER$"
+ "$DATE$"
+ "$EVENTSTARTTIME$"
+ "$HOSTACKAUTHOR$"
+ "$HOSTACKAUTHORALIAS$"
+ "$HOSTACKAUTHORNAME$"
+ "$HOSTACKCOMMENT$"
+ "$HOSTACTIONURL$"
+ "$HOSTADDRESS$"
+ "$HOSTALIAS$"
+ "$HOSTANDSERVICESIMPORTANCE$"
+ "$HOSTATTEMPT$"
+ "$HOSTCHECKCOMMAND$"
+ "$HOSTCHECKTYPE$"
+ "$HOSTDISPLAYNAME$"
+ "$HOSTDOWNTIME$"
+ "$HOSTDURATION$"
+ "$HOSTDURATIONSEC$"
+ "$HOSTEVENTID$"
+ "$HOSTEXECUTIONTIME$"
+ "$HOSTGROUPACTIONURL$"
+ "$HOSTGROUPALIAS$"
+ "$HOSTGROUPMEMBERADDRESSES$"
+ "$HOSTGROUPMEMBERS$"
+ "$HOSTGROUPNAME$"
+ "$HOSTGROUPNAMES$"
+ "$HOSTGROUPNOTES$"
+ "$HOSTGROUPNOTESURL$"
+ "$HOSTIMPORTANCE$"
+ "$HOSTINFOURL$"
+ "$HOSTLATENCY$"
+ "$HOSTNAME$"
+ "$HOSTNOTES$"
+ "$HOSTNOTESURL$"
+ "$HOSTNOTIFICATIONENABLED$"
+ "$HOSTNOTIFICATIONID$"
+ "$HOSTNOTIFICATIONNUMBER$"
+ "$HOSTNOTIFICATIONPERIOD$"
+ "$HOSTOUTPUT$"
+ "$HOSTPERCENTCHANGE$"
+ "$HOSTPERFDATA$"
+ "$HOSTPERFDATAFILE$"
+ "$HOSTPROBLEMID$"
+ "$HOSTSTATE$"
+ "$HOSTSTATEID$"
+ "$HOSTSTATETYPE$"
+ "$ISVALIDTIME$"
+ "$LASTHOSTCHECK$"
+ "$LASTHOSTDOWN$"
+ "$LASTHOSTEVENTID$"
+ "$LASTHOSTPROBLEMID$"
+ "$LASTHOSTSTATE$"
+ "$LASTHOSTSTATECHANGE$"
+ "$LASTHOSTSTATEID$"
+ "$LASTHOSTUNREACHABLE$"
+ "$LASTHOSTUP$"
+ "$LASTSERVICECHECK$"
+ "$LASTSERVICECRITICAL$"
+ "$LASTSERVICEEVENTID$"
+ "$LASTSERVICEOK$"
+ "$LASTSERVICEPROBLEMID$"
+ "$LASTSERVICESTATE$"
+ "$LASTSERVICESTATECHANGE$"
+ "$LASTSERVICESTATEID$"
+ "$LASTSERVICEUNKNOWN$"
+ "$LASTSERVICEWARNING$"
+ "$LOGFILE$"
+ "$LONGDATETIME$"
+ "$LONGHOSTOUTPUT$"
+ "$LONGSERVICEOUTPUT$"
+ "$MAINCONFIGFILE$"
+ "$MAXHOSTATTEMPTS$"
+ "$MAXSERVICEATTEMPTS$"
+ "$NEXTVALIDTIME$"
+ "$NOTIFICATIONAUTHOR$"
+ "$NOTIFICATIONAUTHORALIAS$"
+ "$NOTIFICATIONAUTHORNAME$"
+ "$NOTIFICATIONCOMMENT$"
+ "$NOTIFICATIONISESCALATED$"
+ "$NOTIFICATIONNUMBER$"
+ "$NOTIFICATIONRECIPIENTS$"
+ "$NOTIFICATIONTYPE$"
+ "$OBJECTCACHEFILE$"
+ "$PROCESSSTARTTIME$"
+ "$RESOURCEFILE$"
+ "$RETENTIONDATAFILE$"
+ "$SERVICEACKAUTHOR$"
+ "$SERVICEACKAUTHORALIAS$"
+ "$SERVICEACKAUTHORNAME$"
+ "$SERVICEACKCOMMENT$"
+ "$SERVICEACTIONURL$"
+ "$SERVICEATTEMPT$"
+ "$SERVICECHECKCOMMAND$"
+ "$SERVICECHECKTYPE$"
+ "$SERVICEDESC$"
+ "$SERVICEDISPLAYNAME$"
+ "$SERVICEDOWNTIME$"
+ "$SERVICEDURATION$"
+ "$SERVICEDURATIONSEC$"
+ "$SERVICEEVENTID$"
+ "$SERVICEEXECUTIONTIME$"
+ "$SERVICEGROUPACTIONURL$"
+ "$SERVICEGROUPALIAS$"
+ "$SERVICEGROUPMEMBERS$"
+ "$SERVICEGROUPNAME$"
+ "$SERVICEGROUPNAMES$"
+ "$SERVICEGROUPNOTES$"
+ "$SERVICEGROUPNOTESURL$"
+ "$SERVICEIMPORTANCE$"
+ "$SERVICEINFOURL$"
+ "$SERVICEISVOLATILE$"
+ "$SERVICELATENCY$"
+ "$SERVICENOTES$"
+ "$SERVICENOTESURL$"
+ "$SERVICENOTIFICATIONENABLED$"
+ "$SERVICENOTIFICATIONID$"
+ "$SERVICENOTIFICATIONNUMBER$"
+ "$SERVICENOTIFICATIONPERIOD$"
+ "$SERVICEOUTPUT$"
+ "$SERVICEPERCENTCHANGE$"
+ "$SERVICEPERFDATA$"
+ "$SERVICEPERFDATAFILE$"
+ "$SERVICEPROBLEMID$"
+ "$SERVICESTATE$"
+ "$SERVICESTATEID$"
+ "$SERVICESTATETYPE$"
+ "$SHORTDATETIME$"
+ "$STATUSDATAFILE$"
+ "$TEMPFILE$"
+ "$TEMPPATH$"
+ "$TIME$"
+ "$TIMET$"
+ "$TOTALHOSTPROBLEMS$"
+ "$TOTALHOSTPROBLEMSUNHANDLED$"
+ "$TOTALHOSTSDOWN$"
+ "$TOTALHOSTSDOWNUNHANDLED$"
+ "$TOTALHOSTSERVICES$"
+ "$TOTALHOSTSERVICESCRITICAL$"
+ "$TOTALHOSTSERVICESOK$"
+ "$TOTALHOSTSERVICESUNKNOWN$"
+ "$TOTALHOSTSERVICESWARNING$"
+ "$TOTALHOSTSUNREACHABLE$"
+ "$TOTALHOSTSUNREACHABLEUNHANDLED$"
+ "$TOTALHOSTSUP$"
+ "$TOTALSERVICEPROBLEMS$"
+ "$TOTALSERVICEPROBLEMSUNHANDLED$"
+ "$TOTALSERVICESCRITICAL$"
+ "$TOTALSERVICESCRITICALUNHANDLED$"
+ "$TOTALSERVICESOK$"
+ "$TOTALSERVICESUNKNOWN$"
+ "$TOTALSERVICESUNKNOWNUNHANDLED$"
+ "$TOTALSERVICESWARNING$"
+ "$TOTALSERVICESWARNINGUNHANDLED$"
+ "$USER1$"
+ "$USER10$"
+ "$USER100$"
+ "$USER101$"
+ "$USER102$"
+ "$USER103$"
+ "$USER104$"
+ "$USER105$"
+ "$USER106$"
+ "$USER107$"
+ "$USER108$"
+ "$USER109$"
+ "$USER11$"
+ "$USER110$"
+ "$USER111$"
+ "$USER112$"
+ "$USER113$"
+ "$USER114$"
+ "$USER115$"
+ "$USER116$"
+ "$USER117$"
+ "$USER118$"
+ "$USER119$"
+ "$USER12$"
+ "$USER120$"
+ "$USER121$"
+ "$USER122$"
+ "$USER123$"
+ "$USER124$"
+ "$USER125$"
+ "$USER126$"
+ "$USER127$"
+ "$USER128$"
+ "$USER129$"
+ "$USER13$"
+ "$USER130$"
+ "$USER131$"
+ "$USER132$"
+ "$USER133$"
+ "$USER134$"
+ "$USER135$"
+ "$USER136$"
+ "$USER137$"
+ "$USER138$"
+ "$USER139$"
+ "$USER14$"
+ "$USER140$"
+ "$USER141$"
+ "$USER142$"
+ "$USER143$"
+ "$USER144$"
+ "$USER145$"
+ "$USER146$"
+ "$USER147$"
+ "$USER148$"
+ "$USER149$"
+ "$USER15$"
+ "$USER150$"
+ "$USER151$"
+ "$USER152$"
+ "$USER153$"
+ "$USER154$"
+ "$USER155$"
+ "$USER156$"
+ "$USER157$"
+ "$USER158$"
+ "$USER159$"
+ "$USER16$"
+ "$USER160$"
+ "$USER161$"
+ "$USER162$"
+ "$USER163$"
+ "$USER164$"
+ "$USER165$"
+ "$USER166$"
+ "$USER167$"
+ "$USER168$"
+ "$USER169$"
+ "$USER17$"
+ "$USER170$"
+ "$USER171$"
+ "$USER172$"
+ "$USER173$"
+ "$USER174$"
+ "$USER175$"
+ "$USER176$"
+ "$USER177$"
+ "$USER178$"
+ "$USER179$"
+ "$USER18$"
+ "$USER180$"
+ "$USER181$"
+ "$USER182$"
+ "$USER183$"
+ "$USER184$"
+ "$USER185$"
+ "$USER186$"
+ "$USER187$"
+ "$USER188$"
+ "$USER189$"
+ "$USER19$"
+ "$USER190$"
+ "$USER191$"
+ "$USER192$"
+ "$USER193$"
+ "$USER194$"
+ "$USER195$"
+ "$USER196$"
+ "$USER197$"
+ "$USER198$"
+ "$USER199$"
+ "$USER2$"
+ "$USER20$"
+ "$USER200$"
+ "$USER201$"
+ "$USER202$"
+ "$USER203$"
+ "$USER204$"
+ "$USER205$"
+ "$USER206$"
+ "$USER207$"
+ "$USER208$"
+ "$USER209$"
+ "$USER21$"
+ "$USER210$"
+ "$USER211$"
+ "$USER212$"
+ "$USER213$"
+ "$USER214$"
+ "$USER215$"
+ "$USER216$"
+ "$USER217$"
+ "$USER218$"
+ "$USER219$"
+ "$USER22$"
+ "$USER220$"
+ "$USER221$"
+ "$USER222$"
+ "$USER223$"
+ "$USER224$"
+ "$USER225$"
+ "$USER226$"
+ "$USER227$"
+ "$USER228$"
+ "$USER229$"
+ "$USER23$"
+ "$USER230$"
+ "$USER231$"
+ "$USER232$"
+ "$USER233$"
+ "$USER234$"
+ "$USER235$"
+ "$USER236$"
+ "$USER237$"
+ "$USER238$"
+ "$USER239$"
+ "$USER24$"
+ "$USER240$"
+ "$USER241$"
+ "$USER242$"
+ "$USER243$"
+ "$USER244$"
+ "$USER245$"
+ "$USER246$"
+ "$USER247$"
+ "$USER248$"
+ "$USER249$"
+ "$USER25$"
+ "$USER250$"
+ "$USER251$"
+ "$USER252$"
+ "$USER253$"
+ "$USER254$"
+ "$USER255$"
+ "$USER256$"
+ "$USER26$"
+ "$USER27$"
+ "$USER28$"
+ "$USER29$"
+ "$USER3$"
+ "$USER30$"
+ "$USER31$"
+ "$USER32$"
+ "$USER33$"
+ "$USER34$"
+ "$USER35$"
+ "$USER36$"
+ "$USER37$"
+ "$USER38$"
+ "$USER39$"
+ "$USER4$"
+ "$USER40$"
+ "$USER41$"
+ "$USER42$"
+ "$USER43$"
+ "$USER44$"
+ "$USER45$"
+ "$USER46$"
+ "$USER47$"
+ "$USER48$"
+ "$USER49$"
+ "$USER5$"
+ "$USER50$"
+ "$USER51$"
+ "$USER52$"
+ "$USER53$"
+ "$USER54$"
+ "$USER55$"
+ "$USER56$"
+ "$USER57$"
+ "$USER58$"
+ "$USER59$"
+ "$USER6$"
+ "$USER60$"
+ "$USER61$"
+ "$USER62$"
+ "$USER63$"
+ "$USER64$"
+ "$USER65$"
+ "$USER66$"
+ "$USER67$"
+ "$USER68$"
+ "$USER69$"
+ "$USER7$"
+ "$USER70$"
+ "$USER71$"
+ "$USER72$"
+ "$USER73$"
+ "$USER74$"
+ "$USER75$"
+ "$USER76$"
+ "$USER77$"
+ "$USER78$"
+ "$USER79$"
+ "$USER8$"
+ "$USER80$"
+ "$USER81$"
+ "$USER82$"
+ "$USER83$"
+ "$USER84$"
+ "$USER85$"
+ "$USER86$"
+ "$USER87$"
+ "$USER88$"
+ "$USER89$"
+ "$USER9$"
+ "$USER90$"
+ "$USER91$"
+ "$USER92$"
+ "$USER93$"
+ "$USER94$"
+ "$USER95$"
+ "$USER96$"
+ "$USER97$"
+ "$USER98$"
+ "$USER99$")))
)
@@ -232,15 +825,31 @@
(concat "^[ \t\r\n]*"
- (regexp-alt-raw
- '("define +\\(host\\|service\\|timeperiod\\|contact\\|command\\)"
- "define +\\(host\\|contact\\|service\\)group"
- "define +\\(service\\|host\\)dependency"
- "define +\\(service\\|host\\|hostgroup\\)escalation"))
-
- ;; These can be "terminated" by either an opening curly
- ;; brace, or a space.
- "\\({\\| \\)")
+ "\\(" ;; Stick parenthesis around whatever comes out
+ ;; of regexp-opt. We use this to match a
+ ;; subexpression during font-lock.
+ (regexp-opt
+ '("define command"
+ "define contact"
+ "define contactgroup"
+ "define host"
+ "define hostdependency"
+ "define hostescalation"
+ "define hostextinfo"
+ "define hostgroup"
+ "define null"
+ "define service"
+ "define servicedependency"
+ "define serviceescalation"
+ "define serviceextinfo"
+ "define servicegroup"
+ "define timeperiod"))
+ ;; This closes the parentheses that we opened
+ "\\)" ;; before regexp-opt.
+
+ ;; These can be "terminated" by either an opening curly
+ ;; brace, or a space.
+ "\\({\\| \\)")
)
)
@@ -297,15 +906,15 @@
(make-local-variable 'indent-line-function)
(set-syntax-table nagios-mode-syntax-table)
-
- (setq mode-name "nagios"
- major-mode 'nagios-mode
- indent-line-function 'nagios-indent-line
- font-lock-defaults '(nagios-font-lock-keywords)
- comment-start "#"
- comment-start-skip "#\|; +"
- comment-end ""
- )
+
+ (setq mode-name "nagios"
+ major-mode 'nagios-mode
+ indent-line-function 'nagios-indent-line
+ font-lock-defaults '(nagios-font-lock-keywords)
+ comment-start "#"
+ comment-start-skip "#\|; +"
+ comment-end ""
+ )
;; Keyboard Mapping
(use-local-map nagios-mode-map)