tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-14 01:07:52 +02:00
parent 4ddfa565c9 f8c4102cc6
commit d7c6d92166
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/org-footnote.el
View File

@ -552,13 +552,13 @@ or new, let the user edit the definition of the footnote."
(org-footnote-auto-adjust-maybe))
(t
(insert "[" label "]")
(let ((l (copy-marker (org-footnote-create-definition label))))
(org-footnote-auto-adjust-maybe)
(or (ignore-errors (org-footnote-goto-definition label l))
;; Since definition was created outside current
;; scope, edit it remotely.
(progn (set-marker l nil)
(org-edit-footnote-reference))))))))
(org-footnote-create-definition label)
(org-footnote-auto-adjust-maybe)
(if (ignore-errors (org-footnote-goto-definition label))
(forward-char)
;; Definition was created outside current scope: edit it
;; remotely.
(org-edit-footnote-reference))))))
(defvar org-blank-before-new-entry) ; Silence byte-compiler.
(defun org-footnote-create-definition (label)