procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/emacs-lisp/lisp.el (beginning-of-defun-raw): Don't call end-of-defun

Browse source 
when it might call us back infinitely.

Fixes: debbugs:10797
This commit is contained in:
Dmitry Gutov 2012-02-23 03:13:48 -05:00 • committed by Stefan Monnier
parent 2dbe4d7106
commit 8e911f6f93
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-23 Dmitry Gutov <dgutov@yandex.ru>
* 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 <monnier@iro.umontreal.ca>
* minibuffer.el (completion-table-with-context): Fix inf-loop.

5
lisp/emacs-lisp/lisp.el
View file

@ -257,9 +257,8 @@ is called as a function to find the defun's beginning."
(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))