* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8f961471b80d71007cfb2ed8b44694cdb9bea6a..b7c5c5827e84ec9345280b7074009784552c1330 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-20  Chong Yidong  <cyd@stupidchicken.com>
+
+       * 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.
+
 2010-05-20  Juanma Barranquero  <lekktu@gmail.com>
 
        * composite.el: Require cl when compiling.

diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 5eb9840a4ca2b6a480457e617c7738b1d1d1bb0a..101b2585186bc1c5e7dc61789a41e8f6115609d0 100644 (file)
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -404,6 +404,7 @@ reference.")
     (define-key map "\M-}" 'nxml-forward-paragraph)
     (define-key map "\M-h" 'nxml-mark-paragraph)
     (define-key map "\C-c\C-f" 'nxml-finish-element)
+    (define-key map "\C-c/" 'nxml-finish-element)
     (define-key map "\C-c\C-m" 'nxml-split-element)
     (define-key map "\C-c\C-b" 'nxml-balanced-close-start-tag-block)
     (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 eb84be601de6326a74dd70455eeb0bc1ecadfac3..12f561c68148392338efd6416df47f0962e4d485 100644 (file)
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -214,6 +214,7 @@ parenthetical grouping.")
     (define-key map "\C-c\M-\C-d" 'octave-down-block)
     (define-key map "\C-c\M-\C-h" 'octave-mark-block)
     (define-key map "\C-c]" 'octave-close-block)
+    (define-key map "\C-c/" 'octave-close-block)
     (define-key map "\C-c\C-f" 'octave-insert-defun)
     (define-key map "\C-c\C-h" 'octave-help)
     (define-key map "\C-c\C-il" 'octave-send-line)