branch: externals/denote
commit 4905da57ae9cf1a76b37ceb644babb7f748f0524
Author: Protesilaos Stavrou <i...@protesilaos.com>
Commit: Protesilaos Stavrou <i...@protesilaos.com>
Make denote--link-open-at-point-subr more robust (see commit 76c1345)
Thanks to Bhargav Kulkarni for reporting the bug in issue 631 and for
Jean-Philippe Gagné Guay for commenting on how best to approach the
problem: <https://github.com/protesilaos/denote/issues/631>.
---
README.org | 38 +++++++++++++++++++-------------------
denote.el | 7 ++++---
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/README.org b/README.org
index 372f76bddc..199d7ad374 100644
--- a/README.org
+++ b/README.org
@@ -6447,25 +6447,25 @@ Denote is meant to be a collective effort. Every bit
of help matters.
+ Ideas and/or user feedback :: Abin Simon, Aditya Yadav, Alan
Schmitt, Aleksandr Vityazev, Alex Griffin, Alex Hirschfeld, Alexis
Purslane, Alfredo Borrás, Alp Eren Kose, André Bering, Ashton
- Wiersdorf, Benjamin Kästner, Claudio Migliorelli, Claudiu Tănăselia,
- Colin McLear, Cosmin-Octavian C, Damien Cassou, Elias Storms,
- Federico Stilman, Florian, Frédéric Willem Frank Ehmsen, Glenna D.,
- Guo Yong, Hanspeter Gisler Harold Ollivier, IceAsteroid, Jack Baty,
- Jay Rajput, Jean-Charles Bagneris, Jeff Valk, Jens Östlund, Jeremy
- Friesen, Jonathan Sahar, Johan Bolmsjö, Jonas Großekathöfer,
- Jousimies, Juanjo Presa, Julian Hoch, Kai von Fintel, Kaushal Modi,
- Kolmas, Lukas C. Bossert, M. Hadi Timachi, Maikol Solis, Mark Olson,
- Mirko Hernandez, Morten Kjeldgaard, Niall Dooley, Nick Bell, Oliver
- Epper, Paul van Gelder, Peter Prevos, Peter Smith, Riccardo
- Giannitrapani, Rory Molinari, Samuel W. Flint, Sergio Rey, Suhail
- Singh, Shreyas Ragavan, Stefan Thesing, Summer Emacs, Sven Seebeck,
- Taoufik, TJ Stankus, Vick (VicZz), Viktor Haag, Vineet C. Kulkarni,
- Wade Mealing, Wilf, Yi Liu, Ypot, atanasj, azegas, babusri,
- bdillahu, coherentstate, doolio, duli, drcxd, elge70, elliottw,
- fingerknight, hpgisler, hyperfocus1337,johkneisl, jtpavlock, juh,
- leafarbelm, mentalisttraceur, mjkalyan, oatmealm, pRot0ta1p,
- rbenit68, relict007, sarcom-sar, sienic, skissue, sundar bp,
- wuzhihao, yetanotherfossman, zadca123
+ Wiersdorf, Bhargav Kulkarni, Benjamin Kästner, Claudio Migliorelli,
+ Claudiu Tănăselia, Colin McLear, Cosmin-Octavian C, Damien Cassou,
+ Elias Storms, Federico Stilman, Florian, Frédéric Willem Frank
+ Ehmsen, Glenna D., Guo Yong, Hanspeter Gisler Harold Ollivier,
+ IceAsteroid, Jack Baty, Jay Rajput, Jean-Charles Bagneris, Jeff
+ Valk, Jens Östlund, Jeremy Friesen, Jonathan Sahar, Johan Bolmsjö,
+ Jonas Großekathöfer, Jousimies, Juanjo Presa, Julian Hoch, Kai von
+ Fintel, Kaushal Modi, Kolmas, Lukas C. Bossert, M. Hadi Timachi,
+ Maikol Solis, Mark Olson, Mirko Hernandez, Morten Kjeldgaard, Niall
+ Dooley, Nick Bell, Oliver Epper, Paul van Gelder, Peter Prevos,
+ Peter Smith, Riccardo Giannitrapani, Rory Molinari, Samuel W. Flint,
+ Sergio Rey, Suhail Singh, Shreyas Ragavan, Stefan Thesing, Summer
+ Emacs, Sven Seebeck, Taoufik, TJ Stankus, Vick (VicZz), Viktor Haag,
+ Vineet C. Kulkarni, Wade Mealing, Wilf, Yi Liu, Ypot, atanasj,
+ azegas, babusri, bdillahu, coherentstate, doolio, duli, drcxd,
+ elge70, elliottw, fingerknight, hpgisler, hyperfocus1337,johkneisl,
+ jtpavlock, juh, leafarbelm, mentalisttraceur, mjkalyan, oatmealm,
+ pRot0ta1p, rbenit68, relict007, sarcom-sar, sienic, skissue, sundar
+ bp, wuzhihao, yetanotherfossman, zadca123
Special thanks to Peter Povinec who helped refine the file-naming
scheme, which is the cornerstone of this project.
diff --git a/denote.el b/denote.el
index 6b8c7df4b3..7a922e8d13 100644
--- a/denote.el
+++ b/denote.el
@@ -6286,10 +6286,11 @@ Return either nil or a list whose elements are two cons
cells:
(defun denote--link-open-at-point-subr ()
"Open link at point."
- (let ((query (get-text-property (point) 'denote-link-query-part)))
- (if-let* ((path (denote-get-path-by-id query)))
+ (pcase-let* ((data (denote--link-at-point-get-data))
+ (`(,target . ,_) (car data)))
+ (if-let* ((path (denote-get-path-by-id target)))
(funcall denote-open-link-function path)
- (denote--act-on-query-link query))))
+ (denote--act-on-query-link target))))
(defun denote-link-open-at-point ()
"Open Denote link at point."
