diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/octave-inf.el | 3 | ||||
| -rw-r--r-- | lisp/progmodes/octave-mod.el | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b75d262a9b6..60f1db123cf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-10-26 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/octave-mod.el: + * progmodes/octave-inf.el: Update maintainer. + 2011-10-26 Chong Yidong <cyd@gnu.org> * subr.el (with-wrapper-hook): Rewrite doc. diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el index e9d890c3f26..421f476016e 100644 --- a/lisp/progmodes/octave-inf.el +++ b/lisp/progmodes/octave-inf.el @@ -4,7 +4,7 @@ ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> ;; Author: John Eaton <jwe@bevo.che.wisc.edu> -;; Maintainer: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> +;; Maintainer: FSF ;; Keywords: languages ;; Package: octave-mod @@ -68,6 +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)) + ;; FIXME: free C-h so it can do the describe-prefix-bindings. (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 5e13b8533e7..28e25a35c70 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el @@ -4,7 +4,7 @@ ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> ;; Author: John Eaton <jwe@octave.org> -;; Maintainer: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> +;; Maintainer: FSF ;; Keywords: languages ;; This file is part of GNU Emacs. @@ -223,6 +223,7 @@ 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) @@ -236,6 +237,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-k" 'octave-kill-process) map) |