Mercurial > emacs
diff lisp/ediff-vers.el @ 106192:a2ee981efbec
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.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Sun, 22 Nov 2009 03:14:14 +0000 |
| parents | 009383a57ce8 |
| children | 74565da884e6 |
line wrap: on
line diff
--- a/lisp/ediff-vers.el Sun Nov 22 02:19:23 2009 +0000 +++ b/lisp/ediff-vers.el Sun Nov 22 03:14:14 2009 +0000 @@ -136,7 +136,8 @@ ;; Optional NAME is name to use instead of `*RCS-output*'. ;; This is a modified version from rcs.el v1.1. I use it here to make ;; Ediff immune to changes in rcs.el - (let ((buf (get-buffer-create name))) + (let* ((default-major-mode 'fundamental-mode) ; no frills! + (buf (get-buffer-create name))) (with-current-buffer buf (setq buffer-read-only nil default-directory (file-name-directory (expand-file-name file)))