diff options
| author | Stefan Monnier | 2011-10-23 22:56:59 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2011-10-23 22:56:59 -0400 |
| commit | a3839de209ecd292b124b0818dbc60eaa654aa68 (patch) | |
| tree | 11df166304cf5af70e1119aa4092e9a34585181b /lisp/progmodes | |
| parent | e782cfabe70f10d62c0a1eb6f1eeed74a86d6c2d (diff) | |
| download | emacs-a3839de209ecd292b124b0818dbc60eaa654aa68.tar.gz emacs-a3839de209ecd292b124b0818dbc60eaa654aa68.zip | |
* lisp/progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding.
* lisp/progmodes/octave-mod.el (octave-help): Remove.
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/octave-inf.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/octave-mod.el | 8 |
2 files changed, 1 insertions, 9 deletions
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\")." | |||
| 68 | (define-key map "\C-c\C-l" 'inferior-octave-dynamic-list-input-ring) | 68 | (define-key map "\C-c\C-l" 'inferior-octave-dynamic-list-input-ring) |
| 69 | (define-key map [menu-bar inout list-history] | 69 | (define-key map [menu-bar inout list-history] |
| 70 | '("List Input History" . inferior-octave-dynamic-list-input-ring)) | 70 | '("List Input History" . inferior-octave-dynamic-list-input-ring)) |
| 71 | (define-key map "\C-c\C-h" 'octave-help) | 71 | (define-key map "\C-c\C-h" 'info-lookup-symbol) |
| 72 | map) | 72 | map) |
| 73 | "Keymap used in Inferior Octave mode.") | 73 | "Keymap used in Inferior Octave mode.") |
| 74 | 74 | ||
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." | |||
| 655 | 655 | ||
| 656 | (easy-menu-add octave-mode-menu) | 656 | (easy-menu-add octave-mode-menu) |
| 657 | (octave-initialize-completions)) | 657 | (octave-initialize-completions)) |
| 658 | |||
| 659 | (defvar info-lookup-mode) | ||
| 660 | |||
| 661 | (defun octave-help () | ||
| 662 | "Get help on Octave symbols from the Octave info files. | ||
| 663 | Look up symbol in the function, operator and variable indices of the info files." | ||
| 664 | (let ((info-lookup-mode 'octave-mode)) | ||
| 665 | (call-interactively 'info-lookup-symbol))) | ||
| 666 | 658 | ||
| 667 | ;;; Miscellaneous useful functions | 659 | ;;; Miscellaneous useful functions |
| 668 | 660 | ||