# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1033916189 0
# Node ID 1ad06cb931a91e9f6975f2ecae4ce5a5f5eeff0c
# Parent  76b2ec66665d4dbf63378187e6cd37907830583c
(fortran-beginning-do): Ignore labelled DO loops altogether.

diff -r 76b2ec66665d -r 1ad06cb931a9 lisp/progmodes/fortran.el
--- a/lisp/progmodes/fortran.el	Sat Oct 05 23:36:29 2002 +0000
+++ b/lisp/progmodes/fortran.el	Sun Oct 06 14:56:29 2002 +0000
@@ -1104,12 +1104,13 @@
 
 (defun fortran-beginning-do ()
   "Search backwards for first unmatched DO [WHILE].
-Return point or nil."
-  (let ((case-fold-search t))
+Return point or nil.  Ignores labelled DO loops (ie DO 10 ... 10 CONTINUE)."
+  (let ((case-fold-search t)
+        (dostart-re "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+[^0-9]"))
     (if (save-excursion
 	  (beginning-of-line)
 	  (skip-chars-forward " \t0-9")
-	  (looking-at "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+"))
+	  (looking-at dostart-re))
 	;; Sitting on one.
 	(match-beginning 0)
       ;; Search for one.
@@ -1121,9 +1122,9 @@
 		      (not (and (looking-at fortran-end-prog-re)
 				(fortran-check-end-prog-re))))
 	    (skip-chars-forward " \t0-9")
-	    (cond ((looking-at
-		    "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+")
+	    (cond ((looking-at dostart-re)
 		   (setq count (1- count)))
+                  ;; Note labelled loop ends not considered.
 		  ((looking-at "end[ \t]*do\\b")
 		   (setq count (1+ count)))))
 	  (and (= count 0)