dot/gpg.conf.m4, dot/gpg-agent.conf, Makefile: Adopt GnuPG configuration.

[profile] / dot / ercrc.el

diff --git a/dot/ercrc.el b/dot/ercrc.el
index a539010..6a708ac 100644 (file)
--- a/dot/ercrc.el
+++ b/dot/ercrc.el
@@ -5,15 +5,36 @@
 (setq erc-nick "mdw"
       erc-user-full-name "Mark Wooding")
 
-(if (not (memq 'truncate erc-modules))
-    (setq erc-modules (cons 'truncate erc-modules)))
+(dolist (module '(replace truncate))
+  (if (not (memq module erc-modules))
+      (setq erc-modules (cons module erc-modules))))
 
 (setq erc-fill-column 76
       erc-timestamp-right-column 68
       erc-fill-prefix "   "
       erc-max-buffer-size (* 60 3000))
 
-(load "~/.erc-local.el")
+;; Filter out emoji, which cause severe display confusion.
+(defun mdw-replace-wide-characters (string)
+  (with-output-to-string
+    (let ((i 0)
+         (state nil))
+      (while (< i (length string))
+       (let ((ch (aref string i)))
+         (cond ((and (= (char-width ch) 1)
+                     (not (or (<= #x1f200 ch #x1ffff)
+                              (= ch #x2693))))
+                (when state (princ "*]") (setf state nil))
+                (write-char ch))
+               (t
+                (princ (if state "*" "[*"))
+                (princ (format "#x%x" ch))
+                (setf state t))))
+       (setq i (1+ i)))
+      (when state (princ "*]")))))
+
+(setq erc-replace-alist
+      '(("[[:nonascii:]+]" . mdw-replace-wide-characters)))
 
 (setq erc-track-exclude-types '("NICK" "JOIN" "PART"))
 
@@ -30,12 +51,10 @@
 (setq erc-autojoin t
       erc-autojoin-domain-only nil
       erc-autojoin-channels-alist
-      '(("irc.ssdis.loc" "#devel" "#jukebox" "#nextgen")
-       ("cam.irc.devel.ncipher.com"
-        "#devel" "#jukebox" "#nextgen" "#sec-team")
-       ("chiark.greenend.org.uk" "#chiark")
+      '(("chiark.greenend.org.uk" "#chiark")
        ("irc.distorted.org.uk" "#distorted" "#jukebox")
        ("irc.hstg.corp.good.com" "#hstg")))
+(erc-autojoin-mode 1)
 
 (defvar mdw-erc-auto-greet-bots-alist nil
   "*Alist of (SERVER-REGEXP BOT-NICK MESSAGE-FORM).
@@ -61,27 +80,30 @@ The PLIST is not itself modified."
        (cdr head))
     plist))
 
-(defmacro* mdw-pushnew-replace
-    (item place &rest keys &key (key '#'identity) &allow-other-keys)
+(defun* mdw-cons-replace
+    (item list &rest keys &key (key '#'identity) &allow-other-keys)
+  "Return LIST, with ITEM at the start, replacing any existing matching item.
+Specifically, any item in the list satisfying the test are removed
+\(nondestructively), and then the new ITEM is added to the front."
+  (cons item (apply #'remove* (funcall key item) list :key key
+                   (mdw-remprop-nondestructive :key keys))))
+
+(defmacro* mdw-pushnew-replace (item place &rest keys)
   "Add ITEM to the list PLACE, replacing any existing matching item.
 Specifically, any item in the list satisfying the test are removed
 \(nondestructively), and then the new ITEM is added to the front.
 
 Evaluation order for the keywords is a bit screwy: don't rely on it."
-  ;; `cl-setf-do-modify' returns a list (LETS STORE FETCH).
-  (let ((setf-things (cl-setf-do-modify place (cons 'list keys)))
-       (keyfn (gensym "key"))
-       (itemvar (gensym "item")))
-    `(let ((,keyfn ,key)
-          (,itemvar ,item)
-          ,@(car setf-things))
-       ,(cl-setf-do-store (cadr setf-things)
-                         `(cons ,itemvar
-                                (remove* (funcall ,keyfn ,itemvar)
-                                         ,(caddr setf-things)
-                                         :key ,keyfn
-                                         ,@(mdw-remprop-nondestructive
-                                            :key keys)))))))
+  (cond ((fboundp 'cl-callf2)
+        `(cl-callf2 mdw-cons-replace ,item ,place ,@keys))
+       ((fboundp 'cl-setf-do-modify)
+        ;; `cl-setf-do-modify' returns a list (LETS STORE FETCH).
+        (let ((setf-things (cl-setf-do-modify place (cons 'list keys))))
+          `(let (,@(car setf-things))
+             ,(cl-setf-do-store (cadr setf-things)
+                                `(mdw-cons-replace ,item ,place
+                                                   ,@keys)))))
+       (t (error "Don't know how to hack places on this Emacs."))))
 
 (defun mdw-define-bot-greeting (server bot greeting)
   "Define a new bot greeting."
@@ -93,7 +115,6 @@ Evaluation order for the keywords is a bit screwy: don't rely on it."
   (mdw-pushnew-replace (list server acct passwd)
                       mdw-erc-ircop-alist
                       :test #'string= :key #'car))
-(load "~/.erc-auth.el")
 
 (defun mdw-assoc-regexp (regexp alist)
   "Return the association in ALIST whose car matches REGEXP."
@@ -123,3 +144,6 @@ Evaluation order for the keywords is a bit screwy: don't rely on it."
       (let ((acct (cadr a))
            (passwd (caddr a)))
        (erc-server-send (concat "OPER " acct " " passwd))))))
+
+(load "~/.erc-auth.el")
+(load "~/.erc-local.el")