summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKévin Le Gouguec <kevin.legouguec@gmail.com>2021-09-18 16:11:33 +0200
committerKévin Le Gouguec <kevin.legouguec@gmail.com>2021-09-18 16:11:33 +0200
commit8a89379b0eb659581e9df736a2eed45742e8e3c3 (patch)
tree45ea18a8d700812a22ff9c676dbfd7c69177f31a
parent875d2715befaf0dbb755c6f1096f124b33dd8b39 (diff)
downloaddotfiles-8a89379b0eb659581e9df736a2eed45742e8e3c3.tar.xz
Tweak some Emacs settings
-rw-r--r--.emacs14
-rw-r--r--.emacs-custom.el5
2 files changed, 13 insertions, 6 deletions
diff --git a/.emacs b/.emacs
index 95514e7..86c14dd 100644
--- a/.emacs
+++ b/.emacs
@@ -469,14 +469,18 @@
(let ((id (xml-substitute-numeric-entities (match-string 1))))
(my/describe-message id url))))
-;; Font stuff 🤷🤦. Emacs comes with sensible defaults (e.g. the
-;; default fontset includes Symbola for various subgroups of the
-;; "symbol" script), but no color font by default.
-(when (>= emacs-major-version 27)
- ;; Prefer a color font for emojis.
+;; Font stuff 🤷🤦.
+(cond
+ ((= 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 (⚠⚙).
(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 5d1e4c7..b5e19f5 100644
--- a/.emacs-custom.el
+++ b/.emacs-custom.el
@@ -14,6 +14,7 @@
'(completions-detailed t)
'(completions-group t)
'(delete-selection-mode t)
+ '(describe-bindings-outline t)
'(diff-hl-flydiff-mode t)
'(dired-kill-when-opening-new-dired-buffer t)
'(dired-listing-switches "-al -Fhv --group-directories-first")
@@ -33,6 +34,7 @@
'(erc-notifications-mode t)
'(erc-prompt-for-password nil)
'(erc-track-exclude-types '("JOIN" "NICK" "PART" "QUIT" "333" "353"))
+ '(erc-use-auth-source-for-nickserv-password t)
'(erc-user-full-name 'user-full-name)
'(eshell-scroll-show-maximum-output nil)
'(find-ls-option '("-exec ls -ld {} +" . "-ld"))
@@ -50,7 +52,7 @@
'(hscroll-step 1)
'(ibuffer-default-sorting-mode 'filename/process)
'(icomplete-mode t)
- '(icomplete-scroll t)
+ '(icomplete-scroll t t)
'(icomplete-vertical-mode t)
'(indent-tabs-mode nil)
'(inhibit-startup-screen t)
@@ -79,6 +81,7 @@
'(modus-themes-slanted-constructs t)
'(modus-themes-variable-pitch-headings t)
'(modus-themes-variable-pitch-ui t)
+ '(org-edit-src-content-indentation 0)
'(org-ellipsis "…")
'(org-fontify-done-headline nil)
'(org-fontify-quote-and-verse-blocks t)