nits

5 files changed, 15 insertions, 28 deletions

diff --git a/custom/jao-custom-blog.el b/custom/jao-custom-blog.el
index 3014cb5..201aed6 100644
--- a/custom/jao-custom-blog.el
+++ b/custom/jao-custom-blog.el
@@ -147,8 +147,7 @@
             (mapconcat #'identity tags " ")
             "\n\n")
     (when (member "books" tags)
-      (insert jao-org-static-blog--prev-beg
-              "\n\n[[https://jao.io/img/" file ".jpg]]\n\n"))
+      (insert jao-org-static-blog--prev-beg "\n\n[[../img/" file ".jpg]]\n\n"))
     (save-excursion (insert jao-org-static-blog--prev-end "\n"))))
 
 ;;; Drafts
diff --git a/custom/jao-custom-email.el b/custom/jao-custom-email.el
index a7fc8e0..e8aa863 100644
--- a/custom/jao-custom-email.el
+++ b/custom/jao-custom-email.el
@@ -215,25 +215,6 @@
 
 (jao-sendmail-local)
 
-;;; multipart html renderer
-(defun jao-w3m-html-renderer (handle)
-  (let ((w3m-message-silent t)
-        (mm-w3m-safe-url-regexp nil))
-    (condition-case nil
-        (mm-inline-text-html-render-with-w3m handle)
-      (error (delete-region (point) (point-max))
-             (let ((shr-use-fonts nil)
-                   (shr-use-colors nil))
-               (mm-shr handle))))))
-
-(defun jao-shr-html-renderer (handle)
-  (let ((fill-column nil)
-        (shr-width fill-column))
-    (mm-shr handle)))
-
-;; (setq mm-text-html-renderer #'jao-w3m-html-renderer)
-(setq mm-text-html-renderer #'jao-shr-html-renderer)
-
 ;;; bbdb
 (use-package bbdb
   :ensure t
diff --git a/custom/jao-custom-eww.el b/custom/jao-custom-eww.el
index 6902285..dc643fb 100644
--- a/custom/jao-custom-eww.el
+++ b/custom/jao-custom-eww.el
@@ -20,6 +20,14 @@
 (setq jao-browse-url-function #'jao-eww-browse-url)
 (setq eww-use-browse-url "^\\(gemini\\|gopher\\):")
 
+;;; multipart html renderer
+(defun jao-shr-html-renderer (handle)
+  (let ((fill-column nil)
+        (shr-width fill-column))
+    (mm-shr handle)))
+
+(setq mm-text-html-renderer #'jao-shr-html-renderer)
+
 ;;; Opening URLs
 (defun jao-eww-copy-link ()
   (interactive)
diff --git a/custom/jao-custom-org.el b/custom/jao-custom-org.el
index 6b4200e..1c6076a 100644
--- a/custom/jao-custom-org.el
+++ b/custom/jao-custom-org.el
@@ -12,8 +12,8 @@
         org-complete-tags-always-offer-all-agenda-tags t
         org-cycle-separator-lines 0 ;; no blank lines when all colapsed
         org-deadline-warning-days 14
-        org-default-notes-file (expand-file-name "inbox.org" org-directory)
         org-directory jao-org-dir
+        org-default-notes-file (expand-file-name "inbox.org" org-directory)
         org-display-remote-inline-images 'download ;; 'skip 'cache
         org-ellipsis " .." ;; ↴
         org-email-link-description-format "Email %c: %s"
@@ -148,8 +148,6 @@
 (setq org-src-window-setup 'other-window) ;; current-window
 (require 'org-tempo nil t) ;; <s TAB for 9.2 and later
 
-;; (use-package poly-org :ensure t)
-
 (use-package ob-prolog
   :ensure t
   :after org)
diff --git a/init.el b/init.el
index 978fcfe..1473ce9 100644
--- a/init.el
+++ b/init.el
@@ -573,8 +573,6 @@
 
 
 ;;; Minibuffer
-(defvar jao-modeline-in-minibuffer (and window-system t))
-
 (use-package jao-minibuffer
   :init
   (if (jao-colors-scheme-dark-p)
@@ -596,6 +594,9 @@
 (jao-minibuffer-mode 1)
 
 ;;; Mode line
+;;;; config and jao-mode-line
+(defvar jao-modeline-in-minibuffer (and window-system t))
+
 (setq line-number-display-limit-width 250)
 (setq mode-line-position-column-format '(" %c")
       mode-line-position-line-format '(" %l,%c"))
@@ -609,7 +610,7 @@
              jao-mode-line-remove-from-minibuffer))
 
 (when jao-modeline-in-minibuffer
-  (add-hook 'display-time-hook #'jao-minibuffer-refresh)
+  ;; (add-hook 'display-time-hook #'jao-minibuffer-refresh)
   (add-hook 'after-init-hook
             (lambda () (jao-mode-line-add-to-minibuffer 90))))
 
@@ -1925,7 +1926,7 @@
 (require 'em-term)
 
 (dolist (c '("editor" "more" "wget" "dict" "vim" "links" "w3m" "guile"
-             "ssh" "autossh" "zmore" "pager" "aptitude" "su" "htop" "top"
+             "zmore" "pager" "aptitude" "su" "htop" "top"
              "screen" "whizzml" "iex" "spt"))
   (add-to-list 'eshell-visual-commands c))