* array.c: replace rb_protect_inspect() and rb_inspecting_p() by

  rb_exec_recursive() in eval.c.

* eval.c (rb_exec_recursive): new function.

* array.c (rb_ary_join): use rb_exec_recursive().

* array.c (rb_ary_inspect, rb_ary_hash): ditto.

* file.c (rb_file_join): ditto.

* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.

* io.c (rb_io_puts): ditto.

* object.c (rb_obj_inspect): ditto

* struct.c (rb_struct_inspect): ditto.

* lib/set.rb (SortedSet::setup): a hack to shut up warning.
  [ruby-talk:132866]

* lib/time.rb (Time::strptime): add new function.  inspired by
  [ruby-talk:132815].

* lib/parsedate.rb (ParseDate::strptime): ditto.

* regparse.c: move st_*_strend() functions from st.c.  fixed some
  potential memory leaks.

* exception error messages updated.  [ruby-core:04497]

* ext/socket/socket.c (Init_socket): add bunch of Socket
  constants.  Patch from Sam Roberts <[email protected]>.
  [ruby-core:04409]

* array.c (rb_ary_s_create): no need for negative argc check.
  [ruby-core:04463]

* array.c (rb_ary_unshift_m): ditto.

* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
  of StandardError class, not Exception class.  [ruby-core:04429]

* parse.y (fcall_gen): lvar(arg) will be evaluated as
  lvar.call(arg) when lvar is a defined local variable. [new]

* object.c (rb_class_initialize): call inherited method before
  calling initializing block.

* eval.c (rb_thread_start_1): initialize newly pushed frame.

* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
  fixed: [ruby-core:04444]

* eval.c (is_defined): NODE_IASGN is an assignment.

* ext/readline/readline.c (Readline.readline): use rl_outstream
  and rl_instream.  [ruby-dev:25699]

* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
  [ruby-dev:25675]

* misc/ruby-mode.el: [ruby-core:04415]

* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]

* lib/rdoc/generators/ri_generator.rb: ditto.

* struct.c (make_struct): fixed: [ruby-core:04402]

* ext/curses/curses.c (window_color_set): [ruby-core:04393]

* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
  [ruby-talk:130092]

* object.c: [ruby-doc:818]

* parse.y (open_args): fix too verbose warnings for the space
  before argument parentheses.  [ruby-dev:25492]

* parse.y (parser_yylex): ditto.

* parse.y (parser_yylex): the first expression in the parentheses
  should not be a command.  [ruby-dev:25492]

* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]

* object.c (Init_Object): remove Object#type.  [ruby-core:04335]

* st.c (st_foreach): report success/failure by return value.
  [ruby-Bugs-1396]

* parse.y: forgot to initialize parser struct.  [ruby-dev:25492]

* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
  [ruby-talk:127711]

* document updates - [ruby-core:04296], [ruby-core:04301],
  [ruby-core:04302], [ruby-core:04307]

* dir.c (rb_push_glob): should work for NUL delimited patterns.

* dir.c (rb_glob2): should aware of offset in the pattern.

* string.c (rb_str_new4): should propagate taintedness.

* env.h: rename member names in struct FRAME; last_func -> callee,
  orig_func -> this_func, last_class -> this_class.

* struct.c (rb_struct_set): use original method name, not callee
  name, to retrieve member slot.  [ruby-core:04268]

* time.c (time_strftime): protect from format modification from GC
  finalizers.

* object.c (Init_Object): remove rb_obj_id_obsolete()

* eval.c (rb_mod_define_method): incomplete subclass check.
  [ruby-dev:25464]

* gc.c (rb_data_object_alloc): klass may be NULL.
  [ruby-list:40498]

* bignum.c (rb_big_rand): should return positive random number.
  [ruby-dev:25401]

* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
  random bignums.  [ruby-dev:25396]

* variable.c (rb_autoload): [ruby-dev:25373]

* eval.c (svalue_to_avalue): [ruby-dev:25366]

* string.c (rb_str_justify): [ruby-dev:25367]

* io.c (rb_f_select): [ruby-dev:25312]

* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]

* struct.c (make_struct): [ruby-dev:25249]

* dir.c (dir_open_dir): new function.  [ruby-dev:25242]

* io.c (rb_f_open): add type check for return value from to_open.

* lib/pstore.rb (PStore#transaction): Use the empty content when a
  file is not found.  [ruby-dev:24561]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

17 files changed, 169 insertions, 98 deletions

diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c
index 776df56ecb..be07b8504f 100644
--- a/ext/Win32API/Win32API.c
+++ b/ext/Win32API/Win32API.c
@@ -160,7 +160,7 @@ Win32API_Call(argc, argv, obj)
 
 
     if (items != nimport)
-	rb_raise(rb_eRuntimeError, "Wrong number of parameters: expected %d, got %d.\n",
+	rb_raise(rb_eRuntimeError, "wrong number of parameters: expected %d, got %d",
 	    nimport, items);
 
     for (i = 0; i < nimport; i++) {
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 4ccba8809a..5ac81114b3 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -202,7 +202,7 @@ BigDecimal_load(VALUE self, VALUE str)
     /* First get max prec */
     while((*pch)!=(unsigned char)'\0' && (ch=*pch++)!=(unsigned char)':') {
         if(!ISDIGIT(ch)) {
-            rb_raise(rb_eTypeError, "Load failed: invalid character in the marshaled string");
+            rb_raise(rb_eTypeError, "load failed: invalid character in the marshaled string");
         }
         m = m*10 + (unsigned long)(ch-'0');
     }
@@ -230,7 +230,7 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
         fo = VpGetException();
         if(val==Qnil) return INT2FIX(fo);
         if(val!=Qfalse && val!=Qtrue) {
-            rb_raise(rb_eTypeError, "The second argument must be true or false.");
+            rb_raise(rb_eTypeError, "second argument must be true or false");
             return Qnil; /* Not reached */
         }
         if(f&VP_EXCEPTION_INFINITY) {
@@ -250,13 +250,13 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
         if(val==Qnil) return INT2FIX(fo);
         Check_Type(val, T_FIXNUM);
         if(!VpIsRoundMode(FIX2INT(val))) {
-            rb_raise(rb_eTypeError, "Invalid rounding mode.");
+            rb_raise(rb_eTypeError, "invalid rounding mode");
             return Qnil;
         }
         fo = VpSetRoundMode((unsigned long)FIX2INT(val));
         return INT2FIX(fo);
     }
-    rb_raise(rb_eTypeError, "The first argument for BigDecimal#mode is invalid.");
+    rb_raise(rb_eTypeError, "first argument for BigDecimal#mode invalid");
     return Qnil;
 }
 
@@ -412,7 +412,7 @@ BigDecimal_to_f(VALUE self)
     errno = 0;
     d2 = pow(10.0,(double)e);
     if((errno == ERANGE && e>0) || (d2>1.0 && (fabs(d) > (DBL_MAX / d2)))) {
-       VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion.",0);
+       VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion",0);
        if(d>0.0) return rb_float_new(DBL_MAX);
        else      return rb_float_new(-DBL_MAX);
     }
@@ -940,7 +940,7 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
         Check_Type(vRound, T_FIXNUM);
         sw   = FIX2INT(vRound);
         if(!VpIsRoundMode(sw)) {
-            rb_raise(rb_eTypeError, "Invalid rounding mode.");
+            rb_raise(rb_eTypeError, "invalid rounding mode");
             return Qnil;
         }
         break;
@@ -3304,7 +3304,7 @@ VpCtoV(Real *a, char *int_chr, U_LONG ni, char *frac, U_LONG nf, char *exp_chr,
             es = e*((S_INT)BASE_FIG);
             e = e * 10 + exp_chr[i] - '0';
             if(es>e*((S_INT)BASE_FIG)) {
-                return VpException(VP_EXCEPTION_INFINITY,"Exponent overflow",0);
+                return VpException(VP_EXCEPTION_INFINITY,"exponent overflow",0);
             }
             ++i;
         }
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index a8952bf186..d36610a88a 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -124,7 +124,7 @@ curses_init_screen()
     if (rb_stdscr) return rb_stdscr;
     initscr();
     if (stdscr == 0) {
-	rb_raise(rb_eRuntimeError, "cannot initialize curses");
+	rb_raise(rb_eRuntimeError, "can't initialize curses");
     }
     clear();
     rb_stdscr = prep_window(cWindow, stdscr);
@@ -561,7 +561,7 @@ curses_resizeterm(VALUE obj, VALUE lin, VALUE col)
 #endif
 }
 
-#ifdef USE_COLOR
+#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
 static VALUE
 curses_start_color(VALUE obj)
 {
@@ -1195,6 +1195,20 @@ window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
 #endif
 }
 
+#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
+static VALUE
+window_color_set(VALUE obj, VALUE col) 
+{
+  struct windata *winp;
+  int res;
+
+  GetWINDOW(obj, winp);
+  res = wcolor_set(winp->window, NUM2INT(col), NULL);
+  return (res == OK) ? Qtrue : Qfalse;
+  return Qfalse;
+}
+#endif /* USE_COLOR */
+
 static VALUE
 window_scroll(VALUE obj)
 {
@@ -1471,6 +1485,9 @@ Init_curses()
     rb_define_method(cWindow, "box", window_box, -1);
     rb_define_method(cWindow, "move", window_move, 2);
     rb_define_method(cWindow, "setpos", window_setpos, 2);
+#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
+    rb_define_method(cWindow, "color_set", window_color_set, 1);
+#endif /* USE_COLOR && HAVE_WCOLOR_SET */
     rb_define_method(cWindow, "cury", window_cury, 0);
     rb_define_method(cWindow, "curx", window_curx, 0);
     rb_define_method(cWindow, "maxy", window_maxy, 0);
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb
index 9b319ba30e..01fe971093 100644
--- a/ext/curses/extconf.rb
+++ b/ext/curses/extconf.rb
@@ -19,7 +19,7 @@ elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
 end
 
 if make
-  for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash getbkgd getnstr init isendwin keyname keypad resizeterm scrl set setscrreg ungetch wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr wresize wscrl wsetscrreg def_prog_mode reset_prog_mode timeout wtimeout nodelay init_color)
+  for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash getbkgd getnstr init isendwin keyname keypad resizeterm scrl set setscrreg ungetch wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr wresize wscrl wsetscrreg def_prog_mode reset_prog_mode timeout wtimeout nodelay init_color wcolor_set)
     have_func(f)
   end
   flag = "-D_XOPEN_SOURCE_EXTENDED"
diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c
index 92b2d34cbb..6907e43e1c 100644
--- a/ext/dl/cfunc.c
+++ b/ext/dl/cfunc.c
@@ -237,7 +237,7 @@ rb_dlcfunc_inspect(VALUE self)
   CASE(6); break; CASE(7); break; CASE(8); break; CASE(9); break; CASE(10);break; \
   CASE(11);break; CASE(12);break; CASE(13);break; CASE(14);break; CASE(15);break; \
   CASE(16);break; CASE(17);break; CASE(18);break; CASE(19);break; CASE(20);break; \
-  default: rb_raise(rb_eArgError, "too many arguments."); \
+  default: rb_raise(rb_eArgError, "too many arguments"); \
 }
 
 
@@ -257,7 +257,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
     Data_Get_Struct(self, struct cfunc_data, cfunc);
 
     if( cfunc->ptr == 0 ){
-	rb_raise(rb_eDLError, "can't call null-function.");
+	rb_raise(rb_eDLError, "can't call null-function");
 	return Qnil;
     }
     
diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c
index 18df5c8a38..66a7255ef8 100644
--- a/ext/dl/cptr.c
+++ b/ext/dl/cptr.c
@@ -430,7 +430,7 @@ rb_dlptr_s_to_ptr(VALUE self, VALUE val)
 	    return vptr;
 	}
 	else{
-	    rb_raise(rb_eDLError, "to_ptr should return a CPtr object.");
+	    rb_raise(rb_eDLError, "to_ptr should return a CPtr object");
 	}
     }
     else{
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
index 7f7eddfd18..eaeb3d67a9 100644
--- a/ext/dl/handle.c
+++ b/ext/dl/handle.c
@@ -155,7 +155,7 @@ rb_dlhandle_sym(VALUE self, VALUE sym)
 
     Data_Get_Struct(self, struct dl_handle, dlhandle);
     if( ! dlhandle->open ){
-	rb_raise(rb_eDLError, "Closed handle.");
+	rb_raise(rb_eDLError, "closed handle");
     }
     handle = dlhandle->ptr;
 
@@ -187,7 +187,7 @@ rb_dlhandle_sym(VALUE self, VALUE sym)
 		}
 		CHECK_DLERROR;
 		if( !func ){
-		    rb_raise(rb_eDLError, "Unknown symbol \"%s\".", name);
+		    rb_raise(rb_eDLError, "unknown symbol \"%s\"", name);
 		}
 	    }
 	}
@@ -205,7 +205,7 @@ rb_dlhandle_sym(VALUE self, VALUE sym)
 	}
 	CHECK_DLERROR;
         if( !func ){
-	    rb_raise(rb_eDLError, "Unknown symbol \"%s\".", name);
+	    rb_raise(rb_eDLError, "unknown symbol \"%s\"", name);
 	}
 #endif
     }
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index c42f279d58..6f677a6893 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -410,7 +410,11 @@ Init_etc()
     rb_global_variable(&sPasswd);
 
 #ifdef HAVE_GETGRENT
-    sGroup = rb_struct_define("Group", "name", "passwd", "gid", "mem", NULL);
+    sGroup = rb_struct_define("Group", "name",
+#ifdef HAVE_ST_GR_PASSWD
+			      "passwd",
+#endif
+			      "gid", "mem", NULL);
     rb_global_variable(&sGroup);
 #endif
 }
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index e21f625fd4..84b14309af 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -806,7 +806,7 @@ iconv_iconv
 
     return iconv_convert(VALUE2ICONV(cd), str,
 			 NIL_P(n1) ? 0 : NUM2INT(n1),
-			 NIL_P(n2) ? -1 : NUM2INT(n1),
+                        NIL_P(n2) ? -1 : NUM2INT(n2),
 			 NULL);
 }
 
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
index 3142855de6..f90fb2477a 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -94,7 +94,7 @@ ossl_cipher_initialize(VALUE self, VALUE str)
     name = StringValuePtr(str);
     GetCipher(self, ctx);
     if (!(cipher = EVP_get_cipherbyname(name))) {
-	ossl_raise(rb_eRuntimeError, "Unsupported cipher algorithm (%s).", name);
+	ossl_raise(rb_eRuntimeError, "unsupported cipher algorithm (%s)", name);
     }
     if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, -1) != 1)
 	ossl_raise(eCipherError, NULL);
@@ -198,7 +198,7 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
     if(!NIL_P(vsalt)){
 	StringValue(vsalt);
 	if(RSTRING(vsalt)->len != PKCS5_SALT_LEN)
-	    rb_raise(eCipherError, "salt must be an 8-octet string.");
+	    rb_raise(eCipherError, "salt must be an 8-octet string");
 	salt = RSTRING(vsalt)->ptr;
     }
     iter = NIL_P(viter) ? 2048 : NUM2INT(viter);
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 8e9e63036c..1894e1a5d6 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -375,7 +375,7 @@ getDevice(master,slave)
 	}
 	close(i);
     }
-    rb_raise(rb_eRuntimeError, "Cannot get Master/Slave device");
+    rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
 #else
     char **p;
     char MasterName[DEVICELEN];
@@ -394,7 +394,7 @@ getDevice(master,slave)
 	    close(i);
 	}
     }
-    rb_raise(rb_eRuntimeError, "Cannot get %s", SlaveName);
+    rb_raise(rb_eRuntimeError, "can't get %s", SlaveName);
 #endif
 }
 #endif /* HAVE__GETPTY */
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 4c7b08f514..4b859dd08d 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -7,6 +7,7 @@
 #include <readline/history.h>
 
 #include "ruby.h"
+#include "rubyio.h"
 #include "rubysig.h"
 
 #ifdef HAVE_UNISTD_H
@@ -45,6 +46,7 @@ readline_readline(argc, argv, self)
     char *prompt = NULL;
     char *buff;
     int status;
+    OpenFile *ofp, *ifp;
 
     rb_secure(4);
     if (rb_scan_args(argc, argv, "02", &tmp, &add_hist) > 0) {
@@ -54,6 +56,10 @@ readline_readline(argc, argv, self)
 
     if (!isatty(0) && errno == EBADF) rb_raise(rb_eIOError, "stdin closed");
 
+    GetOpenFile(rb_stdout, ofp);
+    rl_outstream = rb_io_stdio_file(ofp);
+    GetOpenFile(rb_stdin, ifp);
+    rl_instream = rb_io_stdio_file(ifp);
     buff = (char*)rb_protect((VALUE(*)_((VALUE)))readline, (VALUE)prompt,
                               &status);
     if (status) {
@@ -488,7 +494,7 @@ hist_get(self, index)
         i += state->length;
     }
     if (i < 0 || i > state->length - 1) {
-	rb_raise(rb_eIndexError, "Invalid index");
+	rb_raise(rb_eIndexError, "invalid index");
     }
     return rb_tainted_str_new2(state->entries[i]->line);
 }
@@ -510,7 +516,7 @@ hist_set(self, index, str)
         i += state->length;
     }
     if (i < 0 || i > state->length - 1) {
-	rb_raise(rb_eIndexError, "Invalid index");
+	rb_raise(rb_eIndexError, "invalid index");
     }
     SafeStringValue(str);
     replace_history_entry(i, RSTRING(str)->ptr, NULL);
@@ -629,7 +635,7 @@ hist_delete_at(self, index)
     if (i < 0)
         i += state->length;
     if (i < 0 || i > state->length - 1) {
-	rb_raise(rb_eIndexError, "Invalid index");
+	rb_raise(rb_eIndexError, "invalid index");
     }
     return rb_remove_history(i);
 }
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 17aa3661c5..230966bae4 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1611,7 +1611,7 @@ unix_send_io(sock, val)
         fd = FIX2INT(val);
     }
     else {
-	rb_raise(rb_eTypeError, "IO nor file descriptor");
+	rb_raise(rb_eTypeError, "neither IO nor file descriptor");
     }
 
     GetOpenFile(sock, fptr);
@@ -1728,7 +1728,7 @@ unix_recv_io(argc, argv, sock)
         msg.msg_accrightslen != sizeof(fd)
 #endif
 	) {
-	rb_raise(rb_eSocket, "File descriptor was not passed");
+	rb_raise(rb_eSocket, "file descriptor was not passed");
     }
 
 #if FD_PASSING_BY_MSG_CONTROL
@@ -1880,7 +1880,7 @@ setup_domain_and_type(domain, dv, type, tv)
 	    *dv = PF_IPX;
 #endif
 	else
-	    rb_raise(rb_eSocket, "Unknown socket domain %s", ptr);
+	    rb_raise(rb_eSocket, "unknown socket domain %s", ptr);
     }
     else {
 	*dv = NUM2INT(domain);
@@ -1911,7 +1911,7 @@ setup_domain_and_type(domain, dv, type, tv)
 	    *tv = SOCK_PACKET;
 #endif
 	else
-	    rb_raise(rb_eSocket, "Unknown socket type %s", ptr);
+	    rb_raise(rb_eSocket, "unknown socket type %s", ptr);
     }
     else {
 	*tv = NUM2INT(type);
@@ -2215,7 +2215,7 @@ sock_s_gethostbyaddr(argc, argv)
 }
 
 static VALUE
-sock_s_getservbyaname(argc, argv)
+sock_s_getservbyname(argc, argv)
     int argc;
     VALUE *argv;
 {
@@ -2245,6 +2245,25 @@ sock_s_getservbyaname(argc, argv)
 }
 
 static VALUE
+sock_s_getservbyport(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE port, proto;
+    struct servent *sp;
+
+    rb_scan_args(argc, argv, "11", &port, &proto);
+    if (NIL_P(proto)) proto = rb_str_new2("tcp");
+    StringValue(proto);
+
+    sp = getservbyport(NUM2INT(port),  StringValueCStr(proto));
+    if (!sp) {
+	rb_raise(rb_eSocket, "no such service for port %d/%s", NUM2INT(port), RSTRING(proto)->ptr);
+    }
+    return rb_tainted_str_new2(sp->s_name);
+}
+
+static VALUE
 sock_s_getaddrinfo(argc, argv)
     int argc;
     VALUE *argv;
@@ -2629,7 +2648,8 @@ Init_socket()
     rb_define_singleton_method(rb_cSocket, "gethostname", sock_gethostname, 0);
     rb_define_singleton_method(rb_cSocket, "gethostbyname", sock_s_gethostbyname, 1);
     rb_define_singleton_method(rb_cSocket, "gethostbyaddr", sock_s_gethostbyaddr, -1);
-    rb_define_singleton_method(rb_cSocket, "getservbyname", sock_s_getservbyaname, -1);
+    rb_define_singleton_method(rb_cSocket, "getservbyname", sock_s_getservbyname, -1);
+    rb_define_singleton_method(rb_cSocket, "getservbyport", sock_s_getservbyport, -1);
     rb_define_singleton_method(rb_cSocket, "getaddrinfo", sock_s_getaddrinfo, -1);
     rb_define_singleton_method(rb_cSocket, "getnameinfo", sock_s_getnameinfo, -1);
     rb_define_singleton_method(rb_cSocket, "sockaddr_in", sock_s_pack_sockaddr_in, 2);
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index e6df60e328..bdd9680367 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -790,7 +790,7 @@ strscan_peek(self, vlen)
  *   s.unscan
  *   s.scan(/../)         # => "te"
  *   s.scan(/\d/)         # => nil
- *   s.unscan             # ScanError: cannot unscan: prev match had failed
+ *   s.unscan             # ScanError: can't unscan: prev match had failed
  */
 static VALUE
 strscan_peep(self, vlen)
@@ -808,7 +808,7 @@ strscan_unscan(self)
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p))
-        rb_raise(ScanError, "cannot unscan: prev match had failed");
+        rb_raise(ScanError, "can't unscan: prev match had failed");
 
     p->curr = p->prev;
     CLEAR_MATCH_STATUS(p);
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index ff374b07d4..e713008c37 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -4353,8 +4353,15 @@ delete_slaves(ip)
                 slave = Tcl_GetSlave(ip, slave_name);
                 if (slave == (Tcl_Interp*)NULL) continue;
 
+<<<<<<< tcltklib.c
+    if (Tcl_Eval(ip, "info slaves") == TCL_ERROR) {
+        DUMP2("ip(%lx) can't get a list of slave IPs", ip);
+        return;
+    }
+=======
                 /* call ip_finalize */
                 ip_finalize(slave);
+>>>>>>> 1.3
 
                 Tcl_DeleteInterp(slave);
                 Tcl_Release(slave);
@@ -4486,6 +4493,12 @@ ip_replace_wait_commands(interp, mainWin)
                       (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
 #endif
 
+<<<<<<< tcltklib.c
+    /* security check */
+    if (ruby_safe_level >= 4) {
+        rb_raise(rb_eSecurityError, "can't create a TclTkIp object at level %d", ruby_safe_level);
+    }
+=======
     /* replace 'tkwait' command */
 #if TCL_MAJOR_VERSION >= 8
     DUMP1("Tcl_CreateObjCommand(\"tkwait\")");
@@ -4663,6 +4676,7 @@ ip_init(argc, argv, self)
                  "Cannot create a TclTkIp object at level %d", 
                  ruby_safe_level);
     }
+>>>>>>> 1.3
 
     /* create object */
     Data_Get_Struct(self, struct tcltkip, ptr);
@@ -4855,6 +4869,16 @@ ip_create_slave_core(interp, argc, argv)
     thr_crit_bup = rb_thread_critical;
     rb_thread_critical = Qtrue;
 
+<<<<<<< tcltklib.c
+    /* ip is deleted? */
+    if (Tcl_InterpDeleted(master->ip)) {
+        DUMP1("master-ip is deleted");
+        rb_thread_critical = thr_crit_bup;
+        rb_raise(rb_eRuntimeError, "deleted master can't create a new slave interpreter");
+    }
+
+=======
+>>>>>>> 1.3
     /* create slave-ip */
     slave->ref_count = 0;
     slave->allow_ruby_exit = 0;
@@ -7889,7 +7913,7 @@ lib_split_tklist_core(ip_obj, list_str)
         if (result == TCL_ERROR) {
             Tcl_DecrRefCount(listobj);
             if (interp == (Tcl_Interp*)NULL) {
-                rb_raise(rb_eRuntimeError, "cannot get elements from list");
+                rb_raise(rb_eRuntimeError, "can't get elements from list");
             } else {
 #if TCL_MAJOR_VERSION >= 8
                 rb_raise(rb_eRuntimeError, "%s", Tcl_GetStringResult(interp));
@@ -7961,7 +7985,7 @@ lib_split_tklist_core(ip_obj, list_str)
         if (Tcl_SplitList(interp, RSTRING(list_str)->ptr, 
                           &argc, &argv) == TCL_ERROR) {
             if (interp == (Tcl_Interp*)NULL) {
-                rb_raise(rb_eRuntimeError, "cannot get elements from list");
+                rb_raise(rb_eRuntimeError, "can't get elements from list");
             } else {
                 rb_raise(rb_eRuntimeError, "%s", interp->result);
             }
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index aab1a9c7f7..6f44ea894f 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -73,7 +73,7 @@
 #define OLEData_Get_Struct(obj, pole) {\
     Data_Get_Struct(obj, struct oledata, pole);\
     if(!pole->pDispatch) {\
-        rb_raise(rb_eRuntimeError, "Failed to get Dispatch Interface");\
+        rb_raise(rb_eRuntimeError, "failed to get Dispatch Interface");\
     }\
 }
 
@@ -606,7 +606,7 @@ ole_initialize()
     if(gOLEInitialized == Qfalse) {
         hr = OleInitialize(NULL);
         if(FAILED(hr)) {
-            ole_raise(hr, rb_eRuntimeError, "Fail: OLE initialize");
+            ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize");
         }
         gOLEInitialized = Qtrue;
         /*
@@ -1378,12 +1378,12 @@ ole_create_dcom(argc, argv, self)
     if (!gole32)
         gole32 = LoadLibrary("OLE32");
     if (!gole32)
-        rb_raise(rb_eRuntimeError, "Failed to load OLE32");
+        rb_raise(rb_eRuntimeError, "failed to load OLE32");
     if (!gCoCreateInstanceEx)
         gCoCreateInstanceEx = (FNCOCREATEINSTANCEEX*)
             GetProcAddress(gole32, "CoCreateInstanceEx");
     if (!gCoCreateInstanceEx)
-        rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment.");
+        rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment");
     rb_scan_args(argc, argv, "2*", &ole, &host, &others);
 
     pbuf  = ole_mb2wc(StringValuePtr(ole), -1);
@@ -1395,7 +1395,7 @@ ole_create_dcom(argc, argv, self)
     SysFreeString(pbuf);
     if (FAILED(hr))
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Unknown OLE server: `%s'",
+                  "unknown OLE server: `%s'",
                   StringValuePtr(ole));
     memset(&serverinfo, 0, sizeof(COSERVERINFO));    
     serverinfo.pwszName = ole_mb2wc(StringValuePtr(host), -1);
@@ -1405,7 +1405,7 @@ ole_create_dcom(argc, argv, self)
     SysFreeString(serverinfo.pwszName);
     if (FAILED(hr))
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Failed to create DCOM server `%s' in `%s'",
+                  "failed to create DCOM server `%s' in `%s'",
                   StringValuePtr(ole),
                   StringValuePtr(host));
 
@@ -1432,7 +1432,7 @@ ole_bind_obj(moniker, argc, argv, self)
     hr = CreateBindCtx(0, &pBindCtx);
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Failed to create bind context");
+                  "failed to create bind context");
     }
 
     pbuf  = ole_mb2wc(StringValuePtr(moniker), -1);
@@ -1441,7 +1441,7 @@ ole_bind_obj(moniker, argc, argv, self)
     if(FAILED(hr)) {
         OLE_RELEASE(pBindCtx);
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
-                  "Failed to parse display name of moniker `%s'",
+                  "failed to parse display name of moniker `%s'",
                   StringValuePtr(moniker));
     }
     hr = pMoniker->lpVtbl->BindToObject(pMoniker, pBindCtx, NULL, 
@@ -1452,7 +1452,7 @@ ole_bind_obj(moniker, argc, argv, self)
 
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
-                  "Failed to bind moniker `%s'",
+                  "failed to bind moniker `%s'",
                   StringValuePtr(moniker));
     }
     return create_win32ole_object(self, pDispatch, argc, argv);
@@ -1512,7 +1512,7 @@ fole_s_connect(argc, argv, self)
     if(FAILED(hr)) {
         OLE_RELEASE(pUnknown);
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Failed to create WIN32OLE server `%s'", 
+                  "failed to create WIN32OLE server `%s'", 
                   StringValuePtr(svr_name));
     }
 
@@ -1572,19 +1572,19 @@ fole_s_const_load(argc, argv, self)
     if (TYPE(klass) != T_CLASS &&
         TYPE(klass) != T_MODULE &&
         TYPE(klass) != T_NIL) {
-        rb_raise(rb_eTypeError, "2nd paramator must be Class or Module.");
+        rb_raise(rb_eTypeError, "2nd parameter must be Class or Module");
     }
     if (rb_obj_is_kind_of(ole, cWIN32OLE)) {
         OLEData_Get_Struct(ole, pole);
         hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
                                                   0, lcid, &pTypeInfo);
         if(FAILED(hr)) {
-            ole_raise(hr, rb_eRuntimeError, "Failed to GetTypeInfo");
+            ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
         }
         hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
         if(FAILED(hr)) {
             OLE_RELEASE(pTypeInfo);
-            ole_raise(hr, rb_eRuntimeError, "Failed to GetContainingTypeLib");
+            ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
         }
         OLE_RELEASE(pTypeInfo);
         if(TYPE(klass) != T_NIL) {
@@ -1604,7 +1604,7 @@ fole_s_const_load(argc, argv, self)
         hr = LoadTypeLibEx(pBuf, REGKIND_NONE, &pTypeLib);
         SysFreeString(pBuf);
         if (FAILED(hr))
-          ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to LoadTypeLibEx");
+          ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
         if(TYPE(klass) != T_NIL) {
             ole_const_load(pTypeLib, klass, self);
         }
@@ -1614,7 +1614,7 @@ fole_s_const_load(argc, argv, self)
         OLE_RELEASE(pTypeLib);
     }
     else {
-        rb_raise(rb_eTypeError, "1st paramator must be WIN32OLE instance");
+        rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE instance");
     }
     return Qnil;
 }
@@ -1767,11 +1767,11 @@ fole_s_show_help(argc, argv, self)
         helpfile = target;
     }
     if (TYPE(helpfile) != T_STRING) {
-        rb_raise(rb_eTypeError, "1st parameter must be (String|WIN32OLE_TYPE|WIN32OLE_METHOD).");
+        rb_raise(rb_eTypeError, "1st parameter must be (String|WIN32OLE_TYPE|WIN32OLE_METHOD)");
     }
     hwnd = ole_show_help(helpfile, helpcontext);
     if(hwnd == 0) {
-        rb_raise(rb_eRuntimeError, "Failed to open help file `%s'",
+        rb_raise(rb_eRuntimeError, "failed to open help file `%s'",
                  StringValuePtr(helpfile));
     }
     return Qnil;
@@ -1884,7 +1884,7 @@ fole_initialize(argc, argv, self)
     SysFreeString(pBuf);
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Unknown OLE server: `%s'",
+                  "unknown OLE server: `%s'",
                   StringValuePtr(svr_name));
     }
 
@@ -1893,7 +1893,7 @@ fole_initialize(argc, argv, self)
                           &IID_IDispatch, (void**)&pDispatch);
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
-                  "Failed to create WIN32OLE object from `%s'",
+                  "failed to create WIN32OLE object from `%s'",
                   StringValuePtr(svr_name));
     }
     
@@ -1994,7 +1994,7 @@ ole_invoke(argc, argv, self, wFlags)
     rb_scan_args(argc, argv, "1*", &cmd, &paramS);
     OLEData_Get_Struct(self, pole);
     if(!pole->pDispatch) {
-        rb_raise(rb_eRuntimeError, "Failed to get dispatch interface");
+        rb_raise(rb_eRuntimeError, "failed to get dispatch interface");
     }
     wcmdname = ole_mb2wc(StringValuePtr(cmd), -1);
     hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
@@ -2002,7 +2002,7 @@ ole_invoke(argc, argv, self, wFlags)
     SysFreeString(wcmdname);
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Unknown property or method: `%s'",
+                  "unknown property or method: `%s'",
                   StringValuePtr(cmd));
     }
 
@@ -2039,7 +2039,7 @@ ole_invoke(argc, argv, self, wFlags)
                 VariantClear(&op.dp.rgvarg[i]);
             }
             ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                      "Failed to get named argument info: `%s'",
+                      "failed to get named argument info: `%s'",
                       StringValuePtr(cmd));
         }
         op.dp.rgdispidNamedArgs = &(pDispID[1]);
@@ -2495,7 +2495,7 @@ ole_propertyput(self, property, value)
 
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
-                  "Unknown property or method: `%s'",
+                  "unknown property or method: `%s'",
                   StringValuePtr(property));
     }
     /* set property value */
@@ -2606,7 +2606,7 @@ fole_each(self)
 
     if (FAILED(hr)) {
         VariantClear(&result);
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to get IEnum Interface");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to get IEnum Interface");
     }
 
     if (V_VT(&result) == VT_UNKNOWN)
@@ -2619,7 +2619,7 @@ fole_each(self)
                                                          (void**)&pEnum);
     if (FAILED(hr) || !pEnum) {
         VariantClear(&result);
-        ole_raise(hr, rb_eRuntimeError, "Failed to get IEnum Interface");
+        ole_raise(hr, rb_eRuntimeError, "failed to get IEnum Interface");
     }
 
     VariantClear(&result);
@@ -2645,7 +2645,7 @@ fole_missing(argc, argv, self)
     id = rb_to_id(argv[0]);
     mname = rb_id2name(id);
     if(!mname) {
-        rb_raise(rb_eRuntimeError, "Fail: unknown method or property");
+        rb_raise(rb_eRuntimeError, "fail: unknown method or property");
     }
     n = strlen(mname);
     if(mname[n-1] == '=') {
@@ -2675,7 +2675,7 @@ ole_method_sub(self, pOwnerTypeInfo, pTypeInfo, name)
     VALUE method = Qnil;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     }
     for(i = 0; i < pTypeAttr->cFuncs && method == Qnil; i++) {
         hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
@@ -2714,7 +2714,7 @@ olemethod_from_typeinfo(self, pTypeInfo, name)
     VALUE method = Qnil;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     }
     method = ole_method_sub(self, 0, pTypeInfo, name);
     if (method != Qnil) {
@@ -2750,7 +2750,7 @@ ole_methods_sub(pOwnerTypeInfo, pTypeInfo, methods, mask)
     WORD i;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     }
     for(i = 0; i < pTypeAttr->cFuncs; i++) {
         pstr = NULL;
@@ -2791,7 +2791,7 @@ ole_methods_from_typeinfo(pTypeInfo, mask)
     VALUE methods = rb_ary_new();
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     }
 
     ole_methods_sub(0, pTypeInfo, methods, mask);
@@ -2824,7 +2824,7 @@ typeinfo_from_ole(pole, ppti)
     HRESULT hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
                                                       0, lcid, &pTypeInfo);
     if(FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "Failed to GetTypeInfo");
+        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
     }
     hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo,
                                              -1,
@@ -2834,7 +2834,7 @@ typeinfo_from_ole(pole, ppti)
     hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &i);
     OLE_RELEASE(pTypeInfo);
     if (FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "Failed to GetContainingTypeLib");
+        ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
     }
     count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
     for (i = 0; i < count; i++) {
@@ -2969,12 +2969,12 @@ fole_type( self )
 
     hr = pole->pDispatch->lpVtbl->GetTypeInfo( pole->pDispatch, 0, lcid, &pTypeInfo );
     if(FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "Failed to GetTypeInfo");
+        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
     }
     hr = pTypeInfo->lpVtbl->GetContainingTypeLib( pTypeInfo, &pTypeLib, &index );
     if(FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, rb_eRuntimeError, "Failed to GetContainingTypeLib");
+        ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
     }
     hr = pTypeLib->lpVtbl->GetDocumentation( pTypeLib, index,
                                              &bstr, NULL, NULL, NULL);
@@ -3033,12 +3033,12 @@ fole_typelib(self)
     hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
                                               0, lcid, &pTypeInfo);
     if(FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "Failed to GetTypeInfo");
+        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
     }
     hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
     if(FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, rb_eRuntimeError, "Failed to GetContainingTypeLib");
+        ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
     }
     OLE_RELEASE(pTypeInfo);
 
@@ -3053,7 +3053,7 @@ fole_typelib(self)
     pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
     OLE_RELEASE(pTypeLib);
     if (guid == Qnil) {
-        rb_raise(eWIN32OLE_RUNTIME_ERROR, "Fail to get typelib");
+        rb_raise(eWIN32OLE_RUNTIME_ERROR, "failed to get typelib");
     }
     return make_oletypelib_obj(guid, major, minor);
 }
@@ -3294,12 +3294,12 @@ fole_method_help( self, cmdname )
     OLEData_Get_Struct(self, pole);
     hr = typeinfo_from_ole(pole, &pTypeInfo);
     if(FAILED(hr))
-        ole_raise(hr, rb_eRuntimeError, "Failed to get ITypeInfo");
+        ole_raise(hr, rb_eRuntimeError, "failed to get ITypeInfo");
     method = folemethod_s_allocate(cWIN32OLE_METHOD);
     obj = olemethod_from_typeinfo(method, pTypeInfo, cmdname);
     OLE_RELEASE(pTypeInfo);
     if (obj == Qnil)
-        rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found %s",
+        rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s",
                  StringValuePtr(cmdname));
     return obj;
 }
@@ -3336,7 +3336,7 @@ foletype_s_ole_classes(self, typelib)
         pbuf = ole_mb2wc(StringValuePtr(file), -1);
         hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
         if (FAILED(hr))
-          ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to LoadTypeLibEx");
+          ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
         SysFreeString(pbuf);
         ole_classes_from_typelib(pTypeLib, classes);
         OLE_RELEASE(pTypeLib);
@@ -3753,7 +3753,7 @@ foletypelib_initialize(self, args)
     }
 
     if (found == Qfalse) {
-        rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found type library `%s`",
+        rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found type library `%s`",
                  StringValuePtr(typelib));
     }
     return self;
@@ -3922,12 +3922,12 @@ foletypelib_ole_classes(self)
         hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
         SysFreeString(pbuf);
         if (FAILED(hr))
-            ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to LoadTypeLibEx from `%s'",
+            ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx from `%s'",
                       StringValuePtr(path));
         ole_classes_from_typelib(pTypeLib, classes);
         OLE_RELEASE(pTypeLib);
     } else {
-        rb_raise(eWIN32OLE_RUNTIME_ERROR, "Failed to get type library path");
+        rb_raise(eWIN32OLE_RUNTIME_ERROR, "failed to get type library path");
     }
     return classes;
 }
@@ -3970,11 +3970,11 @@ foletype_initialize(self, typelib, oleclass)
     pbuf = ole_mb2wc(StringValuePtr(file), -1);
     hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to LoadTypeLibEx");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
     SysFreeString(pbuf);
     if (oleclass_from_typelib(self, pTypeLib, oleclass) == Qfalse) {
         OLE_RELEASE(pTypeLib);
-        rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found `%s` in `%s`",
+        rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found `%s` in `%s`",
                  StringValuePtr(oleclass), StringValuePtr(typelib));
     }
     OLE_RELEASE(pTypeLib);
@@ -4178,7 +4178,7 @@ ole_type_major_version(pTypeInfo)
     HRESULT hr;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     ver = INT2FIX(pTypeAttr->wMajorVerNum);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return ver;
@@ -4210,7 +4210,7 @@ ole_type_minor_version(pTypeInfo)
     HRESULT hr;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     ver = INT2FIX(pTypeAttr->wMinorVerNum);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return ver;
@@ -4242,7 +4242,7 @@ ole_type_typekind(pTypeInfo)
     HRESULT hr;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     typekind = INT2FIX(pTypeAttr->typekind);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return typekind;
@@ -4410,7 +4410,7 @@ ole_variables(pTypeInfo)
     VALUE variables = rb_ary_new();
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     }
     
     for(i = 0; i < pTypeAttr->cVars; i++) {
@@ -4534,7 +4534,7 @@ ole_variable_ole_type(pTypeInfo, var_index)
     VALUE type;
     hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetVarDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc");
     type = ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), Qnil);
     pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
     return type;
@@ -4579,7 +4579,7 @@ ole_variable_ole_type_detail(pTypeInfo, var_index)
     VALUE type = rb_ary_new();
     hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetVarDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc");
     ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), type);
     pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
     return type;
@@ -4870,12 +4870,12 @@ folemethod_initialize(self, oletype, method)
         Data_Get_Struct(oletype, struct oletypedata, ptype);
         obj = olemethod_from_typeinfo(self, ptype->pTypeInfo, method);
         if (obj == Qnil) {
-            rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found %s",
+            rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s",
                      StringValuePtr(method));
         }
     }
     else {
-        rb_raise(rb_eTypeError, "1st argument should be WIN32OLE_TYPE object.");
+        rb_raise(rb_eTypeError, "1st argument should be WIN32OLE_TYPE object");
     }
     return obj;
 }
@@ -4909,7 +4909,7 @@ ole_method_return_type(pTypeInfo, method_index)
 
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr)) 
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetFuncDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
     
     type = ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), Qnil);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
@@ -4946,7 +4946,7 @@ ole_method_return_vtype(pTypeInfo, method_index)
 
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr)) 
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetFuncDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
     
     vt = INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
@@ -5019,7 +5019,7 @@ ole_method_invkind(pTypeInfo, method_index)
     VALUE invkind;
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if(FAILED(hr)) 
-        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetFuncDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
     invkind = INT2FIX(pFuncDesc->invkind);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return invkind;
@@ -6403,7 +6403,7 @@ fev_initialize(argc, argv, self)
     rb_scan_args(argc, argv, "11", &ole, &itf);
 
     if (!rb_obj_is_kind_of(ole, cWIN32OLE)) {
-        rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE object.");
+        rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE object");
     }
 
     if(TYPE(itf) != T_NIL) {
@@ -6430,7 +6430,7 @@ fev_initialize(argc, argv, self)
     if (FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
         ole_raise(hr, rb_eRuntimeError,
-                  "Failed to query IConnectionPointContainer");
+                  "failed to query IConnectionPointContainer");
     }
 
     hr = pContainer->lpVtbl->FindConnectionPoint(pContainer,
@@ -6439,7 +6439,7 @@ fev_initialize(argc, argv, self)
     OLE_RELEASE(pContainer);
     if (FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, rb_eRuntimeError, "Failed to query IConnectionPoint");
+        ole_raise(hr, rb_eRuntimeError, "failed to query IConnectionPoint");
     }
     pIEV = EVENTSINK_Constructor();
     pIEV->m_iid = iid;
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 90f4d22fa9..15f90681f8 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -2201,7 +2201,7 @@ gzfile_readpartial(gz, len, outbuf)
 	}
         if (!NIL_P(outbuf))
             rb_str_resize(outbuf, 0);
-	rb_raise(rb_eEOFError, "End of file reached");
+	rb_raise(rb_eEOFError, "end of file reached");
     }
 
     dst = zstream_shift_buffer(&gz->z, len);
@@ -3100,7 +3100,7 @@ rb_gzreader_readchar(obj)
     VALUE dst;
     dst = rb_gzreader_getc(obj);
     if (NIL_P(dst)) {
-	rb_raise(rb_eEOFError, "End of file reached");
+	rb_raise(rb_eEOFError, "end of file reached");
     }
     return dst;
 }
@@ -3282,7 +3282,7 @@ rb_gzreader_readline(argc, argv, obj)
     VALUE dst;
     dst = rb_gzreader_gets(argc, argv, obj);
     if (NIL_P(dst)) {
-	rb_raise(rb_eEOFError, "End of file reached");
+	rb_raise(rb_eEOFError, "end of file reached");
     }
     return dst;
 }