diff lisp/ediff-mult.el @ 106192:a2ee981efbec

2009-11-22 Michael Kifer <[e-mail]> * 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.

--- a/lisp/ediff-mult.el	Sun Nov 22 02:19:23 2009 +0000
+++ b/lisp/ediff-mult.el	Sun Nov 22 03:14:14 2009 +0000
@@ -2342,10 +2342,10 @@
 This is used only for sessions that involve 2 or 3 files at the same time.
 ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, mark
 for operation, or simply indicate which are equal files.  If it is nil, then
-`last-command-event' is used to decide which action to take."
+`(ediff-last-command-char)' is used to decide which action to take."
   (interactive)
   (if (null action)
-      (setq action last-command-event))
+      (setq action (ediff-last-command-char)))
   (let ((list (cdr ediff-meta-list))
 	marked1 marked2 marked3
 	fileinfo1 fileinfo2 fileinfo3 elt)