Mercurial > emacs
comparison lisp/ediff-ptch.el @ 86464:bf560797cca0
Load ediff-*.el files silently.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 27 Nov 2007 03:59:56 +0000 |
parents | 8074127c97d7 |
children | 107ccd98fa12 53108e6cea98 |
comparison
equal
deleted
inserted
replaced
86463:5c08bca00047 | 86464:bf560797cca0 |
---|---|
41 (defvar ediff-shell) | 41 (defvar ediff-shell) |
42 | 42 |
43 (eval-when-compile | 43 (eval-when-compile |
44 (let ((load-path (cons (expand-file-name ".") load-path))) | 44 (let ((load-path (cons (expand-file-name ".") load-path))) |
45 (or (featurep 'ediff-init) | 45 (or (featurep 'ediff-init) |
46 (load "ediff-init.el" nil nil 'nosuffix)) | 46 (load "ediff-init.el" nil t 'nosuffix)) |
47 (or (featurep 'ediff-mult) | 47 (or (featurep 'ediff-mult) |
48 (load "ediff-mult.el" nil nil 'nosuffix)) | 48 (load "ediff-mult.el" nil t 'nosuffix)) |
49 (or (featurep 'ediff) | 49 (or (featurep 'ediff) |
50 (load "ediff.el" nil nil 'nosuffix)) | 50 (load "ediff.el" nil t 'nosuffix)) |
51 )) | 51 )) |
52 ;; end pacifier | 52 ;; end pacifier |
53 | 53 |
54 (require 'ediff-init) | 54 (require 'ediff-init) |
55 | 55 |