* [PATCH] Check if `org-capture-link-is-already-stored' is bound before evaluating.
@ 2010-07-09 5:42 David Maus
2010-07-09 8:07 ` Patchwork: Patch 125 Accepted Carsten Dominik
0 siblings, 1 reply; 2+ messages in thread
From: David Maus @ 2010-07-09 5:42 UTC (permalink / raw)
To: emacs-orgmode
* org-capture.el (org-capture): Check if
`org-capture-link-is-already-stored' is bound before evaluating.
If `org-protocol-capture' is the first function that calls
`org-capture', this variable is locally bound while it is globally
unbound. I.e. org-capture.el was not loaded before, the defvar not
evaluated. If `org-protocol-capture' exits, Emacs restores the global
value, which is void.
---
lisp/org-capture.el | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 2b02b77..9ba02e2 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -372,7 +372,8 @@ bypassed."
(t
;; FIXME: Are these needed?
(let* ((orig-buf (current-buffer))
- (annotation (if org-capture-link-is-already-stored
+ (annotation (if (and (boundp 'org-capture-link-is-already-stored)
+ org-capture-link-is-already-stored)
(plist-get org-store-link-plist :annotation)
(org-store-link nil)))
(initial (and (org-region-active-p)
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Patchwork: Patch 125 Accepted
2010-07-09 5:42 [PATCH] Check if `org-capture-link-is-already-stored' is bound before evaluating David Maus
@ 2010-07-09 8:07 ` Carsten Dominik
0 siblings, 0 replies; 2+ messages in thread
From: Carsten Dominik @ 2010-07-09 8:07 UTC (permalink / raw)
To: emacs-orgmode
Patch 125 (http://patchwork.newartisans.com/patch/125/) is now Accepted.
This relates to the following submission:
http://mid.gmane.org/%3C1278654150-28556-1-git-send-email-dmaus%40ictsoc.de%3E
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-11 16:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-09 5:42 [PATCH] Check if `org-capture-link-is-already-stored' is bound before evaluating David Maus
2010-07-09 8:07 ` Patchwork: Patch 125 Accepted Carsten Dominik
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).