(redisplay_internal) [!WINDOWSNT]: Conditionalize last change.

diff --git a/src/ChangeLog b/src/ChangeLog
index a9ba878737e0c95aed6e204cb179a07e14c7e479..8c6aff22f4eb06093ee02f654a5a1bf44db70443 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2008-04-09  Jason Rumney  <jasonr@gnu.org>
 
+       * xdisp.c (redisplay_internal) [!WINDOWSNT]: Conditionalize last change.
+
        * w32term.c (w32_compute_glyph_string_overhangs): Compute overhangs
        for new font backend and composite cases.
 
@@ -23,7 +25,8 @@
        (Fminibuffer_complete_and_exit, Fminibuffer_complete_word)
        (Fdisplay_completion_list, display_completion_list_1)
        (Fminibuffer_completion_help, Fself_insert_and_exit)
-       (Fexit_minibuffer, Fminibuffer_message): Move functions to minibuffer.el.
+       (Fexit_minibuffer, Fminibuffer_message): Move functions to
+       minibuffer.el.
        (syms_of_minibuf): Remove corresponding initializations.
 
        * keyboard.c (Qdeactivate_mark): New var.

diff --git a/src/xdisp.c b/src/xdisp.c
index 8b6ed37df918b570573eebae50b30eec5a955027..7c6c9ebd50d15e3ad8afff50c8a0965731addb45 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11188,7 +11188,9 @@ redisplay_internal (preserve_echo_area)
         the whole thing.  */
       windows_or_buffers_changed++;
       SET_FRAME_GARBAGED (sf);
+#ifndef WINDOWSNT
       set_tty_color_mode (FRAME_TTY (sf), sf);
+#endif
       FRAME_TTY (sf)->previous_frame = sf;
     }