nobu	2014-11-26 19:54:35 +0900 (Wed, 26 Nov 2014)

  New Revision: 48585

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48585

  Log:
    win32.c: for non-standard console
    
    * win32/win32.c (constat_reset): do nothing on non-standard
      console emurators.  [ruby-core:66471] [Bug #10546]

  Modified files:
    trunk/ChangeLog
    trunk/win32/win32.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48584)
+++ ChangeLog	(revision 48585)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Nov 26 19:54:31 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/win32.c (constat_reset): do nothing on non-standard
+	  console emurators.  [ruby-core:66471] [Bug #10546]
+
 Wed Nov 26 19:44:13 2014  Tanaka Akira  <akr@f...>
 
 	* lib/tsort.rb: Returns an enumerator if no block is given.
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 48584)
+++ win32/win32.c	(revision 48585)
@@ -5952,7 +5952,7 @@ constat_reset(HANDLE h) https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L5952
 {
     st_data_t data;
     struct constat *p;
-    if (!conlist) return;
+    if (!conlist || conlist == conlist_disabled) return;
     if (!st_lookup(conlist, (st_data_t)h, &data)) return;
     p = (struct constat *)data;
     p->vt100.state = constat_init;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/