Mercurial > emacs
view src/m/aviion-intel.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
/* This file is minor changes for the Data General AViiON intel machines i586-dg-dguxR4* (tested on i586-dg-dguxR4.11MU04) Done by Ehud Karni, 1998-may-30, ehud@unix.simonwiesel.co.il */ #include "aviion.h" /* 1st load m88k DGUX definitions */ #define INTEL_DGUX /* define for future possible use */ /* Intel machines are LITTLE ENDIAN */ #undef WORDS_BIG_ENDIAN /* No correction needed for byte addresses */ #undef WORD_MACHINE #ifndef INTEL386 #define INTEL386 /* Identify as Intel machine */ #endif #undef m88k /* It sure is NOT a Motorola machine */ /* arch-tag: 7cbf89ef-237c-4da5-bdd0-8d569ae5f3ce (do not change this comment) */