Mercurial > emacs
diff lisp/ediff-mult.el @ 101010:4efc7ca085ce
Replace last-command-char with last-command-event.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 09 Jan 2009 04:44:15 +0000 |
parents | a9dc0e7c3f2b |
children | c55394eee0de |
line wrap: on
line diff
--- a/lisp/ediff-mult.el Fri Jan 09 04:36:00 2009 +0000 +++ b/lisp/ediff-mult.el Fri Jan 09 04:44:15 2009 +0000 @@ -2344,10 +2344,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-char' is used to decide which action to take." +`last-command-event' is used to decide which action to take." (interactive) (if (null action) - (setq action last-command-char)) + (setq action last-command-event)) (let ((list (cdr ediff-meta-list)) marked1 marked2 marked3 fileinfo1 fileinfo2 fileinfo3 elt)