naruse	2012-02-08 10:52:42 +0900 (Wed, 08 Feb 2012)

  New Revision: 34476

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

  Log:
    merge revision(s) 33625:
    
    * ext/readline/readline.c (Init_readline): fix wrong condition.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/readline/readline.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34475)
+++ ruby_1_9_3/ChangeLog	(revision 34476)
@@ -1,3 +1,7 @@
+Wed Feb  8 10:52:36 2012  NARUSE, Yui  <naruse@r...>
+
+	* ext/readline/readline.c (Init_readline): fix wrong condition.
+
 Wed Feb  8 10:50:11 2012  Naohisa Goto  <ngotogenome@g...>
 
 	* test/ruby/test_rubyoptions.rb (test_script_from_stdin): slave pty
Index: ruby_1_9_3/ext/readline/readline.c
===================================================================
--- ruby_1_9_3/ext/readline/readline.c	(revision 34475)
+++ ruby_1_9_3/ext/readline/readline.c	(revision 34476)
@@ -1632,7 +1632,7 @@
 	if (history_get(history_get_offset_func(0)) == NULL) {
 	    history_get_offset_func = history_get_offset_0;
 	}
-#if !defined HAVE_CLEAR_HISTORY
+#if defined HAVE_CLEAR_HISTORY
 	clear_history();
 #else
 	{
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34475)
+++ ruby_1_9_3/version.h	(revision 34476)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 59
+#define RUBY_PATCHLEVEL 60
 
 #define RUBY_RELEASE_DATE "2012-02-08"
 #define RUBY_RELEASE_YEAR 2012

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