Hi Rasmus, On Sun, Oct 25, 2015 at 7:54 AM, Puneeth Chaganti <puncha...@gmail.com> wrote: > >> However, your patch doesn’t work for me in the following example, starting >> from emacs -q, adding /tmp/test.org (with the below content) to my agenda >> list and requiring org-id, org-narrow-to-subtree on foo, and then >> org-open-at-point on the link > > I had patched `org-id-goto' and looks like clicking on links uses > `org-id-open'. I will resend a patch. I wonder if these two > functions can reuse common code.
Here is a patch that works for the case you describe. The widening happens even if the target location is in a different buffer, in this patch.
From ba62042ff37c200d814567a79bcb999aef67581c Mon Sep 17 00:00:00 2001 From: Puneeth Chaganti <puncha...@muse-amuse.in> Date: Sun, 25 Oct 2015 08:24:09 +0530 Subject: [PATCH] Widen if target id location is not in the narrow. --- lisp/org-id.el | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/lisp/org-id.el b/lisp/org-id.el index f86ef22..57d2414 100644 --- a/lisp/org-id.el +++ b/lisp/org-id.el @@ -292,13 +292,7 @@ It returns the ID of the entry. If necessary, the ID is created." "Switch to the buffer containing the entry with id ID. Move the cursor to that entry in that buffer." (interactive "sID: ") - (let ((m (org-id-find id 'marker))) - (unless m - (error "Cannot find entry with ID \"%s\"" id)) - (org-pop-to-buffer-same-window (marker-buffer m)) - (goto-char m) - (move-marker m nil) - (org-show-context))) + (org-id-show id 'org-pop-to-buffer-same-window)) ;;;###autoload (defun org-id-find (id &optional markerp) @@ -634,6 +628,22 @@ optional argument MARKERP, return the position as a new marker." (move-marker (make-marker) pos buf) (cons file pos)))))))) +(defun org-id-show (id cmd) + "Show an entry with id ID by buffer-switching using CMD." + (let ((m (org-id-find id 'marker))) + (unless m + (error "Cannot find entry with ID \"%s\"" id)) + (if (not (equal (current-buffer) (marker-buffer m))) + (funcall cmd (marker-buffer m))) + (when (and (org-buffer-narrowed-p) + (let ((pos (marker-position m))) + (or (< pos (point-min)) + (> pos (point-max))))) + (widen)) + (goto-char m) + (move-marker m nil) + (org-show-context))) + ;; id link type ;; Calling the following function is hard-coded into `org-store-link', @@ -659,25 +669,15 @@ optional argument MARKERP, return the position as a new marker." (defun org-id-open (id) "Go to the entry with id ID." (org-mark-ring-push) - (let ((m (org-id-find id 'marker)) - cmd) - (unless m - (error "Cannot find entry with ID \"%s\"" id)) - ;; Use a buffer-switching command in analogy to finding files - (setq cmd - (or - (cdr - (assq - (cdr (assq 'file org-link-frame-setup)) - '((find-file . switch-to-buffer) - (find-file-other-window . switch-to-buffer-other-window) - (find-file-other-frame . switch-to-buffer-other-frame)))) - 'switch-to-buffer-other-window)) - (if (not (equal (current-buffer) (marker-buffer m))) - (funcall cmd (marker-buffer m))) - (goto-char m) - (move-marker m nil) - (org-show-context))) + (let ((cmd (or + (cdr + (assq + (cdr (assq 'file org-link-frame-setup)) + '((find-file . switch-to-buffer) + (find-file-other-window . switch-to-buffer-other-window) + (find-file-other-frame . switch-to-buffer-other-frame)))) + 'switch-to-buffer-other-window))) + (org-id-show id cmd))) (org-add-link-type "id" 'org-id-open) -- 2.5.0
