emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Bill Wishon <bill@wishon.org>
To: emacs-orgmode@gnu.org
Subject: [PATCH] fix hook calling in org-export-remove-or-extract-drawers
Date: Mon, 30 Apr 2012 18:20:54 -0700	[thread overview]
Message-ID: <CAP2uJAt9fJB-BfzH8d9kyJMERTtWYN-54t_b8F5+mYcp8Vd5WQ@mail.gmail.com> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 400 bytes --]

* lisp/org-exp.el (org-export-remove-or-extract-drawers): Changed funcall
to run-hook-with-args-until-success to properly run the
org-export-format-drawer-function hook.

The problem was that funcall was being executed on the hook (list of
functions) instead of running the hook with
run-hook-with-args-until-success, which tries to run potentially a list of
hooks until one returns non-nil.

~>Bill

[-- Attachment #1.2: Type: text/html, Size: 422 bytes --]

[-- Attachment #2: 0001-Capture-Fix-call-to-org-export-format-drawer-functio.patch --]
[-- Type: application/octet-stream, Size: 1387 bytes --]

From 73df0bdec7289271f4084b91ff633e3537a44df1 Mon Sep 17 00:00:00 2001
From: William Wishon <bill@wishon.org>
Date: Mon, 30 Apr 2012 17:56:18 -0700
Subject: [PATCH] Capture: Fix call to org-export-format-drawer-function hook

* lisp/org-exp.el (org-export-remove-or-extract-drawers): Changed funcall to run-hook-with-args-until-success to properly run the org-export-format-drawer-function hook.

The problem was that funcall was being executed on the hook instead of running the hook with run-hook-with-args-until-success, which tries to run potentially a list of hooks until one returns non-nil.

Modified by William Wishon

TINYCHANGE
---
 lisp/org-exp.el |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 9aac321..796a86c 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -1519,9 +1519,9 @@ EXP-DRAWERS will be removed."
 	 (delete-region beg (point))
 	 (when (or (eq exp-drawers t)
 		   (member name exp-drawers))
-	   (setq content (funcall (or org-export-format-drawer-function
-				      'org-export-format-drawer)
-				  name content))
+	   (setq content (or (run-hook-with-args-until-success
+			      'org-export-format-drawer-function name content)
+				      (org-export-format-drawer name content)))
 	   (insert content)))))))
 
 (defun org-export-format-drawer (name content)
-- 
1.7.10.msysgit.1


             reply	other threads:[~2012-05-01  1:21 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-01  1:20 Bill Wishon [this message]
2012-05-01 10:01 ` [PATCH] fix hook calling in org-export-remove-or-extract-drawers Bastien
2012-05-01 14:46   ` Bill Wishon
2012-05-01 17:58     ` Bastien
2012-05-01 18:02       ` Bill Wishon
2012-05-01 18:18       ` Nicolas Goaziou
2012-05-01 18:29         ` Bill Wishon
2012-05-02 12:35           ` Nicolas Goaziou

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=CAP2uJAt9fJB-BfzH8d9kyJMERTtWYN-54t_b8F5+mYcp8Vd5WQ@mail.gmail.com \
    --to=bill@wishon.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 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).