8 files changed, 148 insertions, 94 deletions
diff --git a/lisp/+elfeed.el b/lisp/+elfeed.el
index ac316c4..8f7f17a 100644
--- a/lisp/+elfeed.el
+++ b/lisp/+elfeed.el

@@ -60,49 +60,51 @@
      (make-directory (file-name-directory script) :parents)
      (with-temp-buffer
        (insert
-         (prin1-to-string ;; Print the following s-expression to a string
+         (let ((print-level nil)
-          `(progn
+               (print-length nil))
-             ;; Set up the environment
+           (prin1-to-string ;; Print the following s-expression to a string
-             (setq lexical-binding t)
+            `(progn
-             (load (locate-user-emacs-file "early-init"))
+               ;; Set up the environment
-             (dolist (pkg '(elfeed elfeed-org))
+               (setq lexical-binding t)
-               (straight-use-package pkg)
+               (load (locate-user-emacs-file "early-init"))
-               (require pkg))
+               (dolist (pkg '(elfeed elfeed-org))
-             ;; Copy variables from current environment
+                 (straight-use-package pkg)
-             (progn
+                 (require pkg))
-               ,@(cl-loop for copy-var in '(rmh-elfeed-org-files
+               ;; Copy variables from current environment
-                                            elfeed-db-directory
+               (progn
-                                            elfeed-curl-program-name
+                 ,@(cl-loop for copy-var in '(rmh-elfeed-org-files
-                                            elfeed-use-curl
+                                              elfeed-db-directory
-                                            elfeed-curl-extra-arguments
+                                              elfeed-curl-program-name
-                                            elfeed-enclosure-default-dir)
+                                              elfeed-use-curl
-                          collect `(progn (message "%S = %S" ',copy-var ',(symbol-value copy-var))
+                                              elfeed-curl-extra-arguments
-                                          (setq ,copy-var ',(symbol-value copy-var)))))
+                                              elfeed-enclosure-default-dir)
-             ;; Define new variables for this environment
+                            collect `(progn (message "%S = %S" ',copy-var ',(symbol-value copy-var))
-             (progn
+                                            (setq ,copy-var ',(symbol-value copy-var)))))
-               ,@(cl-loop for (new-var . new-val) in '((elfeed-curl-max-connections . 4))
+               ;; Define new variables for this environment
-                          collect `(progn (message "%S = %S" ',new-var ',new-val)
+               (progn
-                                          (setq ,new-var ',new-val))))
+                 ,@(cl-loop for (new-var . new-val) in '((elfeed-curl-max-connections . 4))
-             ;; Redefine `elfeed-log' to log everything
+                            collect `(progn (message "%S = %S" ',new-var ',new-val)
-             (defun elfeed-log (level fmt &rest objects)
+                                            (setq ,new-var ',new-val))))
-               (princ (format "[%s] [%s]: %s\n"
+               ;; Redefine `elfeed-log' to log everything
-                              (format-time-string "%F %T")
+               (defun elfeed-log (level fmt &rest objects)
-                              level
+                 (princ (format "[%s] [%s]: %s\n"
-                              (apply #'format fmt objects))))
+                                (format-time-string "%F %T")
-             ;; Run elfeed
+                                level
-             (elfeed-org)
+                                (apply #'format fmt objects))))
-             (elfeed)
+               ;; Run elfeed
-             (elfeed-db-load)
+               (elfeed-org)
-             (elfeed-update)
+               (elfeed)
-             ;; Wait for `elfeed-update' to finish
+               (elfeed-db-load)
-             (while (> (elfeed-queue-count-total) 0)
+               (elfeed-update)
-               (sleep-for 5)
+               ;; Wait for `elfeed-update' to finish
-               (message "%s" (elfeed-queue-count-total))
+               (while (> (elfeed-queue-count-total) 0)
-               (accept-process-output))
+                 (sleep-for 5)
-             ;; Garbage collect and save the database
+                 (message "%s" (elfeed-queue-count-total))
-             (elfeed-db-gc)
+                 (accept-process-output))
-             (elfeed-db-save)
+               ;; Garbage collect and save the database
-             (princ (format ,update-message-format "done.")))))
+               (elfeed-db-gc)
+               (elfeed-db-save)
+               (princ (format ,update-message-format "done."))))))
        (write-file script))
      (chmod script #o777)
      (message update-message-format "start")
diff --git a/lisp/+emacs.el b/lisp/+emacs.el
index f26dc98..b7e31e2 100644
--- a/lisp/+emacs.el
+++ b/lisp/+emacs.el

@@ -60,15 +60,18 @@ Do this only if the buffer is not visiting a file."
 enable-recursive-minibuffers t
 executable-prefix-env t
 fast-but-imprecise-scrolling t
- find-file-visit-truename t
 file-name-shadow-properties '(invisible t intangible t)
 fill-column 80
+ find-file-visit-truename t
 frame-resize-pixelwise t
 global-auto-revert-non-file-buffers t
 global-mark-ring-max 100
 hscroll-margin 1
 hscroll-step 1
 imenu-auto-rescan t
+ image-use-external-converter (or (executable-find "convert")
+                                  (executable-find "gm")
+                                  (executable-find "ffmpeg"))
 indent-tabs-mode nil
 indicate-buffer-boundaries 'left
 indicate-empty-lines nil
@@ -104,7 +107,7 @@ Do this only if the buffer is not visiting a file."
 save-interprogram-paste-before-kill t
 scroll-conservatively 101
 scroll-down-aggressively 0.01
- scroll-margin 1
+ scroll-margin 2
 scroll-preserve-screen-position 1
 scroll-step 1
 scroll-up-aggressively 0.01
@@ -148,6 +151,9 @@ Do this only if the buffer is not visiting a file."
 ;;; Encodings
+;; Allegedly, this is the only one you need...
+(set-language-environment "UTF-8")
+;; But I still set all of these, for fun.
 (setq-default locale-coding-system 'utf-8-unix
              coding-system-for-read 'utf-8-unix
              coding-system-for-write 'utf-8-unix
@@ -159,7 +165,6 @@ Do this only if the buffer is not visiting a file."
                                      STRING))
 (set-charset-priority 'unicode)
-(set-language-environment "UTF-8")
 (prefer-coding-system 'utf-8-unix)
 (set-default-coding-systems 'utf-8-unix)
 (set-terminal-coding-system 'utf-8-unix)
diff --git a/lisp/+ispell.el b/lisp/+ispell.el
index c3ee417..697233f 100644
--- a/lisp/+ispell.el
+++ b/lisp/+ispell.el

@@ -58,30 +58,34 @@ prefix ARG is non-nil; then it just saves them."
  (unless (buffer-file-name)
    (user-error "Buffer not attached to file"))
  (hack-dir-local-variables)
-  (when-let ((new-words (+ispell-append-removing-duplicates
+  (let ((print-level nil)
-                              :test #'string=
+        (print-length nil))
-                              ispell-buffer-session-localwords
+    (when-let ((new-words (cl-remove-if (lambda (el) (eq el '\.\.\.)) ; XXX: NO IDEA
-                              (alist-get 'ispell-buffer-session-localwords
+                                        ; where this came from
-                                         dir-local-variables-alist)
+                                        (+ispell-append-removing-duplicates
-                              (alist-get 'ispell-buffer-session-localwords
+                                         :test #'string=
-                                         file-local-variables-alist)
+                                         ispell-buffer-session-localwords
-                              (+ispell-buffer-local-words-list))))
+                                         (alist-get 'ispell-buffer-session-localwords
-    (save-excursion
+                                                    dir-local-variables-alist)
-      (add-dir-local-variable
+                                         (alist-get 'ispell-buffer-session-localwords
-       major-mode
+                                                    file-local-variables-alist)
-       'ispell-buffer-session-localwords
+                                         (+ispell-buffer-local-words-list)))))
-       (setq ispell-buffer-session-localwords
+      (save-excursion
-             new-words))
+        (add-dir-local-variable
-      (when (or arg
+         major-mode
-                (y-or-n-p "Save .dir-locals.el?"))
+         'ispell-buffer-session-localwords
-        (save-buffer))
+         (setq ispell-buffer-session-localwords
-      (bury-buffer))
+               new-words))
-    (or ispell-buffer-local-name
+        (when (or arg
-        (setq ispell-buffer-local-name (buffer-name)))
+                  (y-or-n-p "Save .dir-locals.el?"))
-    (save-excursion
+          (save-buffer))
-      (goto-char (point-min))
+        (bury-buffer))
-      (while (search-forward ispell-words-keyword nil t)
+      (or ispell-buffer-local-name
-        (delete-region (point-at-bol) (1+ (point-at-eol)))))))
+          (setq ispell-buffer-local-name (buffer-name)))
+      (save-excursion
+        (goto-char (point-min))
+        (while (search-forward ispell-words-keyword nil t)
+          (delete-region (point-at-bol) (1+ (point-at-eol))))))))
 ;;;###autoload
 (defun +ispell-move-buffer-words-to-dir-locals-hook ()
diff --git a/lisp/+kmacro.el b/lisp/+kmacro.el
index 2b2916f..a3cde61 100644
--- a/lisp/+kmacro.el
+++ b/lisp/+kmacro.el

@@ -21,6 +21,7 @@
 (defun +kmacro-change-mode-line (&rest _)
  "Remap the mode-line face when recording a kmacro."
  (add-to-list 'face-remapping-alist '(mode-line . +kmacro-modeline)))
 (defun +kmacro-restore-mode-line (&rest _)
diff --git a/lisp/+modeline.el b/lisp/+modeline.el
index c8dab4e..7bef5c6 100644
--- a/lisp/+modeline.el
+++ b/lisp/+modeline.el

@@ -296,7 +296,7 @@ See `line-number-mode', `column-number-mode', `file-percentage-mode'"
                                                (interactive "e")
                                                (with-selected-window
                                                    (posn-window
-                                                     (event-start ev))
+                                                     (event-start e))
                                                  (god-local-mode -1)
                                                  (force-mode-line-update)))))
                        'mouse-face 'mode-line-highlight))))
@@ -326,5 +326,26 @@ See `line-number-mode', `column-number-mode', `file-percentage-mode'"
                                      map))
                        'mouse-face 'mode-line-highlight))))
+(defface +modeline-kmacro-indicator '((t :foreground "Firebrick"))
+  "Face for the kmacro indicator in the modeline.")
+(defun +modeline-kmacro-indicator (&optional spacer)
+  "Display an indicator when recording a kmacro."
+  (when defining-kbd-macro
+    (concat (or spacer +modeline-default-spacer)
+            (propertize "●"
+                        'face '+modeline-kmacro-indicator
+                        'help-echo (format (concat "Defining a macro\n"
+                                                   "Current step: %d\n"
+                                                   "mouse-1: Stop recording")
+                                           kmacro-counter)
+                        'local-map (purecopy (simple-modeline-make-mouse-map
+                                              'mouse-1 (lambda (e)
+                                                         (interactive "e")
+                                                         (with-selected-window
+                                                             (posn-window (event-start e))
+                                                           (kmacro-end-macro nil)))))
+                        'mouse-face 'mode-line-highlight))))
 (provide '+modeline)
 ;;; +modeline.el ends here
diff --git a/lisp/+org.el b/lisp/+org.el
index 2ff3e11..3d14c52 100644
--- a/lisp/+org.el
+++ b/lisp/+org.el

@@ -550,6 +550,7 @@ language name.")
  "Export region to HTML, and copy it to the clipboard.
 Arguments ASYNC, SUBTREEP, VISIBLE-ONLY, BODY-ONLY, EXT-PLIST,
 and POST-PROCESS are passed to `org-export-to-file'."
+  (interactive) ; XXX: hould this be interactive?
  (message "Exporting Org to HTML...")
  (let ((org-tmp-file "/tmp/org.html"))
    (org-export-to-file 'html org-tmp-file
@@ -567,8 +568,5 @@ and POST-PROCESS are passed to `org-export-to-file'."
  (interactive)
  (+org-export-clip-to-html nil :subtree))
-;;; Taskwise functions
-;; TODO: break out into another library
 (provide '+org)
 ;;; +org.el ends here
diff --git a/lisp/+tab-bar.el b/lisp/+tab-bar.el
index c4b7420..e328146 100644
--- a/lisp/+tab-bar.el
+++ b/lisp/+tab-bar.el

@@ -27,7 +27,8 @@
  "Display `tracking-mode-line-buffers' in the tab-bar."
  ;; TODO: write something to convert a mode-line construct to a tab-bar
  ;; construct.
-  (when tracking-mode
+  (when (and tracking-mode
+             (not (bound-and-true-p org-clock-current-task)))
    (cons (when (> (length tracking-mode-line-buffers) 0)
            '(track-mode-line-separator menu-item " " ignore))
          (cl-loop for i from 0 below (length tracking-mode-line-buffers)
@@ -63,7 +64,8 @@
 (defun +tab-bar-org-clock ()
  "Display `org-mode-line-string' in the tab-bar."
-  (when (org-clocking-p)
+  (when (and (fboundp 'org-clocking-p)
+             (org-clocking-p))
    ;; org-mode-line-string
    `((org-clocking menu-item
                    ,org-mode-line-string
diff --git a/lisp/acdw.el b/lisp/acdw.el
index 7012b16..de2b8e7 100644
--- a/lisp/acdw.el
+++ b/lisp/acdw.el

@@ -281,24 +281,30 @@ always nil; this function is mostly intended for use in init."
 (defun chat-disconnect ()
  "Disconnect from all chats."
  (interactive)
-  (ignore-errors
+  (+with-progress "Quitting circe..."
-    (circe-command-GQUIT "☮ 🫀 🍞"))
-  (ignore-errors
-    (jabber-disconnect))
-  (dolist (team +slack-teams)
    (ignore-errors
-      (slack-team-disconnect team)))
+      (circe-command-GQUIT "☮ 🫀 🍞")
-  (ignore-errors (slack-ws-close))
+      (cancel-timer (irc-connection-get conn :flood-timer))))
-  (+mapc-some-buffers (lambda () "Remove the buffer from tracking and kill it unconditionally."
+  (+with-progress "Quitting jabber..."
-                        (let ((kill-buffer-query-functions nil))
+    (ignore-errors
-                          (tracking-remove-buffer (current-buffer))
+      (jabber-disconnect)))
-                          (kill-buffer)))
+  (+with-progress "Quitting-slack..."
-                      (lambda () "Return t if derived from the following modes."
+      (dolist (team +slack-teams)
-                        (derived-mode-p 'lui-mode
+        (ignore-errors
-                                        'jabber-chat-mode
+          (slack-team-disconnect team)))
-                                        'jabber-roster-mode
+      (ignore-errors (slack-ws-close)))
-                                        'jabber-browse-mode
+  (+with-progress "Killing buffers..."
-                                        'slack-mode))))
+    (ignore-errors
+     (+mapc-some-buffers (lambda () "Remove the buffer from tracking and kill it unconditionally."
+                           (let ((kill-buffer-query-functions nil))
+                             (tracking-remove-buffer (current-buffer))
+                             (kill-buffer)))
+                         (lambda () "Return t if derived from the following modes."
+                           (derived-mode-p 'lui-mode
+                                           'jabber-chat-mode
+                                           'jabber-roster-mode
+                                           'jabber-browse-mode
+                                           'slack-mode))))))
 ;; I can never remember all the damn chat things I run, so this just does all of em.
 (defun chat (&optional arg)
@@ -306,7 +312,9 @@ always nil; this function is mostly intended for use in init."
 With optional ARG, kill all chat-related buffers first."
  (interactive "P")
  (when arg (chat-disconnect))
-  (mapc #'call-interactively chat-functions))
+  (dolist-with-progress-reporter (fn chat-functions)
+      "Connecting to chat..."
+    (call-interactively fn)))
 (defun +forward-paragraph (arg)
  "Move forward ARG (simple) paragraphs.
@@ -353,5 +361,18 @@ SEPARATOR defaults to the newline (\\n)."
  (with-current-buffer (find-file-noselect file)
    (buffer-string)))
+(defmacro +with-progress (pr-args &rest body)
+  "Perform BODY wrapped in a progress reporter.
+PR-ARGS is the list of arguments to pass to
+`make-progress-reporter'; it can be a single string for the
+message, as well.  If you want to use a formatted string, wrap
+the `format' call in a list."
+  (declare (indent 1))
+  (let ((reporter (gensym))
+        (pr-args (if (listp pr-args) pr-args (list pr-args))))
+    `(let ((,reporter (make-progress-reporter ,@pr-args)))
+       (prog1 (progn ,@body)
+         (progress-reporter-done ,reporter)))))
 (provide 'acdw)
 ;;; acdw.el ends here