Mercurial > emacs

comparison lisp/ediff-util.el @ 86465:c1445e6992c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Load ediff-*.el files silently. Don't load reporter when compiling.
author Glenn Morris <rgm@gnu.org>
date Tue, 27 Nov 2007 04:00:50 +0000
parents 51aa47312c4b
children 2039ff581b31
comparison
equal deleted inserted replaced
86464:bf560797cca0 86465:c1445e6992c4
39 (defvar bottom-toolbar-height) 39 (defvar bottom-toolbar-height)
40 (defvar mark-active) 40 (defvar mark-active)
41 41
42 (defvar ediff-after-quit-hook-internal nil) 42 (defvar ediff-after-quit-hook-internal nil)
43 43
44 (and noninteractive
45 (eval-when-compile
46 (load "reporter" 'noerror)))
47
48 (eval-when-compile 44 (eval-when-compile
49 (let ((load-path (cons (expand-file-name ".") load-path))) 45 (let ((load-path (cons (expand-file-name ".") load-path)))
50 (provide 'ediff-util) ; to break recursive load cycle 46 (provide 'ediff-util) ; to break recursive load cycle
51 (or (featurep 'ediff-init) 47 (or (featurep 'ediff-init)
52 (load "ediff-init.el" nil nil 'nosuffix)) 48 (load "ediff-init.el" nil t 'nosuffix))
53 (or (featurep 'ediff-help) 49 (or (featurep 'ediff-help)
54 (load "ediff-help.el" nil nil 'nosuffix)) 50 (load "ediff-help.el" nil t 'nosuffix))
55 (or (featurep 'ediff-mult) 51 (or (featurep 'ediff-mult)
56 (load "ediff-mult.el" nil nil 'nosuffix)) 52 (load "ediff-mult.el" nil t 'nosuffix))
57 (or (featurep 'ediff-wind) 53 (or (featurep 'ediff-wind)
58 (load "ediff-wind.el" nil nil 'nosuffix)) 54 (load "ediff-wind.el" nil t 'nosuffix))
59 (or (featurep 'ediff-diff) 55 (or (featurep 'ediff-diff)
60 (load "ediff-diff.el" nil nil 'nosuffix)) 56 (load "ediff-diff.el" nil t 'nosuffix))
61 (or (featurep 'ediff-merg) 57 (or (featurep 'ediff-merg)
62 (load "ediff-merg.el" nil nil 'nosuffix)) 58 (load "ediff-merg.el" nil t 'nosuffix))
63 (or (featurep 'ediff) 59 (or (featurep 'ediff)
64 (load "ediff.el" nil nil 'nosuffix)) 60 (load "ediff.el" nil t 'nosuffix))
65 (or (featurep 'ediff-tbar) 61 (or (featurep 'ediff-tbar)
66 (featurep 'emacs) 62 (featurep 'emacs)
67 (load "ediff-tbar.el" 'noerror nil 'nosuffix)) 63 (load "ediff-tbar.el" 'noerror nil 'nosuffix))
68 )) 64 ))
69 ;; end pacifier 65 ;; end pacifier