From: Jason Rumney <jasonr@gnu.org>
Date: Sun, 31 Aug 2003 21:38:07 +0000 (+0000)
Subject: (init_iterator): Remove old WINDOWSNT conditional.
X-Git-Tag: ttn-vms-21-2-B4~8940
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a24d4cb27a5ef18009ce05dde83d5d6b1b67911d;p=emacs.git

(init_iterator): Remove old WINDOWSNT conditional.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c8944754767..394a6b17ddb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-31  Jason Rumney  <jasonr@gnu.org>
+
+	* xdisp.c (init_iterator): Remove old WINDOWSNT conditional.
+
 2003-08-30  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* 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)
      attribute changes of named faces, recompute them.  When running
      in batch mode, the face cache of Vterminal_frame is null.  If
      we happen to get called, make a dummy face cache.  */
-  if (
-#ifndef WINDOWSNT
-      noninteractive &&
-#endif
-      FRAME_FACE_CACHE (it->f) == NULL)
+  if (noninteractive && FRAME_FACE_CACHE (it->f) == NULL)
     init_frame_faces (it->f);
   if (FRAME_FACE_CACHE (it->f)->used == 0)
     recompute_basic_faces (it->f);