From: Michael Orlitzky Date: Sun, 13 Nov 2022 00:39:35 +0000 (-0500) Subject: nagios-mode.el: replace all tabs with spaces, as God intended. X-Git-Tag: v0.4~7 X-Git-Url: http://gitweb.michael.orlitzky.com/?p=nagios-mode.git;a=commitdiff_plain;h=e8d77bf664c2f1509bc61c618fcc1b82d631c1bc nagios-mode.el: replace all tabs with spaces, as God intended. --- diff --git a/nagios-mode.el b/nagios-mode.el index 882933f..c56d58d 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)) ) ) ) @@ -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 ) ) @@ -737,31 +737,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 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. + "\\({\\| \\)") ) ) @@ -821,18 +821,18 @@ (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 "" + + ;; 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 + ) ;; Keyboard Mapping (use-local-map nagios-mode-map)