diff options
| author | Glenn Morris <rgm@gnu.org> | 2007-11-27 03:59:56 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2007-11-27 03:59:56 +0000 |
| commit | 7b193954fc622b00a45dd1848c1ba50b3d96bbf2 (patch) | |
| tree | dbe03a73a19505e3d4d8088195cdaab8cf152c7b /lisp/ediff-merg.el | |
| parent | 6980983d9ace0c6bad61e935cfe62ba81baffd0b (diff) | |
| download | emacs-7b193954fc622b00a45dd1848c1ba50b3d96bbf2.tar.gz | |
Load ediff-*.el files silently.
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index d9d19f17630..95f3efca93b 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -37,9 +37,9 @@ (eval-when-compile (let ((load-path (cons (expand-file-name ".") load-path))) (or (featurep 'ediff-init) - (load "ediff-init.el" nil nil 'nosuffix)) + (load "ediff-init.el" nil t 'nosuffix)) (or (featurep 'ediff-util) - (load "ediff-util.el" nil nil 'nosuffix)) + (load "ediff-util.el" nil t 'nosuffix)) )) ;; end pacifier |