5 files changed, 84 insertions, 29 deletions

@@ -245,6 +245,14 @@ can easily remove elements.")
          match))
      text)))
 
+(defun +circe-shorten-urls-all ()
+  "Turn on `+circe-shorten-url-mode' in all chat buffers."
+  (interactive)
+  (+mapc-some-buffers
+   (lambda () (+circe-shorten-url-mode +1))
+   (lambda (buf)
+     (derived-mode-p 'circe-chat-mode))))
+
 ;; Temperature conversion
 
 (+circe-define-filter +circe-F/C-mode
@@ -261,12 +269,13 @@ can easily remove elements.")
   (round (+ 32 (* (/ 9.0 5.0) degc))))
 
 (defun str-F/C (text)
-  (replace-regexp-in-string "[0-9.]+[Ff]"
+  (replace-regexp-in-string "[^.]\\([[:digit:]]+\\(?:\\.[[:digit:]]+\\)?[fF]\\)"
                             (lambda (match)
                               (format "%s/%dC" match
                                       (fahrenheit-to-celsius
                                        (string-to-number match))))
-                            text))
+                            text
+                            nil 1))
 
 (provide '+circe)
 ;;; +circe.el ends here
@@ -183,32 +183,54 @@ The order of elements matters: whichever one matches first is applied."
   "Toggle the percentage display in the mode line (File Percentage Mode)."
   :init-value t :global t :group 'mode-line)
 
-(defun +modeline-position (&optional _) ; adapted from `simple-modeline'
-  "Display the current cursor position."
+(defun +modeline-file-percentage (&optional spacer)
+  "Display the position in the current file."
+  `(,(or spacer +modeline-default-spacer)
+    (:propertize (file-percentage-mode
+                  (" " (-3 "%p") "%%"))
+                 font-lock-face font-lock-comment-face)))
+
+(define-minor-mode region-indicator-mode
+  "Toggle the region indicator in the mode line."
+  :init-value t :global t :group 'mode-line)
+
+(defun +modeline-region (&optional spacer)
+  "Display an indicator if the region is active."
+  (when (and region-indicator-mode
+             (region-active-p))
+    (list
+     (format "%s%6s"
+             (or spacer +modeline-default-spacer)
+             (propertize (format "%s%d"
+                                 (if (and (< (point) (mark))) "-" "+")
+                                 (apply '+ (mapcar (lambda (pos)
+                                                     (- (cdr pos)
+                                                        (car pos)))
+                                                   (region-bounds))))
+                         'font-lock-face 'font-lock-variable-name-face)))))
+
+(defun +modeline-line-column (&optional spacer) ; adapted from `simple-modeline'
+  "Display the current cursor line and column depending on modes."
   (let ((sep "|") (before " [") (after "]"))
-    (list `(:propertize (line-number-mode
-                         ((column-number-mode
-                           (column-number-indicator-zero-based
-                            ,(concat before "%l" sep "%c" after)
-                            ,(concat before "%l" sep "%C" after))
-                           ,(concat before "%l" sep "" after)))
-                         ((column-number-mode
-                           (column-number-indicator-zero-based
-                            ,(concat before sep "%c" after)
-                            ,(concat before sep "%C" after)))))
-                        font-lock-face font-lock-comment-face)
-          (if (region-active-p)
-              (propertize (format "%s%-5d"
-                                  (if (and (mark) (< (point) (mark))) "-" "+")
-                                  (apply '+ (mapcar
-                                             (lambda (pos)
-                                               (- (cdr pos)
-                                                  (car pos)))
-                                             (region-bounds))))
-                          'font-lock-face 'font-lock-variable-name-face))
-          '(:propertize (file-percentage-mode
-                         (" " (-3 "%p") "%%"))
-                        font-lock-face font-lock-comment-face))))
+    `(,(or spacer +modeline-default-spacer)
+      (:propertize (line-number-mode
+                    ((column-number-mode
+                      (column-number-indicator-zero-based
+                       ,(concat before "%l" sep "%c" after)
+                       ,(concat before "%l" sep "%C" after))
+                      ,(concat before "%l" sep "" after)))
+                    ((column-number-mode
+                      (column-number-indicator-zero-based
+                       ,(concat before sep "%c" after)
+                       ,(concat before sep "%C" after)))))
+                   font-lock-face font-lock-comment-face))))
+
+(defun +modeline-position (&optional _)
+  "Display the current cursor position.
+See `line-number-mode', `column-number-mode', `file-percentage-mode'"
+  (append (+modeline-line-column)
+          (+modeline-region)
+          (+modeline-file-percentage)))
 
 (defun +modeline-vc (&optional spacer)
   "Display the version control branch of the current buffer in the modeline."
@@ -420,7 +420,8 @@ the deletion might narrow the column."
   "Open thing at point, or if there isn't something, list things."
   (interactive "P")
   (save-excursion
-    (let* ((this-char-type (org-element-type (org-element-context)))
+    (let* ((browse-url-browser-function #'browse-url-default-browser)
+           (this-char-type (org-element-type (org-element-context)))
            (prev-char-type (ignore-errors
                              (save-excursion
                                (backward-char)
@@ -21,6 +21,26 @@
 (defvar +tab-bar-show-original nil
   "Original value of `tab-bar-show'.")
 
+(defun +tab-bar-tab-name-truncated-left ()
+  "Generate the tab name from the buffer of the selected window.
+This is just like `tab-bar-tab-name-truncated', but truncates the
+name to the left."
+  (let* ((tab-name (buffer-name (window-buffer (minibuffer-selected-window))))
+        (ellipsis (cond
+                   (tab-bar-tab-name-ellipsis)
+                   ((char-displayable-p ?…) "…")
+                   ("...")))
+        (l-ell (length ellipsis))
+        (l-name (length tab-name)))
+    (if (< (length tab-name) tab-bar-tab-name-truncated-max)
+        tab-name
+      (propertize (concat
+                   (when (> (+ l-name l-ell) tab-bar-tab-name-truncated-max)
+                     ellipsis)
+                   (truncate-string-to-width tab-name l-name
+                    (max 0 (- l-name tab-bar-tab-name-truncated-max l-ell))))
+                  'help-echo tab-name))))
+
 
 ;; Emacs 27
 
@@ -145,7 +145,10 @@ within a `with-current-buffer' form."
   (let ((pred (or predicate t)))
     (dolist (buf (buffer-list))
       (with-current-buffer buf
-        (when (if (fboundp pred) (funcall pred buf) pred)
+        (when (if (or (eq (car-safe pred) 'closure)
+                      (fboundp pred))
+                  (funcall pred buf)
+                pred)
           (funcall func))))))
 
 ;; https://github.com/cstby/emacs.d/blob/main/init.el#L67