From: Carsten Dominik <carsten.dominik@gmail.com>
To: Johan Friis <mail@alterecco.net>, David Maus <dmaus@ictsoc.de>
Cc: emacs-orgmode list <emacs-orgmode@gnu.org>
Subject: Re: [PATCH] org-capture - using `file' as template
Date: Wed, 14 Jul 2010 11:04:22 +0200 [thread overview]
Message-ID: <C335C25E-B437-4624-98C8-7F7370FC6EA7@gmail.com> (raw)
In-Reply-To: <87bpaavlpo.fsf@alterecco.net>
Hi Johan, thanks for the report and patch, hi David, thanks for
further comments, I have checked in a fix.
- Carsten
On Jul 14, 2010, at 4:30 AM, Johan Friis wrote:
>
> Setting up capture to use templates from file in the latest git seemed
> to cause some errors. I looked into it and wrote this small patch. It
> could probably use some love, seeing as I am quite new to org-mode,
> elisp and emacs in general.
>
> The error I was getting was related to testing (string-match ...) on
> a list. The fix is to check if txt is a list before doing the test. In
> addition I updated the customize interface to use `file' instead of
> `file-contents'. This seems to be the current way of doing things.
>
> Please note: This is my first time posting here. Please let me know if
> there are some rules to follow that I missed. And thanks for a great
> piece of software :)
>
> Regards,
>
> Johan
>
>
> diff --git a/lisp/org-capture.el b/lisp/org-capture.el
> index 2cb6876..da0925c 100644
> --- a/lisp/org-capture.el
> +++ b/lisp/org-capture.el
> @@ -285,7 +285,7 @@ calendar | %:type %:date"
> (choice :tag "Template"
> (string)
> (list :tag "File"
> - (const :format "" file-contents)
> + (const :format "" file)
> (file :tag "Template file"))
> (list :tag "Function"
> (const :format "" function)
> @@ -981,14 +981,15 @@ Point will remain at the first line after the
> inserted text."
> (org-capture-put :key (car entry) :description (nth 1 entry)
> :target (nth 3 entry))
> (let ((txt (nth 4 entry)) (type (or (nth 2 entry) 'entry)))
> - (when (or (not txt) (not (string-match "\\S-" txt)))
> - ;; The template may be empty or omitted for special types.
> - ;; Here we insert the default templates for such cases.
> - (cond
> - ((eq type 'item) (setq txt "- %?"))
> - ((eq type 'checkitem) (setq txt "- [ ] %?"))
> - ((eq type 'table-line) (setq txt "| %? |"))
> - ((member type '(nil entry)) (setq txt "* %?\n %a"))))
> + (when (or (not txt) (not (listp txt)))
> + (when (or (not txt) (not (string-match "\\S-" txt)))
> + ;; The template may be empty or omitted for special types.
> + ;; Here we insert the default templates for such cases.
> + (cond
> + ((eq type 'item) (setq txt "- %?"))
> + ((eq type 'checkitem) (setq txt "- [ ] %?"))
> + ((eq type 'table-line) (setq txt "| %? |"))
> + ((member type '(nil entry)) (setq txt "* %?\n %a")))))
> (org-capture-put :template txt :type type)))
>
> (defun org-capture-goto-target (&optional template-key)
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
- Carsten
next prev parent reply other threads:[~2010-07-14 9:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-14 2:30 [PATCH] org-capture - using `file' as template Johan Friis
2010-07-14 7:08 ` David Maus
2010-07-14 13:54 ` Johan Friis
2010-07-14 9:04 ` Carsten Dominik [this message]
2010-07-14 18:58 ` Johan Friis
2010-07-14 20:01 ` Carsten Dominik
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=C335C25E-B437-4624-98C8-7F7370FC6EA7@gmail.com \
--to=carsten.dominik@gmail.com \
--cc=dmaus@ictsoc.de \
--cc=emacs-orgmode@gnu.org \
--cc=mail@alterecco.net \
/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).