From: matz@... (Yukihiro Matsumoto)
Date: 1995-12-27T16:39:29+09:00
Subject: [ruby-list:45] ruby 0.95b -> 0.95c patch

まつもと ゆきひろ＠トヨタケーラムです．

年内最後のバージョン0.95cです．今まで指摘された問題のほとん
どは解決していると思います．
# HPとFreeBSDのダイナミックロードを除く．

メイルサーバにもありますので，全体が欲しい方は「get」, パッチが
欲しい方は「patch 自分の持っているバージョン」というサブジェ
クトのメイルを

  ruby-archive@caelum.co.jp

まで．

# EUCに変換してからパッチを当ててください．

                                まつもと ゆきひろ /:|)

-- cut here --
diff -u2raN ruby-0.95b/ChangeLog ruby-0.95c/ChangeLog
--- ruby-0.95b/ChangeLog	Fri Dec 22 16:42:52 1995
+++ ruby-0.95c/ChangeLog	Wed Dec 27 15:00:05 1995
@@ -1,2 +1,23 @@
+Wed Dec 27 13:27:52 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
+
+	* version 0.95c
+
+	* ext/tkutil/tkutil.c: wishがあってもなくても一応コンパイルだけは
+	  するように．
+
+	* lib/tk.rb: 環境変数PATHから{wish|wish4.0}を探すように．
+
+Tue Dec 26 01:03:42 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
+
+	* sample/ruby-mode.el (ruby-parse-region): 正規表現の検出強化．
+
+	* numeric.c (fix_mul): 乗算のオーバーフロー検出アルゴリズムのバグ．
+
+	* ext/extmk.rb.in: ./install-shを使う場合のPATHを調整．
+
+	* Makefile.in (install): lib/*.rbを一つずつインストール．
+
+	* io.c (io_each_line): イテレータの戻り値をnilで統一．
+
 Fri Dec 22 10:34:32 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
 
diff -u2raN ruby-0.95b/Makefile.in ruby-0.95c/Makefile.in
--- ruby-0.95b/Makefile.in	Thu Dec 21 20:49:30 1995
+++ ruby-0.95c/Makefile.in	Tue Dec 26 17:05:08 1995
@@ -90,9 +90,11 @@
 install:	$(bindir)/ruby
 		cd ext; ../miniruby ./extmk.rb install
-		$(INSTALL_DATA) lib/*.rb $(libdir)
+		@for rb in `grep '^lib/' MANIFEST`; do \
+		  $(INSTALL_DATA) $$rb $(libdir); \
+		done
 
 clean:;		@rm -f $(OBJS)
 		@rm -f ext/extinit.c ext/extinit.o
-		cd ext; ../ruby ./extmk.rb clean
+		cd ext; ../miniruby ./extmk.rb clean
 
 realclean:	clean
@@ -101,5 +103,5 @@
 		@rm -f core ruby miniruby *~
 
-test:;		@-./ruby sample/test.rb > ./ruby_test 2>&1;\
+test:;		@-./ruby sample/test.rb > ./ruby_test 2>&1; \
 		 if grep '^end of test' ./ruby_test > /dev/null; then \
 		   echo "test succeeded"; \
diff -u2raN ruby-0.95b/bignum.c ruby-0.95c/bignum.c
--- ruby-0.95b/bignum.c	Wed Dec 20 19:28:58 1995
+++ ruby-0.95c/bignum.c	Tue Dec 26 13:58:10 1995
@@ -263,5 +263,5 @@
     }
     i = x->len;
-    if (x->len == 0) return str_new2("0");
+    if (i == 0) return str_new2("0");
     if (base == 10) {
 	j = (sizeof(USHORT)/sizeof(char)*CHAR_BIT*i*241L)/800+2;
diff -u2raN ruby-0.95b/configure ruby-0.95c/configure
--- ruby-0.95b/configure	Thu Dec 21 18:01:27 1995
+++ ruby-0.95c/configure	Wed Dec 27 12:09:05 1995
@@ -868,5 +868,11 @@
 if eval "test \"`echo '$ac_cv_lib_'dl`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  :
+    ac_tr_lib=HAVE_LIB`echo dl | tr '[a-z]' '[A-Z]'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ldl $LIBS"
+
 else
   echo "$ac_t""no" 1>&6
@@ -880,5 +886,5 @@
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 883 "configure"
+#line 889 "configure"
 #include "confdefs.h"
 
@@ -922,5 +928,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 925 "configure"
+#line 931 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -961,5 +967,5 @@
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 964 "configure"
+#line 970 "configure"
 #include "confdefs.h"
 
@@ -995,5 +1001,5 @@
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 998 "configure"
+#line 1004 "configure"
 #include "confdefs.h"
 
@@ -1032,5 +1038,5 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 1035 "configure"
+#line 1041 "configure"
 #include "confdefs.h"
 main(){return(0);}
@@ -1053,5 +1059,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1056 "configure"
+#line 1062 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -1075,5 +1081,5 @@
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1078 "configure"
+#line 1084 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -1093,5 +1099,5 @@
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1096 "configure"
+#line 1102 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -1114,5 +1120,5 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 1117 "configure"
+#line 1123 "configure"
 #include "confdefs.h"
 #include <ctype.h>
@@ -1153,5 +1159,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1156 "configure"
+#line 1162 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
@@ -1187,5 +1193,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1190 "configure"
+#line 1196 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -1219,5 +1225,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1222 "configure"
+#line 1228 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -1250,5 +1256,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1253 "configure"
+#line 1259 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -1282,5 +1288,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1285 "configure"
+#line 1291 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -1316,5 +1322,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1319 "configure"
+#line 1325 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -1352,5 +1358,5 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 1355 "configure"
+#line 1361 "configure"
 #include "confdefs.h"
 
@@ -1387,5 +1393,5 @@
 if test $ac_cv_type_getgroups = cross; then
         cat > conftest.$ac_ext <<EOF
-#line 1390 "configure"
+#line 1396 "configure"
 #include "confdefs.h"
 #include <unistd.h>
@@ -1414,5 +1420,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1417 "configure"
+#line 1423 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -1453,5 +1459,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1456 "configure"
+#line 1462 "configure"
 #include "confdefs.h"
 #include <alloca.h>
@@ -1484,5 +1490,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1487 "configure"
+#line 1493 "configure"
 #include "confdefs.h"
 
@@ -1542,5 +1548,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1545 "configure"
+#line 1551 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
@@ -1570,5 +1576,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1573 "configure"
+#line 1579 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -1624,5 +1630,5 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 1627 "configure"
+#line 1633 "configure"
 #include "confdefs.h"
 find_stack_direction ()
@@ -1664,5 +1670,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1667 "configure"
+#line 1673 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -1696,5 +1702,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1699 "configure"
+#line 1705 "configure"
 #include "confdefs.h"
 #include <vfork.h>
@@ -1730,5 +1736,5 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 1733 "configure"
+#line 1739 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
@@ -1848,5 +1854,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1851 "configure"
+#line 1857 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -1900,5 +1906,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1903 "configure"
+#line 1909 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -1950,5 +1956,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1953 "configure"
+#line 1959 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -1982,5 +1988,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1985 "configure"
+#line 1991 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2013,5 +2019,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2016 "configure"
+#line 2022 "configure"
 #include "confdefs.h"
 #include <time.h>
@@ -2044,5 +2050,5 @@
 
     cat > conftest.$ac_ext <<EOF
-#line 2047 "configure"
+#line 2053 "configure"
 #include "confdefs.h"
 
@@ -2070,5 +2076,5 @@
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 2073 "configure"
+#line 2079 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2086,5 +2092,5 @@
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 2089 "configure"
+#line 2095 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2115,5 +2121,5 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 2118 "configure"
+#line 2124 "configure"
 #include "confdefs.h"
 main () {
@@ -2152,5 +2158,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2155 "configure"
+#line 2161 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -2168,5 +2174,5 @@
 if test "$rb_cv_fcnt" = ""; then
     cat > conftest.$ac_ext <<EOF
-#line 2171 "configure"
+#line 2177 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -2185,5 +2191,5 @@
 if test "$rb_cv_fcnt" = ""; then
     cat > conftest.$ac_ext <<EOF
-#line 2188 "configure"
+#line 2194 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -2202,5 +2208,5 @@
 if test "$rb_cv_fcnt" = ""; then
     cat > conftest.$ac_ext <<EOF
-#line 2205 "configure"
+#line 2211 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -2232,5 +2238,5 @@
   echo $ac_n "checking struct passwd""... $ac_c" 1>&6
   cat > conftest.$ac_ext <<EOF
-#line 2235 "configure"
+#line 2241 "configure"
 #include "confdefs.h"
 #include <pwd.h>
@@ -2247,5 +2253,5 @@
 
   cat > conftest.$ac_ext <<EOF
-#line 2250 "configure"
+#line 2256 "configure"
 #include "confdefs.h"
 #include <pwd.h>
@@ -2262,5 +2268,5 @@
 
   cat > conftest.$ac_ext <<EOF
-#line 2265 "configure"
+#line 2271 "configure"
 #include "confdefs.h"
 #include <pwd.h>
@@ -2277,5 +2283,5 @@
 
   cat > conftest.$ac_ext <<EOF
-#line 2280 "configure"
+#line 2286 "configure"
 #include "confdefs.h"
 #include <pwd.h>
@@ -2292,5 +2298,5 @@
 
   cat > conftest.$ac_ext <<EOF
-#line 2295 "configure"
+#line 2301 "configure"
 #include "confdefs.h"
 #include <pwd.h>
@@ -2307,5 +2313,5 @@
 
   cat > conftest.$ac_ext <<EOF
-#line 2310 "configure"
+#line 2316 "configure"
 #include "confdefs.h"
 #include <pwd.h>
@@ -2345,5 +2351,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2348 "configure"
+#line 2354 "configure"
 #include "confdefs.h"
 
diff -u2raN ruby-0.95b/configure.in ruby-0.95c/configure.in
--- ruby-0.95b/configure.in	Thu Dec 21 18:00:49 1995
+++ ruby-0.95c/configure.in	Wed Dec 27 12:08:56 1995
@@ -35,5 +35,5 @@
 dnl Checks for libraries.
 AC_CHECK_LIB(crypt, crypt)
-AC_CHECK_LIB(dl, dlopen, [:])	# Dynamic linking for SunOS/Solaris and SYSV
+AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
 AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
 
diff -u2raN ruby-0.95b/error.c ruby-0.95c/error.c
--- ruby-0.95b/error.c	Fri Dec 22 10:29:28 1995
+++ ruby-0.95c/error.c	Wed Dec 27 15:37:02 1995
@@ -49,5 +49,5 @@
 	}
 	else {
-	    str_cat(buf, "\n", 1);
+	    strcat(buf, "\n", 1);
 	    str_cat(errstr, buf, strlen(buf));
 	}
diff -u2raN ruby-0.95b/ext/extmk.rb.in ruby-0.95c/ext/extmk.rb.in
--- ruby-0.95b/ext/extmk.rb.in	Wed Dec 20 13:32:58 1995
+++ ruby-0.95c/ext/extmk.rb.in	Wed Dec 27 14:38:09 1995
@@ -217,8 +217,9 @@
   printf mfile, "\n"
 
+  dots = if "@INSTALL@" =~ /^\// then "" else "../" end
   printf mfile, "\
 TARGET = %s.%s
 
-INSTALL = @INSTALL@
+INSTALL = %s@INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
@@ -230,5 +231,6 @@
 
 realclean:	clean
-", target, if $static then "o" else "@DLEXT@" end
+", target,
+    if $static then "o" else "@DLEXT@" end, dots, dots
 
   if !$static
@@ -344,6 +346,11 @@
   
   d = $1 if d =~ /\/([\/]*)$/
-  print "compiling ", d, "\n"
-
+  if $install
+    print "installing ", d, "\n"
+  elsif $clean
+    print "cleaning ", d, "\n"
+  else
+    print "compiling ", d, "\n"
+  end
   extmake(d)
 end
@@ -363,5 +370,5 @@
 end
 
-exit if $install
+exit if $install or $clean
 if $extobjs
   if older("extinit.c", "Setup")
diff -u2raN ruby-0.95b/ext/socket/extconf.rb ruby-0.95c/ext/socket/extconf.rb
--- ruby-0.95b/ext/socket/extconf.rb	Thu Dec 21 18:06:44 1995
+++ ruby-0.95c/ext/socket/extconf.rb	Wed Dec 27 11:25:28 1995
@@ -1,5 +1,4 @@
 have_library("inet", "gethostbyname")
-have_library("nls", "gethostbyname")
-have_library("nls", "gethostbyname")
+have_library("nsl", "gethostbyname")
 have_library("socket", "socket")
 have_header("sys/un.h")
diff -u2raN ruby-0.95b/ext/tkutil/MANIFEST ruby-0.95c/ext/tkutil/MANIFEST
--- ruby-0.95b/ext/tkutil/MANIFEST	Sat Nov  4 02:04:59 1995
+++ ruby-0.95c/ext/tkutil/MANIFEST	Wed Dec 27 12:59:10 1995
@@ -1,3 +1,2 @@
 MANIFEST
-extconf.rb
 tkutil.c
diff -u2raN ruby-0.95b/ext/tkutil/extconf.rb ruby-0.95c/ext/tkutil/extconf.rb
--- ruby-0.95b/ext/tkutil/extconf.rb	Mon Nov  6 16:25:08 1995
+++ ruby-0.95c/ext/tkutil/extconf.rb
@@ -1,11 +0,0 @@
-for dir in ENV['PATH'].split(':')
-  if File.exists? "#{dir}/wish"
-    $CFLAGS = $CFLAGS + " -DWISHPATH=" + "'\"#{dir}/wish\"'"
-    have_wish = TRUE
-    break
-  end
-end
-
-if have_wish and have_func('pipe')
-  create_makefile("tkutil")
-end
diff -u2raN ruby-0.95b/ext/tkutil/tkutil.c ruby-0.95c/ext/tkutil/tkutil.c
--- ruby-0.95b/ext/tkutil/tkutil.c	Thu Dec 21 00:33:21 1995
+++ ruby-0.95c/ext/tkutil/tkutil.c	Wed Dec 27 12:59:18 1995
@@ -48,5 +48,4 @@
     VALUE cTK = rb_define_class("TkKernel", cObject);
 
-    rb_define_const(mTK, "WISH_PATH", str_new2(WISHPATH));
     rb_define_singleton_method(mTK, "eval_cmd", tk_eval_cmd, -1);
 
diff -u2raN ruby-0.95b/io.c ruby-0.95c/io.c
--- ruby-0.95b/io.c	Wed Dec 20 19:28:55 1995
+++ ruby-0.95c/io.c	Tue Dec 26 01:06:41 1995
@@ -388,5 +388,5 @@
     }
     if (ferror(f) != 0) rb_sys_fail(Qnil);
-    return obj;
+    return Qnil;
 }
 
diff -u2raN ruby-0.95b/lib/tk.rb ruby-0.95c/lib/tk.rb
--- ruby-0.95b/lib/tk.rb	Fri Dec 22 14:25:12 1995
+++ ruby-0.95c/lib/tk.rb	Wed Dec 27 15:38:57 1995
@@ -13,7 +13,18 @@
   extend Tk
 
-  $0 =~ /\/(.*$)/
-    
-  PORT = open(format("|%s -n %s", WISH_PATH, $1), "w+");
+  wish_path = nil
+  ENV['PATH'].split(":").each {|path|
+    for wish in ['wish4.0', 'wish']
+      if File.exists? path+'/'+wish
+	wish_path = path+'/'+wish
+	break
+      end
+      break if wish_path
+    end
+  }
+  fail 'can\'t find wish' if not wish_path
+
+  $0 =~ /\/(.*)$/
+  PORT = open(format("|%s -n %s", wish_path, $1), "w+");
   def tk_write(*args)
     printf PORT, *args;
diff -u2raN ruby-0.95b/numeric.c ruby-0.95c/numeric.c
--- ruby-0.95b/numeric.c	Thu Nov 30 07:16:56 1995
+++ ruby-0.95c/numeric.c	Tue Dec 26 13:31:45 1995
@@ -623,5 +623,5 @@
 	    VALUE r = INT2FIX(c);
 
-	    if (FIX2INT(r) != c) {
+	    if (FIX2INT(r) != c || c/a != b) {
 		r = big_mul(int2big(a), int2big(b));
 	    }
diff -u2raN ruby-0.95b/parse.y ruby-0.95c/parse.y
--- ruby-0.95b/parse.y	Fri Dec 22 10:59:29 1995
+++ ruby-0.95c/parse.y	Wed Dec 27 15:41:17 1995
@@ -140,6 +140,4 @@
 	OR
 	NOT
-	_FILE_
-	_LINE_
 	IF_MOD
 	WHILE_MOD
@@ -380,6 +378,6 @@
 
 fname		: IDENTIFIER
-		| FID
 		| CONSTANT
+		| FID
 		| op
 		    {
@@ -1165,4 +1163,5 @@
 
 operation	: IDENTIFIER
+		| CONSTANT
 		| FID
 
@@ -1542,6 +1541,4 @@
 } kwtable [] = {
     "__END__",  0,              EXPR_BEG,
-    "__FILE__", _FILE_,         EXPR_END,
-    "__LINE__", _LINE_,         EXPR_END,
     "alias",	ALIAS,		EXPR_FNAME,
     "and",	AND,		EXPR_BEG,
@@ -2353,10 +2350,5 @@
   fetch_id:
     tokfix();
-    if (strcmp("__LINE__", tok()) == 0)
-	id = _LINE_;
-    else if (strcmp("__FILE__", tok()) == 0)
-	id = _FILE_;
-    else
-	id = rb_intern(tok());
+    id = rb_intern(tok());
   id_node:
     node = gettable(id);
@@ -2508,12 +2500,4 @@
 	return NEW_NIL();
     }
-    else if (id == _LINE_) {
-	return NEW_LIT(INT2FIX(sourceline));
-    }
-    else if (id == _FILE_) {
-	VALUE s = str_new2(sourcefile);
-
-	return NEW_STR(s);
-    }
     else if (is_local_id(id)) {
 	if (local_id(id)) return NEW_LVAR(id);
@@ -2548,7 +2532,4 @@
     else if (id == NIL) {
 	Error("Can't asign to nil");
-    }
-    else if (id == _LINE_ || id == _FILE_) {
-	Error("Can't asign to special identifier");
     }
     else if (is_local_id(id)) {
diff -u2raN ruby-0.95b/ruby.texi ruby-0.95c/ruby.texi
--- ruby-0.95b/ruby.texi	Fri Dec 22 15:53:41 1995
+++ ruby-0.95c/ruby.texi	Tue Dec 26 00:48:53 1995
@@ -3537,5 +3537,5 @@
 
 @item each @{|@var{line}|@dots{}@}
-@item each_line @{|@var{line}|@dots{}@}
+@itemx each_line @{|@var{line}|@dots{}@}
 
 一行ずつ読み込んでくるためのイテレータ．行の区切りはシステム変数
@@ -3543,5 +3543,5 @@
 もセットされる．
 
-@itemx each_byte @{|@var{ch}|@dots{}@}
+@item each_byte @{|@var{ch}|@dots{}@}
 
 一文字ずつ読み込んでくるためのイテレータ．文字は文字コードを表す
diff -u2raN ruby-0.95b/sample/ruby-mode.el ruby-0.95c/sample/ruby-mode.el
--- ruby-0.95b/sample/ruby-mode.el	Wed Dec 20 16:49:53 1995
+++ ruby-0.95c/sample/ruby-mode.el	Wed Dec 27 15:15:32 1995
@@ -200,11 +200,19 @@
 		(setq in-string t))))
 	     ((looking-at "/")
-	      (if (and (ruby-expr-beg)
+	      (if (and (or (ruby-expr-beg)
+			   (save-excursion
+			     (let ((c (point)) res)
+			       (skip-chars-backward " \t")
+			       (and (not (eq c (point)))
+				    (goto-char pnt)
+				    (not (looking-at "[ \t]"))))))
 		       (goto-char pnt)
 		       (looking-at "\\([^/\n]\\|\\\\/\\)*")
 		       (eq ?/ (char-after (match-end 0))))
 		  (goto-char (1+ (match-end 0)))
-		(goto-char indent-point)
-		(setq in-string t)))
+		(if (not (ruby-expr-beg))
+		    (goto-char pnt)
+		  (goto-char indent-point)
+		  (setq in-string t))))
 	     ((looking-at "\\?")	;skip ?char
 	      (cond
@@ -415,5 +423,5 @@
        ("[^_]\\<\\(begin\\|case\\|else\\|elsif\\|end\\|ensure\\|for\\|if\\|rescue\\|then\\|when\\|while\\)\\>[^_]" 1 defun)
        ("[^_]\\<\\(and\\|break\\|continue\\|fail\\|in\\|not\\|or\\|redo\\|retry\\|return\\|super\\|yield\\)\\>[^_]" 1 keyword)
-       ("[^_]\\<\\(self\\|nil\\|TRUE\\|FALSE\\|__LINE__\\|__FILE__\\)\\>[^_]" 1 define)
+       ("[^_]\\<\\(self\\|nil\\|TRUE\\|FALSE\\)\\>[^_]" 1 define)
        ("$.[a-zA-Z_0-9]*" nil struct)
        ("@[a-zA-Z_0-9]+" nil struct)
diff -u2raN ruby-0.95b/sample/tkbiff.rb ruby-0.95c/sample/tkbiff.rb
--- ruby-0.95b/sample/tkbiff.rb	Fri Dec 15 20:02:32 1995
+++ ruby-0.95c/sample/tkbiff.rb	Wed Dec 27 15:28:56 1995
@@ -113,4 +113,6 @@
   if outcount == 0
     $list.insert 'end', "You have no mail."
+  else
+    $list.see 'end'
   end
   $top.deiconify
@@ -118,4 +120,5 @@
 end
 
+$list.insert 'end', "You have no mail."
 check
 Tk.mainloop
diff -u2raN ruby-0.95b/sample/tkfrom.rb ruby-0.95c/sample/tkfrom.rb
--- ruby-0.95b/sample/tkfrom.rb	Fri Dec 15 20:02:31 1995
+++ ruby-0.95c/sample/tkfrom.rb	Wed Dec 27 15:07:15 1995
@@ -103,4 +103,5 @@
   end
   f.close
+  list.see 'end'
 end
 
diff -u2raN ruby-0.95b/string.c ruby-0.95c/string.c
--- ruby-0.95b/string.c	Thu Dec 21 10:43:54 1995
+++ ruby-0.95c/string.c	Tue Dec 26 01:02:45 1995
@@ -1601,5 +1601,5 @@
     if (RS == Qnil) {
 	rb_yield(str);
-	return (VALUE)str;
+	return Qnil;
     }
 
@@ -1634,5 +1634,5 @@
     }
 
-    return (VALUE)str;
+    return Qnil;
 }
 
@@ -1646,5 +1646,5 @@
 	rb_yield(INT2FIX(str->ptr[i] & 0xff));
     }
-    return (VALUE)str;
+    return Qnil;
 }
 
diff -u2raN ruby-0.95b/version.h ruby-0.95c/version.h
--- ruby-0.95b/version.h	Fri Dec 22 09:42:41 1995
+++ ruby-0.95c/version.h	Tue Dec 26 01:02:09 1995
@@ -1,2 +1,2 @@
-#define RUBY_VERSION "0.95b"
-#define VERSION_DATE "95/12/22"
+#define RUBY_VERSION "0.95c"
+#define VERSION_DATE "95/12/27"