Mercurial > emacs

comparison 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
comparison
equal deleted inserted replaced
86461:f110f62d8e3a 86462:d755c1fce9b3
35 (defvar ediff-window-config-saved) 35 (defvar ediff-window-config-saved)
36 36
37 (eval-when-compile 37 (eval-when-compile
38 (let ((load-path (cons (expand-file-name ".") load-path))) 38 (let ((load-path (cons (expand-file-name ".") load-path)))
39 (or (featurep 'ediff-init) 39 (or (featurep 'ediff-init)
40 (load "ediff-init.el" nil nil 'nosuffix)) 40 (load "ediff-init.el" nil t 'nosuffix))
41 (or (featurep 'ediff-util) 41 (or (featurep 'ediff-util)
42 (load "ediff-util.el" nil nil 'nosuffix)) 42 (load "ediff-util.el" nil t 'nosuffix))
43 )) 43 ))
44 ;; end pacifier 44 ;; end pacifier
45 45
46 (require 'ediff-init) 46 (require 'ediff-init)
47 47