]> code.delx.au - gnu-emacs/blobdiff - lisp/progmodes/fortran.el
Many trivial doc fixes.
[gnu-emacs] / lisp / progmodes / fortran.el
index d53268441f06c1825051d759beaf43ae79f70a60..7f17de99c45cad208745b9e3049908c42d3a0445 100644 (file)
@@ -1,9 +1,10 @@
 ;;; fortran.el --- Fortran mode for GNU Emacs
 
-;; Copyright (c) 1986, 93, 94, 95, 97, 98, 99, 2000 Free Software Foundation, Inc.
+;; Copyright (c) 1986, 93, 94, 95, 97, 98, 99, 2000, 2001
+;;   Free Software Foundation, Inc.
 
 ;; Author: Michael D. Prange <prange@erl.mit.edu>
-;; Maintainer: Dave Love <fx@gnu.org>
+;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk>
 ;; Keywords: languages
 
 ;; This file is part of GNU Emacs.
@@ -29,7 +30,9 @@
 ;;
 ;; Note that it is for editing Fortran77 or Fortran90 fixed source
 ;; form.  For editing Fortran 90 free format source, use `f90-mode'
-;; (f90.el).
+;; (f90.el).  It is meant to support the GNU Fortran language
+;; implemented by g77 (its extensions to Fortran77 and
+;; interpretations, e.g. of blackslash in strings).
 
 ;;; History:
 
 
 ;; Todo:
 
-;; * Tidy it all up!
+;; * Tidy it all up (more)!
 ;; * Implement insertion and removal of statement continuations in
 ;;   mixed f77/f90 style, with the first `&' past column 72 and the
 ;;   second in column 6.
-;; * Support any other extensions to f77 grokked by GNU Fortran.
-
-(require 'easymenu)
+;; * Support any other extensions to f77 grokked by GNU Fortran I've missed.
 
 (defgroup fortran nil
   "Fortran mode for Emacs"
@@ -107,11 +108,12 @@ with a character in column 6."
 (defcustom fortran-comment-indent-style 'fixed
   "*How to indent comments.
 nil forces comment lines not to be touched,
-'fixed makes fixed comment indentation to `fortran-comment-line-extra-indent'
-columns beyond `fortran-minimum-statement-indent-fixed' (for
-`indent-tabs-mode' of nil) or `fortran-minimum-statement-indent-tab' (for
-`indent-tabs-mode' of t), and 'relative indents to current
-Fortran indentation plus `fortran-comment-line-extra-indent'."
+`fixed' makes fixed comment indentation to `fortran-comment-line-extra-indent'
+  columns beyond `fortran-minimum-statement-indent-fixed' (for
+  `indent-tabs-mode' of nil) or `fortran-minimum-statement-indent-tab' (for
+  `indent-tabs-mode' of t), and
+`relative' indents to current Fortran indentation plus
+  `fortran-comment-line-extra-indent'."
   :type '(radio (const :tag "Untouched" nil) (const fixed) (const relative))
   :group 'fortran-indent)
 
@@ -121,18 +123,31 @@ Fortran indentation plus `fortran-comment-line-extra-indent'."
   :group 'fortran-indent
   :group 'fortran-comment)
 
-(defcustom fortran-comment-line-start nil
-  "*Delimiter inserted to start new full-line comment."
+(defcustom fortran-comment-line-start "C"
+  "*Delimiter inserted to start new full-line comment.
+You might want to change this to \"*\", for instance."
   :version "21.1"
-  :type '(choice string (const nil))
+  :type 'string
   :group 'fortran-comment)
 
-(defcustom fortran-comment-line-start-skip nil
+;; This used to match preprocessor lines too, but that messes up
+;; filling and doesn't seem to be necessary.
+(defcustom fortran-comment-line-start-skip
+  "^[CcDd*!]\\(\\([^ \t\n]\\)\\2+\\)?[ \t]*"
   "*Regexp to match the start of a full-line comment."
   :version "21.1"
-  :type '(choice string (const nil))
+  :type 'regexp
   :group 'fortran-comment)
 
+(defcustom fortran-directive-re
+  "^[ \t]*#.*"
+  "*Regexp to match a directive line.
+The matching text will be fontified with `font-lock-keyword-face'.
+The matching line will be given zero indentation."
+  :version "21.4"
+  :type 'regexp
+  :group 'fortran-indent)
+
 (defcustom fortran-minimum-statement-indent-fixed 6
   "*Minimum statement indentation for fixed format continuation style."
   :type 'integer
@@ -207,9 +222,6 @@ This variable used in fixed format mode.")
   "String displayed above current line by \\[fortran-column-ruler].
 This variable used in TAB format mode.")
 
-(defvar fortran-mode-syntax-table nil
-  "Syntax table in use in Fortran mode buffers.")
-
 (defvar fortran-analyze-depth 100
   "Number of lines to scan to determine whether to use fixed or TAB \
 format style.")
@@ -219,52 +231,51 @@ format style.")
   :type 'boolean
   :group 'fortran)
 
-(if fortran-mode-syntax-table
-    ()
-  (setq fortran-mode-syntax-table (make-syntax-table))
-  ;; We might like `;' to be punctuation (g77 multi-statement lines),
-  ;; but that screws abbrevs.
-  (modify-syntax-entry ?\; "w" fortran-mode-syntax-table)
-  (modify-syntax-entry ?\r " " fortran-mode-syntax-table)
-  (modify-syntax-entry ?+ "." fortran-mode-syntax-table)
-  (modify-syntax-entry ?- "." fortran-mode-syntax-table)
-  (modify-syntax-entry ?= "." fortran-mode-syntax-table)
-  (modify-syntax-entry ?* "." fortran-mode-syntax-table)
-  (modify-syntax-entry ?/ "." fortran-mode-syntax-table)
-  (modify-syntax-entry ?\' "\"" fortran-mode-syntax-table)
-  (modify-syntax-entry ?\" "\"" fortran-mode-syntax-table)
-  (modify-syntax-entry ?\\ "\\" fortran-mode-syntax-table)
-  ;; This might be better as punctuation, as for C, but this way you
-  ;; can treat floating-point numbers as symbols.
-  (modify-syntax-entry ?. "_" fortran-mode-syntax-table) ; e.g. `a.ne.b'
-  (modify-syntax-entry ?_ "_" fortran-mode-syntax-table)
-  (modify-syntax-entry ?$ "_" fortran-mode-syntax-table) ; esp. VMSisms
-  (modify-syntax-entry ?\! "<" fortran-mode-syntax-table)
-  (modify-syntax-entry ?\n ">" fortran-mode-syntax-table))
+(defvar fortran-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    ;; We might like `;' to be punctuation (g77 multi-statement
+    ;; lines), but that screws abbrevs.
+    (modify-syntax-entry ?\; "w" table)
+    (modify-syntax-entry ?\r " " table)
+    (modify-syntax-entry ?+ "." table)
+    (modify-syntax-entry ?- "." table)
+    (modify-syntax-entry ?= "." table)
+    (modify-syntax-entry ?* "." table)
+    (modify-syntax-entry ?/ "." table)
+    (modify-syntax-entry ?\' "\"" table)
+    (modify-syntax-entry ?\" "\"" table)
+    ;; Consistent with GNU Fortran -- see the manual.
+    (modify-syntax-entry ?\\ "\\" table)
+    ;; This might be better as punctuation, as for C, but this way you
+    ;; can treat floating-point numbers as symbols.
+    (modify-syntax-entry ?. "_" table) ; e.g. `a.ne.b'
+    (modify-syntax-entry ?_ "_" table)
+    (modify-syntax-entry ?$ "_" table) ; esp. VMSisms
+    (modify-syntax-entry ?\! "<" table)
+    (modify-syntax-entry ?\n ">" table)
+    table)
+  "Syntax table in use in Fortran mode buffers.")
 
 ;; Comments are real pain in Fortran because there is no way to
 ;; represent the standard comment syntax in an Emacs syntax table.
 ;; (We can do so for F90-style).  Therefore an unmatched quote in a
 ;; standard comment will throw fontification off on the wrong track.
 ;; So we do syntactic fontification with regexps.
-\f
-;; Regexps done by simon@gnu with help from Ulrik Dickow <dickow@nbi.dk> and
-;; probably others Si's forgotten about (sorry).
 
-(defconst fortran-font-lock-keywords-1 nil
+(defvar fortran-font-lock-keywords-1 nil
   "Subdued level highlighting for Fortran mode.")
 
-(defconst fortran-font-lock-keywords-2 nil
+(defvar fortran-font-lock-keywords-2 nil
   "Medium level highlighting for Fortran mode.")
 
-(defconst fortran-font-lock-keywords-3 nil
+(defvar fortran-font-lock-keywords-3 nil
   "Gaudy level highlighting for Fortran mode.")
 
-(defconst fortran-font-lock-syntactic-keywords nil
+(defvar fortran-font-lock-syntactic-keywords nil
   "`font-lock-syntactic-keywords' for Fortran.
 These get fixed-format comments fontified.")
 
-(let ((comment-chars "cd")             ; `d' for `debugging' comments
+(let ((comment-chars "cd\\*")          ; `d' for `debugging' comments
       (fortran-type-types
        (eval-when-compile
         (let ((re (regexp-opt
@@ -285,16 +296,17 @@ These get fixed-format comments fontified.")
                               structured-types)
                       structured-types
                       other-types)))))
-          ;; In the optimized regexp above, replace spaces by regexp
-          ;; for optional whitespace, which regexp-opt would have
-          ;; escaped.
+          ;; In the optimized regexp above, replace spaces by a
+          ;; regexp for optional whitespace; regexp-opt would have
+          ;; escaped that.
           (mapconcat #'identity (split-string re) "[ \t]*"))))
       (fortran-keywords
        (eval-when-compile
          (regexp-opt '("continue" "format" "end" "enddo" "if" "then"
                        "else" "endif" "elseif" "while" "inquire" "stop"
                        "return" "include" "open" "close" "read" "write"
-                       "format" "print" "select" "case" "cycle" "exit"))))
+                       "format" "print" "select" "case" "cycle" "exit"
+                      "rewind" "backspace"))))
       (fortran-logicals
        (eval-when-compile
          (regexp-opt '("and" "or" "not" "lt" "le" "eq" "ge" "gt" "ne"
@@ -303,7 +315,7 @@ These get fixed-format comments fontified.")
        ;; Fixed format comments.  (!-style handled normally.)
        (list
         (list (concat "^[" comment-chars "]") 0 '(11))
-        (list (concat "^[^" comment-chars "\t\n]" (make-string 71 ?.)
+        (list (concat "^[^" comment-chars "\t\n]" ".\\{71\\}"
                       "\\([^\n]+\\)")
               1 '(11))))
   (setq fortran-font-lock-keywords-1
@@ -363,6 +375,10 @@ These get fixed-format comments fontified.")
           ;; TAB-formatted line.
           '("^     \\([^ 0]\\)" 1 font-lock-string-face)
           '("^\t\\([1-9]\\)" 1 font-lock-string-face))
+        (list
+         ;; cpp stuff (ugh)
+;;;      '("^# *[a-z]+" . font-lock-keyword-face))
+          `(,fortran-directive-re (0 font-lock-keyword-face t)))
          ;; The list `fortran-font-lock-keywords-2' less that for types
          ;; (see above).
          (cdr (nthcdr (length fortran-font-lock-keywords-1)
@@ -377,157 +393,159 @@ These get fixed-format comments fontified.")
   (list
    (list
     nil
-    ;; Lines below are: 1. leading whitespace; 2. function
-    ;; declaration with optional type, e.g. `real', `real*4',
-    ;; character(*), `double precision' and possible statement
-    ;; continuation; 3. untyped declarations; 4. the variable to
-    ;; index.  [This will be fooled by `end function' allowed by G77.
-    ;; Also, it assumes sensible whitespace is employed.]
-    (concat "^\\s-+\\(\
-\\(\\sw\\|\\s-\\|[*()+]\\)*\
-\\<function\\|subroutine\\|entry\\|block\\s-*data\\|program\\)\
-[ \t" fortran-continuation-string "]+\
-\\(\\sw+\\)")
+    ;; [This will be fooled by `end function' allowed by G77.  Also,
+    ;; it assumes sensible whitespace is employed.]
+    (concat
+     ;; leading whitespace:
+     "^\\s-+\\("
+     ;; function declaration with optional type, e.g. `real',
+     ;; `real*4', character(*), `double precision':
+     "\\(\\sw\\|\\s-\\|[*()+]\\)*"
+     "\\<function\\|subroutine\\|entry\\|block\\s-*data\\|program\\)"
+     ;; Possible statement continuation:
+     "[ \t" fortran-continuation-string "]+"
+     ;; Variable to index:
+     "\\(\\sw+\\)")
     3)
    ;; Un-named block data
    (list nil "^\\s-+\\(block\\s-*data\\)\\s-*$" 1))
   "Imenu generic expression for `imenu-default-create-index-function'.")
 
 (defvar fortran-mode-map
-  (let ((fortran-mode-map (make-sparse-keymap)))
-    (define-key fortran-mode-map ";" 'fortran-abbrev-start)
-    (define-key fortran-mode-map "\C-c;" 'fortran-comment-region)
-    (define-key fortran-mode-map "\M-;" 'fortran-indent-comment)
-    (define-key fortran-mode-map "\M-\n" 'fortran-split-line)
-    (define-key fortran-mode-map "\M-\C-q" 'fortran-indent-subprogram)
-    (define-key fortran-mode-map "\C-c\C-w" 'fortran-window-create-momentarily)
-    (define-key fortran-mode-map "\C-c\C-r" 'fortran-column-ruler)
-    (define-key fortran-mode-map "\C-c\C-p" 'fortran-previous-statement)
-    (define-key fortran-mode-map "\C-c\C-n" 'fortran-next-statement)
-    (define-key fortran-mode-map "\C-c\C-d" 'fortran-join-line) ; like f90
-    (define-key fortran-mode-map "\M-^" 'fortran-join-line) ; subvert delete-indentation
-    (define-key fortran-mode-map "0" 'fortran-electric-line-number)
-    (define-key fortran-mode-map "1" 'fortran-electric-line-number)
-    (define-key fortran-mode-map "2" 'fortran-electric-line-number)
-    (define-key fortran-mode-map "3" 'fortran-electric-line-number)
-    (define-key fortran-mode-map "4" 'fortran-electric-line-number)
-    (define-key fortran-mode-map "5" 'fortran-electric-line-number)
-    (define-key fortran-mode-map "6" 'fortran-electric-line-number)
-    (define-key fortran-mode-map "7" 'fortran-electric-line-number)
-    (define-key fortran-mode-map "8" 'fortran-electric-line-number)
-    (define-key fortran-mode-map "9" 'fortran-electric-line-number)
+  (let ((map (make-sparse-keymap)))
+    (define-key map ";" 'fortran-abbrev-start)
+    (define-key map "\C-c;" 'fortran-comment-region)
+    (define-key map "\M-;" 'fortran-indent-comment)
+    (define-key map "\M-\n" 'fortran-split-line)
+    (define-key map "\M-\C-q" 'fortran-indent-subprogram)
+    (define-key map "\C-c\C-w" 'fortran-window-create-momentarily)
+    (define-key map "\C-c\C-r" 'fortran-column-ruler)
+    (define-key map "\C-c\C-p" 'fortran-previous-statement)
+    (define-key map "\C-c\C-n" 'fortran-next-statement)
+    (define-key map "\C-c\C-d" 'fortran-join-line) ; like f90
+    (define-key map "\M-^" 'fortran-join-line) ; subvert delete-indentation
+    (define-key map "0" 'fortran-electric-line-number)
+    (define-key map "1" 'fortran-electric-line-number)
+    (define-key map "2" 'fortran-electric-line-number)
+    (define-key map "3" 'fortran-electric-line-number)
+    (define-key map "4" 'fortran-electric-line-number)
+    (define-key map "5" 'fortran-electric-line-number)
+    (define-key map "6" 'fortran-electric-line-number)
+    (define-key map "7" 'fortran-electric-line-number)
+    (define-key map "8" 'fortran-electric-line-number)
+    (define-key map "9" 'fortran-electric-line-number)
 
     ;; Menu
-    (unless (boundp 'fortran-mode-menu)
-      (easy-menu-define
-       fortran-mode-menu fortran-mode-map ""
-       `("Fortran"
-        ["Manual" (info "(emacs)Fortran")]
-        ,(customize-menu-create 'fortran)
-        ["Set" Custom-set t]
-        ["Save" Custom-save t]
-        ["Reset to Current" Custom-reset-current t]
-        ["Reset to Saved" Custom-reset-saved t]
-        ["Reset to Standard Settings" Custom-reset-standard t]
-        "----"
-        ["Toggle Auto-fill" fortran-auto-fill-mode :style toggle
-         :selected (eq auto-fill-function 'fortran-do-auto-fill)]
-        ["Toggle abbrev-mode" abbrev-mode :style toggle :selected abbrev-mode]
-        "----"
-        ["Comment-out Region" fortran-comment-region mark-active]
-        ["Uncomment-out region"
-         (fortran-comment-region (region-beginning) (region-end) 1)
-         mark-active]
-        ["Indent Region" indent-region mark-active]
-        ["Indent Subprogram" fortran-indent-subprogram t]
-        "----"
-        ["Beginning of Subprogram" fortran-beginning-of-subprogram t]
-        ["End of Subprogram" fortran-end-of-subprogram t]
-        ("Mark"
-         ["Subprogram" mark-defun t]
-         ["IF Block" fortran-mark-if t]
-         ["DO Block" fortran-mark-do t])
-        ["Narrow to Subprogram" narrow-to-defun t]
-        ["Widen" widen t]
-        "----"
-        ["Temporary column ruler" fortran-column-ruler t]
-        ["72-column window" fortran-window-create t]
-        ["Full Width Window"
-         (enlarge-window-horizontally (- (frame-width) (window-width)))
-         (< (window-width) (frame-width))]
-        ["Momentary 72-column window" fortran-window-create-momentarily t]
-        "----"
-        ["Break Line at Point" fortran-split-line t]
-        ["Join Line" fortran-join-line t]
-        ["Fill Statement/Comment" fill-paragraph  t]
-        "----"
-        ["Add imenu menu"
-         imenu-add-menubar-index (not (and (boundp 'imenu--index-alist)
-                                           imenu--index-alist))])))
-    fortran-mode-map)
+    (easy-menu-define
+     fortran-mode-menu map ""
+     `("Fortran"
+       ["Manual" (info "(emacs)Fortran")]
+       ("Customization"
+       ,(custom-menu-create 'fortran)
+       ["Set" Custom-set t]
+       ["Save" Custom-save t]
+       ["Reset to Current" Custom-reset-current t]
+       ["Reset to Saved" Custom-reset-saved t]
+       ["Reset to Standard Settings" Custom-reset-standard t])
+       "----"
+       ["Toggle Auto-fill" auto-fill-mode :style toggle
+       :selected auto-fill-function]
+       ["Toggle abbrev-mode" abbrev-mode :style toggle :selected abbrev-mode]
+       "----"
+       ["Comment-out Region" fortran-comment-region mark-active]
+       ["Uncomment-out region"
+       (fortran-comment-region (region-beginning) (region-end) 1)
+       mark-active]
+       ["Indent Region" indent-region mark-active]
+       ["Indent Subprogram" fortran-indent-subprogram t]
+       "----"
+       ["Beginning of Subprogram" fortran-beginning-of-subprogram t]
+       ["End of Subprogram" fortran-end-of-subprogram t]
+       ("Mark"
+       ["Subprogram" mark-defun t]
+       ["IF Block" fortran-mark-if t]
+       ["DO Block" fortran-mark-do t])
+       ["Narrow to Subprogram" narrow-to-defun t]
+       ["Widen" widen t]
+       "----"
+       ["Temporary column ruler" fortran-column-ruler t]
+       ["72-column window" fortran-window-create t]
+       ["Full Width Window"
+       (enlarge-window-horizontally (- (frame-width) (window-width)))
+       (< (window-width) (frame-width))]
+       ["Momentary 72-column window" fortran-window-create-momentarily t]
+       "----"
+       ["Break Line at Point" fortran-split-line t]
+       ["Join Line" fortran-join-line t]
+       ["Fill Statement/Comment" fill-paragraph  t]
+       "----"
+       ["Add imenu menu"
+       imenu-add-menubar-index (not (and (boundp 'imenu--index-alist)
+                                         imenu--index-alist))]))
+    map)
   "Keymap used in Fortran mode.")
 \f
 (defvar fortran-mode-abbrev-table
   (let ((ac abbrevs-changed))
     (define-abbrev-table 'fortran-mode-abbrev-table ())
-    (define-abbrev fortran-mode-abbrev-table  ";au"  "automatic" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";b"   "byte" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";bd"  "block data" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";ch"  "character" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";cl"  "close" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";c"   "continue" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";cm"  "common" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";cx"  "complex" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";df"  "define" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";di"  "dimension" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";do"  "double" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";dc"  "double complex" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";dp"  "double precision" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";dw"  "do while" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";e"   "else" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";ed"  "enddo" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";el"  "elseif" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";en"  "endif" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";eq"  "equivalence" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";ew"  "endwhere" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";ex"  "external" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";ey"  "entry" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";f"   "format" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";fa"  ".false." nil)
-    (define-abbrev fortran-mode-abbrev-table  ";fu"  "function" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";g"   "goto" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";im"  "implicit" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";ib"  "implicit byte" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";ic"  "implicit complex" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";ich" "implicit character" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";ii"  "implicit integer" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";il"  "implicit logical" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";ir"  "implicit real" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";inc" "include" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";in"  "integer" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";intr" "intrinsic" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";l"   "logical" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";n"   "namelist" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";o"   "open" nil) ; was ;op
-    (define-abbrev fortran-mode-abbrev-table  ";pa"  "parameter" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";pr"  "program" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";ps"  "pause" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";p"   "print" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";rc"  "record" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";re"  "real" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";r"   "read" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";rt"  "return" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";rw"  "rewind" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";s"   "stop" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";sa"  "save" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";st"  "structure" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";sc"  "static" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";su"  "subroutine" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";tr"  ".true." nil)
-    (define-abbrev fortran-mode-abbrev-table  ";ty"  "type" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";vo"  "volatile" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";w"   "write" nil)
-    (define-abbrev fortran-mode-abbrev-table  ";wh"  "where" nil)
+    (define-abbrev fortran-mode-abbrev-table  ";au"  "automatic" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";b"   "byte" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";bd"  "block data" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";ch"  "character" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";cl"  "close" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";c"   "continue" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";cm"  "common" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";cx"  "complex" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";df"  "define" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";di"  "dimension" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";do"  "double" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";dc"  "double complex" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";dp"  "double precision" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";dw"  "do while" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";e"   "else" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";ed"  "enddo" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";el"  "elseif" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";en"  "endif" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";eq"  "equivalence" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";ew"  "endwhere" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";ex"  "external" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";ey"  "entry" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";f"   "format" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";fa"  ".false." nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";fu"  "function" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";g"   "goto" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";im"  "implicit" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";ib"  "implicit byte" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";ic"  "implicit complex" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";ich" "implicit character" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";ii"  "implicit integer" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";il"  "implicit logical" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";ir"  "implicit real" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";inc" "include" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";in"  "integer" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";intr" "intrinsic" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";l"   "logical" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";n"   "namelist" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";o"   "open" nil 0 t) ; was ;op
+    (define-abbrev fortran-mode-abbrev-table  ";pa"  "parameter" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";pr"  "program" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";ps"  "pause" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";p"   "print" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";rc"  "record" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";re"  "real" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";r"   "read" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";rt"  "return" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";rw"  "rewind" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";s"   "stop" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";sa"  "save" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";st"  "structure" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";sc"  "static" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";su"  "subroutine" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";tr"  ".true." nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";ty"  "type" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";vo"  "volatile" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";w"   "write" nil 0 t)
+    (define-abbrev fortran-mode-abbrev-table  ";wh"  "where" nil 0 t)
     (setq abbrevs-changed ac)
     fortran-mode-abbrev-table))
 \f
@@ -555,8 +573,8 @@ Key definitions:
 Variables controlling indentation style and extra features:
 
  `comment-start'
-    Normally nil in Fortran mode.  If you want to use comments
-    starting with `!', set this to the string \"!\".
+    If you want to use comments starting with `!',
+    set this to the string \"!\".
  `fortran-do-indent'
     Extra indentation within do blocks.  (default 3)
  `fortran-if-indent'
@@ -629,16 +647,16 @@ with no args, if that value is non-nil."
   (make-local-variable 'indent-line-function)
   (setq indent-line-function 'fortran-indent-line)
   (make-local-variable 'comment-indent-function)
-  (setq comment-indent-function 'fortran-comment-indent-function)
-  (make-local-variable 'fortran-comment-line-start-skip)
-  (setq fortran-comment-line-start-skip
-       "^[Cc*]\\(\\([^ \t\n]\\)\\2\\2*\\)?[ \t]*\\|^#.*")
-  (make-local-variable 'fortran-comment-line-start)
-  (setq fortran-comment-line-start "c")
-  (make-local-variable 'comment-start-skip)
-  (setq comment-start-skip "![ \t]*")
+  (setq comment-indent-function 'fortran-comment-indent)
+  (set (make-local-variable 'comment-start-skip)
+       ;; We can't reuse `fortran-comment-line-start-skip' directly because
+       ;; it contains backrefs whereas we need submatch-1 to end at the
+       ;; beginning of the comment delimiter.
+       ;; (concat "\\(\\)\\(![ \t]*\\|" fortran-comment-line-start-skip "\\)")
+       "\\(\\)\\(?:^[CcDd*]\\|!\\)\\(?:\\([^ \t\n]\\)\\2+\\)?[ \t]*")
+  (set (make-local-variable 'comment-padding) "$$$")
   (make-local-variable 'comment-start)
-  (setq comment-start nil)
+  (setq comment-start fortran-comment-line-start)
   (make-local-variable 'require-final-newline)
   (setq require-final-newline t)
   (make-local-variable 'abbrev-all-caps)
@@ -661,6 +679,7 @@ with no args, if that value is non-nil."
   (setq imenu-generic-expression fortran-imenu-generic-expression)
   (setq imenu-syntax-alist '(("_$" . "w")))
   (set (make-local-variable 'fill-paragraph-function) 'fortran-fill-paragraph)
+  (set (make-local-variable 'normal-auto-fill-function) 'fortran-auto-fill)
   (set (make-local-variable 'indent-line-function) 'fortran-indent-line)
   (set (make-local-variable 'indent-region-function)
        (lambda (start end)
@@ -671,41 +690,44 @@ with no args, if that value is non-nil."
        #'fortran-beginning-of-subprogram)
   (set (make-local-variable 'end-of-defun-function)
        #'fortran-end-of-subprogram)
+  (set (make-local-variable 'add-log-current-defun-function)
+       #'fortran-current-defun)
+  (set (make-local-variable 'dabbrev-case-fold-search) 'case-fold-search)
   (run-hooks 'fortran-mode-hook))
 \f
-(defun fortran-comment-indent-function ()
+(defsubst fortran-comment-indent ()
   (save-excursion
-    (skip-chars-backward " \t")
-    (max (+ 1 (current-column))
-        comment-column)))
+    (if (looking-at fortran-comment-line-start-skip) 0
+      (skip-chars-backward " \t")
+      (max (+ 1 (current-column))
+          comment-column))))
 
 (defun fortran-indent-comment ()
   "Align or create comment on current line.
 Existing comments of all types are recognized and aligned.
 If the line has no comment, a side-by-side comment is inserted and aligned
-if the value of  `comment-start'  is not nil.
+if the value of `comment-start' is not nil and allows such comments.
 Otherwise, a separate-line comment is inserted, on this line
 or on a new line inserted before this line if this line is not blank."
   (interactive)
   (beginning-of-line)
   ;; Recognize existing comments of either kind.
-  (cond ((looking-at fortran-comment-line-start-skip)
-        (fortran-indent-line))
-       ((fortran-find-comment-start-skip) ; catches any inline comment and
-                                       ; leaves point after comment-start-skip
-        (if comment-start-skip
-            (progn (goto-char (match-beginning 0))
-                   (if (not (= (current-column) (fortran-comment-indent-function)))
-                       (progn (delete-horizontal-space)
-                              (indent-to (fortran-comment-indent-function)))))
-          (end-of-line)))        ; otherwise goto end of line or sth else?
+  (cond ((fortran-find-comment-start-skip 'all)
+        (goto-char (match-beginning 0))
+        (if (bolp)
+            (fortran-indent-line)
+          (if (not (= (current-column)
+                      (fortran-comment-indent)))
+              (progn (delete-horizontal-space)
+                     (indent-to (fortran-comment-indent))))))
        ;; No existing comment.
        ;; If side-by-side comments are defined, insert one,
        ;; unless line is now blank.
-       ((and comment-start (not (looking-at "^[ \t]*$")))
+       ((and comment-start (not (looking-at "[ \t]*$"))
+             (string-match comment-start-skip (concat " " comment-start)))
         (end-of-line)
         (delete-horizontal-space)
-        (indent-to (fortran-comment-indent-function))
+        (indent-to (fortran-comment-indent))
         (insert comment-start))
        ;; Else insert separate-line comment, making a new line if nec.
        (t
@@ -726,8 +748,8 @@ Puts `fortran-comment-region' at the beginning of every line in the region.
 BEG-REGION and END-REGION are args which specify the region boundaries.
 With non-nil ARG, uncomments the region."
   (interactive "*r\nP")
-  (let ((end-region-mark (make-marker)) (save-point (point-marker)))
-    (set-marker end-region-mark end-region)
+  (let ((end-region-mark (copy-marker end-region))
+       (save-point (point-marker)))
     (goto-char beg-region)
     (beginning-of-line)
     (if (not arg)                      ;comment the region
@@ -796,22 +818,18 @@ The key typed is executed unless it is SPC."
   "Make the window 72 columns wide.
 See also `fortran-window-create-momentarily'."
   (interactive)
-  (condition-case error
-      (progn
-       (let ((window-min-width 2))
-         (if (< (window-width) (frame-width))
-             (enlarge-window-horizontally (- (frame-width)
-                                             (window-width) 1)))
-         (let* ((window-edges (window-edges))
-                (scroll-bar-width (- (nth 2 window-edges)
-                                     (car window-edges)
-                                     (window-width))))
-           (split-window-horizontally (+ 72 scroll-bar-width)))
-         (other-window 1)
-         (switch-to-buffer " fortran-window-extra" t)
-         (select-window (previous-window))))
-    (error (message "No room for Fortran window.")
-          'error)))
+  (let ((window-min-width 2))
+    (if (< (window-width) (frame-width))
+       (enlarge-window-horizontally (- (frame-width)
+                                       (window-width) 1)))
+    (let* ((window-edges (window-edges))
+          (scroll-bar-width (- (nth 2 window-edges)
+                               (car window-edges)
+                               (window-width))))
+      (split-window-horizontally (+ 72 scroll-bar-width)))
+    (other-window 1)
+    (switch-to-buffer " fortran-window-extra" t)
+    (select-window (previous-window))))
 
 (defun fortran-window-create-momentarily (&optional arg)
   "Momentarily make the window 72 columns wide.
@@ -821,11 +839,14 @@ See also `fortran-window-create'."
   (if (or (not arg)
          (= arg 1))
       (save-window-excursion
-       (if (not (equal (fortran-window-create) 'error))
-           (progn (message "Type SPC to continue editing.")
-                  (let ((char (read-event)))
-                    (or (equal char (string-to-char " "))
-                        (setq unread-command-events (list char)))))))
+       (progn
+         (condition-case nil
+             (fortran-window-create)
+           (error (error "No room for Fortran window")))
+         (message "Type SPC to continue editing.")
+         (let ((char (read-event)))
+           (or (equal char (string-to-char " "))
+               (setq unread-command-events (list char))))))
     (fortran-window-create)))
 
 (defun fortran-split-line ()
@@ -833,9 +854,11 @@ See also `fortran-window-create'."
   (interactive)
   (delete-horizontal-space)
   (if (save-excursion
-       (beginning-of-line)
-       (looking-at fortran-comment-line-start-skip))
-      (insert ?\n fortran-comment-line-start ? )
+       (let ((pos (point)))
+         (beginning-of-line)
+         (and (fortran-find-comment-start-skip 'all)
+              (< (match-beginning 0) pos))))
+      (insert ?\n (match-string 0))
     (if indent-tabs-mode
        (insert ?\n ?\t (fortran-numerical-continuation-char))
       (insert "\n " fortran-continuation-string))) ; Space after \n important
@@ -886,7 +909,7 @@ Auto-indent does not happen if a numeric ARG is used."
     (if (or (and (= 5 (current-column))
                 (save-excursion
                   (beginning-of-line)
-                  (looking-at "     "))) ;In col 5 with only spaces to left.
+                  (looking-at " \\{5\\}"))) ;In col 5 with only spaces to left.
            (and (= (if indent-tabs-mode
                        fortran-minimum-statement-indent-tab
                      fortran-minimum-statement-indent-fixed) (current-column))
@@ -926,7 +949,7 @@ Auto-indent does not happen if a numeric ARG is used."
 ;; Note that you can't just check backwards for `subroutine' &c in
 ;; case of un-marked main programs not at the start of the file.
 (defun fortran-beginning-of-subprogram ()
-  "Moves point to the beginning of the current Fortran subprogram."
+  "Move point to the beginning of the current Fortran subprogram."
   (interactive)
   (save-match-data
     (let ((case-fold-search t))
@@ -938,7 +961,7 @@ Auto-indent does not happen if a numeric ARG is used."
          (forward-line)))))
 
 (defun fortran-end-of-subprogram ()
-  "Moves point to the end of the current Fortran subprogram."
+  "Move point to the end of the current Fortran subprogram."
   (interactive)
   (save-match-data
     (let ((case-fold-search t))
@@ -956,22 +979,26 @@ Auto-indent does not happen if a numeric ARG is used."
        (forward-line)))))
 
 (defun fortran-previous-statement ()
-  "Moves point to beginning of the previous Fortran statement.
-Returns `first-statement' if that statement is the first
-non-comment Fortran statement in the file, and nil otherwise."
+  "Move point to beginning of the previous Fortran statement.
+Returns 'first-statement if that statement is the first
+non-comment Fortran statement in the file, and nil otherwise.
+Directive lines are treated as comments."
   (interactive)
   (let (not-first-statement continue-test)
     (beginning-of-line)
     (setq continue-test
          (and
           (not (looking-at fortran-comment-line-start-skip))
+           (not (looking-at fortran-directive-re))
           (or (looking-at
-               (concat "[ \t]*" (regexp-quote fortran-continuation-string)))
-              (looking-at "     [^ 0\n]\\|\t[1-9]"))))
+               (concat "[ \t]*"
+                       (regexp-quote fortran-continuation-string)))
+              (looking-at " \\{5\\}[^ 0\n]\\|\t[1-9]"))))
     (while (and (setq not-first-statement (= (forward-line -1) 0))
                (or (looking-at fortran-comment-line-start-skip)
-                   (looking-at "[ \t]*$\\|     [^ 0\n]\\|\t[1-9]")
-                   (looking-at (concat "[ \t]*"  comment-start-skip)))))
+                    (looking-at fortran-directive-re)
+                   (looking-at "[ \t]*$\\| \\{5\\}[^ 0\n]\\|\t[1-9]")
+                   (looking-at (concat "[ \t]*" comment-start-skip)))))
     (cond ((and continue-test
                (not not-first-statement))
           (message "Incomplete continuation statement."))
@@ -981,9 +1008,10 @@ non-comment Fortran statement in the file, and nil otherwise."
           'first-statement))))
 
 (defun fortran-next-statement ()
-  "Moves point to beginning of the next Fortran statement.
-Returns `last-statement' if that statement is the last
-non-comment Fortran statement in the file, and nil otherwise."
+  "Move point to beginning of the next Fortran statement.
+Returns 'last-statement if that statement is the last
+non-comment Fortran statement in the file, and nil otherwise.
+Directive lines are treated as comments."
   (interactive)
   (let (not-last-statement)
     (beginning-of-line)
@@ -991,8 +1019,9 @@ non-comment Fortran statement in the file, and nil otherwise."
                      (and (= (forward-line 1) 0)
                           (not (eobp))))
                (or (looking-at fortran-comment-line-start-skip)
+                    (looking-at fortran-directive-re)
                    (looking-at "[ \t]*$\\|     [^ 0\n]\\|\t[1-9]")
-                   (looking-at (concat "[ \t]*"  comment-start-skip)))))
+                   (looking-at (concat "[ \t]*" comment-start-skip)))))
     (if (not not-last-statement)
        'last-statement)))
 \f
@@ -1093,7 +1122,7 @@ Return point or nil."
                                (fortran-check-end-prog-re))))
            (skip-chars-forward " \t0-9")
            (cond ((looking-at
-                   "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+[^0-9]")
+                   "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+")
                   (setq count (1- count)))
                  ((looking-at "end[ \t]*do\\b")
                   (setq count (1+ count)))))
@@ -1143,13 +1172,14 @@ Return point or nil."
                          (looking-at ".*)[ \t]*then\\b[ \t]*[^ \t(=a-z0-9]")
                          (let (then-test) ; Multi-line if-then.
                            (while
-                               (and (= (forward-line 1) 0)
-                                    ;; Search forward for then.
-                                    (looking-at "     [^ 0\n]\\|\t[1-9]")
-                                    (not
-                                     (setq then-test
-                                           (looking-at
-                                            ".*then\\b[ \t]*[^ \t(=a-z0-9]")))))
+                               (and
+                                (= (forward-line 1) 0)
+                                ;; Search forward for then.
+                                (looking-at " \\{5\\}[^ 0\n]\\|\t[1-9]")
+                                (not
+                                 (setq then-test
+                                       (looking-at
+                                        ".*then\\b[ \t]*[^ \t(=a-z0-9]")))))
                            then-test))
                         (setq count (+ count 1)))))))
          (and (= count 0)
@@ -1178,7 +1208,7 @@ Return point or nil."
                   (while
                      (and (= (forward-line 1) 0)
                            ;; Search forward for then.
-                           (looking-at "     [^ 0\n]\\|\t[1-9]")
+                           (looking-at " \\{5\\}[^ 0\n]\\|\t[1-9]")
                            (not
                             (setq then-test
                                   (looking-at
@@ -1201,13 +1231,15 @@ Return point or nil."
                          (looking-at ".*)[ \t]*then\\b[ \t]*[^ \t(=a-z0-9]")
                          (let (then-test) ; Multi-line if-then.
                            (while
-                               (and (= (forward-line 1) 0)
-                                    ;; Search forward for then.
-                                    (looking-at "     [^ 0\n]\\|\t[1-9]")
-                                    (not
-                                     (setq then-test
-                                           (looking-at
-                                            ".*then\\b[ \t]*[^ \t(=a-z0-9]")))))
+                               (and
+                                (= (forward-line 1) 0)
+                                ;; Search forward for then.
+                                (looking-at " \\{5\\}[^ 0\n]\\|\t[1-9]")
+                                (not
+                                 (setq then-test
+                                       (looking-at
+                                        (concat ".*then\\b[ \t]*"
+                                                "[^ \t(=a-z0-9]"))))))
                            then-test))
                         (setq count (- count 1)))))
                  ((looking-at "end[ \t]*if\\b")
@@ -1227,8 +1259,7 @@ Return point or nil."
                   (not (fortran-line-number-indented-correctly-p))))
          (fortran-indent-to-column cfi)
        (beginning-of-line)
-       (if (and (not (looking-at fortran-comment-line-start-skip))
-                (fortran-find-comment-start-skip))
+       (if (fortran-find-comment-start-skip)
            (fortran-indent-comment))))
     ;; Never leave point in left margin.
     (if (< (current-column) cfi)
@@ -1244,6 +1275,24 @@ Return point or nil."
          (fortran-blink-matching-if)
          (fortran-blink-matching-do)))))
 
+(defun fortran-auto-fill ()
+  (if (> (current-column) (current-fill-column))
+      (let ((cfi (fortran-calculate-indent)))
+       (save-excursion
+         (beginning-of-line)
+         (if (or (not (= cfi (fortran-current-line-indentation)))
+                 (and (re-search-forward "^[ \t]*[0-9]+"
+                                         (+ (point) 4) t)
+                      (not (fortran-line-number-indented-correctly-p))))
+             (fortran-indent-to-column cfi)
+           (beginning-of-line)
+           (if (fortran-find-comment-start-skip)
+               (fortran-indent-comment))))
+       (fortran-fill)
+       ;; Never leave point in left margin.
+       (if (< (current-column) cfi)
+           (move-to-column cfi)))))
+
 ;; Historically this was a separate function which advertised itself
 ;; as reindenting but only did so where `most likely to be necessary'.
 (defalias 'fortran-indent-new-line 'reindent-then-newline-and-indent)
@@ -1278,7 +1327,7 @@ Return point or nil."
                         (let (then-test)       ;multi-line if-then
                           (while (and (= (forward-line 1) 0)
                                       ;;search forward for then
-                                      (looking-at "     [^ 0\n]\\|\t[1-9]")
+                                      (looking-at " \\{5\\}[^ 0\n]\\|\t[1-9]")
                                       (not (setq then-test
                                                  (looking-at
                                                   ".*then\\b[ \t]\
@@ -1310,6 +1359,9 @@ Return point or nil."
     (save-excursion
       (beginning-of-line)
       (cond ((looking-at "[ \t]*$"))
+            ;; Check for directive before comment, so as not to indent.
+           ((looking-at fortran-directive-re)
+            (setq fortran-minimum-statement-indent 0 icol 0))
            ((looking-at fortran-comment-line-start-skip)
             (cond ((eq fortran-comment-indent-style 'relative)
                    (setq icol (+ icol fortran-comment-line-extra-indent)))
@@ -1320,10 +1372,8 @@ Return point or nil."
            ((or (looking-at (concat "[ \t]*"
                                     (regexp-quote
                                      fortran-continuation-string)))
-                (looking-at "     [^ 0\n]\\|\t[1-9]"))
+                (looking-at " \\{5\\}[^ 0\n]\\|\t[1-9]"))
             (setq icol (+ icol fortran-continuation-indent)))
-           ((looking-at "[ \t]*#")     ; Check for cpp directive.
-            (setq fortran-minimum-statement-indent 0 icol 0))
            (first-statement)
            ((and fortran-check-all-num-for-matching-do
                  (looking-at "[ \t]*[0-9]+")
@@ -1368,7 +1418,7 @@ non-indentation text within the comment."
            (if (stringp fortran-comment-indent-char)
                fortran-comment-indent-char
              (char-to-string fortran-comment-indent-char))))
-         ((or (looking-at "     [^ 0\n]\\|\t[1-9]"))
+         ((or (looking-at " \\{5\\}[^ 0\n]\\|\t[1-9]"))
           (goto-char (match-end 0)))
          (t
           ;; Move past line number.
@@ -1405,7 +1455,7 @@ notes: 1) A non-zero/non-blank character in column 5 indicates a continuation
            (delete-char 2)
            (insert-char ?  5)
            (insert fortran-continuation-string))
-       (if (looking-at "     [^ 0\n]")
+       (if (looking-at " \\{5\\}[^ 0\n]")
            (if indent-tabs-mode
                (progn (delete-char 6)
                       (insert ?\t (fortran-numerical-continuation-char) 1))
@@ -1436,14 +1486,11 @@ notes: 1) A non-zero/non-blank character in column 5 indicates a continuation
       (delete-horizontal-space)
       (indent-to col)
       ;; Indent any comment following code on the same line.
-      (if (and comment-start-skip
-              (fortran-find-comment-start-skip))
+      (if (fortran-find-comment-start-skip)
          (progn (goto-char (match-beginning 0))
-                (if (not (= (current-column)
-                            (fortran-comment-indent-function)))
+                (if (not (= (current-column) (fortran-comment-indent)))
                     (progn (delete-horizontal-space)
-                           (indent-to
-                            (fortran-comment-indent-function)))))))))
+                           (indent-to (fortran-comment-indent)))))))))
 
 (defun fortran-line-number-indented-correctly-p ()
   "Return t if current line's line number is correctly indented.
@@ -1476,33 +1523,37 @@ Otherwise return nil."
              (save-excursion
                (narrow-to-defun)
                (and (re-search-backward
-                     (concat "\\(^[ \t0-9]*do[ \t]*0*" charnum "\\b\\)\\|"
-                             "\\(^[ \t]*0*" charnum "\\b\\)")
+                     (concat
+                      "\\(^[ \t0-9]*do[ \t]*0*"
+                      charnum "\\b\\)\\|" "\\(^[ \t]*0*"
+                      charnum "\\b\\)")
                      nil t)
-                    (looking-at (concat "^[ \t0-9]*do[ \t]*0*"
-                                        charnum))))))))))
+                    (looking-at
+                     (concat "^[ \t0-9]*do[ \t]*0*"
+                             charnum))))))))))
 
-(defun fortran-find-comment-start-skip ()
+(defun fortran-find-comment-start-skip (&optional all)
   "Move to past `comment-start-skip' found on current line.
-Return t if `comment-start-skip' found, nil if not."
-  ;; In order to move point only if comment-start-skip is found, this
-  ;; one uses a lot of save-excursions.  Note that re-search-forward
-  ;; moves point even if comment-start-skip is inside a string-constant.
-  ;; Some code expects certain values for match-beginning and end
+Return non-nil if `comment-start-skip' found, nil if not.
+If ALL is nil, only match comments that start in column > 0."
   (interactive)
-  (if (save-excursion
-       (re-search-forward comment-start-skip (line-end-position) t))
-      (let ((save-match-beginning (match-beginning 0))
-           (save-match-end (match-end 0)))
-       (if (fortran-is-in-string-p (match-beginning 0))
-           (save-excursion
-             (goto-char save-match-end)
-             (fortran-find-comment-start-skip)) ; recurse for rest of line
-         (goto-char save-match-beginning)
-         (re-search-forward comment-start-skip (line-end-position) t)
-         (goto-char (match-end 0))
-         t))
-    nil))
+  ;; Hopefully at some point we can just use the line below!  -stef
+  ;; (comment-search-forward (line-end-position) t))
+  (when (or all comment-start-skip)
+    (let ((pos (point))
+         (css (if comment-start-skip
+                  (concat fortran-comment-line-start-skip
+                          "\\|" comment-start-skip)
+                fortran-comment-line-start-skip)))
+      (when (re-search-forward css (line-end-position) t)
+       (if (and (or all (> (match-beginning 0) (line-beginning-position)))
+                (or (save-match-data
+                      (not (fortran-is-in-string-p (match-beginning 0))))
+                    ;; Recurse for rest of line.
+                    (fortran-find-comment-start-skip all)))
+           (point)
+         (goto-char pos)
+         nil)))))
 
 ;;From: ralf@up3aud1.gwdg.de (Ralf Fassel)
 ;; Test if TAB format continuation lines work.
@@ -1564,26 +1615,11 @@ Return t if `comment-start-skip' found, nil if not."
          ;; result is
          (nth 3 parse-state))))))
 
-(defun fortran-auto-fill-mode (arg)
-  "Toggle fortran-auto-fill mode.
-With ARG, turn `fortran-auto-fill' mode on iff ARG is positive.
-In `fortran-auto-fill' mode, inserting a space at a column beyond `fill-column'
-automatically breaks the line at a previous space."
-  (interactive "P")
-  (prog1 (setq auto-fill-function
-              (if (if (null arg)
-                      (not auto-fill-function)
-                    (> (prefix-numeric-value arg) 0))
-                  #'fortran-do-auto-fill
-                nil))
-    (force-mode-line-update)))
-
-(defun fortran-do-auto-fill ()
-  (if (> (current-column) fill-column)
-      (fortran-indent-line)))
+;; From old version.
+(defalias 'fortran-auto-fill-mode 'auto-fill-mode)
 
 (defun fortran-fill ()
-  (let* ((auto-fill-function #'fortran-do-auto-fill)
+  (let* ((auto-fill-function #'fortran-auto-fill)
         (opoint (point))
         (bol (line-beginning-position))
         (eol (line-end-position))
@@ -1633,44 +1669,35 @@ automatically breaks the line at a previous space."
     ;;
     ;; Need to use fortran-find-comment-start-skip to make sure that quoted !'s
     ;; don't prevent a break.
-    (if (not (or (save-excursion
-                  (if (and (re-search-backward comment-start-skip bol t)
-                           (not (fortran-is-in-string-p (point))))
-                      (progn
-                        (skip-chars-backward " \t")
-                        (< (current-column) (1+ fill-column)))))
-                (save-excursion
-                  (goto-char fill-point)
-                  (bolp))))
-       (if (> (save-excursion
+    (when (and (save-excursion
+                (beginning-of-line)
+                (when (fortran-find-comment-start-skip)
+                  (goto-char (match-beginning 0))
+                  (>= (point) fill-point)))
+              (save-excursion
                 (goto-char fill-point)
-                (current-column))
-              (1+ fill-column))
-           (progn (goto-char fill-point)
-                  (fortran-break-line))
-         (save-excursion
-           (if (> (save-excursion
-                    (goto-char fill-point)
-                    (current-column))
-                  (+ (fortran-calculate-indent) fortran-continuation-indent))
-               (progn
-                 (goto-char fill-point)
-                 (fortran-break-line))))))))
+                (not (bolp)))
+              (> (save-excursion
+                   (goto-char opoint)
+                   (current-column))
+                 (min (1+ fill-column)
+                      (+ (fortran-calculate-indent)
+                         fortran-continuation-indent))))
+      (goto-char fill-point)
+      (fortran-break-line)
+      (end-of-line))))
 
 (defun fortran-break-line ()
   (let ((opoint (point))
        (bol (line-beginning-position))
-       (eol (line-end-position))
-       (comment-string nil))
-    (save-excursion
-      (if (and comment-start-skip (fortran-find-comment-start-skip))
-         (progn
-           (re-search-backward comment-start-skip bol t)
-           (setq comment-string (buffer-substring (point) eol))
-           (delete-region (point) eol))))
+       (comment-string
+        (save-excursion
+          (if (fortran-find-comment-start-skip)
+              (delete-and-extract-region
+               (match-beginning 0) (line-end-position))))))
     ;; Forward line 1 really needs to go to next non white line
     (if (save-excursion (forward-line)
-                       (or (looking-at "     [^ 0\n]\\|\t[1-9]")))
+                       (looking-at " \\{5\\}[^ 0\n]\\|\t[1-9]"))
        (progn
          (end-of-line)
          (delete-region (point) (match-end 0))
@@ -1682,7 +1709,7 @@ automatically breaks the line at a previous space."
          (goto-char bol)
          (end-of-line)
          (delete-horizontal-space)
-         (indent-to (fortran-comment-indent-function))
+         (indent-to (fortran-comment-indent))
          (insert comment-string)))))
 
 (defun fortran-analyze-file-format ()
@@ -1696,13 +1723,13 @@ file before the end or the first `fortran-analyze-depth' lines."
       (while (not (or
                   (eobp)
                   (eq (char-after) ?\t)
-                  (looking-at "      ")
+                  (looking-at " \\{6\\}")
                   (> i fortran-analyze-depth)))
        (forward-line)
        (setq i (1+ i)))
       (cond
        ((eq (char-after) ?\t) t)
-       ((looking-at "      ") nil)
+       ((looking-at " \\{6\\}") nil)
        (fortran-tab-mode-default t)
        (t nil)))))
 
@@ -1714,49 +1741,50 @@ file before the end or the first `fortran-analyze-depth' lines."
 
 (defun fortran-fill-paragraph (&optional justify)
   "Fill surrounding comment block as paragraphs, else fill statement.
-
 Intended as the value of `fill-paragraph-function'."
   (interactive "P")
   (save-excursion
     (beginning-of-line)
-    (if (not (looking-at "[Cc*]"))
+    (if (not (looking-at fortran-comment-line-start-skip))
        (fortran-fill-statement)
-      ;; We're in a comment block.  Find the start and end of a
-      ;; paragraph, delimited either by non-comment lines or empty
-      ;; comments.  (Get positions as markers, since the
-      ;; `indent-region' below can shift the block's end).
-      (let* ((non-empty-comment (concat "\\(" fortran-comment-line-start-skip
-                                       "\\)" "[^ \t\n]"))
-            (start (save-excursion
-                     ;; Find (start of) first line.
-                     (while (and (zerop (forward-line -1))
-                                 (looking-at non-empty-comment)))
-                     (or (looking-at non-empty-comment)
-                         (forward-line)) ; overshot
-                     (point-marker)))
-            (end (save-excursion
-                   ;; Find start of first line past region to fill.
-                   (while (progn (forward-line)
-                                 (looking-at non-empty-comment)))
-                   (point-marker))))
-       ;; Indent the block, find the string comprising the effective
-       ;; comment start skip and use that as a fill-prefix for
-       ;; filling the region.
-       (indent-region start end nil)
-       (let ((paragraph-ignore-fill-prefix nil)
-             (fill-prefix (progn (beginning-of-line)
-                                 (looking-at fortran-comment-line-start-skip)
-                                 (match-string 0))))
-         (let (fill-paragraph-function)
-           (fill-region start end justify))) ; with normal `fill-paragraph'
-       (set-marker start nil)
-       (set-marker end nil))))
+       ;; We're in a comment block.  Find the start and end of a
+       ;; paragraph, delimited either by non-comment lines or empty
+       ;; comments.  (Get positions as markers, since the
+       ;; `indent-region' below can shift the block's end).
+       (let* ((non-empty-comment
+               (concat fortran-comment-line-start-skip "[^ \t\n]"))
+              (start (save-excursion
+                       ;; Find (start of) first line.
+                       (while (and (zerop (forward-line -1))
+                                   (looking-at non-empty-comment)))
+                       (or (looking-at non-empty-comment)
+                           (forward-line)) ; overshot
+                       (point-marker)))
+              (end (save-excursion
+                     ;; Find start of first line past region to fill.
+                     (while (progn
+                              (forward-line)
+                              (looking-at non-empty-comment)))
+                     (point-marker))))
+         ;; Indent the block, find the string comprising the effective
+         ;; comment start skip and use that as a fill-prefix for
+         ;; filling the region.
+         (indent-region start end nil)
+         (let ((paragraph-ignore-fill-prefix nil)
+               (fill-prefix (progn
+                              (beginning-of-line)
+                              (looking-at fortran-comment-line-start-skip)
+                              (match-string 0))))
+           (let (fill-paragraph-function)
+             (fill-region start end justify))) ; with normal `fill-paragraph'
+         (set-marker start nil)
+         (set-marker end nil))))
   t)
 
 (defun fortran-fill-statement ()
   "Fill a fortran statement up to `fill-column'."
   (interactive)
-  (let ((auto-fill-function #'fortran-do-auto-fill))
+  (let ((auto-fill-function #'fortran-auto-fill))
     (if (not (save-excursion
               (beginning-of-line)
               (or (looking-at "[ \t]*$")
@@ -1777,18 +1805,44 @@ Intended as the value of `fill-paragraph-function'."
          (fortran-previous-statement)))
     (fortran-indent-line)))
 
-(defun fortran-strip-sqeuence-nos (do-space)
-  "Delete all text after column 72 (assumed to be sequence numbers).
-Also delete trailing whitespace after stripping such text.  Supplying
-prefix arg DO-SPACE prevent stripping the whitespace."
+(defun fortran-strip-sequence-nos (&optional do-space)
+  "Delete all text in column 72 and up (assumed to be sequence numbers).
+Normally also deletes trailing whitespace after stripping such text.
+Supplying prefix arg DO-SPACE prevents stripping the whitespace."
   (interactive "p")
   (save-excursion
     (goto-char (point-min))
-    (while (re-search-forward (concat "^" (make-string 72 ?.)" \\(.*\\)")
-                             nil t)
+    (while (re-search-forward "^.\\{72\\}\\(.*\\)" nil t)
       (replace-match "" nil nil nil 1)
       (unless do-space (delete-horizontal-space)))))
 
+;; This code used to live in add-log.el, but this is a better place
+;; for it.
+(defun fortran-current-defun ()
+  "Function to use for `add-log-current-defun-function' in Fortran mode."
+  ;; We must be inside function body for this to work.
+  (fortran-beginning-of-subprogram)
+  (let ((case-fold-search t))          ; case-insensitive
+    ;; search for fortran subprogram start
+    (if (re-search-forward
+        (concat "^[ \t]*\\(program\\|subroutine\\|function"
+                "\\|[ \ta-z0-9*()]*[ \t]+function\\|"
+                "\\(block[ \t]*data\\)\\)")
+        (save-excursion (fortran-end-of-subprogram)
+                        (point))
+        t)
+       (or (match-string-no-properties 2)
+           (progn
+             ;; move to EOL or before first left paren
+             (if (re-search-forward "[(\n]" nil t)
+                 (progn (backward-char)
+                        (skip-chars-backward " \t"))
+               (end-of-line))
+             ;; Use the name preceding that.
+             (buffer-substring-no-properties (point) (progn (backward-sexp)
+                                                            (point)))))
+      "main")))
+
 (provide 'fortran)
 
 ;;; fortran.el ends here