Merge branch 'main' of tildegit.org:acdw/emacs

3 files changed, 127 insertions, 158 deletions

@@ -19,7 +19,7 @@
 ;;; Setup
 
 ;;;; `setup'
-(straight-use-package '(setup :host nil :repo "https://git.sr.ht/~zge/setup"))
+(straight-use-package '(setup :host nil :repo "https://git.sr.ht/~pkal/setup"))
 (require 'setup)
 
 (setup setup
@@ -174,25 +174,31 @@
            custom-unlispify-tag-names nil
            custom-variable-default-form 'lisp)
 
-  (defun unpackaged/custom-toggle-all-more-hide (&rest _)
-    "Toggle all \"More/Hide\" widgets in current buffer."
-    (interactive)
-    (widget-map-buttons (lambda (widget _)
-                          (pcase (widget-get widget :off)
-                            ("More" (widget-apply-action widget)))
-                          nil)))
-  (advice-add 'custom-buffer-create
-              :after #'unpackaged/custom-toggle-all-more-hide)
-
-  (defun acdw/custom-toggle-showing-all-values (&rest _)
-    "Toggle all \"Show Value\" widgets in current buffer."
-    (interactive)
-    (widget-map-buttons (lambda (widget _)
-                          (pcase (widget-get widget :off)
-                            ("Show Value" (widget-apply-action widget)))
-                          nil)))
-  (advice-add 'custom-buffer-create
-              :after #'acdw/custom-toggle-showing-all-values))
+  ;; `Custom-mode-hook' fires /before/ the widgets are built, so I have to
+  ;; install advice after the widgets are made.
+  (advice-add
+   'custom-buffer-create :after
+   (defun custom-buffer@expand-widgets (&rest _)
+     "Expand descriptions and values of variables in `Custom-mode' buffers."
+     (interactive)
+     ;; "More/Hide" widgets (thanks alphapapa!)
+     (widget-map-buttons (lambda (widget _)
+                           (pcase (widget-get widget :off)
+                             ("More" (widget-apply-action widget)))
+                           nil))
+     ;; "Show Value" widgets (the little triangles)
+     (widget-map-buttons (lambda (widget _)
+                           (pcase (widget-get widget :off)
+                             ("Show Value" (widget-apply-action widget)))
+                           nil))))
+
+  (add-hook                            ; thanks u/oantolin!
+   'Custom-mode-hook
+   (defun custom-mode@imenu ()
+     "Build `imenu' for `Custom-mode'."
+     (setq imenu-generic-expression
+           '(("Faces" "^\\(?:Show\\|Hide\\) \\(.*\\) face: \\[sample\\]" 1)
+             ("Variables" "^\\(?:Show Value\\|Hide\\) \\([^:\n]*\\)" 1))))))
 
 (setup debugger
   (:hook visual-line-mode)
@@ -337,8 +343,7 @@
    erc-fill-static-center 14
    erc-format-nick-function #'erc-format-truncate-@nick
    erc-header-line-face-method #'erc/update-header-line-show-disconnected
-   erc-hide-list '("NICK" "MODE" "JOIN" "NICK" "PART" "QUIT"
-                   "324" "329" "332" "333" "353" "477")
+   erc-hide-list '("NICK" "MODE" "JOIN" "PART" "QUIT")
    erc-interpret-controls-p t
    erc-interpret-mirc-color t
    erc-join-buffer 'bury
@@ -347,7 +352,7 @@
    erc-kill-server-buffer-on-quit t
    erc-nick "acdw"
    erc-nick-truncate (- erc-fill-static-center 1)
-   erc-prompt (lambda () (acdw-erc/prompt))
+   erc-prompt #'acdw-erc/prompt
    erc-prompt-for-password nil          ; use ~/.authinfo
    erc-rename-buffers t
    erc-server erc-default-server
@@ -356,7 +361,8 @@
      (mapcar #'car erc-autojoin-channels-alist))
    erc-server-coding-system '(utf-8 . utf-8)
    erc-track-exclude-types (append erc-hide-list
-                                   '("AWAY"))
+                                   '("AWAY"
+                                     "353" "324" "329" "332" "333" "477"))
    erc-track-exclude-server-buffer t
    erc-track-position-in-mode-line 'before-modes
    erc-track-visibility nil             ; only the selected frame
@@ -845,12 +851,6 @@ like a dumbass."
            "M-u" upcase-dwim
            "M-l" downcase-dwim)
 
-  ;; (when (display-graphic-p)
-  ;;   (:global "<escape>" keyboard-escape-quit))
-
-  ;; Remap C-h to DEL -- <f1> can be the "help" key
-  ;; (define-key key-translation-map [?\C-h] [?\C-?])
-
   (:global "C-c t" acdw/insert-iso-date
            "C-z" nil))
 
@@ -939,7 +939,6 @@ if ripgrep is installed, otherwise `consult-grep'."
    ;; C-x bindings (`ctl-x-map')
    "C-x M-:" consult-complex-command
    "C-x b" consult-buffer
-   "<f1>" consult-buffer                ; trying this out ...
    "C-x 4 b" consult-buffer-other-window
    "C-x 5 b" consult-buffer-other-frame
    ;; Custom M-# bindings for fast register access
@@ -1006,15 +1005,14 @@ if ripgrep is installed, otherwise `consult-grep'."
     (:advise completing-read-multiple
              :filter-args #'crm-indicator))
 
-  (with-eval-after-load 'vertico
-    (with-eval-after-load 'consult
-      (when (boundp 'consult-crm-map)
-        (define-key consult-crm-map "\r" #'+vertico-crm-exit)
-        (define-key consult-crm-map "\t" #'vertico-exit)
-        (defun +vertico-crm-exit ()
-          (interactive)
-          (run-at-time 0 nil #'vertico-exit)
-          (funcall #'vertico-exit))))))
+  (with-eval-after-loads (vertico consult)
+    (when (boundp 'consult-crm-map)
+      (define-key consult-crm-map "\r" #'+vertico-crm-exit)
+      (define-key consult-crm-map "\t" #'vertico-exit)
+      (defun +vertico-crm-exit ()
+        (interactive)
+        (run-at-time 0 nil #'vertico-exit)
+        (funcall #'vertico-exit)))))
 
 (setup (:straight crux)
   
@@ -1086,11 +1084,10 @@ if ripgrep is installed, otherwise `consult-grep'."
           #'which-key--hide-popup-ignore-command)
         embark-become-indicator embark-action-indicator)
   
-  (with-eval-after-load 'embark
-    (with-eval-after-load 'consult
-      (setup (:straight embark-consult)
-        (add-hook 'embark-collect-mode-hook
-                  #'consult-preview-at-point-mode)))))
+  (with-eval-after-loads (embark consult)
+    (setup (:straight embark-consult)
+      (add-hook 'embark-collect-mode-hook
+                #'consult-preview-at-point-mode))))
 
 (setup (:straight epithet)
   (add-hook 'Info-selection-hook #'epithet-rename-buffer)
@@ -1201,6 +1198,7 @@ if ripgrep is installed, otherwise `consult-grep'."
 (setup (:straight (mastodon
                    :host github
                    :repo "mooseyboots/mastodon.el"))
+  (:straight request)
   (:option mastodon-instance-url "https://writing.exchange"
            mastodon-auth-source-file (car auth-sources)
            mastodon-client--token-file (acdw/dir "mastodon.plstore")))
@@ -1301,35 +1299,39 @@ if ripgrep is installed, otherwise `consult-grep'."
 (setup (:straight org)
   (:straight org-contrib)
   (require 'acdw-org)                   ; so I don't clutter up init.el
-  (:option org-adapt-indentation nil
-           org-catch-invisible-edits 'smart
-           org-clock-clocked-in-display 'mode-line
-           org-clock-string-limit 7     ; gives time and not title
-           org-confirm-babel-evaluate nil
-           org-ellipsis " …"
-           org-export-coding-system 'utf-8-unix
-           org-export-headline-levels 8
-           org-export-with-section-numbers nil
-           org-export-with-smart-quotes t
-           org-export-with-sub-superscripts t
-           org-export-with-toc nil
-           org-fontify-done-headline t
-           org-fontify-quote-and-verse-blocks t
-           org-fontify-whole-heading-line t
-           org-hide-emphasis-markers t
-           org-html-coding-system  'utf-8-unix
-           org-imenu-depth 3
-           org-outline-path-complete-in-steps nil
-           org-pretty-entities t
-           org-refile-use-outline-path 'file
-           org-special-ctrl-a/e t
-           org-special-ctrl-k t
-           org-src-fontify-natively t
-           org-src-tab-acts-natively t
-           org-src-window-setup 'current-window
-           org-startup-truncated nil
-           org-tags-column 0 ; (- 0 fill-column -3)
-           org-directory "~/org")
+  (:option
+   org-adapt-indentation nil
+   org-catch-invisible-edits 'smart
+   org-clock-clocked-in-display 'mode-line
+   org-clock-string-limit 7     ; gives time and not title
+   org-confirm-babel-evaluate nil
+   org-directory "~/org"
+   org-ellipsis " …"
+   org-export-coding-system 'utf-8-unix
+   org-export-headline-levels 8
+   org-export-with-section-numbers nil
+   org-export-with-smart-quotes t
+   org-export-with-sub-superscripts t
+   org-export-with-toc nil
+   org-fontify-done-headline t
+   org-fontify-quote-and-verse-blocks t
+   org-fontify-whole-heading-line t
+   org-hide-emphasis-markers t
+   org-html-coding-system  'utf-8-unix
+   org-image-actual-width '(300)
+   org-imenu-depth 3
+   org-outline-path-complete-in-steps nil
+   org-pretty-entities t
+   org-refile-use-outline-path 'file
+   org-special-ctrl-a/e t
+   org-special-ctrl-k t
+   org-src-fontify-natively t
+   org-src-tab-acts-natively t
+   org-src-window-setup 'current-window
+   org-startup-truncated nil
+   org-startup-with-inline-images t
+   org-tags-column 0 ; (- 0 fill-column -3)
+   )
 
   (:bind "RET" acdw-org/return-dwim
          "<S-return>" acdw-org/org-table-copy-down
@@ -1348,7 +1350,10 @@ if ripgrep is installed, otherwise `consult-grep'."
          acdw/org-fix-lines-before-save)
   
   (advice-add 'org-delete-backward-char
-              :override #'acdw-org/delete-backward-char))
+              :override #'acdw-org/delete-backward-char)
+
+  (setup (:straight org-appear)
+    (:hook-into org-mode)))
 
 (setup (:straight paredit)
 
@@ -1463,6 +1468,8 @@ if ripgrep is installed, otherwise `consult-grep'."
   
   (global-undo-fu-session-mode +1))
 
+(setup (:straight unfill))
+
 (setup (:straight (unfocused
                    :host github
                    :repo "duckwork/unfocused"))
@@ -243,74 +243,13 @@ the deletion might narrow the column."
       (org-table-copy-down n)
     (acdw-org/return-dwim n)))
 
-(defun acdw-org/count-words (start end)
-  "Count words between START and END, respecting `org-mode' conventions."
-  (interactive (list nil nil))
-  (require 'cl-lib)
-  (require 'ox)
-  (message "Counting words...")
-  (cond ((not (called-interactively-p 'any))
-         (let ((words 0))
-           (save-excursion
-             (save-restriction
-               (narrow-to-region start end)
-               (goto-char (point-min))
-               (while (< (point) (point-max))
-                 (cond
-                  ;; Ignore comments
-                  ((or (org-at-comment-p)
-                       (org-in-commented-heading-p)) nil)
-                  ;; Ignore tables
-                  ((org-at-table-p) nil)
-                  ;; Ignore hyperlinks, but count the descriptions
-                  ((looking-at org-bracket-link-analytic-regexp)
-                   (when-let ((desc (match-string-no-properties 5)))
-                     (save-match-data
-                       (setq words (+ words
-                                      (length (remove ""
-                                                      (org-split-string
-                                                       desc "\\W")))))))
-                   (goto-char (match-end 0)))
-                  ;; Ignore source code blocks
-                  ((org-in-src-block-p) nil)
-                  ;; Ignore footnotes
-                  ((or (org-footnote-at-definition-p)
-                       (org-footnote-at-reference-p))
-                   nil)
-                  ;; else... check the context
-                  (t (let ((contexts (org-context)))
-                       (cond
-                        ;; Ignore tags, TODO keywords, etc.
-                        ((or (assoc :todo-keyword contexts)
-                             (assoc :priority contexts)
-                             (assoc :keyword contexts)
-                             (assoc :checkbox contexts))
-                         nil)
-                        ;; Ignore sections tagged :no-export
-                        ((assoc :tags contexts)
-                         (if (cl-intersection (org-get-tags-at)
-                                              org-export-exclude-tags
-                                              :test 'equal)
-                             (org-forward-same-level 1)
-                           nil))
-                        ;; else... count the word
-                        (t (setq words (1+ words)))))))
-                 (re-search-forward "\\w+\\W*")))
-             words)))
-        ((use-region-p)
-         (message "%d words in region"
-                  (acdw-org/count-words (region-beginning) (region-end))))
-        (t
-         (message "%d words in buffer"
-                  (acdw-org/count-words (point-min) (point-max))))))
-
 ;; This isn't the best code, but it'll do.
 (defun acdw-org/count-words-stupidly (start end &optional limit)
   "Count words between START and END, ignoring a lot.
 
 Since this function is, for some reason, pricy, the optional
 parameter LIMIT sets a word limit at which to stop counting.
-Once the function hits that number, it'll return \"-LIMIT\"
+Once the function hits that number, it'll return -LIMIT
 instead of the true count."
   (interactive (list nil nil))
   (cond ((not (called-interactively-p 'any))
@@ -334,13 +273,35 @@ instead of the true count."
                   ((or (looking-at org-drawer-regexp)
                        (looking-at org-clock-drawer-re))
                    (search-forward ":END:" nil :noerror))
+                  ;; Ignore tables
+                  ((org-at-table-p) (forward-line))
+                  ;; Ignore hyperlinks, but count the descriptions
+                  ((looking-at org-bracket-link-analytic-regexp)
+                   (when-let ((desc (match-string-no-properties 5)))
+                     (save-match-data
+                       (setq words (+ words
+                                      (length (remove ""
+                                                      (org-split-string
+                                                       desc "\\W")))))))
+                   (goto-char (match-end 0)))
+                  ;; Ignore source blocks
+                  ((org-in-src-block-p) (foreward-line))
                   ;; Count everything else
-                  (t (setq words (1+ words))
-                     (if (and limit
-                              (> words limit))
-                         (setq words limit
-                               continue nil))
-                     (forward-word-strictly))))))
+                  (t
+                   ;; ... unless it's in a few weird contexts
+                   (let ((contexts (org-context)))
+                     (cond ((or (assoc :todo-keyword contexts)
+                                (assoc :priority contexts)
+                                (assoc :keyword contexts)
+                                (assoc :checkbox contexts))
+                            (forward-word-strictly))
+                           
+                           (t (setq words (1+ words))
+                              (if (and limit
+                                       (> words limit))
+                                  (setq words (- limit)
+                                        continue nil))
+                              (forward-word-strictly)))))))))
            words))
         ((use-region-p)
          (message "%d words in region"
@@ -87,21 +87,6 @@ ARG).  When called with multiple arguments or a list, it returns
       (save-restriction
         (unfill-region (point-min) (point-max))))))
 
-(defun kill-ring-save-unfilled (start end &optional region)
-  "Unfill, kill, then re-fill the region defined by START and END positions.
-REGION is passed straight to `kill-ring-save'."
-  (interactive "*r")
-  (let ((sentence-end-double-space nil))
-    (unfill-region start end)
-    (kill-ring-save
-     ;; A quick hack to try and ameliorate the "Args out of range" error when
-     ;; `unfill-region' removes some newlines.  I'm not sure if this will work
-     ;; if calling from Lisp or other such nonsense.
-     (max start (point-min))
-     (min end (point-max))
-     region))
-  (fill-region start end))
-
 (defmacro when-unfocused (name &rest forms)
   "Define a function NAME, executing FORMS, that fires when Emacs
 is unfocused."
@@ -123,6 +108,22 @@ is unfocused."
               ,@body)
      (message "%s... Done." ,message)))
 
+(defmacro with-eval-after-loads (files &rest body)
+  "Execute BODY after FILES are loaded.
+This macro simplifies `with-eval-after-load' for multiple nested
+features."
+  (declare (indent 1) (debug (form def-body)))
+  (waterfall-list 'with-eval-after-load files body))
+
+(defun waterfall-list (car list rest)
+  "Cons CAR with each element in LIST in a waterfall fashion, end with REST.
+For use with the `with-eval-after-loads' function."
+  (cond ((atom list) `(,car ',list ,@rest))
+        ((= 1 (length list)) `(,car ',(car list) ,@rest))
+        (t
+         `(,car ',(car list)
+                ,(waterfall-list car (cdr list) rest)))))
+
 
 ;;; Comment-or-uncomment-sexp
 ;; from https://endlessparentheses.com/a-comment-or-uncomment-sexp-command.html