From 4d858415375e29990172e384eeae1c211762b2c0 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sat, 27 Mar 2021 23:18:31 +0000
Subject: eww-current-url

---
 lib/net/jao-eww-session.el | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/net/jao-eww-session.el b/lib/net/jao-eww-session.el
index ddbc572..6b4d52c 100644
--- a/lib/net/jao-eww-session.el
+++ b/lib/net/jao-eww-session.el
@@ -238,7 +238,7 @@ the session is already displayed in a eww tab, jao-eww-session can:
         (count 0))
     (dolist (b (jao-eww-session--list-buffers) (list pos (reverse urls)))
       (set-buffer b)
-      (let ((url (jao-eww-session--filter (jao-eww-buffer-url) jao-eww-url-filters)))
+      (let ((url (jao-eww-session--filter (eww-current-url) jao-eww-url-filters)))
         (when url
           (when (eq b cb) (setq pos count))
           (setq count (1+ count))
@@ -267,12 +267,12 @@ the session is already displayed in a eww tab, jao-eww-session can:
             (lambda ()
               (y-or-n-p
                (format "'%s' (%s) is already open. Duplicate tab? "
-                       (jao-eww-buffer-title) (jao-eww-buffer-url)))))
+                       (jao-eww-buffer-title) (eww-current-url)))))
            (urls (regexp-opt urls))
            (test-b
             (lambda (b)
               (set-buffer b)
-              (or (and (string-match urls (jao-eww-buffer-url))
+              (or (and (string-match urls (eww-current-url))
                        (or (equal jao-eww-session-duplicate-tabs 'never)
                            (not (duplicate-p)))
                        b)
@@ -354,8 +354,6 @@ the session is already displayed in a eww tab, jao-eww-session can:
 (advice-add 'eww-forward-url :after #'jao-eww-session--save-backup)
 
 ;;; Interactive functions:
-;;;###autoload
-(defun jao-eww-buffer-url () (plist-get eww-data :url))
 
 ;;;###autoload
 (defun jao-eww-buffer-title () (plist-get eww-data :title))
-- 
cgit v1.2.3