diff options
| author | Richard M. Stallman | 1993-03-01 09:13:26 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-03-01 09:13:26 +0000 |
| commit | a994e1613455c591db2350b0a94d8db62e79f3a0 (patch) | |
| tree | cc84c409fbe8876619c9187c996ff6ff95bba1f3 /src | |
| parent | a7b19b15b3ade4e7d20756f06075428f45c4ef77 (diff) | |
| download | emacs-a994e1613455c591db2350b0a94d8db62e79f3a0.tar.gz emacs-a994e1613455c591db2350b0a94d8db62e79f3a0.zip | |
Don't include dispextern.h more than once.
(INTERVAL_VISIBLE_P): NILP test was backwards.
Diffstat (limited to 'src')
| -rw-r--r-- | src/intervals.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/intervals.h b/src/intervals.h index 6635ed78bc0..a50e46c61b2 100644 --- a/src/intervals.h +++ b/src/intervals.h | |||
| @@ -18,7 +18,9 @@ along with GNU Emacs; see the file COPYING. If not, write to | |||
| 18 | the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | 18 | the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ |
| 19 | 19 | ||
| 20 | #ifdef USE_TEXT_PROPERTIES | 20 | #ifdef USE_TEXT_PROPERTIES |
| 21 | #ifndef NORMAL_FACE | ||
| 21 | #include "dispextern.h" | 22 | #include "dispextern.h" |
| 23 | #endif | ||
| 22 | 24 | ||
| 23 | #define NULL_INTERVAL 0 | 25 | #define NULL_INTERVAL 0 |
| 24 | #define INTERVAL_DEFAULT NULL_INTERVAL | 26 | #define INTERVAL_DEFAULT NULL_INTERVAL |
| @@ -135,7 +137,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |||
| 135 | 137 | ||
| 136 | /* Is this interval visible? Replace later with cache access */ | 138 | /* Is this interval visible? Replace later with cache access */ |
| 137 | #define INTERVAL_VISIBLE_P(i) \ | 139 | #define INTERVAL_VISIBLE_P(i) \ |
| 138 | (! NULL_INTERVAL_P (i) && ! NILP (Fmemq (Qinvisible, (i)->plist))) | 140 | (! NULL_INTERVAL_P (i) && NILP (Fmemq (Qinvisible, (i)->plist))) |
| 139 | 141 | ||
| 140 | /* Is this interval writable? Replace later with cache access */ | 142 | /* Is this interval writable? Replace later with cache access */ |
| 141 | #define INTERVAL_WRITABLE_P(i) \ | 143 | #define INTERVAL_WRITABLE_P(i) \ |