From eafebefd5406eaecbefaf9e0ac4ac0ddf1a2adea Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sat, 3 Apr 2021 01:52:20 +0100
Subject: browsing tweaks (and eww-lnum)

---
 init.org                 | 25 +++++++++++++++----------
 lib/themes/jao-themes.el |  1 +
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/init.org b/init.org
index 99ed68b..5bfb684 100644
--- a/init.org
+++ b/init.org
@@ -2099,12 +2099,12 @@
 *** Downloads using wget
     #+BEGIN_SRC emacs-lisp
       (defun jao-wget--get-title (filename)
-        (let ((fn (file-name-sans-extension filename)))
+        (let ((fn (file-name-base filename)))
           (if (string-blank-p fn)
               (plist-get eww-data :title)
             (subst-char-in-string ?- ?  (capitalize fn)))))
 
-      (defun jao-wget (url &optional user pwd &rest ignored)
+      (defun jao-wget (url &optional user pwd)
         "Download URL using wget."
         (let* ((def (file-name-nondirectory url))
                (pmt (format "Save %s to: " url))
@@ -2234,7 +2234,7 @@
               ("^https?://.*\\.slack\\..*" . ,jao-browse-url-external-function)
               ("^https?://.*\\.gotomeeting\\.com\\.*" . browse-url-chrome)
               ("^https?://meet\\.google\\.com\\.*" . ,jao-browse-url-external-function)
-              (,(jao-wget--regexp) . jao-wget)
+              (,(jao-wget--regexp) . jao-download)
               (jao-video--url-p . jao-maybe-view-video)
               ("." . ,jao-browse-url-function)))
 
@@ -2325,25 +2325,30 @@
           (when-let (b (car (jao-eww-session--list-buffers)))
             (switch-to-buffer b)))
 
-        (defun jao-eww--turn-images-on ()
-          (interactive nil eww-mode)
-          (let ((shr-blocked-images nil))
-            (eww-reload)))
+        (defun jao-eww-reload (images)
+          (interactive "P" eww-mode)
+          (if images
+              (let ((shr-blocked-images nil))
+                (eww-reload t))
+            (call-interactively 'eww-reload)))
 
         (defun jao-eww--next-image ()
           (interactive)
           (when-let (p (text-property-search-forward 'image-displayer nil nil t))
             (goto-char (prop-match-beginning p))))
 
+        (use-package eww-lnum :ensure t)
+
         :bind (:map eww-mode-map (("d" . eww-download)
                                   ("D" . jao-download)
-                                  ("g" . jao-eww-browse-dwim)
-                                  ("I" . jao-eww--turn-images-on)
+                                  ("o" . jao-eww-browse-dwim)
+                                  ("f" . eww-lnum-follow)
+                                  ("F" . eww-lnum-universal)
                                   ("j" . jao-eww-visit-url-on-page)
                                   ("J" . jao-eww-jump-to-url-on-page)
                                   ("L" . eww-forward-url)
                                   ("N" . jao-eww--next-image)
-                                  ("r" . eww-reload)
+                                  ("r" . jao-eww-reload)
                                   ("S" . jao-eww-session-load)
                                   ("W" . jao-eww--close)
                                   ("w" . org-eww-copy-for-org-mode)
diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el
index e1003f0..a78d890 100644
--- a/lib/themes/jao-themes.el
+++ b/lib/themes/jao-themes.el
@@ -524,6 +524,7 @@
             (eww-form-checkbox (p f01) bx)
             (eww-form-file (p f00) bx)
             (eww-invalid-certificate (p error))
+            (eww-lnum-number (p error))
             (eww-valid-certificate (~ success))
             (eww-form-select bx)
             (eww-form-text bx (p f11))
-- 
cgit v1.2.3