diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 11:28:08 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 11:28:08 +0000 |
commit | 89fff52dfaa140931efb29f82eaee6d777e5e39d (patch) | |
tree | 309b030d7506cf75d3f7c507e17a18ba991c59d0 | |
parent | e3f7b363e8b0ac7eaf78da19001438f40d287f88 (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | misc/ruby-mode.el | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sun Jun 15 20:27:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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:20:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * 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 @@ -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 |