From 826c68098670b69d6c3a7fee389d5d861b1adcc7 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Thu, 13 May 2021 03:29:25 +0100
Subject: gnus and emacs-w3m are so good...

---
 attic/w3m.org | 156 ----------------------------------------------------------
 eww.org       |   7 ---
 gnus.org      |  10 ++--
 init.org      |   7 ++-
 readme.org    |   2 +-
 w3m.org       | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 165 insertions(+), 173 deletions(-)
 delete mode 100644 attic/w3m.org
 create mode 100644 w3m.org

diff --git a/attic/w3m.org b/attic/w3m.org
deleted file mode 100644
index e1229ab..0000000
--- a/attic/w3m.org
+++ /dev/null
@@ -1,156 +0,0 @@
-#+title: Customizations for emacs-w3m
-
-* browse-url and afio
-  #+begin_src emacs-lisp
-    (defun jao-w3m-find-url (url)
-      (let* ((url (w3m-canonicalize-url url))
-             (fn `(lambda (b)
-                    (with-current-buffer b
-                      (string= ,url (w3m-canonicalize-url w3m-current-url))))))
-        (when-let (b (seq-find fn (w3m-list-buffers)))
-          (pop-to-buffer b))))
-
-    (defun jao-w3m-browse-url (url &rest r)
-      (jao-afio--goto-www)
-      (select-window (frame-first-window))
-      (or (jao-w3m-find-url url)
-          (w3m-goto-url-new-session url)))
-
-    (defun jao-w3m-download (arg)
-      (interactive "P")
-      (jao-download (w3m-anchor) arg))
-
-    (setq jao-afio-use-w3m t)
-    (setq jao-browse-url-function 'jao-w3m-browse-url)
-  #+end_src
-* Org integration
-  #+begin_src emacs-lisp
-    (defun jao-w3m-get-link ()
-      (let ((wb (w3m-alive-p)))
-        (when wb
-          (let ((url (with-current-buffer wb w3m-current-url))
-                (title (w3m-buffer-title wb)))
-            (cons url title)))))
-
-    (defun jao-insert-w3m-link ()
-      (interactive)
-      (let ((link (jao-w3m-get-link)))
-        (when link (insert "[[" (car link) "][" (cdr link) "]]"))))
-
-    (with-eval-after-load "org"
-      (require 'ol-w3m nil t)
-      (define-key org-mode-map "\C-cW" 'jao-insert-w3m-link))
-  #+end_src
-* Capture page
-  #+begin_src emacs-lisp
-    (defun jao-w3m-capture-page ()
-      (interactive)
-      (let* ((title (w3m-current-title))
-             (url w3m-current-url)
-             (html (y-or-n-p "Save as HTML (y) or PS (n)? "))
-             (basename (concat (read-string "File name: ")
-                               (if html ".html" ".ps")))
-             (name (expand-file-name basename jao-sink-dir)))
-        (if html
-            (progn
-              (w3m-view-source)
-              (write-region (point-min) (point-max) name nil nil nil t)
-              (w3m-view-source))
-          (progn
-            (split-window-horizontally 85)
-            (w3m-redisplay-this-page)
-            (ps-print-buffer name)
-            (delete-other-windows)
-            (w3m-redisplay-this-page)))
-        (kill-new (format "[[doc:%s][%s]] ([[%s][original]])"
-                          basename title url))))
-   #+end_src
-* Email
-  #+begin_src emacs-lisp
-    (defun jao-w3m-gnus-html-renderer (handle)
-      (let ((w3m-message-silent t)
-            (mm-w3m-safe-url-regexp nil)
-            (shr-use-colors nil)
-            (shr-use-fonts nil)
-            (fill-column (min (window-width) 110)))
-        (condition-case nil
-            (mm-inline-text-html-render-with-w3m handle)
-          (error (delete-region (point) (point-max))
-                 (mm-shr handle)))))
-
-    (setq mm-text-html-renderer #'jao-w3m-gnus-html-renderer)
-
-    (with-eval-after-load "gnus-art"
-      (define-key gnus-article-mode-map "\C-ci" 'w3m-view-image)
-      (define-key gnus-article-mode-map "z" 'w3m-lnum-zoom-in-image))
-  #+end_src
-* Package
-  #+begin_src emacs-lisp
-    (use-package w3m
-      :ensure t
-      :custom ((w3m-key-binding 'info)
-               (w3m-display-mode 'dual-pane))
-      :init
-      (setq w3m-add-user-agent nil
-            w3m-command "w3m"
-            w3m-confirm-leaving-secure-page nil
-            w3m-cookie-accept-bad-cookies t
-            w3m-cookie-accept-domains '(".github.com"
-                                        ".librarything.com"
-                                        ".goodreads.com"
-                                        ".sr.ht"
-                                        ".gnu.org"
-                                        ".codeberg.org"
-                                        "codeberg.org"
-                                        ".bookshop.org"
-                                        ".reddit.com")
-            w3m-cookie-reject-domains '(".")
-            w3m-do-cleanup-temp-files t
-            w3m-fill-column 110
-            w3m-goto-article-function 'jao-w3m-browse-url
-            w3m-form-input-textarea-buffer-lines 40
-            w3m-history-minimize-in-new-session t
-            w3m-history-reuse-history-elements nil
-            w3m-image-no-idle-timer t
-            w3m-make-new-session t
-            w3m-profile-directory "~/.w3m"
-            w3m-redisplay-pages-automatically-p t
-            w3m-resize-images t
-            w3m-safe-url-regexp nil
-            w3m-search-default-engine "duckduckgo" ; "google-en"
-            w3m-select-buffer-horizontal-window nil
-            w3m-select-buffer-window-ratio '(20 . 40)
-            w3m-session-load-last-sessions t
-            w3m-session-load-crashed-sessions 'ask
-            w3m-show-graphic-icons-in-header-line nil
-            w3m-show-graphic-icons-in-mode-line nil
-            w3m-space-before-favicon "|"
-            w3m-use-tab nil
-            w3m-use-tab-line nil
-            w3m-use-title-buffer-name t
-            w3m-use-cookies t
-            w3m-use-filter nil
-            w3m-use-favicon nil
-            w3m-use-header-line nil
-            w3m-use-refresh nil
-            w3m-use-symbol t)
-
-      :config
-      :bind (:map w3m-mode-map
-                  (("+" . w3m-zoom-in-image)
-                   ("-" . w3m-zoom-out-image)
-                   ("C-c C-@" . tracking-next-buffer)
-                   ("C-c C-SPC" . tracking-next-buffer)
-                   ("C-c C-b" . nil)
-                   ("C-c c" . jao-w3m-capture-page)
-                   ("b" . w3m-view-previous-page)
-                   ("B" . w3m-view-next-page)
-                   ("c" . w3m-print-this-url)
-                   ("d" . jao-w3m-download)
-                   ("D" . w3m-download)
-                   ("f" . w3m-lnum-follow)
-                   ("v" . jao-view-video)
-                   ("w" . org-w3m-copy-for-org-mode)
-                   ("x" . jao-rss-subscribe-rss)
-                   ("y" . w3m-print-current-url))))
-  #+end_src
diff --git a/eww.org b/eww.org
index 6e917e7..2aa5dcf 100644
--- a/eww.org
+++ b/eww.org
@@ -45,7 +45,6 @@
     (advice-add 'eww-back-url :after #'jao-eww--rename-buffer)
     (advice-add 'eww-forward-url :after #'jao-eww--rename-buffer)
   #+end_src
-
 * Opening URLs
   #+begin_src emacs-lisp
     (defun jao-eww-browse (arg)
@@ -67,9 +66,7 @@
             (let ((shr-blocked-images nil))
               (eww-reload t))
           (call-interactively 'eww-reload)))
-
   #+end_src
-
 * Images
   #+begin_src emacs-lisp
     (defun jao-eww-next-image ()
@@ -103,7 +100,6 @@
       (jao-eww-reopen t))
   #+end_src
 * Visiting links in a page
-
   #+begin_src emacs-lisp
     (defun jao-eww-copy-link ()
       (interactive)
@@ -160,13 +156,10 @@
 
     (advice-add 'eww-make-unique-file-name :around #'jao-eww--append-html)
   #+end_src
-
 * eww-lnum
-
   #+begin_src emacs-lisp
     (use-package eww-lnum :ensure t)
   #+end_src
-
 * Sessions
   #+begin_src emacs-lisp
     (use-package jao-eww-session
diff --git a/gnus.org b/gnus.org
index 7ab954e..5337bdc 100644
--- a/gnus.org
+++ b/gnus.org
@@ -409,9 +409,9 @@
              (gcc-self . t)
              (auto-expire . t)
              (total-expire . t)
-             (expiry-wait . 365)
+             (expiry-wait . 14)
              (jao-gnus--trash-group "nnimap:trash")
-             (expiry-target . delete))
+             (expiry-target . "nnimap:trove/bigml"))
             ("^nnimap:bigml/support"
              (posting-style (address "support@bigml.com")))
             (,jao-gnus-expirable
@@ -614,12 +614,12 @@
           gnus-visible-headers
           (concat
            gnus-visible-headers
-           "\\|^X-Newsreader:\\|^X-Mailer:\\|User-Agent:\\|X-User-Agent:")))
+           "\\|^List-[iI][Dd]:\\|^X-Newsreader:\\|^X-Mailer:\\|User-Agent:\\|X-User-Agent:")))
     #+end_src
 *** HTML email
     #+BEGIN_SRC emacs-lisp
       (setq  gnus-button-url 'browse-url-generic
-             gnus-inhibit-images nil
+             gnus-inhibit-images t
              mm-discouraged-alternatives nil ;; '("text/html" "text/richtext")
              mm-inline-large-images 'resize)
 
@@ -634,7 +634,7 @@
               (when (re-search-forward "^\\(To\\|Subject\\):" nil t)
                 (beginning-of-line)
                 (let ((shr-width 1000))
-                  (shr-render-region begin (- (point) 1))))))))
+                  (shr-render-region begin (1- (point)))))))))
 
       (add-hook 'gnus-part-display-hook 'jao-gnus-remove-anchors)
 
diff --git a/init.org b/init.org
index ec386df..c0576a0 100644
--- a/init.org
+++ b/init.org
@@ -1593,13 +1593,12 @@
     #+end_src
 *** Web browsers
     #+begin_src emacs-lisp
-      (jao-load-org "eww")
-      ;; (jao-load-org "w3m")
+      ;; (jao-load-org "eww")
+      (jao-load-org "w3m")
     #+end_src
 * Email
   #+begin_src emacs-lisp
-    (setq jao-afio-mail-function 'gnus ;; 'notmuch 'gnus 'mu4e
-          jao-afio-notmuch-in-web nil)
+    (setq jao-afio-mail-function 'gnus) ;; 'notmuch 'gnus 'mu4e
     (jao-load-org "email")
   #+end_src
 * PDFs
diff --git a/readme.org b/readme.org
index 1ee2dfc..fbc2616 100644
--- a/readme.org
+++ b/readme.org
@@ -69,8 +69,8 @@
 - [[./gnus.org][gnus.org]]: tangled to gnus.el automatically by init.org, so that it's
   ready for loading by Gnus.
 - [[./notmuch.org][notmuch.org]]: email handling in emacs using notmuch.
-- [[./eww.org][eww.org]]: browsing with eww.
 - [[./w3m.org][w3m.org]]: browsing with emacs-w3m.
+- [[./eww.org][eww.org]]: browsing with eww.
 - [[./exwm.org][exwm.org]]: configuration for exwm, loaded when ~jao-exwmn-enable~ is
   called.
 
diff --git a/w3m.org b/w3m.org
new file mode 100644
index 0000000..e1229ab
--- /dev/null
+++ b/w3m.org
@@ -0,0 +1,156 @@
+#+title: Customizations for emacs-w3m
+
+* browse-url and afio
+  #+begin_src emacs-lisp
+    (defun jao-w3m-find-url (url)
+      (let* ((url (w3m-canonicalize-url url))
+             (fn `(lambda (b)
+                    (with-current-buffer b
+                      (string= ,url (w3m-canonicalize-url w3m-current-url))))))
+        (when-let (b (seq-find fn (w3m-list-buffers)))
+          (pop-to-buffer b))))
+
+    (defun jao-w3m-browse-url (url &rest r)
+      (jao-afio--goto-www)
+      (select-window (frame-first-window))
+      (or (jao-w3m-find-url url)
+          (w3m-goto-url-new-session url)))
+
+    (defun jao-w3m-download (arg)
+      (interactive "P")
+      (jao-download (w3m-anchor) arg))
+
+    (setq jao-afio-use-w3m t)
+    (setq jao-browse-url-function 'jao-w3m-browse-url)
+  #+end_src
+* Org integration
+  #+begin_src emacs-lisp
+    (defun jao-w3m-get-link ()
+      (let ((wb (w3m-alive-p)))
+        (when wb
+          (let ((url (with-current-buffer wb w3m-current-url))
+                (title (w3m-buffer-title wb)))
+            (cons url title)))))
+
+    (defun jao-insert-w3m-link ()
+      (interactive)
+      (let ((link (jao-w3m-get-link)))
+        (when link (insert "[[" (car link) "][" (cdr link) "]]"))))
+
+    (with-eval-after-load "org"
+      (require 'ol-w3m nil t)
+      (define-key org-mode-map "\C-cW" 'jao-insert-w3m-link))
+  #+end_src
+* Capture page
+  #+begin_src emacs-lisp
+    (defun jao-w3m-capture-page ()
+      (interactive)
+      (let* ((title (w3m-current-title))
+             (url w3m-current-url)
+             (html (y-or-n-p "Save as HTML (y) or PS (n)? "))
+             (basename (concat (read-string "File name: ")
+                               (if html ".html" ".ps")))
+             (name (expand-file-name basename jao-sink-dir)))
+        (if html
+            (progn
+              (w3m-view-source)
+              (write-region (point-min) (point-max) name nil nil nil t)
+              (w3m-view-source))
+          (progn
+            (split-window-horizontally 85)
+            (w3m-redisplay-this-page)
+            (ps-print-buffer name)
+            (delete-other-windows)
+            (w3m-redisplay-this-page)))
+        (kill-new (format "[[doc:%s][%s]] ([[%s][original]])"
+                          basename title url))))
+   #+end_src
+* Email
+  #+begin_src emacs-lisp
+    (defun jao-w3m-gnus-html-renderer (handle)
+      (let ((w3m-message-silent t)
+            (mm-w3m-safe-url-regexp nil)
+            (shr-use-colors nil)
+            (shr-use-fonts nil)
+            (fill-column (min (window-width) 110)))
+        (condition-case nil
+            (mm-inline-text-html-render-with-w3m handle)
+          (error (delete-region (point) (point-max))
+                 (mm-shr handle)))))
+
+    (setq mm-text-html-renderer #'jao-w3m-gnus-html-renderer)
+
+    (with-eval-after-load "gnus-art"
+      (define-key gnus-article-mode-map "\C-ci" 'w3m-view-image)
+      (define-key gnus-article-mode-map "z" 'w3m-lnum-zoom-in-image))
+  #+end_src
+* Package
+  #+begin_src emacs-lisp
+    (use-package w3m
+      :ensure t
+      :custom ((w3m-key-binding 'info)
+               (w3m-display-mode 'dual-pane))
+      :init
+      (setq w3m-add-user-agent nil
+            w3m-command "w3m"
+            w3m-confirm-leaving-secure-page nil
+            w3m-cookie-accept-bad-cookies t
+            w3m-cookie-accept-domains '(".github.com"
+                                        ".librarything.com"
+                                        ".goodreads.com"
+                                        ".sr.ht"
+                                        ".gnu.org"
+                                        ".codeberg.org"
+                                        "codeberg.org"
+                                        ".bookshop.org"
+                                        ".reddit.com")
+            w3m-cookie-reject-domains '(".")
+            w3m-do-cleanup-temp-files t
+            w3m-fill-column 110
+            w3m-goto-article-function 'jao-w3m-browse-url
+            w3m-form-input-textarea-buffer-lines 40
+            w3m-history-minimize-in-new-session t
+            w3m-history-reuse-history-elements nil
+            w3m-image-no-idle-timer t
+            w3m-make-new-session t
+            w3m-profile-directory "~/.w3m"
+            w3m-redisplay-pages-automatically-p t
+            w3m-resize-images t
+            w3m-safe-url-regexp nil
+            w3m-search-default-engine "duckduckgo" ; "google-en"
+            w3m-select-buffer-horizontal-window nil
+            w3m-select-buffer-window-ratio '(20 . 40)
+            w3m-session-load-last-sessions t
+            w3m-session-load-crashed-sessions 'ask
+            w3m-show-graphic-icons-in-header-line nil
+            w3m-show-graphic-icons-in-mode-line nil
+            w3m-space-before-favicon "|"
+            w3m-use-tab nil
+            w3m-use-tab-line nil
+            w3m-use-title-buffer-name t
+            w3m-use-cookies t
+            w3m-use-filter nil
+            w3m-use-favicon nil
+            w3m-use-header-line nil
+            w3m-use-refresh nil
+            w3m-use-symbol t)
+
+      :config
+      :bind (:map w3m-mode-map
+                  (("+" . w3m-zoom-in-image)
+                   ("-" . w3m-zoom-out-image)
+                   ("C-c C-@" . tracking-next-buffer)
+                   ("C-c C-SPC" . tracking-next-buffer)
+                   ("C-c C-b" . nil)
+                   ("C-c c" . jao-w3m-capture-page)
+                   ("b" . w3m-view-previous-page)
+                   ("B" . w3m-view-next-page)
+                   ("c" . w3m-print-this-url)
+                   ("d" . jao-w3m-download)
+                   ("D" . w3m-download)
+                   ("f" . w3m-lnum-follow)
+                   ("v" . jao-view-video)
+                   ("w" . org-w3m-copy-for-org-mode)
+                   ("x" . jao-rss-subscribe-rss)
+                   ("y" . w3m-print-current-url))))
+  #+end_src
-- 
cgit v1.2.3