[Emacs-diffs] /srv/bzr/emacs/trunk r101055: * lisp/progmodes/octave-mod.el (octave-mode-map): Use comment-dwim.

[Stefan Monnier]

------------------------------------------------------------
revno: 101055
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2010-08-12 12:46:44 +0200
message:
  * lisp/progmodes/octave-mod.el (octave-mode-map): Use comment-dwim.
  (octave-mode): Set comment-add.
modified:
  lisp/ChangeLog
  lisp/progmodes/octave-mod.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-12 08:55:20 +0000
+++ b/lisp/ChangeLog    2010-08-12 10:46:44 +0000
@@ -1,3 +1,8 @@
+2010-08-12  Stefan Monnier  <address@hidden>
+
+       * progmodes/octave-mod.el (octave-mode-map): Use comment-dwim 
(bug#6829).
+       (octave-mode): Set comment-add.
+
 2010-08-12  Antoine Levitt  <address@hidden>  (tiny change)
 
        * cus-edit.el (custom-save-variables, custom-save-faces): Fix up

=== modified file 'lisp/progmodes/octave-mod.el'
--- a/lisp/progmodes/octave-mod.el      2010-05-20 15:12:20 +0000
+++ b/lisp/progmodes/octave-mod.el      2010-08-12 10:46:44 +0000
@@ -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)