A few accumulated changes

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 997e6cf..631ce8c 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -147,15 +147,16 @@ This sets each user option VAR's value to the corresponding VALUE.
      '(;; GNU ELPA
        (debbugs "0.26")
        (delight "1.7")
-       (ebdb "0.6.19")
+       (ebdb "0.6.20")
        (orgalist "1.13")
        (rt-liberation "1.31")
        (yasnippet "0.14.0")
        (expand-region "0.11.0")
+       (emms "6.2")
        ;; bndl
        ;; (refinery-theme "0.1.1")
        ;; Org ELPA
-       (org-plus-contrib "20201012"))))
+       (org-plus-contrib "20201109"))))
   (package-initialize))
 
 (csetq package-archive-upload-base "/ssh:caffeine:~/www/p/elpa")
@@ -288,6 +289,31 @@ This sets each user option VAR's value to the corresponding VALUE.
 
 ;;;; Elisp-level customizations
 
+;; (define-key minibuffer-local-completion-map
+;;   "\t" #'minibuffer-force-complete)
+
+(with-eval-after-load 'icomplete
+
+(setq icomplete-on-del-error-function #'abort-recursive-edit)
+
+(defun b/icomplete-fido-backward-updir ()
+  "Delete char before or go up directory, like `ido-mode'."
+  (interactive)
+  (if (and (eq (char-before) ?/)
+           (eq (icomplete--category) 'file))
+      (save-excursion
+        (goto-char (1- (point)))
+        (when (search-backward "/" (point-min) t)
+          (delete-region (1+ (point)) (point-max))))
+    (condition-case nil
+        (call-interactively #'delete-backward-char)
+      (error
+       (when icomplete-on-del-error-function
+         (funcall icomplete-on-del-error-function))))))
+
+(define-key icomplete-fido-mode-map
+  (kbd "DEL") #'b/icomplete-fido-backward-updir))
+
 ;; startup
 ;; don't need to see the startup echo area message
 (advice-add #'display-startup-echo-area-message :override #'ignore)
@@ -517,6 +543,7 @@ Make N (default: 1) copies of the current line or region."
 (global-set-key (kbd "C-a") #'b/move-indentation-or-beginning-of-line)
 (global-set-key (kbd "C-c a i") #'ielm)
 (global-set-key (kbd "C-c d") #'b/duplicate-line-or-region)
+(global-set-key (kbd "C-c j") #'b/join-line-top)
 (global-set-key (kbd "C-S-j") #'b/join-line-top)
 (global-set-key (kbd "C-c x") #'execute-extended-command)
 
@@ -562,7 +589,8 @@ Make N (default: 1) copies of the current line or region."
  (expand-file-name
   (convert-standard-filename "lisp") user-emacs-directory))
 
-(require 'bandali-exwm)
+(when (featurep 'exwm)
+  (require 'bandali-exwm))
 
 (require 'bandali-org)
 

diff --git a/.emacs.d/lisp/bandali-erc.el b/.emacs.d/lisp/bandali-erc.el
index dd04abe..ed27df3 100644 (file)
--- a/.emacs.d/lisp/bandali-erc.el
+++ b/.emacs.d/lisp/bandali-erc.el
@@ -60,7 +60,8 @@
     "Deop myself from current channel."
     (erc-cmd-DEOP (format "%s" (erc-current-nick))))
   (add-to-list 'erc-modules 'keep-place)
-  (add-to-list 'erc-modules 'notifications)
+  (when (display-graphic-p)
+    (add-to-list 'erc-modules 'notifications))
   (add-to-list 'erc-modules 'smiley)
   (add-to-list 'erc-modules 'spelling)
   (declare-function erc-update-modules "erc")
@@ -95,9 +96,9 @@
   (csetq
    erc-pal-highlight-type 'nick
    erc-pals
-   '("aindilis" "blackbeard" "bremner" "brettgilio" "civodul" "dto"
-     "ggoes" "iank" "jrasata" "mplsCorwin" "quidam" "rwp" "sachac"
-     "sudoman" "technomancy"))
+   '("aindilis" "blackbeard" "bremner" "~brettgilio?@*" "civodul"
+     "dto" "ggoes" "iank" "jrasata" "mplsCorwin" "quidam" "rwp"
+     "sachac" "sudoman" "technomancy"))
   (with-eval-after-load 'erc-match
     (set-face-attribute
      'erc-pal-face nil
@@ -107,7 +108,7 @@
      :background (face-attribute 'font-lock-string-face :background)))
 
   ;; erc-pcomplete
-  (csetq erc-pcomplete-nick-postfix ", ")
+  (csetq erc-pcomplete-nick-postfix ",")
 
   ;; erc-stamp
   (csetq erc-timestamp-only-if-changed-flag nil

diff --git a/.emacs.d/lisp/bandali-gnus.el b/.emacs.d/lisp/bandali-gnus.el
index bdcc501..671a1cb 100644 (file)
--- a/.emacs.d/lisp/bandali-gnus.el
+++ b/.emacs.d/lisp/bandali-gnus.el
@@ -77,6 +77,8 @@
                                 (list ".*<\\(.*\\)\\.iana\\.org>.*" "l.\\1")
                                 ;; orbitalfox (e.g. gemini)
                                 (list ".*<\\(.*\\)\\.lists\\.orbitalfox\\.eu>.*" "l.\\1")
+                                ;; haskell
+                                (list ".*<\\(.*\\)\\.haskell\\.org>.*" "l.\\1")
                                 ;; *.lists.sr.ht, omitting one dot if present
                                 ;;    add more \\.?\\([^.]*\\) if needed
                                 (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists\\.sr\\.ht>.*" "l.~\\1.\\2\\3")
@@ -86,7 +88,6 @@
                                 (list ".*atreus.freelists.org" "l.atreus")
                                 (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
                                 ;; (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")
                                 ;; ----------------------------------
@@ -282,6 +283,7 @@
  nndraft-directory     (concat gnus-home-directory "drafts/")
  gnus-save-newsrc-file nil
  gnus-read-newsrc-file nil
+ gnus-search-use-parsed-queries t
  gnus-interactive-exit nil
  gnus-gcc-mark-as-read t)
 
@@ -310,8 +312,8 @@
 ;; global key bindings
 (global-set-key (kbd "s-m") #'gnus-plugged)
 (global-set-key (kbd "s-M") #'gnus-unplugged)
-(global-set-key (kbd "C-c a m") #'gnus-plugged)
-(global-set-key (kbd "C-c a M") #'gnus-unplugged)
+(global-set-key (kbd "C-c m") #'gnus-plugged)
+(global-set-key (kbd "C-c M") #'gnus-unplugged)
 
 (with-eval-after-load 'gnus-art
   (csetq

diff --git a/.emacs.d/lisp/bandali-theme.el b/.emacs.d/lisp/bandali-theme.el
index 63c15d0..fa5911c 100644 (file)
--- a/.emacs.d/lisp/bandali-theme.el
+++ b/.emacs.d/lisp/bandali-theme.el
@@ -24,10 +24,11 @@
 
 ;;; Code:
 
-(add-to-list 'load-path (b/lisp "refinery-theme"))
-(with-eval-after-load 'package
-  (require 'refinery-theme)
-  (load-theme 'refinery t))
+(when (display-graphic-p)
+  (add-to-list 'load-path (b/lisp "refinery-theme"))
+  (with-eval-after-load 'package
+    (require 'refinery-theme)
+    (load-theme 'refinery t)))
 
 ;; (require 'smart-mode-line)
 ;; ;; thanks, but no thanks; don't make fixed-width fills.