diff options
| author | Chong Yidong | 2010-05-20 11:12:20 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-05-20 11:12:20 -0400 |
| commit | f8e6369193666ccd4e38b1ed490042a2a7ce5c91 (patch) | |
| tree | d149fbee77027ab022dcf8323f68db8416587aa6 | |
| parent | 31c4aaf628ce21077b2f4de95bb4d0dd8e0b96ee (diff) | |
| download | emacs-f8e6369193666ccd4e38b1ed490042a2a7ce5c91.tar.gz emacs-f8e6369193666ccd4e38b1ed490042a2a7ce5c91.zip | |
* nxml/nxml-mode.el (nxml-mode-map): Bind C-c / to
nxml-finish-element, for consistency with SGML mode.
* progmodes/octave-mod.el (octave-mode-map): Bind C-c / to
octave-close-block.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/nxml/nxml-mode.el | 1 | ||||
| -rw-r--r-- | lisp/progmodes/octave-mod.el | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d8f961471b8..b7c5c5827e8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2010-05-20 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * nxml/nxml-mode.el (nxml-mode-map): Bind C-c / to | ||
| 4 | nxml-finish-element, for consistency with SGML mode. | ||
| 5 | |||
| 6 | * progmodes/octave-mod.el (octave-mode-map): Bind C-c / to | ||
| 7 | octave-close-block. | ||
| 8 | |||
| 1 | 2010-05-20 Juanma Barranquero <lekktu@gmail.com> | 9 | 2010-05-20 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 10 | ||
| 3 | * composite.el: Require cl when compiling. | 11 | * composite.el: Require cl when compiling. |
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el index 5eb9840a4ca..101b2585186 100644 --- a/lisp/nxml/nxml-mode.el +++ b/lisp/nxml/nxml-mode.el | |||
| @@ -404,6 +404,7 @@ reference.") | |||
| 404 | (define-key map "\M-}" 'nxml-forward-paragraph) | 404 | (define-key map "\M-}" 'nxml-forward-paragraph) |
| 405 | (define-key map "\M-h" 'nxml-mark-paragraph) | 405 | (define-key map "\M-h" 'nxml-mark-paragraph) |
| 406 | (define-key map "\C-c\C-f" 'nxml-finish-element) | 406 | (define-key map "\C-c\C-f" 'nxml-finish-element) |
| 407 | (define-key map "\C-c/" 'nxml-finish-element) | ||
| 407 | (define-key map "\C-c\C-m" 'nxml-split-element) | 408 | (define-key map "\C-c\C-m" 'nxml-split-element) |
| 408 | (define-key map "\C-c\C-b" 'nxml-balanced-close-start-tag-block) | 409 | (define-key map "\C-c\C-b" 'nxml-balanced-close-start-tag-block) |
| 409 | (define-key map "\C-c\C-i" 'nxml-balanced-close-start-tag-inline) | 410 | (define-key map "\C-c\C-i" 'nxml-balanced-close-start-tag-inline) |
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index eb84be601de..12f561c6814 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el | |||
| @@ -214,6 +214,7 @@ parenthetical grouping.") | |||
| 214 | (define-key map "\C-c\M-\C-d" 'octave-down-block) | 214 | (define-key map "\C-c\M-\C-d" 'octave-down-block) |
| 215 | (define-key map "\C-c\M-\C-h" 'octave-mark-block) | 215 | (define-key map "\C-c\M-\C-h" 'octave-mark-block) |
| 216 | (define-key map "\C-c]" 'octave-close-block) | 216 | (define-key map "\C-c]" 'octave-close-block) |
| 217 | (define-key map "\C-c/" 'octave-close-block) | ||
| 217 | (define-key map "\C-c\C-f" 'octave-insert-defun) | 218 | (define-key map "\C-c\C-f" 'octave-insert-defun) |
| 218 | (define-key map "\C-c\C-h" 'octave-help) | 219 | (define-key map "\C-c\C-h" 'octave-help) |
| 219 | (define-key map "\C-c\C-il" 'octave-send-line) | 220 | (define-key map "\C-c\C-il" 'octave-send-line) |