From 0e9d401519c020af29a7e35da7acfca25e6c3be4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 29 Sep 2011 22:53:45 +0200 Subject: [PATCH] org-footnote: Fix an infloop * lisp/org-footnote.el (org-footnote-renumber-fn:N): Fix an infloop introduced by commit 1effad02beb79b2fb26506bd4142cb74bbe3a906. --- lisp/org-footnote.el | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index d54a0f8ee..64e7cc3fe 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -891,15 +891,16 @@ If LABEL is non-nil, delete that footnote instead." (org-with-wide-buffer (goto-char (point-min)) (while (re-search-forward "\\[fn:\\([0-9]+\\)[]:]" nil t) - (goto-char (match-beginning 0)) - ;; Ensure match is a footnote reference or definition. - (when (or (and (bolp) (save-match-data (org-footnote-at-definition-p))) - (save-match-data (org-footnote-at-reference-p))) - (let ((new-val (or (cdr (assoc (match-string 1) map)) - (number-to-string (incf n))))) - (unless (assoc (match-string 1) map) - (push (cons (match-string 1) new-val) map)) - (replace-match new-val nil nil nil 1))))))) + (save-excursion + (goto-char (match-beginning 0)) + ;; Ensure match is a footnote reference or definition. + (when (or (and (bolp) (save-match-data (org-footnote-at-definition-p))) + (save-match-data (org-footnote-at-reference-p))) + (let ((new-val (or (cdr (assoc (match-string 1) map)) + (number-to-string (incf n))))) + (unless (assoc (match-string 1) map) + (push (cons (match-string 1) new-val) map)) + (replace-match new-val nil nil nil 1)))))))) (defun org-footnote-auto-adjust-maybe () "Renumber and/or sort footnotes according to user settings." -- 2.11.4.GIT