aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorStefan Monnier2012-10-28 10:56:51 -0400
committerStefan Monnier2012-10-28 10:56:51 -0400
commit70edffb13005de4aa58ba818559b85aa63a1cdd4 (patch)
treef25322a5427af78d2f055a50cc008bb124eeaba5 /lisp/ChangeLog
parent3a51f0eb4168885b869641e9d5c98e3f40e5a515 (diff)
downloademacs-70edffb13005de4aa58ba818559b85aa63a1cdd4.tar.gz
emacs-70edffb13005de4aa58ba818559b85aa63a1cdd4.zip
* lisp/tmm.el (tmm-prompt): Use map-keymap.
* doc/lispref/keymaps.texi (Format of Keymaps): Document the multiple inheritance format. Fixes: debbugs:12744
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7349617d58..c52ed5e6e8b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-10-28 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * tmm.el (tmm-prompt): Use map-keymap (bug#12744).
4
12012-10-27 Eli Zaretskii <eliz@gnu.org> 52012-10-27 Eli Zaretskii <eliz@gnu.org>
2 6
3 * profiler.el (profiler-report-make-entry-part): Fix help-echo 7 * profiler.el (profiler-report-make-entry-part): Fix help-echo