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
This commit is contained in:
shyouhei 2008-06-15 11:27:43 +00:00
parent 19ce20916a
commit 306831553d
3 changed files with 8 additions and 2 deletions

View File

@ -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.

View File

@ -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

View File

@ -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