diff options
| author | Glenn Morris | 2012-02-05 19:20:11 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-02-05 19:20:11 -0800 |
| commit | dac86404ae17873adeff3f1f977b443a72772884 (patch) | |
| tree | ac7b496926835031547d9e755e6da103829cc9e8 /doc/lispref/ChangeLog | |
| parent | 91d2ed4e3b1650f1eaa4e9c2e291d574d95bd8ea (diff) | |
| download | emacs-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 'doc/lispref/ChangeLog')
| -rw-r--r-- | doc/lispref/ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index e26f91b1b4c..5de2251c19f 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | 2012-02-06 Glenn Morris <rgm@gnu.org> | 1 | 2012-02-06 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * keymaps.texi (Tool Bar): Mention separators. | 3 | * keymaps.texi (Tool Bar): Mention separators. |
| 4 | (Inheritance and Keymaps): | ||
| 5 | Mention make-composed-keymap and multiple inheritance. | ||
| 4 | 6 | ||
| 5 | * modes.texi (Running Hooks): Mention run-hook-wrapped. | 7 | * modes.texi (Running Hooks): Mention run-hook-wrapped. |
| 6 | 8 | ||