From: Tassilo Horn <tassilo@member.fsf.org>
To: emacs-orgmode@gnu.org
Subject: Re: Difference between org-footnote.el and footnote.el
Date: Fri, 22 Oct 2010 11:43:21 +0200 [thread overview]
Message-ID: <87lj5q7ebq.fsf@thinkpad.tsdh.de> (raw)
In-Reply-To: 80zku63adu.fsf@mundaneum.com
* repos/el/org-mode/lisp/org-footnote.el
(org-footnote-create-definition)
(org-footnote-goto-local-insertion-point): Add footnotes before
signature when in message-mode.
---
| 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
--git a/lisp/org-footnote.el b/lisp/org-footnote.el
index 36fcfb2..4be0504 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -302,15 +302,20 @@ or new, let the user edit the definition of the footnote."
(t
(setq re (concat "^" org-footnote-tag-for-non-org-mode-files "[ \t]*$"))
(unless (re-search-forward re nil t)
- (goto-char (point-max))
- (skip-chars-backward " \t\r\n")
- (insert "\n\n")
- (delete-region (point) (point-max))
- (insert org-footnote-tag-for-non-org-mode-files "\n"))
- (goto-char (point-max))
- (skip-chars-backward " \t\r\n")))
- (insert "\n\n")
- (insert "[" label "] ")
+ (let ((max (if (and (eq major-mode 'message-mode)
+ (re-search-forward message-signature-separator nil t))
+ (progn (beginning-of-line) (point))
+ (goto-char (point-max)))))
+ (skip-chars-backward " \t\r\n")
+ (delete-region (point) max)
+ (insert "\n\n")
+ (insert org-footnote-tag-for-non-org-mode-files "\n")))))
+ ;; Skip existing footnotes
+ (while (re-search-forward "^[[:space:]]*\\[[^]]+\\] " nil t)
+ (forward-line))
+ (insert "[" label "] \n")
+ (goto-char (1- (point)))
+ (when (org-mode-p) (org-indent-line-function))
(message "Edit definition and go back with `C-c &' or, if unique, with `C-c C-c'.")))
;;;###autoload
@@ -506,7 +511,8 @@ ENTRY is (fn-label num-mark definition)."
(beginning-of-line 0))
(if (looking-at "[ \t]*#\\+TBLFM:") (beginning-of-line 2))
(end-of-line 1)
- (skip-chars-backward "\n\r\t "))
+ (skip-chars-backward "\n\r\t ")
+ (forward-line))
(defun org-footnote-delete (&optional label)
"Delete the footnote at point.
--
1.7.3.1
Sébastien Vauban <wxhgmqzgwmuf@spammotel.com>
writes:
Hi Seb,
> If I sum up this whole thread about footnote.el vs org-footnote.el,
> the latest one (org-footnote.el) seems better than the original
> footnote.el in every aspect but for the placement of the footnotes
> before the signature.
Yep, that sounds correct.
> Does someone take care of updating it?
Above is a patch. It seems to work correctly in both mails and
org-files for me, but I was that stupid not to try the original
org-footnote.el before implementing that feature. So there could be
regressions, or at least not 100% compatible behavior. I'm not sure,
but did the original version create a "stack of footnote definitions",
e.g. was the numbering from latest to oldest footnote? Now it's the
other way round, which looks better to me...
Please everyone, give it a test drive, and if it works, feel free to
commit.
Bye,
Tassilo
next prev parent reply other threads:[~2010-10-22 9:43 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-20 5:37 A few questions about how you write e-mails Jeff Horn
2010-10-20 5:51 ` Glyn Millington
2010-10-20 5:57 ` Noorul Islam K M
2010-10-20 6:44 ` Samuel Wales
2010-10-20 11:36 ` Bernt Hansen
2010-10-20 17:20 ` Nick Dokos
2010-10-22 8:06 ` Sébastien Vauban
2010-10-22 8:47 ` Tassilo Horn
2010-10-20 20:10 ` Eric Schulte
2010-10-21 1:55 ` Matt Lundin
2010-10-21 2:47 ` suvayu ali
2010-10-21 3:40 ` Nick Dokos
2010-10-21 8:10 ` suvayu ali
2010-10-22 12:27 ` Matthias Danzl
2010-10-22 15:07 ` suvayu ali
2010-10-21 7:45 ` Tassilo Horn
2010-10-21 8:07 ` suvayu ali
2010-10-21 8:17 ` Difference between org-footnote.el and footnote.el (was: A few questions about how you write e-mails) Tassilo Horn
2010-10-21 9:10 ` [Orgmode] Difference between org-footnote.el and footnote.el Andreas Röhler
2010-10-21 9:38 ` Tassilo Horn
2010-10-21 10:17 ` Tassilo Horn
2010-10-21 15:05 ` Nick Dokos
2010-10-21 15:05 ` Nick Dokos
2010-10-21 15:19 ` Charles Philip Chan
2010-10-21 15:28 ` Tassilo Horn
2010-10-21 19:11 ` Eric S Fraga
2010-10-22 8:22 ` Sébastien Vauban
2010-10-22 9:43 ` Tassilo Horn [this message]
2010-10-22 9:53 ` [PATCH] Make footnotes work correctly in message-mode (was: Difference between org-footnote.el and footnote.el) Tassilo Horn
2010-10-22 12:11 ` [PATCH] Make footnotes work correctly in message-mode Sébastien Vauban
2010-10-22 12:29 ` Tassilo Horn
2010-10-22 14:24 ` Sébastien Vauban
2010-10-22 13:00 ` Dan Davison
2010-10-22 15:51 ` Sébastien Vauban
2010-10-22 15:43 ` Sébastien Vauban
2010-10-22 16:23 ` Tassilo Horn
2010-10-22 18:44 ` Sébastien Vauban
2010-10-24 16:20 ` [PATCH] Make footnotes work correctly in message-mode (was: Difference between org-footnote.el and footnote.el) Carsten Dominik
2010-10-24 17:02 ` Nick Dokos
2010-10-24 17:14 ` [PATCH] Make footnotes work correctly in message-mode Tassilo Horn
2010-10-21 17:30 ` [Orgmode] Difference between org-footnote.el and footnote.el Andreas Röhler
2010-10-21 17:52 ` Tassilo Horn
2010-10-21 18:21 ` Andreas Röhler
2010-10-21 18:25 ` Stephen J. Turnbull
2010-10-21 6:16 ` A few questions about how you write e-mails Noorul Islam K M
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lj5q7ebq.fsf@thinkpad.tsdh.de \
--to=tassilo@member.fsf.org \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.