usa	2016-04-22 18:23:01 +0900 (Fri, 22 Apr 2016)

  New Revision: 54695

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

  Log:
    merge revision(s) 54423,54489: [Backport #12201] [Backport #12202]
    
    * ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.
      patched by Anton Sivakov [Bug #12201] [Bug #12202]
    
    * ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo.
      [Bug #12202] [ruby-core:74802]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/nkf/nkf-utf8/nkf.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ext/nkf/nkf-utf8/nkf.c
===================================================================
--- ruby_2_2/ext/nkf/nkf-utf8/nkf.c	(revision 54694)
+++ ruby_2_2/ext/nkf/nkf-utf8/nkf.c	(revision 54695)
@@ -3833,8 +3833,8 @@ fold_conv(nkf_char c2, nkf_char c1) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/nkf/nkf-utf8/nkf.c#L3833
 	    f_prev = c1;
 	    f_line = 0;
 	    fold_state =  CR;
-	} else if ((f_prev == c1 && !fold_preserve_f)
-		   || (f_prev == LF && fold_preserve_f)
+	} else if ((f_prev == c1)
+		   || (f_prev == LF)
 		  ) {        /* duplicate newline */
 	    if (f_line) {
 		f_line = 0;
@@ -5435,8 +5435,8 @@ mime_putc(nkf_char c) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/nkf/nkf-utf8/nkf.c#L5435
 		mimeout_state.buf[mimeout_state.count++] = (char)c;
 		if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
 		    eof_mime();
-		    for (i=0;i<mimeout_state.count;i++) {
-			(*o_mputc)(mimeout_state.buf[i]);
+		    for (j=0;j<mimeout_state.count;j++) {
+			(*o_mputc)(mimeout_state.buf[j]);
 			base64_count++;
 		    }
 		    mimeout_state.count = 0;
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54694)
+++ ruby_2_2/version.h	(revision 54695)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-04-22"
-#define RUBY_PATCHLEVEL 309
+#define RUBY_PATCHLEVEL 310
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54694)
+++ ruby_2_2/ChangeLog	(revision 54695)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Fri Apr 22 18:22:15 2016  NARUSE, Yui  <naruse@r...>
+
+	* ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo.
+	  [Bug #12202] [ruby-core:74802]
+
+Fri Apr 22 18:22:15 2016  NARUSE, Yui  <naruse@r...>
+
+	* ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.
+	  patched by Anton Sivakov [Bug #12201] [Bug #12202]
+
 Fri Apr 22 18:19:32 2016  Naotoshi Seo  <sonots@g...>
 
 	* ext/date/date_core.c (datetime_to_time): preserve timezone info

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54423,54489


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