aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2007-11-27 03:57:54 +0000
committerGlenn Morris <[email protected]>2007-11-27 03:57:54 +0000
commitc88af7493e37c28eeaae26112116194d085cc61f (patch)
tree6e8b3b0a15246cec4a6c01cc3621e2720dc80438
parente637bdf8633aa842af56ccaf81edd29f8bd9a48a (diff)
Load ediff-*.el files silently.
-rw-r--r--lisp/ediff-diff.el4
-rw-r--r--lisp/ediff-help.el2
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 06d7b60344..a835fb8e75 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -35,9 +35,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
diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el
index 0c37be3137..833260db67 100644
--- a/lisp/ediff-help.el
+++ b/lisp/ediff-help.el
@@ -33,7 +33,7 @@
(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))
))
;; end pacifier