From 433d9ace74fbd35205c06bcef487bd3e5d41e6bb Mon Sep 17 00:00:00 2001 From: Michael Kifer Date: Sun, 22 Nov 2009 03:14:14 +0000 Subject: 2009-11-22 Michael Kifer * 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. --- lisp/ediff-mult.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp/ediff-mult.el') diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index a1dfbded153..f2365f53060 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -2342,10 +2342,10 @@ If this is a session registry buffer then just bury it." 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) -- cgit v1.2.3