[PATCH pkgs/ediff] Adapt ediff dependencies to new vc

Ville Skyttä scop at xemacs.org
Mon Oct 29 17:40:19 EDT 2007


On Monday 29 October 2007, Michael Kifer wrote:
> No problem. This is just for the makefile, which I do not maintain.

Actually, my bad - this patch lacks a related part which I have in my local 
tree.  In the new vc, vc-call is a macro, so vc-hooks needs to be loaded for 
ediff-vers.el (ediff-vc-latest-version) at compile time to avoid it being 
miscompiled.

I posted this patch in September but don't remember exactly why I haven't 
applied it, possibly because I don't remember seeing a reply to my post back 
then: http://calypso.tux.org/pipermail/xemacs-beta/2007-September/012194.html

Ok to apply this along with the rest of the previous patch?


Index: ediff-vers.el
===================================================================
RCS 
file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-vers.el,v
retrieving revision 1.17
diff -u -r1.17 ediff-vers.el
--- ediff-vers.el       23 Jan 2007 21:42:43 -0000      1.17
+++ ediff-vers.el       29 Oct 2007 21:32:29 -0000
@@ -61,6 +61,9 @@

 ;; VC.el support

+(eval-when-compile
+  (require 'vc-hooks)) ;; for vc-call macro
+
 (defun ediff-vc-latest-version (file)
   "Return the version level of the latest version of FILE in repository."
   (if (fboundp 'vc-latest-version)



More information about the XEmacs-Patches mailing list