(fortran-mode-map): Don't bind M-;.

(fortran-mode): Set values for comment-region-function,
uncomment-region-function and comment-insert-comment-function.
(fortran-uncomment-region): New function.

2 files changed, 27 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28630124723..3a723a52b70 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2007-11-03  Glenn Morris  <rgm@gnu.org>
+
+        * newcomment.el (comment-dwim): Call comment-insert-comment-function,
+        if defined, for blank lines.  Doc fix.
+
+        * progmodes/fortran.el (fortran-mode-map): Don't bind M-;.
+        (fortran-mode): Set values for comment-region-function,
+        uncomment-region-function and comment-insert-comment-function.
+        (fortran-uncomment-region): New function.
+
+        * textmodes/nroff-mode.el (nroff-mode): Set
+        comment-insert-comment-function rather than indent-line-function.
+        (nroff-indent-line-function): Remove.
+        (nroff-insert-comment-function): New function.
+
 2007-11-02  Michael Kifer  <kifer@cs.stonybrook.edu>
 
         * ediff-vers.el (ediff-vc-working-revision): Add a quote.
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 023e285659a..01c4c09c954 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -593,7 +593,8 @@ Used in the Fortran entry in `hs-special-modes-alist'.")
   (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)
+    ;; The default comment-dwim does at least as much as this.
+;;;    (define-key map "\M-;"     'fortran-indent-comment)
     (define-key map "\M-\n"    'fortran-split-line)
     (define-key map "\M-\C-n"  'fortran-end-of-block)
     (define-key map "\M-\C-p"  'fortran-beginning-of-block)
@@ -841,6 +842,11 @@ with no args, if that value is non-nil."
        ;; (concat "\\(\\)\\(![ \t]*\\|" fortran-comment-line-start-skip "\\)")
        "\\(\\)\\(?:^[CcDd*]\\|!\\)\\(?:\\([^ \t\n]\\)\\2+\\)?[ \t]*")
   (set (make-local-variable 'comment-indent-function) 'fortran-comment-indent)
+  (set (make-local-variable 'comment-region-function) 'fortran-comment-region)
+  (set (make-local-variable 'uncomment-region-function)
+       'fortran-uncomment-region)
+  (set (make-local-variable 'comment-insert-comment-function)
+       'fortran-indent-comment)
   (set (make-local-variable 'abbrev-all-caps) t)
   (set (make-local-variable 'normal-auto-fill-function) 'fortran-auto-fill)
   (set (make-local-variable 'indent-tabs-mode) (fortran-analyze-file-format))
@@ -981,6 +987,11 @@ With non-nil ARG, uncomments the region."
     (set-marker end-region-mark nil)
     (set-marker save-point nil)))
 
+;; uncomment-region calls this with 3 args.
+(defun fortran-uncomment-region (start end &optional ignored)
+  "Uncomment every line in the region."
+  (fortran-comment-region start end t))
+
 
 (defun fortran-abbrev-start ()
   "Typing ;\\[help-command] or ;? lists all the Fortran abbrevs.