[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff.el,v |
Date: |
Tue, 27 Nov 2007 04:05:09 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/11/27 04:05:08
Index: ediff.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff.el,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- ediff.el 25 Nov 2007 16:48:31 -0000 1.91
+++ ediff.el 27 Nov 2007 04:05:08 -0000 1.92
@@ -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 @@
(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)