Hans de Graaff writes:
Attached to this mail are a patch for the ruby-modes package and two
new
files. This is basically a sync to the upstream version distributed with
ruby 1.8.5_pre4. The patch is rather large because there have been many
changes upstream.
The patch looks reasonable (it's not all that large considering the
interval since the last sync).
Do you need a separate ruby-electric.el.upstream? We generally only
use that convention for collisions of very different files (in
particular, our Makefile is rarely at all similar to an upstream
Makefile), or files that for some reason we do not want to be loaded
in the XEmacs version. In this case it looks like the only
differences are one autoload cookie and two tiny style changes. In
that case it makes more sense to add the upstream version to the CVS
mainline (or a vendor branch, if you remember that ancient technology)
and just deal with the merges as you go.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches