nagachika	2015-03-18 02:40:51 +0900 (Wed, 18 Mar 2015)

  New Revision: 49996

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

  Log:
    merge revision(s) r48585,r48587: [Backport #10546]
    
    * win32/win32.c (constat_reset): do nothing on non-standard
      console emurators.  [ruby-core:66471] [Bug #10546]
      console emulators.  [ruby-core:66471] [Bug #10546]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/version.h
    branches/ruby_2_1/win32/win32.c
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49995)
+++ ruby_2_1/ChangeLog	(revision 49996)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Mar 18 02:40:18 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/win32.c (constat_reset): do nothing on non-standard
+	  console emulators.  [ruby-core:66471] [Bug #10546]
+
 Wed Mar 18 02:03:02 2015  Kazuki Tsujimoto  <kazuki@c...>
 
 	* vm_insnhelper.c (rb_vm_rewrite_cref_stack): copy nd_refinements
Index: ruby_2_1/win32/win32.c
===================================================================
--- ruby_2_1/win32/win32.c	(revision 49995)
+++ ruby_2_1/win32/win32.c	(revision 49996)
@@ -5924,7 +5924,7 @@ constat_reset(HANDLE h) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/win32/win32.c#L5924
 {
     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;
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49995)
+++ ruby_2_1/version.h	(revision 49996)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-03-18"
-#define RUBY_PATCHLEVEL 317
+#define RUBY_PATCHLEVEL 318
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r48585,48587


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