(fortran-tab-mode-minor-mode-string): Delete this variable,

introduced in previous change.
(fortran-tab-mode-string): Change default value.
(fortran-mode): Use mode-line-process (rather than
minor-mode-alist) to indicate tab format code.
(fortran-analyze-file-format): Return fortran-tab-mode-default if
no match.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c977f577572c28faff9f9c3fea15f99bc9c7550..3fabfecb2140dc49713d1c7b9c3fbf9b2cc0bb27 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,8 +9,8 @@
        (fortran-break-before-delimiters, fortran-mode-hook)
        (fortran-end-prog-re, fortran-imenu-generic-expression): Minor
        doc changes.
-       (fortran-tab-mode-minor-mode-string): New variable.
        (fortran-tab-mode-string): Now customization is meaningful.
+       Change default value.
        (fortran-column-ruler-fixed, fortran-column-ruler-tab)
        (fortran-analyze-depth): Use defcustom.
        (fortran-if-start-re, fortran-end-prog-re1, fortran-fill)
@@ -23,7 +23,7 @@
        depth of fortran-type-types has changed.  Remove extra and.
        (fortran-mode-menu): Minor re-organization.  Use lookup-key.
        (fortran-mode): Doc changes.  Some re-organization.  Use
-       fortran-tab-mode-minor-mode-string.
+       mode-line-process (rather than minor-mode-alist) for tab format.
        (fortran-comment-indent): Add doc string.  Move save-excursion.
        Use 1+.
        (fortran-indent-comment, fortran-fill-statement): Change
@@ -45,7 +45,7 @@
        (fortran-indent-to-column): Doc change.  Use when, unless.
        (fortran-find-comment-start-skip): No longer interactive.
        (fortran-analyze-file-format): Minor doc change.  Remove
-       un-needed setq.
+       un-needed setq.  Return fortran-tab-mode-default if no match.
        (minor-mode-alist): Use add-to-list.
        (fortran-fill-paragraph): Change interactive spec, doc string.
        

diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index ecbe9a0241e3c8281fb08faf732da7572caa4626..e158304b4160ccdb3a64e86259f2ccbce6604a81 100644 (file)
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -83,22 +83,11 @@ with a character in column 6."
   :type  'boolean
   :group 'fortran-indent)
 
-(defcustom fortran-tab-mode-string " TAB"
-  "*String to appear in mode line in TAB format buffers.
-Should have a leading space."
+(defcustom fortran-tab-mode-string "/t"
+  "*String to appear in mode line in TAB format buffers."
   :type  'string
   :group 'fortran-indent)
 
-(defvar fortran-tab-mode-minor-mode-string nil
-  "Internal variable used for `minor-mode-alist' in Fortran mode.
-Do not change the value of this variable - edit `fortran-tab-mode-string'
-instead.")
-(make-variable-buffer-local 'fortran-tab-mode-minor-mode-string)
-
-(add-to-list 'minor-mode-alist
-             '(fortran-tab-mode-minor-mode-string
-               (indent-tabs-mode fortran-tab-mode-minor-mode-string)))
-
 (defcustom fortran-do-indent 3
   "*Extra indentation applied to DO blocks."
   :type  'integer
@@ -677,8 +666,8 @@ with no args, if that value is non-nil."
   (set (make-local-variable 'comment-indent-function) 'fortran-comment-indent)
   (set (make-local-variable 'abbrev-all-caps) t)
   (set (make-local-variable 'normal-auto-fill-function) 'fortran-auto-fill)
-  (setq fortran-tab-mode-minor-mode-string fortran-tab-mode-string)
   (set (make-local-variable 'indent-tabs-mode) (fortran-analyze-file-format))
+  (setq mode-line-process '(indent-tabs-mode fortran-tab-mode-string))
   (set (make-local-variable 'fill-column) 72)
   (set (make-local-variable 'fill-paragraph-function) 'fortran-fill-paragraph)
   (set (make-local-variable 'font-lock-defaults)
@@ -1761,8 +1750,7 @@ before the end or in the first `fortran-analyze-depth' lines."
       (cond
        ((eq (char-after) ?\t) t)
        ((looking-at " \\{6\\}") nil)
-       (fortran-tab-mode-default t)
-       (t nil)))))
+       (t fortran-tab-mode-default)))))
 
 (defun fortran-fill-paragraph (&optional justify)
   "Fill surrounding comment block as paragraphs, else fill statement.