(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 f634890451d29a73cbfcd241501adae91fec6dbe..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>
 
@@ -123,8 +123,7 @@ comparison or merge operations are being performed."
        (fundamental-mode))
       (let ((output-buffer (ediff-rcs-get-output-buffer filename buff)))
        (delete-windows-on output-buffer)
-       (save-excursion
-         (set-buffer output-buffer)
+       (with-current-buffer output-buffer
          (apply 'call-process "co" nil t nil
                 ;; -q: quiet (no diagnostics)
                 (append switches rcs-default-co-switches