Commit d81ceaaf authored by Dmitry Gutov's avatar Dmitry Gutov
Browse files

* lisp/progmodes/ruby-mode.el (ruby-end-of-defun)

(ruby-beginning-of-defun): Simplify, allow indentation before
block beginning and end keywords.  Also, fix accidental change in the former.
parent 0ba2d4b6
2012-09-07 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby-end-of-defun)
(ruby-beginning-of-defun): Simplify, allow indentation before
block beginning and end keywords.
2012-09-06 Stefan Monnier <monnier@iro.umontreal.ca>
 
* emacs-lisp/cl-macs.el (cl--do-arglist): Understand _ on &key args
......
......@@ -839,8 +839,8 @@ and `\\' when preceded by `?'."
With ARG, move backward multiple defuns. Negative ARG means
move forward."
(interactive "p")
(and (re-search-backward (concat "^\\(" ruby-block-beg-re "\\)\\b")
nil 'move (or arg 1))
(and (re-search-backward (concat "^\\s *\\(" ruby-block-beg-re "\\)\\_>")
nil t (or arg 1))
(beginning-of-line)))
(defun ruby-end-of-defun (&optional arg)
......@@ -848,7 +848,7 @@ move forward."
With ARG, move forward multiple defuns. Negative ARG means
move backward."
(interactive "p")
(and (re-search-forward ruby-indent-beg-re nil 'move (or arg 1))
(and (re-search-forward (concat "^\\s *" ruby-block-end-re) nil t (or arg 1))
(beginning-of-line))
(forward-line 1))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment