Fix the brace-on-line function.

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

diff --git a/nagios-mode.el b/nagios-mode.el
index 61cf412b64dba9745273b1b06efab7e626ab1ac4..377400172a2cf08b2123314612205d95d2a52be1 100644 (file)
--- a/nagios-mode.el
+++ b/nagios-mode.el
@@ -93,9 +93,11 @@
       (beginning-of-line)
 
       ;; Now insert indent-column spaces.
-      (while (< 0 indent-column)
-       (insert " ")
-       (setq indent-column (- indent-column 1)))
+      (let ((indent-remaining indent-column))
+       (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.
@@ -106,7 +108,7 @@
       ;; 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)
+         (goto-char (+ (beginning-of-line-pos) indent-column))
       )
     )
   )
@@ -152,18 +154,20 @@
 (defun brace-on-line()
   ;; Is there a curly brace on this line?
   (save-excursion
+    (beginning-of-line)
     (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.
 
+  ;; 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)
        )
        )