diff options
| author | Jan D | 2015-04-26 13:55:01 +0200 |
|---|---|---|
| committer | Jan D | 2015-04-26 13:55:01 +0200 |
| commit | f92ac2e82ed199d6f25d2a59508e08addb1150ac (patch) | |
| tree | d7d7756e3dbce10d8f73c27815d815499f78c2bd /lisp/progmodes/ruby-mode.el | |
| parent | 5a094119ce79723108abd90a1fcc33721e964823 (diff) | |
| parent | a40869789fc5502e3d4e393b7c31d78cb7f29aa1 (diff) | |
| download | emacs-f92ac2e82ed199d6f25d2a59508e08addb1150ac.tar.gz emacs-f92ac2e82ed199d6f25d2a59508e08addb1150ac.zip | |
Merge branch 'master' into cairo
Diffstat (limited to 'lisp/progmodes/ruby-mode.el')
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index f2fb95ce59a..0e2f66e5bc5 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el | |||
| @@ -1392,7 +1392,8 @@ by `end-of-defun'." | |||
| 1392 | (interactive "p") | 1392 | (interactive "p") |
| 1393 | (ruby-forward-sexp) | 1393 | (ruby-forward-sexp) |
| 1394 | (let (case-fold-search) | 1394 | (let (case-fold-search) |
| 1395 | (when (looking-back (concat "^\\s *" ruby-block-end-re)) | 1395 | (when (looking-back (concat "^\\s *" ruby-block-end-re) |
| 1396 | (line-beginning-position)) | ||
| 1396 | (forward-line 1)))) | 1397 | (forward-line 1)))) |
| 1397 | 1398 | ||
| 1398 | (defun ruby-beginning-of-indent () | 1399 | (defun ruby-beginning-of-indent () |