mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-04 06:31:13 -08:00
Code Issues Projects Releases Wiki Activity

Load ediff-*.el files silently.

Browse source
This commit is contained in:
Glenn Morris 2007-11-27 03:59:56 +00:00
parent 6980983d9a
commit 7b193954fc
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ediff-merg.el
View file

@ -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

4
lisp/ediff-mult.el
View file

@ -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

6
lisp/ediff-ptch.el
View file

@ -43,11 +43,11 @@
(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-mult)
(load "ediff-mult.el" nil nil 'nosuffix))
(load "ediff-mult.el" nil t 'nosuffix))
(or (featurep 'ediff)
(load "ediff.el" nil nil 'nosuffix))
(load "ediff.el" nil t 'nosuffix))
))
;; end pacifier