From 7c558c9b5ee7aaf336f643cc6767ec875441a239 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sat, 12 Sep 2020 23:59:23 -0400
Subject: [PATCH] A few small accumulated changes

---
 init.el              | 27 ++++++++++++++++++++++-----
 lisp/bandali-erc.el  |  1 +
 lisp/bandali-gnus.el | 18 +++++++++++++-----
 var/eshell/alias     |  1 +
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/init.el b/init.el
index ed50494..bebc421 100644
--- a/init.el
+++ b/init.el
@@ -181,11 +181,11 @@
  enable-recursive-minibuffers t
  resize-mini-windows t
  ;; more useful frame titles
- frame-title-format '("" invocation-name " - "
-                      (:eval
-                       (if (buffer-file-name)
-                           (abbreviate-file-name (buffer-file-name))
-                         "%b")))
+ ;; frame-title-format '("" invocation-name " - "
+ ;;                      (:eval
+ ;;                       (if (buffer-file-name)
+ ;;                           (abbreviate-file-name (buffer-file-name))
+ ;;                         "%b")))
  ;; i don't feel like jumping out of my chair every now and again; so
  ;; don't BEEP! at me, emacs
  ring-bell-function 'ignore
@@ -207,6 +207,8 @@
  ;; cursor shape
  cursor-type t)
 
+(set-fontset-font t 'arabic "Vazir")
+
 ;; unicode support
 (comment
   (dolist (ft (fontset-list))
@@ -513,6 +515,16 @@
   ;; (magit-completing-read-function 'magit-ido-completing-read)
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
+(use-package magit-extras
+  :after magit
+  :config
+  (setq magit-pop-revision-stack-format
+        (pcase-let ((`(,pt ,_eob ,index-regexp)
+                     (default-value 'magit-pop-revision-stack-format)))
+          `(,pt "[%N: %h]: %ci\n  %s
+  https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=%H"
+                ,index-regexp))))
+
 ;; recently opened files
 (use-package recentf
   :defer 0.2
@@ -582,6 +594,10 @@
   :bind (:map doc-view-mode-map
               ("M-RET" . image-previous-line)))
 
+(use-package shr
+  :custom
+  (shr-max-width 80))
+
 ;; Email (with Gnus, message, and EBDB)
 (require 'bandali-gnus)
 (use-package sendmail
@@ -626,6 +642,7 @@
   :config (show-paren-mode))
 
 (use-package elec-pair
+  :disabled
   :demand
   :config (electric-pair-mode))
 
diff --git a/lisp/bandali-erc.el b/lisp/bandali-erc.el
index 4fe50b0..89ec6a0 100644
--- a/lisp/bandali-erc.el
+++ b/lisp/bandali-erc.el
@@ -67,6 +67,7 @@
   (erc-fill-static-center 18))
 
 (use-package erc-match
+  :disabled
   :after erc
   :config
   (set-face-attribute
diff --git a/lisp/bandali-gnus.el b/lisp/bandali-gnus.el
index d5231c2..3759dcf 100644
--- a/lisp/bandali-gnus.el
+++ b/lisp/bandali-gnus.el
@@ -80,9 +80,11 @@
                                   (list ".*<\\(.*\\)\\.libreplanet\\.org>.*" "l.\\1")
                                   ;; iana (e.g. tz-announce)
                                   (list ".*<\\(.*\\)\\.iana\\.org>.*" "l.\\1")
+                                  ;; orbitalfox (e.g. gemini)
+                                  (list ".*<\\(.*\\)\\.lists\\.orbitalfox\\.eu>.*" "l.\\1")
                                   ;; *.lists.sr.ht, omitting one dot if present
                                   ;;    add more \\.?\\([^.]*\\) if needed
-                                  (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3")
+                                  (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists\\.sr\\.ht>.*" "l.~\\1.\\2\\3")
                                   ;; webmasters
                                   (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
                                   ;; other
@@ -91,7 +93,7 @@
                                   ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d
                                   (list ".*haskell-cafe.haskell.org" "l.haskell-cafe")
                                   ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u
-                                  ;; (list ".*dev.lists.parabola.nu" "l.parabola-dev") ;u
+                                  (list ".*dev.lists.parabola.nu" "l.parabola-dev")
                                   ;; ----------------------------------
                                   ;; legend: (u)nsubscribed | (d)ead
                                   ;; ----------------------------------
@@ -160,6 +162,12 @@
      ("l\\.emacsconf-discuss"
       (to-address . "emacsconf-discuss@gnu.org")
       (to-list    . "emacsconf-discuss@gnu.org"))
+     ("l\\.emacsconf-org"
+      (to-address . "emacsconf-org@gnu.org")
+      (to-list    . "emacsconf-org@gnu.org"))
+     ("l\\.emacsconf-org-private"
+      (to-address . "emacsconf-org-private@gnu.org")
+      (to-list    . "emacsconf-org-private@gnu.org"))
      ("l\\.emacsconf-register"
       (to-address . "emacsconf-register@gnu.org")
       (to-list    . "emacsconf-register@gnu.org"))
@@ -445,9 +453,9 @@ Computer Science Club, University of Waterloo")
   :config
   (when (version< "27" emacs-version)
     (set-face-attribute 'mm-uu-extract nil :extend t))
-  :custom
-  (mm-uu-diff-groups-regexp
-   "\\(gmane\\|gnu\\|l\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|dev\\)"))
+  (when (version< emacs-version "27")
+    (setq mm-uu-diff-groups-regexp
+          "\\(gmane\\|gnu\\|l\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|dev\\)")))
 
 (use-package mml)
 
diff --git a/var/eshell/alias b/var/eshell/alias
index a5109a4..203b616 100644
--- a/var/eshell/alias
+++ b/var/eshell/alias
@@ -1,5 +1,6 @@
 alias .. cd ..
 alias ... cd ../..
+alias d dired $*
 alias e find-file-other-window $1
 alias ee find-file $1
 alias emacs find-file $1
-- 
2.20.1