Mercurial > emacs
diff lisp/ediff-init.el @ 91204:53108e6cea98
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 06 Dec 2007 09:51:45 +0000 |
| parents | 880960b70474 f110f62d8e3a |
| children | 2fcaae6177a5 |
line wrap: on
line diff
--- a/lisp/ediff-init.el Thu Dec 06 07:36:30 2007 +0000 +++ b/lisp/ediff-init.el Thu Dec 06 09:51:45 2007 +0000 @@ -37,10 +37,6 @@ (defvar ediff-multiframe) (defvar ediff-use-toolbar-p) (defvar mswindowsx-bitmap-file-path) - -(and noninteractive - (eval-when-compile - (load "ange-ftp" 'noerror))) ;; end pacifier ;; This is used to avoid compilation warnings. When emacs/xemacs forms can