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.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.el')
| -rw-r--r-- | lisp/ediff.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index 33f53130caf..ad2f3c0de2e 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -1451,7 +1451,9 @@ Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'." "Return string describing the version of Ediff. When called interactively, displays the version." (interactive) - (if (called-interactively-p 'interactive) + ;; called-interactively-p - not in XEmacs + ;; (if (called-interactively-p 'interactive) + (if (interactive-p) (message "%s" (ediff-version)) (format "Ediff %s of %s" ediff-version ediff-date))) |