diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2009-12-07 06:56:40 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2009-12-07 06:56:40 +0000 |
| commit | 2de386ca1d481a544e6fed79baaa19adcc80161d (patch) | |
| tree | 4037b6959bfce053dec319fdb1336ba1e22a385a /lisp/ediff-init.el | |
| parent | dab816a917fffcd49a26b422a7b5d435bc3e8b78 (diff) | |
| download | emacs-2de386ca1d481a544e6fed79baaa19adcc80161d.tar.gz | |
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/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 09c62df631d..843fbf2979d 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -1548,7 +1548,8 @@ This default should work without changes." (defun ediff-event-key (event-or-key) (if (featurep 'xemacs) - (if (eventp event-or-key) (event-key event-or-key) event-or-key) + ;;(if (eventp event-or-key) (event-key event-or-key) event-or-key) + (if (eventp event-or-key) (event-to-character event-or-key t t) event-or-key) event-or-key)) (defun ediff-last-command-char () |