From 4f11878b7d5f7c51f7d5a1a5805d5d0383f66966 Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Fri, 18 Mar 2022 09:58:22 -0500 Subject: [PATCH] Update: Transient macro names Closes #269. See https://github.com/magit/transient/issues/192. Thanks to Jonas Bernoulli (@tarsius). --- README.org | 3 +++ org-ql-view.el | 12 +++++------ org-ql.info | 57 +++++++++++++++++++++++++++----------------------- 3 files changed, 40 insertions(+), 32 deletions(-) diff --git a/README.org b/README.org index 3161a4d..89ea764 100644 --- a/README.org +++ b/README.org @@ -527,6 +527,9 @@ Simple links may also be written manually in either sexp or non-sexp form, like: *Fixed* + In dynamic blocks, links to headings with statistics cookies were broken. (Fixes [[https://github.com/alphapapa/org-ql/issues/248][#248]]. Thanks to [[https://github.com/maikol-solis][Maikol Solis]] and [[https://github.com/yantar92][Ihor Radchenko]].) +*Updated* ++ Compatibility with new macro names in Transient. ([[https://github.com/alphapapa/org-ql/pull/269][#269]]. Thanks to [[https://github.com/tarsius][Jonas Bernoulli]].) + ** 0.6 *Added* diff --git a/org-ql-view.el b/org-ql-view.el index e571dbf..74f74d9 100644 --- a/org-ql-view.el +++ b/org-ql-view.el @@ -718,7 +718,7 @@ When opened, the link searches the buffer it's opened from." (unless (or value transient--prefix) (message "Unset %s" variable)))) -(define-transient-command org-ql-view-dispatch () +(transient-define-prefix org-ql-view-dispatch () "Show Org QL View dispatcher." [["Edit" ("t" org-ql-view--transient-title) @@ -753,7 +753,7 @@ When opened, the link searches the buffer it's opened from." org-ql-view--format-query (org-ql-view--font-lock-string 'emacs-lisp-mode))))) -(define-infix-command org-ql-view--transient-title () +(transient-define-infix org-ql-view--transient-title () ;; TODO: Add an asterisk or something when the view has been modified but not saved. :description (lambda () (org-ql-view--format-transient-key-value "Title" org-ql-view-title)) :class 'org-ql-view--variable @@ -766,7 +766,7 @@ When opened, the link searches the buffer it's opened from." (format "%s" org-ql-view-title)) history))) -(define-infix-command org-ql-view--transient-query () +(transient-define-infix org-ql-view--transient-query () :description (lambda () (org-ql-view--format-transient-lisp-argument "Query" org-ql-view-query)) :class 'org-ql-view--variable :argument "" @@ -784,7 +784,7 @@ When opened, the link searches the buffer it's opened from." ;; Parse non-sexp query into sexp query. (org-ql--query-string-to-sexp query))))) -(define-infix-command org-ql-view--transient-in () +(transient-define-infix org-ql-view--transient-in () :description (lambda () (org-ql-view--format-transient-lisp-argument "In buffers/files" org-ql-view-buffers-files)) :class 'org-ql-view--variable :argument "" @@ -795,7 +795,7 @@ When opened, the link searches the buffer it's opened from." ;; argument, but it gives the same result. (org-ql-view--complete-buffers-files))) -(define-infix-command org-ql-view--transient-super-groups () +(transient-define-infix org-ql-view--transient-super-groups () :description (lambda () (org-ql-view--format-transient-lisp-argument "Group by" org-ql-view-super-groups)) :class 'org-ql-view--variable @@ -806,7 +806,7 @@ When opened, the link searches the buffer it's opened from." ;; FIXME: Figure out how to integrate initial-input and history. (org-ql-view--complete-super-groups))) -(define-infix-command org-ql-view--transient-sort () +(transient-define-infix org-ql-view--transient-sort () :description (lambda () (org-ql-view--format-transient-lisp-argument "Sort by" (or org-ql-view-sort 'buffer-order))) diff --git a/org-ql.info b/org-ql.info index 8349fd0..7e1a4cf 100644 --- a/org-ql.info +++ b/org-ql.info @@ -995,6 +995,11 @@ File: README.info, Node: 061-pre, Next: 06, Up: Changelog Solis (https://github.com/maikol-solis) and Ihor Radchenko (https://github.com/yantar92).) + *Updated* + • Compatibility with new macro names in Transient. (#269 + (https://github.com/alphapapa/org-ql/pull/269). Thanks to Jonas + Bernoulli (https://github.com/tarsius).) +  File: README.info, Node: 06, Next: 052, Prev: 061-pre, Up: Changelog @@ -1600,32 +1605,32 @@ Node: Links35371 Node: Tips36058 Node: Changelog36376 Node: 061-pre37117 -Node: 0637492 -Node: 05240507 -Node: 05140807 -Node: 0541224 -Node: 04942698 -Node: 04842972 -Node: 04743319 -Node: 04643714 -Node: 04544114 -Node: 04444475 -Node: 04344834 -Node: 04245031 -Node: 04145192 -Node: 0445433 -Node: 03249366 -Node: 03149745 -Node: 0349942 -Node: 02352917 -Node: 02253145 -Node: 02153413 -Node: 0253612 -Node: 0157647 -Node: Notes57748 -Node: Comparison with Org Agenda searches57910 -Node: org-sidebar58782 -Node: License59061 +Node: 0637685 +Node: 05240700 +Node: 05141000 +Node: 0541417 +Node: 04942891 +Node: 04843165 +Node: 04743512 +Node: 04643907 +Node: 04544307 +Node: 04444668 +Node: 04345027 +Node: 04245224 +Node: 04145385 +Node: 0445626 +Node: 03249559 +Node: 03149938 +Node: 0350135 +Node: 02353110 +Node: 02253338 +Node: 02153606 +Node: 0253805 +Node: 0157840 +Node: Notes57941 +Node: Comparison with Org Agenda searches58103 +Node: org-sidebar58975 +Node: License59254  End Tag Table