Mercurial > emacs
view src/m/paragon.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
/* m/ file for Paragon i860 machine. */ #include "i860.h" #define COFF #define SYSTEM_MALLOC #define TEXT_START 0x10000 #define LIB_STANDARD -lc -lic -lmach #define KEEP_OLD_TEXT_SCNPTR #define KEEP_OLD_PADDR #define drem fmod /* arch-tag: c1bc280c-25e5-4993-9b91-333c52ab3674 (do not change this comment) */