X-Git-Url: http://gitweb.michael.orlitzky.com/?p=nagios-mode.git;a=blobdiff_plain;f=nagios-mode.el;h=3e869461782acc820a132be3b7446bbf7b428072;hp=e486edc5b4f93e290a418926017b03976e2e3278;hb=a752ddc739d752cd88c24d0498d6ed2c3383bdb8;hpb=36e47cd9620f76fe2b69b0e2604e5448353b0047

diff --git a/nagios-mode.el b/nagios-mode.el
index e486edc..3e86946 100644
--- a/nagios-mode.el
+++ b/nagios-mode.el
@@ -36,41 +36,75 @@
 
 (defun nagios-indent-line(&optional flag)
   "Indents a line, taking nesting into account."
+  (interactive)
   (nagios-indent-to (nagios-calculate-indent))
   )
 
 
+(defun beginning-of-line-pos()
+  ;; Return the point position corresponding to the beginning
+  ;; of the current line.
+  (save-excursion
+    (beginning-of-line)
+    (point)
+  )
+)
+
+(defun end-of-line-pos()
+  ;; Return the point position corresponding to the end
+  ;; of the current line.
+  (save-excursion
+    (end-of-line)
+    (point)
+  )
+)
+
+(defun point-offset()
+  ;; How far are we from the beginning of the line?
+  (- (point) (beginning-of-line-pos))
+)
+
+(defun first-char-offset()
+  ;; How far is the first character on this line
+  ;; from the beginning of the line?
+  (save-excursion
+    (+ (pos-offset) (skip-chars-forward " \t"))
+  )
+)
+
+(defun first-char-pos()
+  ;; What's the position of the first character on this line?
+  (+ (beginning-of-line-pos) (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))
 
-  (setq first-char-offset
-	(skip-chars-forward " \t"))
+  ;; Store the point in orig-pos.
+  (let ((orig-point (point)))
 
-  (setq first-char-pos
-	(+ bol first-char-offset))
-  
-  (delete-region bol first-char-pos)
-  
-  (beginning-of-line)
-
-  (setq pos-change (- indent-column first-char-offset))
-  (setq pos-offset (+ pos-offset pos-change))
+    ;; 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)))
 
-  (if (<= pos-offset indent-column)
-      (setq pos-offset indent-column))
-  
-  (while (< 0 indent-column)
-    (insert " ")
-    (setq indent-column (- indent-column 1)))
+      ;; Delete any leading whitespace, and move the point to the
+      ;; beginning of the line.
+      (delete-region (beginning-of-line-pos) (first-char-pos))
+      (beginning-of-line)
 
-  (goto-char (+ bol pos-offset))
+      ;; Now insert indent-column spaces.
+      (while (< 0 indent-column)
+	(insert " ")
+	(setq indent-column (- indent-column 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 (- (first-char-offset) orig-first-char-offset)))
+	(goto-char (+ orig-point text-delta))
+      )
+    )
   )
+)
 
 
 
@@ -109,32 +143,34 @@
 )
 
 
+(defun brace-on-line()
+  ;; Is there a curly brace on this line?
+  (save-excursion
+    (re-search-forward "[{}]" (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)
+  ;; 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)
+		    (setq indent nagios-indent-level)
+		    0)
+	)
+       )
 
-  indent
-  )
+    ;; Set the indentation level to 0 if we find either brace on this
+    ;; line.
+    (if (brace-on-line)
+	(setq indent 0)
+    )
 
+    indent
+  )
+)
 
 
 ;; Keymaps