diff options
| author | Michael Kifer | 2009-12-07 06:56:40 +0000 |
|---|---|---|
| committer | Michael Kifer | 2009-12-07 06:56:40 +0000 |
| commit | 2de386ca1d481a544e6fed79baaa19adcc80161d (patch) | |
| tree | 4037b6959bfce053dec319fdb1336ba1e22a385a /lisp/ChangeLog | |
| parent | dab816a917fffcd49a26b422a7b5d435bc3e8b78 (diff) | |
| download | emacs-2de386ca1d481a544e6fed79baaa19adcc80161d.tar.gz emacs-2de386ca1d481a544e6fed79baaa19adcc80161d.zip | |
2009-12-07 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-init.el (ediff-event-key): use event-to-character instead of
event-key.
* ediff-mult.el (ediff-setup-meta-map, ediff-prepare-meta-buffer): add
menus to the meta mode. (Dan Nicolaescu's <dann@ics.uci.edu> patch.)
* ediff.el (ediff-buffers-internal): add unwind-protect.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b1472f76bfb..be160bf9abe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2009-12-07 Michael Kifer <kifer@cs.stonybrook.edu> | ||
| 2 | |||
| 3 | * ediff-init.el (ediff-event-key): use event-to-character instead of | ||
| 4 | event-key. | ||
| 5 | |||
| 6 | * ediff-mult.el (ediff-setup-meta-map, ediff-prepare-meta-buffer): add | ||
| 7 | menus to the meta mode. (Dan Nicolaescu's <dann@ics.uci.edu> patch.) | ||
| 8 | |||
| 9 | * ediff.el (ediff-buffers-internal): add unwind-protect. | ||
| 10 | |||
| 1 | 2009-12-07 Michael Albinus <michael.albinus@gmx.de> | 11 | 2009-12-07 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 12 | ||
| 3 | Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphaël | 13 | Handle prompt rules of ksh in OpenBSD 4.5. Reported by Raphaël |