emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/consult c89fd0a: Consult bookmark using `alist-get` (#4


From: ELPA Syncer
Subject: [elpa] externals/consult c89fd0a: Consult bookmark using `alist-get` (#411)
Date: Sun, 5 Sep 2021 13:57:07 -0400 (EDT)

branch: externals/consult
commit c89fd0a1299f8bd6a123427c6ce48239702dfe84
Author: Sylvain Rousseau <thisirs@gmail.com>
Commit: GitHub <noreply@github.com>

    Consult bookmark using `alist-get` (#411)
    
    * Use bookmark-get-* instead of alist
    
    * bookmark-get-bookmark-record already called in bookmark-get-*
---
 consult.el | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/consult.el b/consult.el
index a6602e8..cba01ae 100644
--- a/consult.el
+++ b/consult.el
@@ -3364,14 +3364,12 @@ There exists no equivalent of this command in Emacs 28."
             (funcall preview nil t))
         (funcall
          preview
-         (when-let (bm (and cand
-                            (bookmark-get-bookmark-record
-                             (assoc cand bookmark-alist))))
-           (let ((handler (alist-get 'handler bm #'bookmark-default-handler)))
+         (when-let (bm (and cand (assoc cand bookmark-alist)))
+           (let ((handler (or (bookmark-get-handler bm) 
#'bookmark-default-handler)))
              ;; Only preview bookmarks with the default handler.
              (if-let* ((file (and (eq handler #'bookmark-default-handler)
-                                  (alist-get 'filename bm)))
-                       (pos (alist-get 'position bm))
+                                  (bookmark-get-filename bm)))
+                       (pos (bookmark-get-position bm))
                        (buf (funcall open file)))
                  (set-marker (make-marker) pos buf)
                (message "No preview for %s" handler)
@@ -3390,12 +3388,11 @@ There exists no equivalent of this command in Emacs 28."
   (let ((narrow (mapcar (pcase-lambda (`(,y ,_ ,x)) (cons x y))
                         consult-bookmark-narrow)))
     (mapcar (lambda (cand)
-              (let ((bm (bookmark-get-bookmark-record cand)))
-                (propertize (car cand)
-                            'consult--type
-                            (alist-get
-                             (alist-get 'handler bm #'bookmark-default-handler)
-                             narrow))))
+              (propertize (car cand)
+                          'consult--type
+                          (alist-get
+                           (or (bookmark-get-handler cand) 
#'bookmark-default-handler)
+                           narrow)))
             bookmark-alist)))
 
 ;;;###autoload



reply via email to

[Prev in Thread] Current Thread [Next in Thread]