From 89fff52dfaa140931efb29f82eaee6d777e5e39d Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 11:28:08 +0000 Subject: 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 in [ruby-core:15915] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ misc/ruby-mode.el | 2 +- version.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f736cec155..14b91a258a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jun 15 20:27:59 2008 Nobuyoshi Nakada + + * 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 in [ruby-core:15915] + Sun Jun 15 20:20:59 2008 Nobuyoshi Nakada * numeric.c (fix_coerce): try conversion before type check. diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index 25c6b3008d..779a52def4 100644 --- a/misc/ruby-mode.el +++ b/misc/ruby-mode.el @@ -255,7 +255,7 @@ The variable ruby-indent-level controls the amount of indentation. (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 diff --git a/version.h b/version.h index a70d581796..d4ea702931 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 186 +#define RUBY_PATCHLEVEL 187 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3