f90 indentation fix.

* lisp/progmodes/f90.el (f90-calculate-indent):
Give preprocessor lines before the first code statement zero indent.

Fixes: debbugs:9690

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 611219cb5ec6ecc61f1c1be1d4e8514cfc393bf7..1b3c22e8c73fac32d5d40c185c7f2e16fcf006c9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-08  Glenn Morris  <rgm@gnu.org>
+
+       * progmodes/f90.el (f90-calculate-indent): Give preprocessor lines
+       before the first code statement zero indent.  (Bug#9690)
+
 2011-10-08  Chong Yidong  <cyd@stupidchicken.com>
 
        * simple.el (count-words-region): Always count in the region.

diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index eb33822ce555ae93975c5a2a49b9d36b2671b5ed..3d5c8a97835d0a471857a00065f339e936da172b 100644 (file)
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1489,14 +1489,19 @@ Does not check type and subprogram indentation."
       (if (not (f90-previous-statement))
           ;; If f90-previous-statement returns nil, we must have been
           ;; called from on or before the first line of the first statement.
-          (setq icol (if (save-excursion
-                           ;; f90-previous-statement has moved us over
-                           ;; comment/blank lines, so we need to get
-                           ;; back to the first code statement.
-                           (when (looking-at "[ \t]*\\([!#]\\|$\\)")
-                             (f90-next-statement))
-                           (skip-chars-forward " \t0-9")
-                           (f90-looking-at-program-block-start))
+          (setq icol (if (or (save-excursion
+                               (goto-char pnt)
+                               (beginning-of-line)
+                               ;; Preprocessor line before code statement.
+                               (looking-at "[ \t]*#"))
+                             (progn
+                               ;; f90-previous-statement has moved us over
+                               ;; comment/blank lines, so we need to get
+                               ;; back to the first code statement.
+                               (when (looking-at "[ \t]*\\([!#]\\|$\\)")
+                                 (f90-next-statement))
+                               (skip-chars-forward " \t0-9")
+                               (f90-looking-at-program-block-start)))
                          0
                        ;; No explicit PROGRAM start statement.
                        f90-program-indent))