diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | config.sub | 4 | ||||
| -rw-r--r-- | lib/find.rb | 5 | ||||
| -rw-r--r-- | lib/rexml/encodings/ISO-8859-1.rb | 2 | ||||
| -rw-r--r-- | parse.y | 2 |
5 files changed, 15 insertions, 6 deletions
@@ -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 d2c7af03c5..b85986a473 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 9ca39cabcb..52efde81fd 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 5beefbd408..32ddfbc909 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*') @@ -384,7 +384,7 @@ stmts : none } | stmts terms stmt { - $$ = block_append($1, $3); + $$ = block_append($1, newline_node($3)); } | error stmt { |