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

3 files changed, 49 insertions, 2 deletions

@@ -32,7 +32,9 @@
 
 (defun acdw-modeline/erc ()
   "ERC indicator for the modeline."
-  (when (boundp 'erc-modified-channels-object)
+  (when (and (boundp 'erc-modified-channels-object)
+             (not (bound-and-true-p org-clock-current-task))
+             )
     (format-mode-line erc-modified-channels-object)))
 
 (defun acdw-modeline/god-mode-indicator ()
@@ -116,6 +118,6 @@ Uses `acdw-modeline/word-count-modes' to determine which function to use."
                   #'count-words))
           (min (if (region-active-p) (region-beginning) (point-min)))
           (max (if (region-active-p) (region-end) (point-max))))
-      (format "%dW" (funcall fn min max)))))
+      (format " %dW" (funcall fn min max)))))
 
 (provide 'acdw-modeline)
@@ -304,6 +304,42 @@ the deletion might narrow the column."
          (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)
+  "Count words between START and END, ignoring a lot."
+  (interactive (list nil nil))
+  (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))
+                   (forward-line))
+                  ;; Ignore headings
+                  ((or (org-at-heading-p))
+                   (forward-line))
+                  ;; Ignore drawers
+                  ((or (looking-at org-drawer-regexp)
+                       (looking-at org-clock-drawer-re))
+                   (search-forward ":END:"))
+                  ;; Count everything else
+                  (t (setq words (1+ words))
+                     (forward-word-strictly))))))
+           words))
+        ((use-region-p)
+         (message "%d words in region"
+                  (acdw-org/count-words-stupidly (region-beginning)
+                                                 (region-end))))
+        (t
+         (message "%d words in buffer"
+                  (acdw-org/count-words-stupidly (point-min)
+                                                 (point-max))))))
+
 
 ;;; Zero-width spaces
 ;; https://blog.tecosaur.com/tmio/2021-05-31-async.html#easy-zero-width
@@ -497,6 +497,15 @@ Then, build `browse-url-button-regexp' with the new protocol."
   (add-to-list 'acdw/button-protocols proto)
   (setq-default browse-url-button-regexp (acdw/build-button-url-regexp)))
 
+;;; Browse-URL tweaks
+
+;; convert twitter.com to nitter
+(defun acdw/eww-browse-twitter-url (url &rest args)
+  "Browse a Twitter.com URL using Nitter."
+  (let* ((nitter "nitter.snopyta.org")
+         (url (replace-regexp-in-string "twitter\\.com" nitter url)))
+    (eww-browse-url url args)))
+
 
 ;;; Recentf renaming with dired
 ;; from ... somewhere.  'rjs', apparently?