(makefile-warn-suspicious-lines): clean

up the code and the regexp and make sure the cursor is temporarily
moved to the suspicious line while querying the user.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 99209b23efe22b8849559e96cb46ed9f5de5d5fb..77b0671a899d72212408758f5771fa2e349c505f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-22  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * progmodes/make-mode.el (makefile-warn-suspicious-lines): clean
+       up the code and the regexp and make sure the cursor is temporarily
+       moved to the suspicious line while querying the user.
+
 2000-03-22  Jason Rumney  <jasonr@gnu.org>
 
        * w32-fns.el (w32-charset-info-alist): Initialize.

diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index c4265252b9a73f3049418e5a92db76dceaef4487..b2d50413fb41b5763c851e0ff3bd02a65a7a84f2 100644 (file)
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1344,20 +1344,14 @@ and generates the overview, one line per target name."
 ;;; ------------------------------------------------------------
 
 (defun makefile-warn-suspicious-lines ()
-  (let ((dont-save nil))
-    (if (eq major-mode 'makefile-mode)
-       (let ((suspicious
-              (save-excursion
-                (goto-char (point-min))
-                (re-search-forward
-                 "\\(^[\t]+$\\)\\|\\(^[ ]+[\t]\\)" (point-max) t))))
-         (if suspicious
-             (let ((line-nr (count-lines (point-min) suspicious)))
-               (setq dont-save
-                     (not (y-or-n-p
-                           (format "Suspicious line %d. Save anyway "
-                                   line-nr))))))))
-    dont-save))
+  ;; Returning non-nil cancels the save operation
+  (if (eq major-mode 'makefile-mode)
+      (save-excursion
+       (goto-char (point-min))
+       (if (re-search-forward "^\\(\t+$\\| +\t\\)" nil t)
+           (not (y-or-n-p
+                 (format "Suspicious line %d. Save anyway "
+                         (count-lines (point-min) (point)))))))))
          
 \f