kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r32252 from trunk into ruby_1_9_2.

Browse source 
--
 * lib/irb/workspace.rb: fix BUG#4793.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-08-11 00:37:54 +00:00
parent 9d46a8085e
commit ec8392ea46
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Jun 28 00:08:43 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
* lib/irb/workspace.rb: fix BUG#4793.
Mon Jun 27 01:34:18 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Jun 27 01:34:18 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/etc/test_etc.rb (TestEtc#test_get{pw,gr}nam): skip entries * test/etc/test_etc.rb (TestEtc#test_get{pw,gr}nam): skip entries

2
lib/irb/workspace.rb
View file

@ -97,7 +97,7 @@ EOF
when 3 when 3
return nil if bt =~ /irb\/.*\.rb/ return nil if bt =~ /irb\/.*\.rb/
return nil if bt =~ /irb\.rb/ return nil if bt =~ /irb\.rb/
bt.sub!(/:\s*in `irb_binding'/, '') bt = bt.sub(/:\s*in `irb_binding'/, '')
end end
bt bt
end end

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 296 #define RUBY_PATCHLEVEL 297
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1