From: Samuel Loury <konubinix@gmail.com>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: OrgMode ML <emacs-orgmode@gnu.org>
Subject: Re: org-expiry not compatible with the new drawer syntax
Date: Mon, 02 Feb 2015 08:31:56 +0100 [thread overview]
Message-ID: <87sieobwgj.fsf@konixwork.incubateur.ens-lyon.fr> (raw)
In-Reply-To: <87fvasp0n7.fsf@nicolasgoaziou.fr>
[-- Attachment #1.1: Type: text/plain, Size: 877 bytes --]
Hi,
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
> Samuel Loury <konubinix@gmail.com> writes:
>
>> I suggest to provide a helper that would move point after the meta-data
>> part to avoid code duplication. Something like (no surprise :-)):
>> (defun org-goto-after-metadata-part ()
>> (when (org-looking-at-p org-planning-line-re) (forward-line))
>> (when (looking-at org-property-drawer-re)
>> (goto-char (match-end 0))
>> (forward-line)))
>
> Indeed.
>
>> I would have gladly provided a patch myself but I couldn't find neither
>> a good name for the function nor a correct location to store it. Should
>> it be in org.el? It is already 24850 lines long...
>
> I changed `org-end-of-meta-data-and-drawers' into
> `org-end-of-meta-data'.
>
> Could you merge your other patch and the use of this function?
Please find attached the merged patch, as asked for.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-Make-use-of-org-insert-heading-instead-of-inserting-.patch --]
[-- Type: text/x-diff, Size: 1175 bytes --]
From 02dd79b12d6f19551d1d9648a3a84e53c4cee984 Mon Sep 17 00:00:00 2001
From: Konubinix <konubinix@gmail.com>
Date: Thu, 6 Nov 2014 11:02:23 +0100
Subject: [PATCH] Make use of `org-insert-heading' instead of inserting the *
character
* lisp/org-agenda.el (org-agenda-insert-diary-as-top-level): Make
use of `org-insert-heading' instead of inserting the * character
Therefore, the hooks associated to the insertion of a heading will be
triggered. Since those hooks may cause the creation of some
metadata. `org-end-of-meta-data' is used afterward.
---
lisp/org-agenda.el | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 5f7c9ac..164e2d5 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -9488,7 +9488,10 @@ a timestamp can be added there."
(widen)
(goto-char (point-max))
(or (bolp) (insert "\n"))
- (insert "* " text "\n")
+ (org-insert-heading)
+ (insert text)
+ (org-end-of-meta-data)
+ (unless (bolp) (insert "\n"))
(if org-adapt-indentation (org-indent-to-column 2)))
(defun org-agenda-insert-diary-make-new-entry (text)
--
2.1.4
[-- Attachment #1.3: Type: text/plain, Size: 134 bytes --]
Thank you for you support.
--
Konubinix
GPG Key : 7439106A
Fingerprint: 5993 BE7A DA65 E2D9 06CE 5C36 75D2 3CED 7439 106A
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]
next prev parent reply other threads:[~2015-02-02 7:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-30 7:22 org-expiry not compatible with the new drawer syntax Samuel Loury
2015-01-30 9:30 ` Nicolas Goaziou
2015-01-30 10:28 ` Samuel Loury
2015-01-30 10:35 ` Samuel Loury
2015-01-30 18:46 ` Nicolas Goaziou
2015-02-02 7:31 ` Samuel Loury [this message]
2015-02-02 12:26 ` Nicolas Goaziou
2015-02-02 12:45 ` Samuel Loury
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
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sieobwgj.fsf@konixwork.incubateur.ens-lyon.fr \
--to=konubinix@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=mail@nicolasgoaziou.fr \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).