[Emacs-diffs] /srv/bzr/emacs/trunk r107393: * lisp/emacs-lisp/lisp.el (beginning-of-defun-raw): Don't call end-of-defun

[Stefan Monnier]

------------------------------------------------------------
revno: 107393
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10797
author: Dmitry Gutov <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-02-23 03:13:48 -0500
message:
  * lisp/emacs-lisp/lisp.el (beginning-of-defun-raw): Don't call end-of-defun
  when it might call us back infinitely.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/lisp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-23 04:38:29 +0000
+++ b/lisp/ChangeLog    2012-02-23 08:13:48 +0000
@@ -1,3 +1,8 @@
+2012-02-23  Dmitry Gutov  <address@hidden>
+
+       * emacs-lisp/lisp.el (beginning-of-defun-raw): Don't call end-of-defun
+       when it might call us back infinitely (bug#10797).
+
 2012-02-23  Stefan Monnier  <address@hidden>
 
        * minibuffer.el (completion-table-with-context): Fix inf-loop.

=== modified file 'lisp/emacs-lisp/lisp.el'
--- a/lisp/emacs-lisp/lisp.el   2012-01-19 07:21:25 +0000
+++ b/lisp/emacs-lisp/lisp.el   2012-02-23 08:13:48 +0000
@@ -257,9 +257,8 @@
        (if (> arg 0)
            (dotimes (i arg)
              (funcall beginning-of-defun-function))
-         ;; Better not call end-of-defun-function directly, in case
-         ;; it's not defined.
-         (end-of-defun (- arg))))))
+        (dotimes (i (- arg))
+          (funcall end-of-defun-function))))))
 
    ((or defun-prompt-regexp open-paren-in-column-0-is-defun-start)
     (and (< arg 0) (not (eobp)) (forward-char 1))