yugui	2009-10-25 23:46:51 +0900 (Sun, 25 Oct 2009)

  New Revision: 25482

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25482

  Log:
    merges r24533 from trunk into ruby_1_9_1.
    --
    * doc/ChangeLog-1.8.0: add forgotten entry contributed by
      TAKAHASHI Kaoru.  [ruby-dev:39065]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/doc/ChangeLog-1.8.0
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/doc/ChangeLog-1.8.0
===================================================================
--- ruby_1_9_1/doc/ChangeLog-1.8.0	(revision 25481)
+++ ruby_1_9_1/doc/ChangeLog-1.8.0	(revision 25482)
@@ -10516,6 +10516,11 @@
 	* eval.c (block_pass): should allow block argument relay even in
 	  the tainted mode.
 
+Thu Jan 17 09:43:05 2002  TAKAHASHI Kaoru  <kaoru@k...>
+
+	* misc/ruby-mode.el (ruby-add-log-current-method): New function
+	for `add-log-current-defun-function'.
+
 Thu Jan 17 04:51:48 2002  Yukihiro Matsumoto  <matz@r...>
 
 	* ext/socket/socket.c: support subclassing by proper "initialize"
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25481)
+++ ruby_1_9_1/ChangeLog	(revision 25482)
@@ -1,3 +1,8 @@
+Fri Aug 14 00:29:22 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* doc/ChangeLog-1.8.0: add forgotten entry contributed by
+	  TAKAHASHI Kaoru.  [ruby-dev:39065]
+
 Fri Aug 14 00:19:49 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/delegate.rb (Delegator#method_missing): __FILE__ may contain
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25481)
+++ ruby_1_9_1/version.h	(revision 25482)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 288
+#define RUBY_PATCHLEVEL 289
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/