From 5ca4310294df8393175b1a8f1f12aec14bb31b8a Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 21 Aug 2010 00:00:45 -0400 Subject: [PATCH] Prefix all functions with "nagios-". --- nagios-mode.el | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/nagios-mode.el b/nagios-mode.el index 22535b5..7ee729f 100644 --- a/nagios-mode.el +++ b/nagios-mode.el @@ -41,7 +41,7 @@ ) -(defun beginning-of-line-pos() +(defun nagios-beginning-of-line-pos() ;; Return the point position corresponding to the beginning ;; of the current line. (save-excursion @@ -50,7 +50,7 @@ ) ) -(defun end-of-line-pos() +(defun nagios-end-of-line-pos() ;; Return the point position corresponding to the end ;; of the current line. (save-excursion @@ -59,12 +59,12 @@ ) ) -(defun point-offset() +(defun nagios-point-offset() ;; How far are we from the beginning of the line? - (- (point) (beginning-of-line-pos)) + (- (point) (nagios-beginning-of-line-pos)) ) -(defun first-char-offset() +(defun nagios-first-char-offset() ;; How far is the first character on this line ;; from the beginning of the line? (save-excursion @@ -73,9 +73,9 @@ ) ) -(defun first-char-pos() +(defun nagios-first-char-pos() ;; What's the position of the first character on this line? - (+ (beginning-of-line-pos) (first-char-offset)) + (+ (nagios-beginning-of-line-pos) (nagios-first-char-offset)) ) (defun nagios-indent-to(indent-column) @@ -85,11 +85,11 @@ ;; 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 (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 (beginning-of-line-pos) (first-char-pos)) + (delete-region (nagios-beginning-of-line-pos) (nagios-first-char-pos)) (beginning-of-line) ;; Now insert indent-column spaces. @@ -101,46 +101,46 @@ ;; 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 (- (first-char-offset) orig-first-char-offset))) + (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 (< (point-offset) indent-column) - (goto-char (+ (beginning-of-line-pos) indent-column)) + (if (< (nagios-point-offset) indent-column) + (goto-char (+ (nagios-beginning-of-line-pos) indent-column)) ) ) ) ) -(defun char-is-commented(pos) +(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 "#" (beginning-of-line-pos) t) + (re-search-backward "#" (nagios-beginning-of-line-pos) t) ) ) -(defun char-is-commented-and-valid(pos) +(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 - (char-is-commented pos) + (nagios-char-is-commented pos) ) ) -(defun last-opening-brace() +(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 (char-is-commented-and-valid lob) + (while (nagios-char-is-commented-and-valid lob) (goto-char lob) (setq lob (re-search-backward "{" nil t)) ) @@ -153,14 +153,14 @@ ) -(defun last-closing-brace() +(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))) - (while (char-is-commented-and-valid lcb) + (while (nagios-char-is-commented-and-valid lcb) (goto-char lcb) (setq lcb (re-search-backward "}" nil t)) ) @@ -177,17 +177,17 @@ ;; 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) ) -(defun brace-on-line() +(defun nagios-brace-on-line() ;; Is there a curly brace on this line? (save-excursion (beginning-of-line) - (re-search-forward "[{}]" (end-of-line-pos) t) + (re-search-forward "[{}]" (nagios-end-of-line-pos) t) ) ) @@ -206,7 +206,8 @@ ;; Set the indentation level to 0 if we find either brace on this ;; line and. - (if (and (brace-on-line) (not (char-is-commented (brace-on-line)))) + (if (and (nagios-brace-on-line) + (not (nagios-char-is-commented (nagios-brace-on-line)))) 0 indent ) -- 2.44.2