* lisp/progmodes/octave-mod.el (octave-mode-map): Use comment-dwim.

(octave-mode): Set comment-add.

Fixes: debbugs:6829

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 02b380e1bb2..99829566bb5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/octave-mod.el (octave-mode-map): Use comment-dwim (bug#6829).
+        (octave-mode): Set comment-add.
+
 2010-08-12  Antoine Levitt  <antoine.levitt@gmail.com>  (tiny change)
 
         * cus-edit.el (custom-save-variables, custom-save-faces): Fix up
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index 12f561c6814..4951ac153d9 100644
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -194,7 +194,6 @@ parenthetical grouping.")
     (define-key map ";" 'octave-electric-semi)
     (define-key map " " 'octave-electric-space)
     (define-key map "\n" 'octave-reindent-then-newline-and-indent)
-    (define-key map "\e;" 'octave-indent-for-comment)
     (define-key map "\e\n" 'octave-indent-new-comment-line)
     (define-key map "\e\t" 'octave-complete-symbol)
     (define-key map "\M-\C-a" 'octave-beginning-of-defun)
@@ -507,6 +506,7 @@ including a reproducible test case and send the message."
   (setq comment-start-skip "\\s<+\\s-*")
   (make-local-variable 'comment-indent-function)
   (setq comment-indent-function 'octave-comment-indent)
+  (set (make-local-variable 'comment-add) 1)
 
   (make-local-variable 'parse-sexp-ignore-comments)
   (setq parse-sexp-ignore-comments t)