From 2da49bb6a64e84b57228ff34c76324b0fe6e6885 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 24 Jul 2006 06:55:26 +0000 Subject: * ext/readline/readline.c (readline_readline): rl_deprep_term_function may be NULL with libedit. reported by Ryan Davis. [ruby-dev:29070] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/readline/readline.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7d30282e0..6ad1394df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jul 24 15:51:52 2006 Tanaka Akira + + * ext/readline/readline.c (readline_readline): rl_deprep_term_function + may be NULL with libedit. reported by Ryan Davis. [ruby-dev:29070] + Mon Jul 24 15:19:55 2006 Yukihiro Matsumoto * eval.c (rb_call0): revert last change. [ruby-dev:29112] diff --git a/ext/readline/readline.c b/ext/readline/readline.c index aa481ad71..af7e029d1 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -83,7 +83,9 @@ readline_readline(argc, argv, self) rl_cleanup_after_signal(); #elif defined HAVE_RL_DEPREP_TERM_FUNCTION /* restore terminal mode */ - (*rl_deprep_term_function)(); + if (rl_deprep_term_function != NULL) /* NULL in libedit. [ruby-dev:29116] */ + (*rl_deprep_term_function)(); + else #else rl_deprep_terminal(); #endif -- cgit