diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-06-07 15:02:32 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-06-07 15:02:32 +0000 |
| commit | 2902d3081e3aedb345d8d68d859e4ca9d5d50410 (patch) | |
| tree | 1ee8d6ac2e87315bd360dfa757079711daf852b5 | |
| parent | 7d5492a63f78b590705041cae8c04f3197e90b41 (diff) | |
* ext/curses/curses.c (curses_insertln): merged a patch from
TAKAHASHI Tamotsu <ttakah@lapis.plala.or.jp>. [ruby-ext:02305]
* lib/irb/init.rb (IRB::IRB.rc_file_generators): more flexible
IRB.rc_file_generators. [ruby-core:05163]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ext/curses/curses.c | 27 | ||||
| -rw-r--r-- | lib/irb/init.rb | 3 |
3 files changed, 40 insertions, 0 deletions
@@ -1,3 +1,13 @@ +Wed Jun 8 00:00:01 2005 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/curses/curses.c (curses_insertln): merged a patch from + TAKAHASHI Tamotsu <ttakah@lapis.plala.or.jp>. [ruby-ext:02305] + +Tue Jun 7 19:34:15 2005 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/irb/init.rb (IRB::IRB.rc_file_generators): more flexible + IRB.rc_file_generators. [ruby-core:05163] + Tue Jun 7 18:39:31 2005 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/thread.rb: RDoc documentation from Eric Hodel diff --git a/ext/curses/curses.c b/ext/curses/curses.c index c56f18f0f6..64855e39e3 100644 --- a/ext/curses/curses.c +++ b/ext/curses/curses.c @@ -446,6 +446,17 @@ curses_deleteln(obj) return Qnil; } +/* def insertln */ +static VALUE +curses_insertln(obj) + VALUE obj; +{ +#if defined(HAVE_INSERTLN) || defined(insertln) + insertln(); +#endif + return Qnil; +} + /* def keyname */ static VALUE curses_keyname(obj, c) @@ -1159,6 +1170,20 @@ window_deleteln(obj) return Qnil; } +/* def insertln */ +static VALUE +window_insertln(obj) + VALUE obj; +{ +#if defined(HAVE_WINSERTLN) || defined(winsertln) + struct windata *winp; + + GetWINDOW(obj, winp); + winsertln(winp->window); +#endif + return Qnil; +} + static VALUE window_scrollok(VALUE obj, VALUE bf) { @@ -1438,6 +1463,7 @@ Init_curses() rb_define_module_function(mCurses, "getstr", curses_getstr, 0); rb_define_module_function(mCurses, "delch", curses_delch, 0); rb_define_module_function(mCurses, "deleteln", curses_deleteln, 0); + rb_define_module_function(mCurses, "insertln", curses_insertln, 0); rb_define_module_function(mCurses, "keyname", curses_keyname, 1); rb_define_module_function(mCurses, "lines", curses_lines, 0); rb_define_module_function(mCurses, "cols", curses_cols, 0); @@ -1505,6 +1531,7 @@ Init_curses() rb_define_method(cWindow, "getstr", window_getstr, 0); rb_define_method(cWindow, "delch", window_delch, 0); rb_define_method(cWindow, "deleteln", window_deleteln, 0); + rb_define_method(cWindow, "insertln", window_insertln, 0); rb_define_method(cWindow, "scroll", window_scroll, 0); rb_define_method(cWindow, "scrollok", window_scrollok, 1); rb_define_method(cWindow, "idlok", window_idlok, 1); diff --git a/lib/irb/init.rb b/lib/irb/init.rb index ad46a0afdc..bc8f9b599b 100644 --- a/lib/irb/init.rb +++ b/lib/irb/init.rb @@ -223,6 +223,9 @@ module IRB # enumerate possible rc-file base name generators def IRB.rc_file_generators + if irbrc = ENV["IRBRC"] + yield proc{|rc| irbrc} + end if home = ENV["HOME"] yield proc{|rc| home+"/.irb#{rc}"} end |