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 @@
+2013-04-17  Leo Liu  <sdl.web@gmail.com>
+
+        * progmodes/octave-mod.el (octave-mode-map): Fix key binding to
+        octave-hide-process-buffer.
+
 2013-04-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * 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.")
     (define-key map "\C-c\C-i\C-f" 'octave-send-defun)
     (define-key map "\C-c\C-i\C-r" 'octave-send-region)
     (define-key map "\C-c\C-i\C-s" 'octave-show-process-buffer)
-    ;; FIXME: free C-h so it can do the describe-prefix-bindings.
-    (define-key map "\C-c\C-i\C-h" 'octave-hide-process-buffer)
+    (define-key map "\C-c\C-i\C-q" 'octave-hide-process-buffer)
     (define-key map "\C-c\C-i\C-k" 'octave-kill-process)
     map)
   "Keymap used in Octave mode.")