procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2009-11-24 Michael Kifer <kifer@cs.stonybrook.edu>

Browse source 
* ediff-vers.el (ediff-rcs-get-output-buffer): Revert the change
	made on 2009-11-22.
This commit is contained in:
Michael Kifer 2009-11-24 03:16:38 +00:00
parent 86677b58d0
commit a34d856516
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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

3
lisp/ediff-vers.el
View file

@ -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)))