* lisp/progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding.

* lisp/progmodes/octave-mod.el (octave-help): Remove.

3 files changed, 16 insertions, 19 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ceb3617176..acefb4f6f15 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding.
+        * progmodes/octave-mod.el (octave-help): Remove.
+
 2011-10-23  Michael Albinus  <michael.albinus@gmx.de>
 
         Sync with Tramp 2.2.3.
@@ -16,16 +21,16 @@
         for toggle-read-only.  Note that this hasn't called vc-next-action
         since 2008-05-02, though it wasn't documented at the time.
 
-        * vc/ediff-init.el (ediff-toggle-read-only-function): Use
-        toggle-read-only.
+        * vc/ediff-init.el (ediff-toggle-read-only-function):
+        Use toggle-read-only.
 
 2011-10-22  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         Fix bug #9560, sporadic wrong indentation; improve instrumentation
         of c-parse-state.
 
-        * cc-engine.el (c-append-lower-brace-pair-to-state-cache): correct
-        faulty logical expression.
+        * cc-engine.el (c-append-lower-brace-pair-to-state-cache):
+        correct faulty logical expression.
         (c-parse-state-state, c-record-parse-state-state):
         (c-replay-parse-state-state): New defvar/defuns.
         (c-debug-parse-state): Use new functions.
@@ -39,8 +44,8 @@
 
         * progmodes/idlwave.el (idlwave-mode):
         * progmodes/vera-mode.el (vera-mode): No need to set
-        require-final-newline; that's done in prog-mode.  Suggested by
-        Stefan Monnier.
+        require-final-newline; that's done in prog-mode.
+        Suggested by Stefan Monnier.
 
 2011-10-21  Martin Rudalics  <rudalics@gmx.at>
 
@@ -61,8 +66,8 @@
 2011-10-21  Chong Yidong  <cyd@gnu.org>
 
         * progmodes/idlwave.el (idlwave-mode):
-        * progmodes/vera-mode.el (vera-mode): Use
-        mode-require-final-newline.
+        * progmodes/vera-mode.el (vera-mode):
+        Use mode-require-final-newline.
 
 2011-10-20  Glenn Morris  <rgm@gnu.org>
 
@@ -198,8 +203,8 @@
         (global-whitespace-mode, global-whitespace-newline-mode):
         * xt-mouse.el (xterm-mouse-mode): Doc fix.
 
-        * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
-        autogenerated docstring.
+        * emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
+        Fix autogenerated docstring.
 
 2011-10-19  Juri Linkov  <juri@jurta.org>
 
diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el
index cb64b2436c6..e9d890c3f26 100644
--- a/lisp/progmodes/octave-inf.el
+++ b/lisp/progmodes/octave-inf.el
@@ -68,7 +68,7 @@ mode, set this to (\"-q\" \"--traditional\")."
     (define-key map "\C-c\C-l" 'inferior-octave-dynamic-list-input-ring)
     (define-key map [menu-bar inout list-history]
       '("List Input History" . inferior-octave-dynamic-list-input-ring))
-    (define-key map "\C-c\C-h" 'octave-help)
+    (define-key map "\C-c\C-h" 'info-lookup-symbol)
     map)
   "Keymap used in Inferior Octave mode.")
 
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index 183347cdeca..5e13b8533e7 100644
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -655,14 +655,6 @@ including a reproducible test case and send the message."
 
   (easy-menu-add octave-mode-menu)
   (octave-initialize-completions))
-
-(defvar info-lookup-mode)
-
-(defun octave-help ()
-  "Get help on Octave symbols from the Octave info files.
-Look up symbol in the function, operator and variable indices of the info files."
-  (let ((info-lookup-mode 'octave-mode))
-    (call-interactively 'info-lookup-symbol)))
 
 ;;; Miscellaneous useful functions