diff options
| author | Jason Rumney | 2003-08-31 21:38:07 +0000 |
|---|---|---|
| committer | Jason Rumney | 2003-08-31 21:38:07 +0000 |
| commit | a24d4cb27a5ef18009ce05dde83d5d6b1b67911d (patch) | |
| tree | 09b46e1e7d27d83f34286c2cdd1cf92d36b5abb6 /src | |
| parent | bbc2d90e8c8343a5274d3a22f3436f7d8452a403 (diff) | |
| download | emacs-a24d4cb27a5ef18009ce05dde83d5d6b1b67911d.tar.gz emacs-a24d4cb27a5ef18009ce05dde83d5d6b1b67911d.zip | |
(init_iterator): Remove old WINDOWSNT conditional.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c8944754767..394a6b17ddb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2003-08-31 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (init_iterator): Remove old WINDOWSNT conditional. | ||
| 4 | |||
| 1 | 2003-08-30 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 5 | 2003-08-30 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * xterm.c (x_term_init): Initialize new fields in x_display_info. | 7 | * xterm.c (x_term_init): Initialize new fields in x_display_info. |
diff --git a/src/xdisp.c b/src/xdisp.c index c825dd21d3d..9b3fc088775 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -1999,11 +1999,7 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id) | |||
| 1999 | attribute changes of named faces, recompute them. When running | 1999 | attribute changes of named faces, recompute them. When running |
| 2000 | in batch mode, the face cache of Vterminal_frame is null. If | 2000 | in batch mode, the face cache of Vterminal_frame is null. If |
| 2001 | we happen to get called, make a dummy face cache. */ | 2001 | we happen to get called, make a dummy face cache. */ |
| 2002 | if ( | 2002 | if (noninteractive && FRAME_FACE_CACHE (it->f) == NULL) |
| 2003 | #ifndef WINDOWSNT | ||
| 2004 | noninteractive && | ||
| 2005 | #endif | ||
| 2006 | FRAME_FACE_CACHE (it->f) == NULL) | ||
| 2007 | init_frame_faces (it->f); | 2003 | init_frame_faces (it->f); |
| 2008 | if (FRAME_FACE_CACHE (it->f)->used == 0) | 2004 | if (FRAME_FACE_CACHE (it->f)->used == 0) |
| 2009 | recompute_basic_faces (it->f); | 2005 | recompute_basic_faces (it->f); |