Fix a setq within an if statement.

[nagios-mode.git] / nagios-mode.el

diff --git a/nagios-mode.el b/nagios-mode.el
index 5745f10482fb7334e1d54f4aaa11ee6634b940c3..33a5742dce47478b8105706afbc9fa866e16b676 100644 (file)
--- a/nagios-mode.el
+++ b/nagios-mode.el
@@ -36,6 +36,7 @@
 
 (defun nagios-indent-line(&optional flag)
   "Indents a line, taking nesting into account."
+  (interactive)
   (nagios-indent-to (nagios-calculate-indent))
   )
 
@@ -58,7 +59,7 @@
   )
 )
 
-(defun pos-offset()
+(defun point-offset()
   ;; How far are we from the beginning of the line?
   (- (point) (beginning-of-line-pos))
 )
@@ -67,7 +68,8 @@
   ;; How far is the first character on this line
   ;; from the beginning of the line?
   (save-excursion
-    (+ (pos-offset) (skip-chars-forward " \t"))
+    (beginning-of-line)
+    (skip-chars-forward " \t")
   )
 )
 
@@ -78,7 +80,6 @@
 
 (defun nagios-indent-to(indent-column)
   "Indent the current line to column indent-column."
-
   ;; Store the point in orig-pos.
   (let ((orig-point (point)))
 
@@ -101,6 +102,12 @@
       (let ((text-delta (- (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 indent-column)
+      )
     )
   )
 )
@@ -151,12 +158,12 @@
 
 (defun nagios-calculate-indent()
   "Calculate the level of indentation."
-  ;; We're either inside a block, or we aren't.
 
+  ;; 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)
-                   (setq indent nagios-indent-level)
+                   nagios-indent-level
                    0)
        )
        )