diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 11:27:43 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 11:27:43 +0000 |
| commit | 306831553d32b7fc083e3edc2336d9853c7a9968 (patch) | |
| tree | e5b21656c4d43b8d54db6cf6eeba02e68aa4e9bc | |
| parent | 19ce20916a7d3922d9526310aea055bd2c77dfbb (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_5@17208 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:21 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:07:30 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 21e1b4664c..3fe99017d9 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 185 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 185 +#define RUBY_PATCHLEVEL 186 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |