diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2009-11-22 03:14:14 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2009-11-22 03:14:14 +0000 |
| commit | 433d9ace74fbd35205c06bcef487bd3e5d41e6bb (patch) | |
| tree | a7d85bd9038bbc883093b9a830980723b4639b03 /lisp/ediff-init.el | |
| parent | 5ea5dbc9255d4abf0e2ab727167a2c9ba9c11076 (diff) | |
| download | emacs-433d9ace74fbd35205c06bcef487bd3e5d41e6bb.tar.gz | |
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el: use viper-last-command-char instead of
last-command-char/last-command-event.
(viper-prefix-arg-value): do correct conversion of event-char for
XEmacs.
* viper-util.el, viper.el: use viper-last-command-char instead of
last-command-char/last-command-event.
* ediff-init.el, ediff-mult.el, ediff-util.el: relpace
last-command-char and last-command-event with (ediff-last-command-char) everywhere.
* ediff-vers.el (ediff-rcs-get-output-buffer): make sure the buffer is
created in fundamental mode.
* ediff.el (ediff-version): revert the change of interactive-p to
called-interactively-p.
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index d58008f9d12..09c62df631d 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -1551,6 +1551,9 @@ This default should work without changes." (if (eventp event-or-key) (event-key event-or-key) event-or-key) event-or-key)) +(defun ediff-last-command-char () + (ediff-event-key last-command-event)) + (defsubst ediff-frame-iconified-p (frame) (and (ediff-window-display-p) (frame-live-p frame) |