diff options
Diffstat (limited to 'lisp/ediff-ptch.el')
-rw-r--r-- | lisp/ediff-ptch.el | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index f8d0810bd9d..b2775816a8c 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/ediff-ptch.el @@ -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) |