From 1a4d128124a2487a50f3a33e3f5e1e7dbde0acb6 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 8 Feb 2012 01:52:42 +0000 Subject: [PATCH] merge revision(s) 33625: * ext/readline/readline.c (Init_readline): fix wrong condition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/readline/readline.c | 2 +- version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0578f69dba..6e79865d67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Feb 8 10:52:36 2012 NARUSE, Yui + + * ext/readline/readline.c (Init_readline): fix wrong condition. + Wed Feb 8 10:50:11 2012 Naohisa Goto * test/ruby/test_rubyoptions.rb (test_script_from_stdin): slave pty diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 68ff07dc0d..7480feccc6 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -1632,7 +1632,7 @@ Init_readline() 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 { diff --git a/version.h b/version.h index 9dcfddc331..de898ee0c4 100644 --- a/version.h +++ b/version.h @@ -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