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

[xemacs-cvs at xemacs.org]

  User: michaelk
  Date: 08/04/06 21:33:37

  Modified:    packages/xemacs-packages/ediff ediff.el ediff-wind.el
                        ediff-vers.el ediff-util.el ChangeLog
Log:
	* ediff*.el: replace 3-argument 'require' statements with 1-argument
	ones (wrapped in if's). For compatibility with the current stable
	version of XEmacs.

Revision  Changes    Path
1.44      +1 -1      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.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- ediff.el	2008/04/04 08:06:12	1.43
+++ ediff.el	2008/04/06 19:33:35	1.44
@@ -8,7 +8,7 @@
 ;; Keywords: comparing, merging, patching, tools, unix
 
 (defconst ediff-version "2.81.2" "The current version of Ediff")
-(defconst ediff-date "January 09, 2008" "Date of last update")
+(defconst ediff-date "April 06, 2008" "Date of last update")
 
 
 ;; This file is part of GNU Emacs.



1.30      +3 -5      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.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ediff-wind.el	2008/04/04 08:06:12	1.29
+++ ediff-wind.el	2008/04/06 19:33:36	1.30
@@ -49,7 +49,8 @@
   (require 'ediff-init)
   (require 'ediff-util)
   (require 'ediff-help)
-  (require 'ediff-tbar nil 'noerror)
+  (if (featurep 'xemacs)
+      (require 'ediff-tbar))
   )
 ;; end pacifier
 
@@ -57,10 +58,7 @@
 
 ;; be careful with ediff-tbar
 (if (featurep 'xemacs)
-    (condition-case nil
-	(require 'ediff-tbar)
-      (error
-       (defun ediff-compute-toolbar-width () 0)))
+    (require 'ediff-tbar)
   (defun ediff-compute-toolbar-width () 0))
 
 (defgroup ediff-window nil



1.22      +8 -2      XEmacs/packages/xemacs-packages/ediff/ediff-vers.el

Index: ediff-vers.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-vers.el,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ediff-vers.el	2008/04/04 08:06:12	1.21
+++ ediff-vers.el	2008/04/06 19:33:36	1.22
@@ -36,8 +36,14 @@
 
 (and noninteractive
      (eval-when-compile
-       (require 'pcvs nil 'noerror)
-       (require 'rcs nil 'noerror)
+       (condition-case nil
+	   ;; for compatibility with current stable version of xemacs
+	   (progn
+	     ;;(require 'pcvs nil 'noerror)
+	     ;;(require 'rcs nil 'noerror)
+	     (require 'pcvs)
+	     (require 'rcs))
+	 (error nil))
        (require 'vc)
        (require 'ediff-init)
        ))



1.41      +4 -1      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.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- ediff-util.el	2008/04/04 08:06:13	1.40
+++ ediff-util.el	2008/04/06 19:33:36	1.41
@@ -57,7 +57,9 @@
       (require 'ediff-diff))
   (require 'ediff-merg)
   (require 'ediff)
-  (require 'ediff-tbar nil 'noerror)
+  ;; for compatibility with current stable version of xemacs
+  (if (featurep 'xemacs)
+      (require 'ediff-tbar))
   )
 ;; end pacifier
 
@@ -69,6 +71,7 @@
 (require 'ediff-diff)
 (require 'ediff-merg)
 
+;; for compatibility with current stable version of xemacs
 (if (featurep 'xemacs)
     (require 'ediff-tbar))
 



1.131     +6 -0      XEmacs/packages/xemacs-packages/ediff/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ChangeLog,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- ChangeLog	2008/04/04 08:06:14	1.130
+++ ChangeLog	2008/04/06 19:33:36	1.131
@@ -1,3 +1,9 @@
+2008-04-06  Michael Kifer  <kifer at cs.stonybrook.edu>
+	
+	* ediff*.el: replace 3-argument 'require' statements with 1-argument
+	ones (wrapped in if's). For compatibility with the current stable
+	version of XEmacs.
+	
 2008-04-04  Michael Kifer  <kifer at cs.stonybrook.edu>
 	
 	* ediff*el: replaced load with require in eval-when-compile.