diff options
author | Glenn Morris <[email protected]> | 2007-11-27 04:00:50 +0000 |
---|---|---|
committer | Glenn Morris <[email protected]> | 2007-11-27 04:00:50 +0000 |
commit | 5e9938821878bb44ffc84518cda4b8ffa48de927 (patch) | |
tree | 3a65904675ad95df819caa942f3a086ab70cb8a3 /lisp/ediff-util.el | |
parent | 7b193954fc622b00a45dd1848c1ba50b3d96bbf2 (diff) |
Load ediff-*.el files silently.
Don't load reporter when compiling.
Diffstat (limited to 'lisp/ediff-util.el')
-rw-r--r-- | lisp/ediff-util.el | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 2ed8f73a28..2c8d246841 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -41,27 +41,23 @@ (defvar ediff-after-quit-hook-internal nil) -(and noninteractive - (eval-when-compile - (load "reporter" 'noerror))) - (eval-when-compile (let ((load-path (cons (expand-file-name ".") load-path))) (provide 'ediff-util) ; to break recursive load cycle (or (featurep 'ediff-init) - (load "ediff-init.el" nil nil 'nosuffix)) + (load "ediff-init.el" nil t 'nosuffix)) (or (featurep 'ediff-help) - (load "ediff-help.el" nil nil 'nosuffix)) + (load "ediff-help.el" nil t 'nosuffix)) (or (featurep 'ediff-mult) - (load "ediff-mult.el" nil nil 'nosuffix)) + (load "ediff-mult.el" nil t 'nosuffix)) (or (featurep 'ediff-wind) - (load "ediff-wind.el" nil nil 'nosuffix)) + (load "ediff-wind.el" nil t 'nosuffix)) (or (featurep 'ediff-diff) - (load "ediff-diff.el" nil nil 'nosuffix)) + (load "ediff-diff.el" nil t 'nosuffix)) (or (featurep 'ediff-merg) - (load "ediff-merg.el" nil nil 'nosuffix)) + (load "ediff-merg.el" nil t 'nosuffix)) (or (featurep 'ediff) - (load "ediff.el" nil nil 'nosuffix)) + (load "ediff.el" nil t 'nosuffix)) (or (featurep 'ediff-tbar) (featurep 'emacs) (load "ediff-tbar.el" 'noerror nil 'nosuffix)) |