diff options
| author | Glenn Morris | 2012-12-27 00:21:08 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-12-27 00:21:08 -0800 |
| commit | 82e2a1f054cc0306494d1194036af4c5d7301caf (patch) | |
| tree | f78be2edfd92d4eba0dc28bd110f646a314438ae /lisp/progmodes/ruby-mode.el | |
| parent | c34339f3a2c425ca37bec0c6a152f913ab61f458 (diff) | |
| parent | e1da740354d9cab626bce82645adcfc6b0735b70 (diff) | |
| download | emacs-82e2a1f054cc0306494d1194036af4c5d7301caf.tar.gz emacs-82e2a1f054cc0306494d1194036af4c5d7301caf.zip | |
Merge from emacs-24; up to 2012-12-03T21:07:47Z!eggert@cs.ucla.edu
Diffstat (limited to 'lisp/progmodes/ruby-mode.el')
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index b223aece416..5cba1df3c8f 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | ;; URL: http://www.emacswiki.org/cgi-bin/wiki/RubyMode | 7 | ;; URL: http://www.emacswiki.org/cgi-bin/wiki/RubyMode |
| 8 | ;; Created: Fri Feb 4 14:49:13 JST 1994 | 8 | ;; Created: Fri Feb 4 14:49:13 JST 1994 |
| 9 | ;; Keywords: languages ruby | 9 | ;; Keywords: languages ruby |
| 10 | ;; Version: 1.0 | 10 | ;; Version: 1.2 |
| 11 | 11 | ||
| 12 | ;; This file is part of GNU Emacs. | 12 | ;; This file is part of GNU Emacs. |
| 13 | 13 | ||
| @@ -64,8 +64,9 @@ | |||
| 64 | "Regexp to match keywords that nest without blocks.") | 64 | "Regexp to match keywords that nest without blocks.") |
| 65 | 65 | ||
| 66 | (defconst ruby-indent-beg-re | 66 | (defconst ruby-indent-beg-re |
| 67 | (concat "^\\s *" (regexp-opt '("class" "module" "def" "if" "unless" "case" | 67 | (concat "^\\(\\s *" (regexp-opt '("class" "module" "def")) "\\|" |
| 68 | "while" "until" "for" "begin")) "\\_>") | 68 | (regexp-opt '("if" "unless" "case" "while" "until" "for" "begin")) |
| 69 | "\\)\\_>") | ||
| 69 | "Regexp to match where the indentation gets deeper.") | 70 | "Regexp to match where the indentation gets deeper.") |
| 70 | 71 | ||
| 71 | (defconst ruby-modifier-beg-keywords | 72 | (defconst ruby-modifier-beg-keywords |