[Emacs-diffs] Changes to emacs/lisp/ediff-ptch.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/05/03 20:53:31

Index: ediff-ptch.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-ptch.el,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- ediff-ptch.el       10 Apr 2008 14:09:35 -0000      1.41
+++ ediff-ptch.el       3 May 2008 20:53:30 -0000       1.42
@@ -36,18 +36,8 @@
   :group 'ediff)
 
 ;; compiler pacifier
-(defvar ediff-window-A)
-(defvar ediff-window-B)
-(defvar ediff-window-C)
-(defvar ediff-use-last-dir)
-(defvar ediff-shell)
-
 (eval-when-compile
-  (require 'ediff-init)
-  (if (not (featurep 'ediff-mult))
-      (require 'ediff-mult))
-  (require 'ediff)
-  )
+  (require 'ediff))
 ;; end pacifier
 
 (require 'ediff-init)