From: Michael Kifer Date: Tue, 24 Nov 2009 03:16:38 +0000 (+0000) Subject: 2009-11-24 Michael Kifer X-Git-Tag: emacs-pretest-23.1.90~255 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a34d856516db603a6b4522972d844a3b9d3c64ee;p=emacs.git 2009-11-24 Michael Kifer * ediff-vers.el (ediff-rcs-get-output-buffer): Revert the change made on 2009-11-22. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 212ab1f1846..a3b6b604480 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-11-24 Michael Kifer + + * ediff-vers.el (ediff-rcs-get-output-buffer): Revert the change + made on 2009-11-22. + 2009-11-24 Glenn Morris * bookmark.el (bookmark-bmenu-hide-filenames): Remove assignment to diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 0cc321ade33..b5c0c0bd942 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -136,8 +136,7 @@ comparison or merge operations are being performed." ;; 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)))