# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1281610004 -7200
# Node ID 8646a04a2d974ab75434efdca49fc01b608f2b91
# Parent  29c78eee2a9ff0ba898be521d409915f185c7c11
* lisp/progmodes/octave-mod.el (octave-mode-map): Use comment-dwim.
(octave-mode): Set comment-add.

diff -r 29c78eee2a9f -r 8646a04a2d97 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Aug 12 11:02:02 2010 +0200
+++ b/lisp/ChangeLog	Thu Aug 12 12:46:44 2010 +0200
@@ -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 -r 29c78eee2a9f -r 8646a04a2d97 lisp/progmodes/octave-mod.el
--- a/lisp/progmodes/octave-mod.el	Thu Aug 12 11:02:02 2010 +0200
+++ b/lisp/progmodes/octave-mod.el	Thu Aug 12 12:46:44 2010 +0200
@@ -194,7 +194,6 @@
     (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 @@
   (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)