summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-06 09:28:03 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-06 09:28:03 +0000
commit70bf6c675419c2df1a5cd9f2f803e1a6a46d9d91 (patch)
treebea332cf97e74e61414f56eced92721ea42dc61d
parente8253cceca56c3b05fbe041acb0a82d600622fe0 (diff)
* several backports from 1.9
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--config.sub4
-rw-r--r--lib/find.rb5
-rw-r--r--lib/rexml/encodings/ISO-8859-1.rb2
-rw-r--r--parse.y2
5 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c9ae8f..cd5953a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -143,6 +143,14 @@ Mon Jan 26 15:11:47 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* sample/exyacc.rb: escape '}' to avoid warning.
+Mon Jan 26 14:41:46 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/delegate.rb (Delegator::initialize): preserve
+ singleton_method_added method [ruby-dev:22685]
+
+ * lib/delegate.rb (Delegator::initialize): use Kernel::raise
+ instead of mere raise. [ruby-dev:22681]
+
Mon Jan 26 12:47:17 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c: define CONST84 when TCL_MAJOR_VERSION == 7
diff --git a/config.sub b/config.sub
index d2c7af0..b85986a 100644
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2003-01-03'
+timestamp='2004-01-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -118,7 +118,7 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+ nto-qnx* | linux-* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
diff --git a/lib/find.rb b/lib/find.rb
index 9ca39ca..52efde8 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -36,7 +36,8 @@ module Find
paths.collect!{|d| d.dup}
while file = paths.shift
catch(:prune) do
- yield file
+ next unless File.exist? file
+ yield file.dup.taint
begin
if File.lstat(file).directory? then
d = Dir.open(file)
@@ -50,7 +51,7 @@ module Find
else
f = File.join(file, f)
end
- paths.unshift f
+ paths.unshift f.untaint
end
ensure
d.close
diff --git a/lib/rexml/encodings/ISO-8859-1.rb b/lib/rexml/encodings/ISO-8859-1.rb
index 5beefbd..32ddfbc 100644
--- a/lib/rexml/encodings/ISO-8859-1.rb
+++ b/lib/rexml/encodings/ISO-8859-1.rb
@@ -1,6 +1,6 @@
module REXML
module Encoding
- @@__REXML_encoding_methods =<<-EOL
+ @@__REXML_encoding_methods =<<-'EOL'
# Convert from UTF-8
def encode content
array_utf8 = content.unpack('U*')
diff --git a/parse.y b/parse.y
index a6c869f..204b788 100644
--- a/parse.y
+++ b/parse.y
@@ -384,7 +384,7 @@ stmts : none
}
| stmts terms stmt
{
- $$ = block_append($1, $3);
+ $$ = block_append($1, newline_node($3));
}
| error stmt
{