(dired-view-command-alist): New variable.

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

diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index aca09b19b27e0c59c7821aa3483dbfee307b7cda..88d4ea16d7b26658c0865bbdd59cda650cb3ec14 100644 (file)
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -1,8 +1,8 @@
 ;;; ediff-vers.el --- version control interface to Ediff
 
-;;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+;;; Copyright (C) 1995, 96, 97, 2002 Free Software Foundation, Inc.
 
-;; Author: Michael Kifer <kifer@cs.sunysb.edu>
+;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
 ;; This file is part of GNU Emacs.
 
@@ -21,6 +21,7 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
 
 ;;; Code:
 
@@ -34,10 +35,20 @@
 
 (and noninteractive
      (eval-when-compile
-       (load "pcl-cvs" 'noerror)
-       (load "rcs" 'noerror)
-       (load "generic-sc" 'noerror)
-       (load "vc" 'noerror)))
+       (let ((load-path (cons (expand-file-name ".") load-path)))
+        (load "pcl-cvs" 'noerror)
+        (load "rcs" 'noerror)
+        ;; On 8+3 MS-DOS filesystems, generic-x.el is loaded
+        ;; instead of (the missing) generic-sc.el.  Since the
+        ;; version of Emacs which supports MS-DOS doesn't have
+        ;; generic-sc, we simply avoid loading it.
+        (or (and (fboundp 'msdos-long-file-names)
+                 (not (msdos-long-file-names)))
+            (load "generic-sc" 'noerror))
+        ;; (load "vc" 'noerror) ; this sometimes causes compiler error
+        (or (featurep 'ediff-init)
+            (load "ediff-init.el" nil nil 'nosuffix))
+        )))
 ;; end pacifier
       
 ;; VC.el support
@@ -80,6 +91,8 @@
     (message "Working ...")
     (setq filename (expand-file-name filename))
     (with-output-to-temp-buffer buff
+      (ediff-with-current-buffer standard-output
+       (fundamental-mode))
       (let ((output-buffer (ediff-rcs-get-output-buffer filename buff)))
        (delete-windows-on output-buffer)
        (save-excursion
@@ -237,7 +250,7 @@
 
 ;; PCL-CVS.el support
 
-
+;; MK: Check. This function doesn't seem to be used any more by pcvs or pcl-cvs
 (defun cvs-run-ediff-on-file-descriptor (tin)
 ;; This is a replacement for cvs-emerge-mode
 ;; Runs after cvs-update.