Merge from trunk.

2 files changed, 5 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f62dff32008..3df05a7a37a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-16  Leo Liu  <sdl.web@gmail.com>
+
+        * progmodes/octave-mod.el (octave-mode-map): Remove redundant key
+        binding to info-lookup-symbol.
+
 2013-04-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * minibuffer.el (completion--twq-all):
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index 806afe5a537..4f70cf77b76 100644
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -223,8 +223,6 @@ parenthetical grouping.")
     (define-key map "\C-c]" 'smie-close-block)
     (define-key map "\C-c/" 'smie-close-block)
     (define-key map "\C-c\C-f" 'octave-insert-defun)
-    ;; FIXME: free C-h so it can do the describe-prefix-bindings.
-    (define-key map "\C-c\C-h" 'info-lookup-symbol)
     (define-key map "\C-c\C-il" 'octave-send-line)
     (define-key map "\C-c\C-ib" 'octave-send-block)
     (define-key map "\C-c\C-if" 'octave-send-defun)