[PATCH 1/2] org-store-link: Return link when invoked from within agenda buffer

From: Jambunathan K <kjambunathan@gmail.com>
To: emacs-orgmode@gnu.org
Subject: [PATCH 1/2] org-store-link: Return link when invoked from within agenda buffer
Date: Mon, 23 Aug 2010 04:07:31 +0530	[thread overview]
Message-ID: <81sk26s06x.fsf@gmail.com> (raw)
In-Reply-To: <81fwybeoem.fsf@gmail.com> (Jambunathan K.'s message of "Thu, 19 Aug 2010 00:31:05 +0530")

[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]


Carsten, 

Sorry about multiple drops. This post *should* contain the patch.

Summary: 

When I trigger a org-capture, with the cursor positioned on a line in
the agenda buffer, I want the link to the agenda entry to be available
as an annotation (%a) to the capture process. Currently this is broken.

The enclosed patch fixes this.

Setup:

# file todo.org
* TODO Talk to someone
   SCHEDULED: <2010-08-23 Mon>

# org-capture-templates
 ("z" "Conversation" entry
  (file+headline "~/conversation.org" "Conversations")
  "** Note taken on %U\n   %a\n   %?" :prepend t :empty-lines 1)

Steps for reporduction:

1. Restrict agenda to todo.org
2. Do org-agenda
3. Place the cursor on the above todo line
4. Trigger an org-capture for the above capture entry

Examine the entries in conversation.org before/after the patch is
applied. Note the absence/presence of the link to the parent todo entry.

* Conversations

** Note taken on [2010-08-23 Mon 03:58]
   [[file:~/todo.org::*Talk%20to%20someone][Talk to someone]]

** Note taken on [2010-08-23 Mon 03:42]

Jambunathan K.


[-- Attachment #2: Type: text/plain, Size: 1857 bytes --]

From bcceabe70968416fb4540e32c68bfbda76820f9b Mon Sep 17 00:00:00 2001
From: Jambunathan K <kjambunathan@gmail.com>
Date: Sun, 22 Aug 2010 23:36:52 +0530
Subject: [PATCH 1/2] org-store-link: Return link when invoked from within agenda buffer.

* org.el (org-store-link): Return link when invoked non-interactively from
an agenda buffer.

TINYCHANGE
---
 lisp/org.el |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 366c8dd..5db7aab 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8218,7 +8218,7 @@ For file links, arg negates `org-context-in-file-links'."
   (org-load-modules-maybe)
   (setq org-store-link-plist nil)  ; reset
   (let ((outline-regexp (org-get-limited-outline-regexp))
-	link cpltxt desc description search txt custom-id)
+	link cpltxt desc description search txt custom-id agenda-link)
     (cond
 
      ((run-hook-with-args-until-success 'org-store-link-functions)
@@ -8250,9 +8250,10 @@ For file links, arg negates `org-context-in-file-links'."
 		   (get-text-property (point) 'org-marker))))
 	(when m
 	  (org-with-point-at m
-	    (if (interactive-p)
-		(call-interactively 'org-store-link)
-	      (org-store-link nil))))))
+	    (setq agenda-link
+		  (if (interactive-p)
+		      (call-interactively 'org-store-link)
+		    (org-store-link nil)))))))
 
      ((eq major-mode 'calendar-mode)
       (let ((cd (calendar-cursor-to-date)))
@@ -8389,7 +8390,7 @@ For file links, arg negates `org-context-in-file-links'."
 			       "::#" custom-id))
 	    (setq org-stored-links
 		  (cons (list link desc) org-stored-links))))
-      (and link (org-make-link-string link desc)))))
+      (or agenda-link (and link (org-make-link-string link desc))))))
 
 (defun org-store-link-props (&rest plist)
   "Store link properties, extract names and addresses."
-- 
1.7.0.4


[-- Attachment #3: Type: text/plain, Size: 201 bytes --]

_______________________________________________
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
