(fortran-mode): Don't set

fortran-comment-line-start-skip.  Set comment-start to
fortran-comment-line-start.
(fortran-fill-paragraph) <non-empty-comment>: Remove regexp group.
(fortran-comment-line-start-skip): Simplify slightly.

2 files changed, 13 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b6821311474..d2c8c5ec443 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-28  Dave Love  <fx@gnu.org>
+
+        * progmodes/fortran.el (fortran-mode): Don't set
+        fortran-comment-line-start-skip.  Set comment-start to
+        fortran-comment-line-start.
+        (fortran-fill-paragraph) <non-empty-comment>: Remove regexp group.
+        (fortran-comment-line-start-skip): Simplify slightly.
+
 2000-11-28  Gerd Moellmann  <gerd@gnu.org>
 
         * play/5x5.el: Remove RCS keyword.
@@ -29,6 +37,8 @@
 
 2000-11-27  Dave Love  <fx@gnu.org>
 
+        * net/ldap.el (ldap) <defgroup>: Add :version.
+
         * tooltip.el (tooltip-use-echo-area): Doc fix.
 
         * cus-start.el <minibuffer-prompt-properties>: Add version.
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index f335b097abd..b5b2caa2cff 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -130,7 +130,7 @@ You might want to change this to \"*\", for instance."
 ;; 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\\2*\\)?[ \t]*"
+  "^[CcDd*!]\\(\\([^ \t\n]\\)\\2+\\)?[ \t]*"
   "*Regexp to match the start of a full-line comment."
   :version "21.1"
   :type 'regexp
@@ -636,10 +636,8 @@ with no args, if that value is non-nil."
   (setq comment-indent-function 'fortran-comment-indent)
   (make-local-variable 'comment-start-skip)
   (setq comment-start-skip "![ \t]*")
-  (setq fortran-comment-line-start-skip
-        "^[Cc*]\\(\\([^ \t\n]\\)\\2\\2*\\)?[ \t]*\\|^#.*")
   (make-local-variable 'comment-start)
-  (setq fortran-comment-line-start "c")
+  (setq comment-start fortran-comment-line-start)
   (make-local-variable 'require-final-newline)
   (setq require-final-newline t)
   (make-local-variable 'abbrev-all-caps)
@@ -1737,8 +1735,7 @@ Intended as the value of `fill-paragraph-function'."
         ;; 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]"))
+                (concat fortran-comment-line-start-skip "[^ \t\n]"))
                (start (save-excursion
                         ;; Find (start of) first line.
                         (while (and (zerop (forward-line -1))