summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-07-14 08:38:00 -0500
committerCase Duckworth2021-07-14 08:38:00 -0500
commita67fc7dc87be0d567ab032c9e35b338e6d2f2766 (patch)
tree8c2222ffe32752534acf04b19b8d8704517fc122
parentAdd `erc/reconnect' (diff)
parentAdd "AWAY" to erc-track-exclude-types (diff)
downloademacs-a67fc7dc87be0d567ab032c9e35b338e6d2f2766.tar.gz
emacs-a67fc7dc87be0d567ab032c9e35b338e6d2f2766.zip
Merge branch 'main' of tildegit.org:acdw/emacs
-rw-r--r--init.el5
-rw-r--r--lisp/acdw-erc.el17
2 files changed, 12 insertions, 10 deletions
diff --git a/init.el b/init.el index d1e81fe..fb2cd3f 100644 --- a/init.el +++ b/init.el
@@ -322,7 +322,8 @@
322 (when (boundp 'erc-autojoin-channels-alist) 322 (when (boundp 'erc-autojoin-channels-alist)
323 (mapcar #'car erc-autojoin-channels-alist)) 323 (mapcar #'car erc-autojoin-channels-alist))
324 erc-server-coding-system '(utf-8 . utf-8) 324 erc-server-coding-system '(utf-8 . utf-8)
325 erc-track-exclude-types erc-hide-list 325 erc-track-exclude-types (append erc-hide-list
326 '("AWAY"))
326 erc-track-exclude-server-buffer t 327 erc-track-exclude-server-buffer t
327 erc-track-position-in-mode-line 'before-modes 328 erc-track-position-in-mode-line 'before-modes
328 erc-track-visibility nil ; only the selected frame 329 erc-track-visibility nil ; only the selected frame
@@ -355,7 +356,7 @@
355 356
356 (setup (:straight erc-image) 357 (setup (:straight erc-image)
357 (:option (append erc-modules) 'image 358 (:option (append erc-modules) 'image
358 erc-image-inline-rescale 'window)) 359 erc-image-inline-rescale 300))
359 360
360 (erc-update-modules))) 361 (erc-update-modules)))
361 362
diff --git a/lisp/acdw-erc.el b/lisp/acdw-erc.el index 783dcd8..423c4a5 100644 --- a/lisp/acdw-erc.el +++ b/lisp/acdw-erc.el
@@ -96,19 +96,20 @@ If USE-TLS is non-nil, use TLS."
96 "The prompt to show for ERC." 96 "The prompt to show for ERC."
97 ;; Rewrite s-truncate to avoid dependency. 97 ;; Rewrite s-truncate to avoid dependency.
98 (let ((name (buffer-name)) 98 (let ((name (buffer-name))
99 (ellipsis "...") 99 (ellipsis "~")
100 (len erc-fill-static-center)) 100 (len erc-fill-static-center))
101 (if (and len (> (length name) (- len 2))) 101 (if (and len (> (length name) (- len 2)))
102 (format "%s%s>" 102 (format "%s%s>"
103 (substring name 0 (- len 2 (length ellipsis))) 103 (substring name 0 (- len 2 (length ellipsis)))
104 ellipsis) 104 ellipsis)
105 (format "%s%s>" (let ((ss) ; Rewrite s-repeat to avoid dependency. 105 (format "%s%s>"
106 (num (- len 2 (length name)))) 106 name
107 (while (> num 0) 107 (let ((ss) ; Rewrite s-repeat to avoid dependency.
108 (setq ss (cons " " ss)) 108 (num (- len 2 (length name))))
109 (setq num (1- num))) 109 (while (> num 0)
110 (apply #'concat ss)) 110 (setq ss (cons " " ss))
111 name)))) 111 (setq num (1- num)))
112 (apply #'concat ss))))))
112 113
113 114
114;;; Uh 115;;; Uh