X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=nagios-mode.el;h=8535db85e66e2386ab18ec4e5428ee1749c6af18;hb=ebb6782855e13461b064d2f163b207119fd8d6e4;hp=71cc5a008f9480cbdf11a33ce0970e4198008284;hpb=05efadf89278ffc7a715fcd77e38babcd4ccac64;p=nagios-mode.git diff --git a/nagios-mode.el b/nagios-mode.el index 71cc5a0..8535db8 100644 --- a/nagios-mode.el +++ b/nagios-mode.el @@ -94,21 +94,21 @@ ;; Now insert indent-column spaces. (let ((indent-remaining indent-column)) - (while (< 0 indent-remaining) - (insert " ") - (setq indent-remaining (- indent-remaining 1))) + (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)) + (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)) + (goto-char (+ (nagios-beginning-of-line-pos) indent-column)) ) ) ) @@ -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) ) ) @@ -141,13 +141,13 @@ (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)) + (goto-char lob) + (setq lob (re-search-backward "{" nil t)) ) (if lob - lob - -1) + lob + -1) ) ) ) @@ -161,13 +161,13 @@ (let ((lcb (re-search-backward "}" nil t))) (while (nagios-char-is-commented-and-valid lcb) - (goto-char lcb) - (setq lcb (re-search-backward "}" nil t)) + (goto-char lcb) + (setq lcb (re-search-backward "}" nil t)) ) (if lcb - lcb - -1) + lcb + -1) ) ) ) @@ -199,16 +199,16 @@ ;; 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) - ) + 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 + (not (nagios-char-is-commented (nagios-brace-on-line)))) + 0 indent ) ) @@ -242,31 +242,78 @@ (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) + '("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) "[ \r\n\t]+") ) @@ -329,6 +376,7 @@ "$HOSTACTIONURL$" "$HOSTADDRESS$" "$HOSTALIAS$" + "$HOSTANDSERVICESIMPORTANCE$" "$HOSTATTEMPT$" "$HOSTCHECKCOMMAND$" "$HOSTCHECKTYPE$" @@ -340,17 +388,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 +474,16 @@ "$SERVICEGROUPNAMES$" "$SERVICEGROUPNOTES$" "$SERVICEGROUPNOTESURL$" + "$SERVICEIMPORTANCE$" + "$SERVICEINFOURL$" "$SERVICEISVOLATILE$" "$SERVICELATENCY$" "$SERVICENOTES$" "$SERVICENOTESURL$" + "$SERVICENOTIFICATIONENABLED$" "$SERVICENOTIFICATIONID$" "$SERVICENOTIFICATIONNUMBER$" + "$SERVICENOTIFICATIONPERIOD$" "$SERVICEOUTPUT$" "$SERVICEPERCENTCHANGE$" "$SERVICEPERFDATA$" @@ -727,32 +784,31 @@ (concat "^[ \t\r\n]*" - "\\(" ;; 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 hostgroupescalation" - "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. - "\\({\\| \\)") + "\\(" ;; 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. + "\\({\\| \\)") ) ) @@ -807,23 +863,17 @@ (make-local-variable 'comment-start-skip) (make-local-variable 'comment-end) (make-local-variable 'indent-line-function) - (make-local-variable 'syntax-begin-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 "" - - ;; Since comments and strings do not span multiple lines, - ;; the syntax parser can safely start parsing at the beginning - ;; of any line. - syntax-begin-function 'beginning-of-line - ) + 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)