procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Load dired and ediff-*.el files silently.

Browse source 
Don't load info, pcl-cvs when compiling.
(Info-goto-node): Declare as a function.
This commit is contained in:
Glenn Morris 2007-11-27 04:05:08 +00:00
parent a61506a749
commit 76d0c4088f
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lisp/ediff.el
View file

@ -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
@ -1428,6 +1426,8 @@ When called interactively, displays the version."
(message (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)