aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorGlenn Morris2012-02-05 19:20:11 -0800
committerGlenn Morris2012-02-05 19:20:11 -0800
commitdac86404ae17873adeff3f1f977b443a72772884 (patch)
treeac7b496926835031547d9e755e6da103829cc9e8 /etc
parent91d2ed4e3b1650f1eaa4e9c2e291d574d95bd8ea (diff)
downloademacs-dac86404ae17873adeff3f1f977b443a72772884.tar.gz
emacs-dac86404ae17873adeff3f1f977b443a72772884.zip
Document make-composed-keymap
* doc/lispref/keymaps.texi (Inheritance and Keymaps): Mention make-composed-keymap and multiple inheritance. * etc/NEWS: Related edits.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS7
1 files changed, 5 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index f1088874eb8..2e50271d2dd 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1412,8 +1412,11 @@ as well as those in the -*- line.
1412--- 1412---
1413** rx.el has a new `group-n' construct for explicitly numbered groups. 1413** rx.el has a new `group-n' construct for explicitly numbered groups.
1414 1414
1415** keymaps can inherit from multiple parents. 1415+++
1416There is a new function `make-composed-keymap' that [does something]. 1416** New function `make-composed-keymap' that constructs a new keymap
1417from multiple input maps. You can use this to make a keymap that
1418inherits from multiple maps, eg:
1419 (set-keymap-parent newmap (make-composed-keymap othermap parent))
1417 1420
1418+++ 1421+++
1419** Set `debug-on-event' to make Emacs enter the debugger e.g. on receipt 1422** Set `debug-on-event' to make Emacs enter the debugger e.g. on receipt