summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/progmodes/octave.el7
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62f094dc6e4..9fdb5fdc6f8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
* progmodes/octave.el (octave-indent-comment): Fix the indentation
of ### or %%%.
+ (octave-mode-map): Bind octave-indent-defun to C-c C-q instead of
+ C-M-q.
2013-05-12 Leo Liu <sdl.web@gmail.com>
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index f00347d319a..fc1e7bb757e 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -96,9 +96,10 @@ parenthetical grouping.")
(defvar octave-mode-map
(let ((map (make-sparse-keymap)))
- (define-key map "\M-." 'octave-find-definition)
- (define-key map "\e\n" 'octave-indent-new-comment-line)
- (define-key map "\M-\C-q" 'octave-indent-defun)
+ (define-key map "\M-." 'octave-find-definition)
+ (define-key map "\M-\C-j" 'octave-indent-new-comment-line)
+ ;; C-c C-q is also used by cc modes for similar command
+ (define-key map "\C-c\C-q" 'octave-indent-defun)
(define-key map "\C-c\C-p" 'octave-previous-code-line)
(define-key map "\C-c\C-n" 'octave-next-code-line)
(define-key map "\C-c\C-a" 'octave-beginning-of-line)