diff options
| author | Carsten Dominik <dominik@science.uva.nl> | 2009-01-27 11:39:48 +0000 |
|---|---|---|
| committer | Carsten Dominik <dominik@science.uva.nl> | 2009-01-27 11:39:48 +0000 |
| commit | 65c439fd68997aa8f44cad817d09f97c35b0635c (patch) | |
| tree | 4317105206b2f28e0b6f97e16c709face4ad5e87 /lisp/org/org-footnote.el | |
| parent | e6c815ae0953136a01aef0d5321b9c78ffcfbdfb (diff) | |
| download | emacs-65c439fd68997aa8f44cad817d09f97c35b0635c.tar.gz emacs-65c439fd68997aa8f44cad817d09f97c35b0635c.tar.bz2 emacs-65c439fd68997aa8f44cad817d09f97c35b0635c.zip | |
2009-01-27 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-todo): Return correct state type even if the blocker
throws an error.
(org-modifier-cursor-error): Renamed from
`org-shiftcursor-error'.
(org-shiftmetaleft, org-shiftmetaright, org-shiftmetaup)
(org-shiftmetadown): Call `org-modifier-cursor-error'.
* org-agenda.el (org-agenda-todo): Call `org-todo' interactively,
to get real errors from the blocker hook.
* org.el (org-shiftselect-error, org-call-for-shift-select): New
functions.
(org-set-visibility-according-to-property): Turn off the setting
of `org-show-entry-below', to avoid overruling a FOLDED visibility
property.
* org.el (org-support-shift-select): New option.
(org-shiftup, org-shiftdown, org-shiftright, org-shiftleft)
(org-shiftcontrolright, org-shiftcontrolleft): Support for shift
selection outside contexts.
* org-list.el (org-at-item-bullet-p): New function.
* org-jsinfo.el (org-infojs-handle-options): Remove unnecessary
variables.
* org-footnote.el (org-footnote-normalize): Remove unnecessary
variable.
(org-insert-footnote-reference-near-definition): Remove
unnecessary let form.
Diffstat (limited to 'lisp/org/org-footnote.el')
| -rw-r--r-- | lisp/org/org-footnote.el | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el index 05ebce54c0b..4372411c06d 100644 --- a/lisp/org/org-footnote.el +++ b/lisp/org/org-footnote.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.19a +;; Version: 6.19e ;; ;; This file is part of GNU Emacs. ;; @@ -255,7 +255,7 @@ or new, let the user edit the definition of the footnote." "Start the definition of a footnote with label LABEL." (interactive "sLabel: ") (setq label (org-footnote-normalize-label label)) - (let (re p) + (let (re) (cond ((org-mode-p) (if (not org-footnote-section) @@ -322,7 +322,7 @@ Org-mode exporters. When SORT-ONLY is set, only sort the footnote definitions into the referenced sequence." ;; This is based on Paul's function, but rewritten. - (let ((count 0) ref def idef ref-table liste beg beg1 marker a before + (let ((count 0) ref def idef ref-table beg beg1 marker a before ins-point) (save-excursion ;; Now find footnote references, and extract the definitions @@ -443,12 +443,11 @@ referenced sequence." "Find first reference of footnote ENTRY and insert the definition there. ENTRY is (fn-label num-mark definition)." (when (car entry) - (let ((pos (point))) - (goto-char (point-min)) - (when (re-search-forward (format ".\\[%s[]:]" (regexp-quote (car entry))) - nil t) - (org-footnote-goto-local-insertion-point) - (insert (format "\n\n[%s] %s" (car entry) (nth 2 entry))))))) + (goto-char (point-min)) + (when (re-search-forward (format ".\\[%s[]:]" (regexp-quote (car entry))) + nil t) + (org-footnote-goto-local-insertion-point) + (insert (format "\n\n[%s] %s" (car entry) (nth 2 entry)))))) (defun org-footnote-goto-local-insertion-point () "Find insertion point for footnote, just before next outline heading." |