(f90-match-end): Simplify it a bit.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6fa2a5dd67b0030ecd207e6989cb948ae71a9cd6..b74d7930cab4b8d8d402bd4fa4c7d3f3b5d71c94 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-19  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+       * progmodes/f90.el (f90-match-end): Simplify it a bit.
+
 2002-05-19  Richard M. Stallman  <rms@gnu.org>
 
        * indent.el (indent-region): Make COLUMN arg optional.

diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 2c56284ae639e4acaffc0e46b487ff2353b637d7..f06883c7646443a4b1080682c74583b31a137917 100644 (file)
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1598,22 +1598,11 @@ Leave point at the end of line."
             end-name  (car (cdr end-struct)))
       (save-excursion
         (beginning-of-line)
-        (while
-            (and (not (zerop count))
-                 (let ((stop nil) notexist)
-                   (while (not stop)
-                     (setq notexist
-                           (not (re-search-backward
-                                 (concat "\\(" f90-blocks-re "\\)") nil t)))
-                     (if notexist
-                         (setq stop t)
-                       (setq stop
-                             (not (or (f90-in-string)
-                                      (f90-in-comment))))))
-                   (not notexist)))
+        (while (and (> count 0) (re-search-backward f90-blocks-re nil t))
           (beginning-of-line)
           (skip-chars-forward " \t0-9")
-          (cond ((setq matching-beg
+          (cond ((or (f90-in-string) (f90-in-comment)))
+                ((setq matching-beg
                        (or
                         (f90-looking-at-do)
                         (f90-looking-at-if-then)
@@ -1622,9 +1611,9 @@ Leave point at the end of line."
                         (f90-looking-at-type-like)
                         (f90-looking-at-program-block-start)))
                  (setq count (1- count)))
-                ((looking-at (concat "end[ \t]*" f90-blocks-re "\\b"))
+                ((looking-at (concat "end[ \t]*" f90-blocks-re))
                  (setq count (1+ count)))))
-        (if (not (zerop count))
+        (if (> count 0)
             (message "No matching beginning.")
           (f90-update-line)
           (if (eq f90-smart-end 'blink)