[Emacs-diffs] Changes to emacs/lisp/ediff.el,v

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   08/01/10 06:54:14

Index: ediff.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff.el,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- ediff.el    9 Jan 2008 06:16:06 -0000       1.95
+++ ediff.el    10 Jan 2008 06:54:11 -0000      1.96
@@ -113,6 +113,9 @@
 (defvar ediff-last-dir-patch)
 (defvar ediff-patch-default-directory)
 
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
+
 
 (eval-when-compile
   (and noninteractive
@@ -361,8 +364,7 @@
                 (list (cons 'ediff-job-name job-name))
                 merge-buffer-file)))
 
-;; declare-function does not exist in XEmacs
-;;(declare-function diff-latest-backup-file "diff" (fn)))
+(declare-function diff-latest-backup-file "diff" (fn))
 
 ;;;###autoload
 (defalias 'ediff 'ediff-files)
@@ -1428,7 +1430,7 @@
     (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))
+(declare-function Info-goto-node "info" (nodename &optional fork))
 
 ;;;###autoload
 (defun ediff-documentation (&optional node)