Mercurial > emacs
changeset 106213:74565da884e6
2009-11-24 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-vers.el (ediff-rcs-get-output-buffer): Revert the change
made on 2009-11-22.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Tue, 24 Nov 2009 03:16:38 +0000 |
| parents | eada49222b30 |
| children | 8653ee602137 |
| files | lisp/ChangeLog lisp/ediff-vers.el |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Nov 24 02:40:03 2009 +0000 +++ b/lisp/ChangeLog Tue Nov 24 03:16:38 2009 +0000 @@ -1,3 +1,8 @@ +2009-11-24 Michael Kifer <kifer@cs.stonybrook.edu> + + * ediff-vers.el (ediff-rcs-get-output-buffer): Revert the change + made on 2009-11-22. + 2009-11-24 Glenn Morris <rgm@gnu.org> * bookmark.el (bookmark-bmenu-hide-filenames): Remove assignment to
--- a/lisp/ediff-vers.el Tue Nov 24 02:40:03 2009 +0000 +++ b/lisp/ediff-vers.el Tue Nov 24 03:16:38 2009 +0000 @@ -136,8 +136,7 @@ ;; 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* ((default-major-mode 'fundamental-mode) ; no frills! - (buf (get-buffer-create name))) + (let ((buf (get-buffer-create name))) (with-current-buffer buf (setq buffer-read-only nil default-directory (file-name-directory (expand-file-name file)))