Mercurial > emacs
view src/s/usg5-4-3.h @ 66687:26faad662ac6
2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-merge.el (ediff-merge-region-is-non-clash): return t, if not
merging.
* ediff-util.el (ediff-previous-difference): don't skip regions that
have merge clashes.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Fri, 04 Nov 2005 05:40:03 +0000 |
parents | 695cf19ef79e |
children | 375f2633d815 |
line wrap: on
line source
/* s/ file for System V release 4.3. */ #include "usg5-4-2.h" /* Bill_Mann@PraxisInt.com: without this switch emacs generates this error on start up for an i486-ncr-sysv4.3 (running the X toolkit): _XipOpenIM() Unable to find Atom _XIM_INPUTMETHOD */ #define X11R5_INHIBIT_I18N /* arch-tag: 03ac8b3a-c3d4-4441-a773-1c1d9f111f1a (do not change this comment) */