From a373e812d0e6c1186bf24c05072bd853035e2e97 Mon Sep 17 00:00:00 2001
From: Adam Porter <adam@alphapapa.net>
Date: Wed, 4 Sep 2024 22:00:41 -0500
Subject: [PATCH] Fix: (org-ql-view--link-follow) Reading link parameters

This is needed due to changes in Emacs 30, but this code was always
mistaken, and it just happened to work.

See <https://github.com/jorgenschaefer/emacs-buttercup/issues/247>.

Fixes #441.

Suggested-by: Ola Nilsson <ola.nilsson@gmail.com>
---
 README.org     |  3 +-
 org-ql-view.el |  8 ++---
 org-ql.info    | 93 ++++++++++++++++++++++++++------------------------
 3 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/README.org b/README.org
index 6fda2ae..3ec87f8 100644
--- a/README.org
+++ b/README.org
@@ -555,7 +555,8 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
 
 ** 0.8.9-pre
 
-Nothing new yet.
+*Fixes*
++ Reading of view settings from Org links in upcoming Emacs version.  ([[https://github.com/alphapapa/org-ql/issues/461][#461]].  Thanks to [[https://github.com/snogge][Ola Nilsson]] for help debugging, and for maintaining [[https://github.com/jorgenschaefer/emacs-buttercup][Buttercup]].)
 
 ** 0.8.8
 
diff --git a/org-ql-view.el b/org-ql-view.el
index b5c4bb7..0978a80 100644
--- a/org-ql-view.el
+++ b/org-ql-view.el
@@ -622,7 +622,7 @@ purposes of compatibility with changes in Org 9.4."
                (query (url-unhex-string query))
                (params (when params (url-parse-query-string params)))
                ;; `url-parse-query-string' returns "improper" alists, which makes this awkward.
-               (sort (when-let* ((stored-string (alist-get "sort" params nil nil #'string=))
+               (sort (when-let* ((stored-string (car (alist-get "sort" params nil nil #'string=)))
                                  (read-value (read stored-string)))
                        ;; Ensure the value is either a symbol or list of symbols (which excludes lambdas).
                        (unless (or (symbolp read-value) (cl-every #'symbolp read-value))
@@ -630,11 +630,11 @@ purposes of compatibility with changes in Org 9.4."
                                 read-value))
                        read-value))
                (org-super-agenda-allow-unsafe-groups nil) ; Disallow unsafe group selectors.
-               (groups (--when-let (alist-get "super-groups" params nil nil #'string=)
+               (groups (--when-let (car (alist-get "super-groups" params nil nil #'string=))
                          (read it)))
-               (title (--when-let (alist-get "title" params nil nil #'string=)
+               (title (--when-let (car (alist-get "title" params nil nil #'string=))
                         (read it)))
-               (buffers-files (--if-let (alist-get "buffers-files" params nil nil #'string=)
+               (buffers-files (--if-let (car (alist-get "buffers-files" params nil nil #'string=))
                                   (org-ql-view--expand-buffers-files (read it))
                                 (current-buffer))))
     (unless (or (bufferp buffers-files)
diff --git a/org-ql.info b/org-ql.info
index cfe60fc..c0a424c 100644
--- a/org-ql.info
+++ b/org-ql.info
@@ -1084,7 +1084,12 @@ File: README.info,  Node: 089-pre,  Next: 088,  Up: Changelog
 5.1 0.8.9-pre
 =============
 
-Nothing new yet.
+*Fixes*
+   • Reading of view settings from Org links in upcoming Emacs version.
+     (#461 (https://github.com/alphapapa/org-ql/issues/461).  Thanks to
+     Ola Nilsson (https://github.com/snogge) for help debugging, and for
+     maintaining Buttercup
+     (https://github.com/jorgenschaefer/emacs-buttercup).)
 
 
 File: README.info,  Node: 088,  Next: 087,  Prev: 089-pre,  Up: Changelog
@@ -2064,49 +2069,49 @@ Node: Links38939
 Node: Tips39626
 Node: Changelog39950
 Node: 089-pre40900
-Node: 08841012
-Node: 08742092
-Node: 08643320
-Node: 08543554
-Node: 08444210
-Node: 08344662
-Node: 08245003
-Node: 08145396
-Node: 0845817
-Node: 07448543
-Node: 07348768
-Node: 07249502
-Node: 07150423
-Node: 0751234
-Node: 06354100
-Node: 06254633
-Node: 06154940
-Node: 0655510
-Node: 05258566
-Node: 05158868
-Node: 0559293
-Node: 04960824
-Node: 04861106
-Node: 04761455
-Node: 04661864
-Node: 04562272
-Node: 04462633
-Node: 04362992
-Node: 04263195
-Node: 04163356
-Node: 0463603
-Node: 03267704
-Node: 03168107
-Node: 0368304
-Node: 02371604
-Node: 02271838
-Node: 02172118
-Node: 0272323
-Node: 0176401
-Node: Notes76502
-Node: Comparison with Org Agenda searches76664
-Node: org-sidebar77553
-Node: License77832
+Node: 08841308
+Node: 08742388
+Node: 08643616
+Node: 08543850
+Node: 08444506
+Node: 08344958
+Node: 08245299
+Node: 08145692
+Node: 0846113
+Node: 07448839
+Node: 07349064
+Node: 07249798
+Node: 07150719
+Node: 0751530
+Node: 06354396
+Node: 06254929
+Node: 06155236
+Node: 0655806
+Node: 05258862
+Node: 05159164
+Node: 0559589
+Node: 04961120
+Node: 04861402
+Node: 04761751
+Node: 04662160
+Node: 04562568
+Node: 04462929
+Node: 04363288
+Node: 04263491
+Node: 04163652
+Node: 0463899
+Node: 03268000
+Node: 03168403
+Node: 0368600
+Node: 02371900
+Node: 02272134
+Node: 02172414
+Node: 0272619
+Node: 0176697
+Node: Notes76798
+Node: Comparison with Org Agenda searches76960
+Node: org-sidebar77849
+Node: License78128
 
 End Tag Table