jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: (org-ql-view--link-store) Test Org version

Browse source 
See #147.  Thanks to @tpeacock19 for reporting.
This commit is contained in:
Adam Porter 2020-11-12 02:10:57 -06:00
parent a069cf5b2c
commit 284eda87e5
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
org-ql-view.el
View file

@ -648,6 +648,8 @@ protocol. See, e.g. `org-ql-view--link-store'."
:title title))) :title title)))
(defvar org-ql-view--link-store-counter 0 (defvar org-ql-view--link-store-counter 0
;; TODO: When compatibility with Org <=9.1.4 is dropped, remove this. See
;; <https://github.com/alphapapa/org-ql/issues/147#issuecomment-725835457>.
"Workaround for an idiosyncrasy of `org-store-link' that calls link-storing functions twice.") "Workaround for an idiosyncrasy of `org-store-link' that calls link-storing functions twice.")
(defun org-ql-view--link-store () (defun org-ql-view--link-store ()
@ -661,11 +663,13 @@ When opened, the link searches the buffer it's opened from."
(cl-some #'bufferp org-ql-view-buffers-files)) (cl-some #'bufferp org-ql-view-buffers-files))
;; Buffers are unreadable, so they can't be linked to. ;; Buffers are unreadable, so they can't be linked to.
(user-error "Views that search buffers rather than files can't be linked to")) (user-error "Views that search buffers rather than files can't be linked to"))
(cl-incf org-ql-view--link-store-counter) (cl-incf org-ql-view--link-store-counter) ;; TODO: Remove when not supporting Org<=9.1.4. See other comment.
(cl-flet ((prompt-for (buffers-files) (cl-flet ((prompt-for (buffers-files)
;; HACK: Use counter to avoid prompting the first of the ;; HACK: Use counter to avoid prompting the first of the
;; two times that `org-store-link' calls this function. ;; two times that `org-store-link' calls this function.
(when (cl-evenp org-ql-view--link-store-counter) ;; TODO: Remove the version check when not supporting Org<=9.1.4. See other comment.
(when (or (version< "9.1.4" (org-version))
(cl-evenp org-ql-view--link-store-counter))
(pcase-exhaustive (pcase-exhaustive
(completing-read (format "Link to search file containing inserted link or %s? " buffers-files) (completing-read (format "Link to search file containing inserted link or %s? " buffers-files)
(list "containing file" buffers-files) nil t) (list "containing file" buffers-files) nil t)