aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ediff-merg.el4
-rw-r--r--lisp/ediff-mult.el4
-rw-r--r--lisp/ediff-ptch.el6
3 files changed, 7 insertions, 7 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index d9d19f17630..95f3efca93b 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -37,9 +37,9 @@
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
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 51502615cf7..97c05e3b3cb 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -115,9 +115,9 @@
115(eval-when-compile 115(eval-when-compile
116 (let ((load-path (cons (expand-file-name ".") load-path))) 116 (let ((load-path (cons (expand-file-name ".") load-path)))
117 (or (featurep 'ediff-init) 117 (or (featurep 'ediff-init)
118 (load "ediff-init.el" nil nil 'nosuffix)) 118 (load "ediff-init.el" nil t 'nosuffix))
119 (or (featurep 'ediff-util) 119 (or (featurep 'ediff-util)
120 (load "ediff-util.el" nil nil 'nosuffix)) 120 (load "ediff-util.el" nil t 'nosuffix))
121 )) 121 ))
122;; end pacifier 122;; end pacifier
123 123
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index 2efa2ac3012..905a07c53df 100644
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -43,11 +43,11 @@
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