[Emacs-diffs] emacs/lisp ChangeLog ediff-vers.el

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   09/11/24 03:16:41

Modified files:
        lisp           : ChangeLog ediff-vers.el 

Log message:
        2009-11-24  Michael Kifer  <address@hidden>
                
                * ediff-vers.el (ediff-rcs-get-output-buffer): Revert the change
                made on 2009-11-22.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16713&r2=1.16714
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-vers.el?cvsroot=emacs&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16713
retrieving revision 1.16714
diff -u -b -r1.16713 -r1.16714
--- ChangeLog   24 Nov 2009 02:38:08 -0000      1.16713
+++ ChangeLog   24 Nov 2009 03:16:38 -0000      1.16714
@@ -1,3 +1,8 @@
+2009-11-24  Michael Kifer  <address@hidden>
+       
+       * ediff-vers.el (ediff-rcs-get-output-buffer): Revert the change
+       made on 2009-11-22.
+       
 2009-11-24  Glenn Morris  <address@hidden>
 
        * bookmark.el (bookmark-bmenu-hide-filenames): Remove assignment to

Index: ediff-vers.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-vers.el,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- ediff-vers.el       22 Nov 2009 03:14:15 -0000      1.48
+++ ediff-vers.el       24 Nov 2009 03:16:41 -0000      1.49
@@ -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)))