Mercurial > emacs

changeset 86463:5c08bca00047

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Load ediff-*.el files silently.
author Glenn Morris <rgm@gnu.org>
date Tue, 27 Nov 2007 03:59:27 +0000
parents d755c1fce9b3
children bf560797cca0
files lisp/ediff-mult.el
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ediff-mult.el	Tue Nov 27 03:59:04 2007 +0000
+++ b/lisp/ediff-mult.el	Tue Nov 27 03:59:27 2007 +0000
@@ -115,9 +115,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