diff options
| author | Glenn Morris | 2007-11-27 04:01:30 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-11-27 04:01:30 +0000 |
| commit | 1dee844f0c6f8ba2da39a95e17e8083e1441c907 (patch) | |
| tree | 011be6f3bf442358dd5c7600110ac26c3d76d50d | |
| parent | 2f78f9049a8b74605814453a6265b33d048a8028 (diff) | |
| download | emacs-1dee844f0c6f8ba2da39a95e17e8083e1441c907.tar.gz emacs-1dee844f0c6f8ba2da39a95e17e8083e1441c907.zip | |
Load ediff-*.el files silently.
| -rw-r--r-- | lisp/ediff-vers.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 293acc5a854..0fd06176b46 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | (load "rcs" 'noerror) | 41 | (load "rcs" 'noerror) |
| 42 | ;; (load "vc" 'noerror) ; this sometimes causes compiler error | 42 | ;; (load "vc" 'noerror) ; this sometimes causes compiler error |
| 43 | (or (featurep 'ediff-init) | 43 | (or (featurep 'ediff-init) |
| 44 | (load "ediff-init.el" nil nil 'nosuffix)) | 44 | (load "ediff-init.el" nil t 'nosuffix)) |
| 45 | ))) | 45 | ))) |
| 46 | ;; end pacifier | 46 | ;; end pacifier |
| 47 | 47 | ||