about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--init.el6
-rw-r--r--lisp/acdw-modeline.el11
2 files changed, 10 insertions, 7 deletions
diff --git a/init.el b/init.el index cbea97e..f1f3b3e 100644 --- a/init.el +++ b/init.el
@@ -813,8 +813,8 @@ like a dumbass."
813 813
814;;; Packages 814;;; Packages
815 815
816(setup (:straight (0x0 :host nil 816(setup (:straight (0x0 :host gitlab
817 :repo "https://git.sr.ht/~zge/nullpointer-emacs")) 817 :repo "willvaughn/emacs-0x0"))
818 (:option 0x0-default-host 'ttm)) 818 (:option 0x0-default-host 'ttm))
819 819
820(setup (:straight (apheleia :host github 820(setup (:straight (apheleia :host github
@@ -1061,6 +1061,8 @@ if ripgrep is installed, otherwise `consult-grep'."
1061 ("WRKF: NPR for the Capital Region" . 1061 ("WRKF: NPR for the Capital Region" .
1062 ,(concat "https://playerservices.streamtheworld.com/" 1062 ,(concat "https://playerservices.streamtheworld.com/"
1063 "api/livestream-redirect/WRKFFM.mp3")) 1063 "api/livestream-redirect/WRKFFM.mp3"))
1064 ("BadRadio: 24/7 PHONK" .
1065 "https://s2.radio.co/s2b2b68744/listen")
1064 ("tilderadio" . 1066 ("tilderadio" .
1065 "https://radio.tildeverse.org/radio/8000/radio.ogg") 1067 "https://radio.tildeverse.org/radio/8000/radio.ogg")
1066 ("vantaradio" . 1068 ("vantaradio" .
diff --git a/lisp/acdw-modeline.el b/lisp/acdw-modeline.el index c073992..104ea28 100644 --- a/lisp/acdw-modeline.el +++ b/lisp/acdw-modeline.el
@@ -128,10 +128,11 @@ Otherwise, cdr should be a function that takes two points (see `count-words')."
128Uses `acdw-modeline/word-count-modes' to determine which function to use." 128Uses `acdw-modeline/word-count-modes' to determine which function to use."
129 (when-let ((modefun 129 (when-let ((modefun
130 (assoc major-mode acdw-modeline/word-count-modes #'equal))) 130 (assoc major-mode acdw-modeline/word-count-modes #'equal)))
131 (let ((fn (or (cdr modefun) 131 (let* ((fn (or (cdr modefun)
132 #'count-words)) 132 #'count-words))
133 (min (if (region-active-p) (region-beginning) (point-min))) 133 (r (region-active-p))
134 (max (if (region-active-p) (region-end) (point-max)))) 134 (min (if r (region-beginning) (point-min)))
135 (format " %dW" (funcall fn min max))))) 135 (max (if r (region-end) (point-max))))
136 (format " %s%dW" (if r "+" "") (funcall fn min max)))))
136 137
137(provide 'acdw-modeline) 138(provide 'acdw-modeline)