Alan Mackenzie writes: Those members were removed in r5552 "Fix performance regression in refactored syntax cache", which also did a bunch of refactoring in syntax.c and syntax.h. Apparently your syntax.h and syntax.c are out of sync. My guess is that because you contributed the original ideas for the patch in r5545 "Alan Mackenzie's syntax cache bounds fix", you got a conflict between your code and mine in syntax.c, and it doesn't get updated. Why you didn't notice this earlier, I can't really say. :-) Check for up-to-date-ness with hg status and/or hg diff. Unless you've made other changes to syntax.c or other files that you don't want to lose, "hg update --clean" should give you a clean tree identical to the XEmacs repo's. If you're unsure, feel free to ask. _______________________________________________ XEmacs-Beta mailing list XEmacs-Beta(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-beta

Alan Mackenzie writes: Ah.:-) Unfortunately, that won't happen. All VCSes that I know of insist that you straighten out conflicts, and report back to them when they're fixed. Glad to hear it! BTW IIRC, one thing I found awkward about Mercurial is that if there is a conflict that you fix by hand, you need to use "hg resolve" to mark each such file as committable. Both git (for sure) and bzr (IIRC) accept the "add" command for this purpose, but I don't think hg does. If you're the kind of person who effortlessly remembers this kind of nitty-gritty detail, great! If not, don't bother trying to memorize it, just ask here when you do eventually run into it. :-) _______________________________________________ XEmacs-Beta mailing list XEmacs-Beta(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-beta