diff options
| author | Leo Liu | 2013-04-17 09:46:26 +0800 |
|---|---|---|
| committer | Leo Liu | 2013-04-17 09:46:26 +0800 |
| commit | 7a1beb6cf13d0daa7920670c52ee6bffe9a7ac90 (patch) | |
| tree | 40f06125c4b9dd6ce1e4f0e6b7208cf28199a3d4 | |
| parent | 2d3fa3e5020daec5efb00b2b03a9c4022e79e729 (diff) | |
| download | emacs-7a1beb6cf13d0daa7920670c52ee6bffe9a7ac90.tar.gz emacs-7a1beb6cf13d0daa7920670c52ee6bffe9a7ac90.zip | |
* progmodes/octave-mod.el (octave-mode-map): Fix key binding to
octave-hide-process-buffer.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/octave-mod.el | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index de1121fa131..23b873d0047 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-04-17 Leo Liu <sdl.web@gmail.com> | ||
| 2 | |||
| 3 | * progmodes/octave-mod.el (octave-mode-map): Fix key binding to | ||
| 4 | octave-hide-process-buffer. | ||
| 5 | |||
| 1 | 2013-04-17 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2013-04-17 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * vc/vc-hg.el (vc-hg-annotate-re): Disallow ": " in file names | 8 | * vc/vc-hg.el (vc-hg-annotate-re): Disallow ": " in file names |
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index 4f70cf77b76..8bdc74c6ef6 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el | |||
| @@ -235,8 +235,7 @@ parenthetical grouping.") | |||
| 235 | (define-key map "\C-c\C-i\C-f" 'octave-send-defun) | 235 | (define-key map "\C-c\C-i\C-f" 'octave-send-defun) |
| 236 | (define-key map "\C-c\C-i\C-r" 'octave-send-region) | 236 | (define-key map "\C-c\C-i\C-r" 'octave-send-region) |
| 237 | (define-key map "\C-c\C-i\C-s" 'octave-show-process-buffer) | 237 | (define-key map "\C-c\C-i\C-s" 'octave-show-process-buffer) |
| 238 | ;; FIXME: free C-h so it can do the describe-prefix-bindings. | 238 | (define-key map "\C-c\C-i\C-q" 'octave-hide-process-buffer) |
| 239 | (define-key map "\C-c\C-i\C-h" 'octave-hide-process-buffer) | ||
| 240 | (define-key map "\C-c\C-i\C-k" 'octave-kill-process) | 239 | (define-key map "\C-c\C-i\C-k" 'octave-kill-process) |
| 241 | map) | 240 | map) |
| 242 | "Keymap used in Octave mode.") | 241 | "Keymap used in Octave mode.") |