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

2 files changed, 25 insertions, 1 deletions

@@ -66,6 +66,7 @@ If USE-TLS is non-nil, use TLS."
 (defun erc/connect ()
   "Connect to all the servers in `erc/servers'."
   (interactive)
+  (require 'erc)
   (mapcar #'connect-to-erc erc/servers))
 
 (defun filter-server-buffers ()
@@ -79,7 +80,26 @@ If USE-TLS is non-nil, use TLS."
   (dolist (buffer (filter-server-buffers))
     (with-message (format "Killing server buffer: %s" (buffer-name buffer))
       (with-current-buffer buffer
-        (erc-quit-server erc/bye-message)))))
+        (erc-quit-server erc/bye-message))))
+  (force-mode-line-update))
+
+(defun acdw-erc/prompt ()
+  "The prompt to show for ERC."
+  ;; Rewrite s-truncate to avoid dependency.
+  (let ((name (buffer-name))
+        (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))))
 
 (provide 'acdw-erc)
 ;;; acdw-erc.el ends here
@@ -410,6 +410,10 @@ Prompt only if there are unsaved changes."
   (custom-set-faces '(fringe
                       ((t (:foreground "dim gray"))))))
 
+(defun acdw/require-private ()
+  "Require `acdw-private', which is in private.el."
+  (require 'acdw-private "private.el"))
+
 
 ;;; URL regexp
 ;; really, I just want to add gemini:// protocol, but I'm going to do some