Mark Triggs <[EMAIL PROTECTED]> writes: > Masatake YAMATO <[EMAIL PROTECTED]> writes: > >> I'm trying to merge mark's xtla--main--0.1--patch-77. >> And I found duplicated code in the revision. >> >> tla--buffers-menu is existed in both xtla.el and xtla-core.el. >> I may find more. I will report again. > > Hm... that's strange. It looks like I've made an error while merging. > I'll try getting a copy of my patch-76 and repeat the merge to see if I > can work out what went wrong. I'll post back here once I know what's > going on :o)
Right. The problem was that I included your base-0 in my merge, and a bunch of old patches got reapplied and made a general mess of things :o) There's a patch in my archive (patch-79) that undoes all of this and should set things right. Everyone: please be sure to apply my patch-79 if you have applied my patch-77. Take care, Mark -- Mark Triggs <[EMAIL PROTECTED]>
