diff options
| author | Eli Zaretskii | 2002-04-19 12:22:13 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2002-04-19 12:22:13 +0000 |
| commit | b125e64388de7d5cecb60c1dffa5d7a0d472a958 (patch) | |
| tree | 45a479e359224a08c51cd042ed84232875e50a4d | |
| parent | 9413a271ee0548b124ed45d5ee568ae24405ecf2 (diff) | |
| download | emacs-b125e64388de7d5cecb60c1dffa5d7a0d472a958.tar.gz emacs-b125e64388de7d5cecb60c1dffa5d7a0d472a958.zip | |
Update maintainer.
(f90-line-continued): Recognize blank/comment lines embedded in
continuation lines.
(f90-looking-at-program-block-start): No extra indentation after
function or subroutine keyword appears in single quotes.
| -rw-r--r-- | lisp/progmodes/f90.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 4588e8f73b6..dd7fc86b3a5 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | ;; Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Torbj\"orn Einarsson <Torbjorn.Einarsson@era.ericsson.se> | 5 | ;; Author: Torbj\"orn Einarsson <Torbjorn.Einarsson@era.ericsson.se> |
| 6 | ;; Maintainer: Dave Love <fx@gnu.org> | 6 | ;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk> |
| 7 | ;; Keywords: fortran, f90, languages | 7 | ;; Keywords: fortran, f90, languages |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| @@ -874,6 +874,8 @@ with no args, if that value is non-nil." | |||
| 874 | 874 | ||
| 875 | (defsubst f90-line-continued () | 875 | (defsubst f90-line-continued () |
| 876 | (save-excursion | 876 | (save-excursion |
| 877 | (beginning-of-line) | ||
| 878 | (while (and (looking-at "[ \t]*\\(!\\|$\\)") (zerop (forward-line -1)))) | ||
| 877 | (let ((bol (f90-get-beg-of-line))) | 879 | (let ((bol (f90-get-beg-of-line))) |
| 878 | (end-of-line) | 880 | (end-of-line) |
| 879 | (while (f90-in-comment) | 881 | (while (f90-in-comment) |
| @@ -994,7 +996,7 @@ Name is non-nil only for type." | |||
| 994 | (looking-at "\\(module\\)[ \t]+\\(\\sw+\\)\\>")) | 996 | (looking-at "\\(module\\)[ \t]+\\(\\sw+\\)\\>")) |
| 995 | (list (f90-match-piece 1) (f90-match-piece 2))) | 997 | (list (f90-match-piece 1) (f90-match-piece 2))) |
| 996 | ((and (not (looking-at "end[ \t]*\\(function\\|subroutine\\)")) | 998 | ((and (not (looking-at "end[ \t]*\\(function\\|subroutine\\)")) |
| 997 | (looking-at "[^!\"\&\n]*\\(function\\|subroutine\\)[ \t]+\\(\\sw+\\)")) | 999 | (looking-at "[^!'\"\&\n]*\\(function\\|subroutine\\)[ \t]+\\(\\sw+\\)")) |
| 998 | (list (f90-match-piece 1) (f90-match-piece 2))))) | 1000 | (list (f90-match-piece 1) (f90-match-piece 2))))) |
| 999 | 1001 | ||
| 1000 | (defsubst f90-looking-at-program-block-end () | 1002 | (defsubst f90-looking-at-program-block-end () |