diff options
Diffstat (limited to 'lisp/ediff.el')
| -rw-r--r-- | lisp/ediff.el | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index a2aafc90292..a53b93aee5b 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -113,22 +113,20 @@ (defvar ediff-last-dir-patch) (defvar ediff-patch-default-directory) -(and noninteractive - (eval-when-compile - (load-library "dired") - (load-library "info") - (load "pcl-cvs" 'noerror))) + (eval-when-compile + (and noninteractive + (load "dired" nil t)) (let ((load-path (cons (expand-file-name ".") load-path))) (provide 'ediff) ; to break recursive load cycle (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-ptch) - (load "ediff-ptch.el" nil nil 'nosuffix)) + (load "ediff-ptch.el" nil t 'nosuffix)) (or (featurep 'ediff-vers) - (load "ediff-vers.el" nil nil 'nosuffix)) + (load "ediff-vers.el" nil t 'nosuffix)) )) ;; end pacifier @@ -363,6 +361,7 @@ (list (cons 'ediff-job-name job-name)) merge-buffer-file))) +(declare-function diff-latest-backup-file "diff" (fn)) ;;;###autoload (defalias 'ediff 'ediff-files) @@ -1424,9 +1423,11 @@ Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'." When called interactively, displays the version." (interactive) (if (interactive-p) - (message (ediff-version)) + (message "%s" (ediff-version)) (format "Ediff %s of %s" ediff-version ediff-date))) +;; info is run first, and will autoload info.el. +(declare-function Info-goto-node "info" (nodename &optional fork)) ;;;###autoload (defun ediff-documentation (&optional node) |