shyouhei	2008-06-15 20:27:43 +0900 (Sun, 15 Jun 2008)

  New Revision: 17208

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/misc/ruby-mode.el
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 15790:
    * misc/ruby-mode.el (ruby-mode): should use `run-mode-hooks' instead
      of calling `run-hooks' directly to run the mode hook.  patch from
      Chiyuan Zhang <pluskid AT gmail.com> in [ruby-core:15915]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/misc/ruby-mode.el?r1=17208&r2=17207&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17208&r2=17207&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17208&r2=17207&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17207)
+++ ruby_1_8_5/ChangeLog	(revision 17208)
@@ -1,3 +1,9 @@
+Sun Jun 15 20:27:21 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* misc/ruby-mode.el (ruby-mode): should use `run-mode-hooks' instead
+	  of calling `run-hooks' directly to run the mode hook.  patch from
+	  Chiyuan Zhang <pluskid AT gmail.com> in [ruby-core:15915]
+
 Sun Jun 15 20:07:30 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* numeric.c (fix_coerce): try conversion before type check.
Index: ruby_1_8_5/misc/ruby-mode.el
===================================================================
--- ruby_1_8_5/misc/ruby-mode.el	(revision 17207)
+++ ruby_1_8_5/misc/ruby-mode.el	(revision 17208)
@@ -255,7 +255,7 @@
   (make-local-variable 'add-log-current-defun-function)
   (setq add-log-current-defun-function 'ruby-add-log-current-method)
 
-  (run-hooks 'ruby-mode-hook))
+  (run-mode-hooks 'ruby-mode-hook))
 
 (defun ruby-current-indentation ()
   (save-excursion
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17207)
+++ ruby_1_8_5/version.h	(revision 17208)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 185
+#define RUBY_PATCHLEVEL 186
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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