From: Jason Rumney <jasonr@gnu.org>
Date: Wed, 9 Apr 2008 13:33:56 +0000 (+0000)
Subject: (redisplay_internal) [!WINDOWSNT]: Conditionalize last change.
X-Git-Tag: emacs-pretest-23.0.90~6393
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d28646bf8bb5ff19406a4c86d07c4d9c6f000d0;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index a9ba878737e..8c6aff22f4e 100644
--- 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 8b6ed37df91..7c6c9ebd50d 100644
--- 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;
     }