CVS update by michaelk packages/xemacs-packages/ediff, ediff-util.el ...

[xemacs-cvs at xemacs.org]

  User: michaelk
  Date: 08/01/10 07:59:16

  Modified:    packages/xemacs-packages/ediff ediff.el ediff-wind.el
                        ediff-util.el ChangeLog
Log:
	* ediff*.el: uncommented declare-function.

Revision  Changes    Path
1.42      +5 -3      XEmacs/packages/xemacs-packages/ediff/ediff.el

Index: ediff.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff.el,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- ediff.el	2008/01/09 06:34:31	1.41
+++ ediff.el	2008/01/10 06:59:14	1.42
@@ -113,7 +113,10 @@
 (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
        (load "dired" nil t))
@@ -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 @@ When called interactively, displays the 
     (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)



1.28      +7 -3      XEmacs/packages/xemacs-packages/ediff/ediff-wind.el

Index: ediff-wind.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-wind.el,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ediff-wind.el	2008/01/09 06:34:31	1.27
+++ ediff-wind.el	2008/01/10 06:59:14	1.28
@@ -40,6 +40,11 @@
 (defvar frame-icon-title-format)
 (defvar ediff-diff-status)
 
+;; declare-function does not exist in XEmacs
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
+
+
 (eval-when-compile
   (let ((load-path (cons (expand-file-name ".") load-path)))
     (or (featurep 'ediff-init)
@@ -147,10 +152,9 @@ In this case, Ediff will use those frame
   :type 'function
   :group 'ediff-window)
 
-;; declare-function does not exist in XEmacs
 ;; Definitions hidden from the compiler by compat wrappers.
-;;(declare-function ediff-display-pixel-width "ediff-init")
-;;(declare-function ediff-display-pixel-height "ediff-init")
+(declare-function ediff-display-pixel-width "ediff-init")
+(declare-function ediff-display-pixel-height "ediff-init")
 
 (defconst ediff-control-frame-parameters
   (list



1.39      +4 -3      XEmacs/packages/xemacs-packages/ediff/ediff-util.el

Index: ediff-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-util.el,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ediff-util.el	2008/01/09 06:34:32	1.38
+++ ediff-util.el	2008/01/10 06:59:14	1.39
@@ -41,6 +41,9 @@
 
 (defvar ediff-after-quit-hook-internal nil)
 
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
+
 (eval-when-compile
   (let ((load-path (cons (expand-file-name ".") load-path)))
     (provide 'ediff-util) ; to break recursive load cycle
@@ -2820,10 +2823,8 @@ up an appropriate window config."
   (message
    "To resume, type M-x eregistry and select the desired Ediff session"))
 
-
 ;; ediff-barf-if-not-control-buffer ensures only called from ediff.
-;; declare-function does not exist in XEmacs
-;;(declare-function ediff-version "ediff" ()))
+(declare-function ediff-version "ediff" ())
 
 (defun ediff-status-info ()
   "Show the names of the buffers or files being operated on by Ediff.



1.128     +5 -0      XEmacs/packages/xemacs-packages/ediff/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ChangeLog,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- ChangeLog	2008/01/09 10:01:34	1.127
+++ ChangeLog	2008/01/10 06:59:15	1.128
@@ -1,3 +1,8 @@
+2008-01-10  Michael Kifer  <kifer at cs.stonybrook.edu>
+	
+		
+	* ediff*.el: uncommented declare-function.
+	
 2008-01-09  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.73 released.