[Emacs-diffs] /srv/bzr/emacs/trunk r109912: * lisp/progmodes/ruby-mode.el (ruby-end-of-defun)

[Dmitry Gutov]

------------------------------------------------------------
revno: 109912
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Fri 2012-09-07 08:36:20 +0400
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/progmodes/ruby-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-07 04:15:56 +0000
+++ b/lisp/ChangeLog    2012-09-07 04:36:20 +0000
@@ -1,3 +1,9 @@
+2012-09-07  Dmitry Gutov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/cl-macs.el (cl--do-arglist): Understand _ on &key args

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2012-09-07 04:15:56 +0000
+++ b/lisp/progmodes/ruby-mode.el       2012-09-07 04:36:20 +0000
@@ -839,8 +839,8 @@
 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 @@
 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))