summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs26
-rw-r--r--.emacs-custom.el3
-rw-r--r--.gnus13
3 files changed, 23 insertions, 19 deletions
diff --git a/.emacs b/.emacs
index 86c14dd..ffb1c04 100644
--- a/.emacs
+++ b/.emacs
@@ -7,15 +7,17 @@
;; resets global-page-break-lines-mode to nil. Cue Custom shrugging,
;; "changed outside Customize".
-;; NB: starting from Emacs 27, package-initialize is automatically
-;; called before loading the user's init file, unless
-;; package-enable-at-startup is set to nil in the early init file.
-(when (< emacs-major-version 27)
+;; Emacs≥27 automatically calls package-initialize before loading the
+;; user's init file, unless package-enable-at-startup is set to nil in
+;; the early init file.
+(unless (>= emacs-major-version 27)
(package-initialize))
(setq custom-file "~/.emacs-custom.el")
(load custom-file)
+(when (>= emacs-major-version 28)
+ (load-theme 'modus-vivendi t))
;; Key bindings
@@ -235,10 +237,8 @@
;; Window management
+;; Bindings ala Terminator
(when window-system
- (when (>= emacs-major-version 28)
- (load-theme 'modus-vivendi t))
- ;; Bindings ala Terminator
(global-set-key (kbd "C-S-o") 'split-window-below)
(global-set-key (kbd "C-S-e") 'split-window-right)
(global-set-key (kbd "C-+") 'text-scale-adjust)
@@ -284,7 +284,7 @@
(let* ((indicator (alist-get 'compilation-in-progress mode-line-modes))
(old-props (text-properties-at 0 (car indicator)))
(new-props '(face compilation-mode-line-run)))
- (setcar indicator (apply #'propertize "⚙" (append new-props old-props)))))
+ (setcar indicator (apply #'propertize "⚙️" (append new-props old-props)))))
(add-hook 'magit-pre-refresh-hook 'diff-hl-magit-pre-refresh)
(add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh)
@@ -470,17 +470,13 @@
(my/describe-message id url))))
;; Font stuff 🤷🤦.
-(cond
- ((= emacs-major-version 27)
+(when (= emacs-major-version 27)
;; Emacs 27 added support for color fonts, but the default fontset
;; did not use any such font for emoji.
(set-fontset-font t 'symbol "Noto Color Emoji" nil 'prepend)
- ;; Make sure the default font does not get overzealous (⚠⚙).
+ ;; Make sure the default font does not get overzealous: ⚠⚙.
+ ;; For Emacs 28, prefer VS-16: ⚠️⚙️.
(setq use-default-font-for-symbols nil))
- ((>= emacs-major-version 28)
- ;; Emacs 28 added an "emoji" script for easier customization, and
- ;; uses a color font for *most* emoji, but not all.
- (set-fontset-font t 'emoji "Noto Color Emoji" nil 'prepend)))
(defun my/project-root ()
(when-let ((project (project-current)))
diff --git a/.emacs-custom.el b/.emacs-custom.el
index b5e19f5..ed938df 100644
--- a/.emacs-custom.el
+++ b/.emacs-custom.el
@@ -15,6 +15,7 @@
'(completions-group t)
'(delete-selection-mode t)
'(describe-bindings-outline t)
+ '(diff-default-read-only t)
'(diff-hl-flydiff-mode t)
'(dired-kill-when-opening-new-dired-buffer t)
'(dired-listing-switches "-al -Fhv --group-directories-first")
@@ -74,11 +75,11 @@
'(minibuffer-depth-indicate-mode t)
'(modus-themes-bold-constructs t)
'(modus-themes-diffs 'deuteranopia)
+ '(modus-themes-italic-constructs t)
'(modus-themes-org-blocks 'grayscale)
'(modus-themes-prompts '(background))
'(modus-themes-region 'bg-only)
'(modus-themes-scale-headings t)
- '(modus-themes-slanted-constructs t)
'(modus-themes-variable-pitch-headings t)
'(modus-themes-variable-pitch-ui t)
'(org-edit-src-content-indentation 0)
diff --git a/.gnus b/.gnus
index 04ff3d7..6a163db 100644
--- a/.gnus
+++ b/.gnus
@@ -16,6 +16,14 @@
gnus-secondary-select-methods
'((nntp "archive.lwn.net")
(nntp "news.gmane.io"))
+
+ ;; Archival of sent messages.
+ gnus-gcc-mark-as-read t
+ ;; The next setting makes the previous one useless; keeping both
+ ;; for now because I'm not sure which I'll settle for.
+ gnus-message-archive-group nil
+
+ ;; Display
gnus-summary-line-format "%*%U%R %-16,16&user-date; %B%-23,23f %s\n"
gnus-summary-dummy-line-format " ╭ %S\n"
gnus-summary-make-false-root 'dummy
@@ -41,8 +49,7 @@
((gnus-seconds-year)
. "%b %d")
(t
- . "%F"))
- gnus-gcc-mark-as-read t)
+ . "%F")))
;; message-subject-re-regexp is used both in Gnus summary buffers to
;; detect and elide similar subjects in a thread, and by message mode
@@ -126,7 +133,7 @@
;; d mark read
;; M-u clear marks (≡ mark unread)
;; E expire
-;; # mark for next action
+;; # mark for next action (or unmark, as of Emacs 28)
;; M-#, M P u unmark for next action
;;
;; In draft summary buffer: