(ps-mule-begin-job): Fix for the case that only ENCODING is set in a font-spec (bug...

[gnu-emacs] / lisp / ediff-vers.el

diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index 0cc321ade334a5be538dce01b8bd5e1ac2126703..e314afc24b5e31dfa13c06f974cd304e72e0092b 100644 (file)
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -1,7 +1,7 @@
 ;;; ediff-vers.el --- version control interface to Ediff
 
 ;; Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
@@ -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)))