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

2 files changed, 12 insertions, 10 deletions

@@ -322,7 +322,8 @@
    (when (boundp 'erc-autojoin-channels-alist)
      (mapcar #'car erc-autojoin-channels-alist))
    erc-server-coding-system '(utf-8 . utf-8)
-   erc-track-exclude-types erc-hide-list
+   erc-track-exclude-types (append erc-hide-list
+                                   '("AWAY"))
    erc-track-exclude-server-buffer t
    erc-track-position-in-mode-line 'before-modes
    erc-track-visibility nil ; only the selected frame
@@ -355,7 +356,7 @@
 
     (setup (:straight erc-image)
       (:option (append erc-modules) 'image
-               erc-image-inline-rescale 'window))
+               erc-image-inline-rescale 300))
     
     (erc-update-modules)))
 
@@ -96,19 +96,20 @@ If USE-TLS is non-nil, use TLS."
   "The prompt to show for ERC."
   ;; Rewrite s-truncate to avoid dependency.
   (let ((name (buffer-name))
-        (ellipsis "...")
+        (ellipsis "~")
         (len erc-fill-static-center))
     (if (and len (> (length name) (- len 2)))
         (format "%s%s>"
                 (substring name 0 (- len 2 (length ellipsis)))
                 ellipsis)
-      (format "%s%s>" (let ((ss) ; Rewrite s-repeat to avoid dependency.
-                            (num (- len 2 (length name))))
-                        (while (> num 0)
-                          (setq ss (cons " " ss))
-                          (setq num (1- num)))
-                        (apply #'concat ss))
-              name))))
+      (format "%s%s>"
+              name
+              (let ((ss) ; Rewrite s-repeat to avoid dependency.
+                    (num (- len 2 (length name))))
+                (while (> num 0)
+                  (setq ss (cons " " ss))
+                  (setq num (1- num)))
+                (apply #'concat ss))))))
 
 
 ;;; Uh