From: Karl Heuer Date: Tue, 10 Jun 1997 18:04:01 +0000 (+0000) Subject: (f90-looking-at-where-or-forall): Recognize where/forall X-Git-Tag: emacs-20.1~1733 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=24c868149ecf731b596ff52bdf68b4cf5db5dd38;p=emacs.git (f90-looking-at-where-or-forall): Recognize where/forall only if it's a block, not a one-line statement. --- diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 0fd525b07bc..1361d617bc9 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. ;; Author: Torbj\"orn Einarsson -;; Last Change: Oct. 14, 1996 +;; Last Change: May 29 1997 ;; Keywords: fortran, f90, languages ;; This file is part of GNU Emacs. @@ -999,9 +999,9 @@ Name is nil if the statement has no label." (list struct label))))))) (defsubst f90-looking-at-where-or-forall () - "Return (kind name) if a where or forall statement starts after point. + "Return (kind name) if a where or forall block starts after point. Name is nil if the statement has no label." - (if (looking-at "\\(\\(\\sw+\\)[ \t]*\:\\)?[ \t]*\\(where\\|forall\\)[ \t]*(") + (if (looking-at "\\(\\(\\sw+\\)[ \t]*\:\\)?[ \t]*\\(where\\|forall\\)[ \t]*(.*)[ \t]*\\(!\\|$\\)") (let (label (struct (f90-match-piece 3))) (if (looking-at "\\(\\sw+\\)[ \t]*\:")