Mercurial > emacs

diff lisp/ediff-merg.el @ 86462:d755c1fce9b3

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:04 +0000
parents 9355f9b7bbff
children 107ccd98fa12 53108e6cea98
line wrap: on
line diff
--- a/lisp/ediff-merg.el	Tue Nov 27 03:58:26 2007 +0000
+++ b/lisp/ediff-merg.el	Tue Nov 27 03:59:04 2007 +0000
@@ -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