Re: rel-22 to trunk merge failures 2008-02-24

[Stefan Monnier]

> [Remember, all changes below are _not_ in the trunk, and will not be
>  merged later, so somebody needs to either make the appropriate change to
>  the trunk (including the ChangeLog entry), or confirm that it isn't
>  needed (e.g., the trunk already contains an equivalent change.
>  Thanks,   -Miles]


> M  src/w32term.c
> M  src/macterm.c
> M  lisp/diff-mode.el

I'll take care of the diff-mode.el changes, thanks Miles,


        Stefan