yugui	2008-11-30 18:23:14 +0900 (Sun, 30 Nov 2008)

  New Revision: 20412

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

  Log:
    merges r20353 from trunk into ruby_1_9_1.
    * strftime.c (rb_strftime): "%^P" should convert to upper case.
      [ruby-dev:37180]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/strftime.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20411)
+++ ruby_1_9_1/ChangeLog	(revision 20412)
@@ -1,3 +1,8 @@
+Tue Nov 25 10:35:29 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* strftime.c (rb_strftime): "%^P" should convert to upper case.
+	  [ruby-dev:37180]
+
 Tue Nov 25 07:51:18 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* strftime.c (FMT): use "%0d" formatter for zero padding, not "%.d".
Index: ruby_1_9_1/strftime.c
===================================================================
--- ruby_1_9_1/strftime.c	(revision 20411)
+++ ruby_1_9_1/strftime.c	(revision 20412)
@@ -404,7 +404,7 @@
 		case 'p':	/* AM or PM based on 12-hour clock */
 		case 'P':	/* am or pm based on 12-hour clock */
 			if ((*format == 'p' && (flags & BIT_OF(CHCASE))) ||
-			    (*format == 'P' && !(flags & BIT_OF(CHCASE)))) {
+			    (*format == 'P' && !(flags & (BIT_OF(CHCASE)|BIT_OF(UPPER))))) {
 				flags &= ~(BIT_OF(UPPER)|BIT_OF(CHCASE));
 				flags |= BIT_OF(LOWER);
 			}

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