Commit Diff


commit - 8816b95ca0d7213037ca85716c07b21185a5735f
commit + ce44dd28de2088ae2bfb5110592a43e58d61c085
blob - a3874f1395c124a08ecc525dd78034004c041c72
blob + 44fe3e720efa480d646c8f29524c542e093b6421
--- early-init.el
+++ early-init.el
@@ -16,16 +16,13 @@
 
 (setq gc-cons-threshold most-positive-fixnum
       gc-cons-percentage 0.6
-      byte-compile-load t
       file-name-handler-alist nil)
 
 (defun mine--restore-startup-defaults ()
   "Restore GC and 'file-name-handler-alist' for normal use."
   (setq gc-cons-threshold (* 128 1024 1024)
         gc-cons-percentage 0.1
-        file-name-handler-alist mine--initial-file-name-handler-alist)
-  (unless (eq system-type 'darwin)
-    (setopt byte-compile-load t)))
+        file-name-handler-alist mine--initial-file-name-handler-alist))
 
 (add-hook 'emacs-startup-hook #'mine--restore-startup-defaults)
 
blob - 81295e71a23f6528a9899691d798b4eaa715f8fa
blob + f0921006d2b774d4caf3a841cbdb8bc5d360e936
--- lisp/setup-core.el
+++ lisp/setup-core.el
@@ -105,7 +105,7 @@ mirrored path as relative; its parent directories are 
 
 (setopt select-enable-clipboard t
         select-enable-primary t
-        save-interprogram-text-before-kill t)
+        save-interprogram-paste-before-kill t)
 
 (require 'server)
 
blob - da7fba590e85f7ce1660ed8a3889f3bf9b813b37
blob + 4d2c9e706cc10c8471b5b24f8380121027181383
--- lisp/setup-evil.el
+++ lisp/setup-evil.el
@@ -60,7 +60,8 @@
            (pt (point)))
       (cond
        ((null cands) (user-error "No matches for `%c'" char))
-       ((null (cdr cands)) (goto-char (car cands)))
+       ;; Each candidate is ((BEG . END) . WND); move to the match start.
+       ((null (cdr cands)) (goto-char (caaar cands)))
        ((avy-jump regex :beg beg :end end)))
       (when (and post (/= (point) pt)) (forward-char post))))
 
blob - 4d92151354065e0b5c1f00761222eb4794592c58
blob + 1085d966f86853f653de174a7c5f437a43ee3f56
--- lisp/setup-ui.el
+++ lisp/setup-ui.el
@@ -10,7 +10,6 @@
 (declare-function fontaine-mode "fontaine" (&optional arg))
 (declare-function fontaine-set-preset "fontaine" (preset))
 (declare-function fontaine-restore-latest-preset "fontaine" ())
-(defvar mine-last-theme)
 
 (setopt initial-major-mode 'fundamental-mode
         inhibit-startup-screen t
@@ -85,43 +84,13 @@
     (dolist (var '(load-path custom-theme-load-path))
       (add-to-list var dir))))
 
-(defun mine-theme--record (&rest _)
-  "Persist selected GUI theme across restarts."
-  (when (and custom-enabled-themes (display-graphic-p))
-    (let ((theme (car custom-enabled-themes)))
-      (when (not (equal mine-last-theme theme))
-        (setq mine-last-theme theme)
-        (with-temp-file (mine-cache-file "theme.el")
-          (princ `(setq mine-last-theme ',theme)))))))
-
-(defun mine-theme--restore ()
-  "Load previously recorded theme name, if any."
-  (let ((file (mine-cache-file "theme.el")))
-    (when (file-exists-p file)
-      (load file 'nomessage))))
-
-(advice-add 'load-theme :after #'mine-theme--record)
-
-(add-hook 'enable-theme-functions #'mine-theme--record)
-
-(unless (display-graphic-p)
-  (or (ignore-errors (load-theme 'eziam-dark t))
-      (ignore-errors (load-theme 'punpun-dark t))))
-
 (use-package doric-themes
   :ensure (:host github :repo "protesilaos/doric-themes"))
 
 (use-package ef-themes
   :if (display-graphic-p)
   :demand t
-  :config
-  (add-hook 'ef-themes-after-load-theme-hook #'mine-theme--record)
-  (mine-theme--restore)
-  (condition-case nil
-      (load-theme (or (and (symbolp mine-last-theme) mine-last-theme)
-                      'ef-winter)
-                  t)
-    (error (load-theme 'ef-winter t))))
+  :config)
 
 (setopt display-line-numbers-width 3)