merge revision(s) r48585,r48587: [Backport ruby#10546]

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Author: nagachika

ChangeLog

@@ -1,3 +1,8 @@
+Wed Mar 18 02:40:18 2015  Nobuyoshi Nakada  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* vm_insnhelper.c (rb_vm_rewrite_cref_stack): copy nd_refinements

version.h

@@ -1,6 +1,6 @@
 #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

win32/win32.c

@@ -5924,7 +5924,7 @@ constat_reset(HANDLE h)
 {
     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;