Merge branch 'main' of https://tildegit.org/acdw/emacs

2 files changed, 106 insertions, 31 deletions

@@ -96,15 +96,17 @@
   (global-auto-revert-mode +1))
 
 (setup browse-url
-  (setq-default browse-url-browser-function 'eww-browse-url
+  (when (acdw/system :work)
+    (add-to-list 'exec-path "C:/Program Files/Mozilla Firefox"))
+  
+  (setq-default browse-url-browser-function ; can be alist (regex . function)
+                '(("." . eww-browse-url))
                 browse-url-secondary-browser-function
-                (if (executable-find "firefox")
+                (if (executable-find "firefox") ; prefer Firefox
                     'browse-url-firefox
                   'browse-url-default-browser)
                 browse-url-new-window-flag t
-                browse-url-firefox-new-window-is-tab t)
-  (when (acdw/system :work)
-    (add-to-list 'exec-path "C:/Program Files/Mozilla Firefox")))
+                browse-url-firefox-new-window-is-tab t))
 
 (setup buffers
   (:global "C-x k" acdw/kill-a-buffer))
@@ -112,12 +114,6 @@
 (setup completion
   (:option completion-ignore-case t
            read-buffer-completion-ignore-case t
-           icomplete-delay-completions-threshold 0
-           icomplete-max-delay-chars 0
-           icomplete-compute-delay 0
-           icomplete-show-matches-on-no-input t
-           icomplete-with-buffer-completion-tables t
-           icomplete-in-buffer t
            completion-styles '(partial-completion substring flex)
            completion-category-defaults nil
            completion-category-overrides
@@ -259,7 +255,8 @@
 
 (setup eshell
   (:option eshell-directory-name (acdw/dir "eshell/" t)
-           eshell-aliases-file (acdw/dir "eshell/aliases" t))
+           eshell-aliases-file (acdw/dir "eshell/aliases" t)
+           eshell-kill-on-exit nil)
 
   (defun eshell-quit-or-delete-char (arg)
     "Delete the character to the right, or quit eshell on an empty line."
@@ -268,10 +265,16 @@
         (eshell-life-is-too-much)
       (delete-forward-char arg)))
 
-  (global-set-key (kbd "<f12>") #'eshell)
+  (defun eshell-pop-or-quit (&optional buffer-name)
+    "Pop open an eshell buffer, or if in an eshell buffer, bury it."
+    (interactive)
+    (if (eq (current-buffer) (get-buffer (or buffer-name "*eshell*")))
+        (eshell-life-is-too-much)
+      (eshell)))
+
+  (:leader "s" eshell-pop-or-quit)
   
   (hook-defun eshell-setup 'eshell-mode-hook
-    (define-key eshell-mode-map (kbd "<f12>") #'bury-buffer)
     (define-key eshell-mode-map (kbd "C-d") #'eshell-quit-or-delete-char)
     (when (boundp 'simple-modeline--mode-line)
       (setq mode-line-format '(:eval simple-modeline--mode-line)))))
@@ -306,15 +309,18 @@
   (unless (file-exists-p ispell-personal-dictionary)
     (write-region "" nil ispell-personal-dictionary nil 0))
 
-  (defun flyspell-start ()
+  (defun flyspell-start (&optional dont-warn-when-unknown-mode)
     "Start `flyspell-mode' or `flyspell-prog-mode', depending on current mode."
     (interactive)
     (cond ((derived-mode-p 'text-mode)
            (flyspell-mode))
           ((derived-mode-p 'prog-mode)
            (flyspell-prog-mode))
-          (t (message "Non-text or -prog mode.  Run `flyspell-mode'."))))
-  (:leader "s" flyspell-start)
+          ((not dont-warn-when-unknown-mode) ; god this is ugly
+           (message "Non-text or -prog mode.  Run `flyspell-mode'."))))
+  
+  (when (acdw/system :home)
+    (flyspell-start t))
 
   (:when-loaded
    (setup (:straight flyspell-correct)
@@ -364,6 +370,9 @@
 (setup imenu
   (:option imenu-auto-rescan t))
 
+(setup Info
+  (:hook variable-pitch-mode))
+
 (setup isearch
   (:option search-default-mode t))
 
@@ -560,6 +569,14 @@
     (:hook flymake-mode
            flymake-shellcheck-load)))
 
+(setup shell-command
+  (:option shell-command-switch (acdw/system
+                                 ;; I should be testing on some variable
+                                 (:home "-csi")
+                                 (:work "-c"))
+           shell-command-prompt-show-cwd t
+           shell-command-default-error-buffer "*shell-command-errors*"))
+
 (setup shr
   (:option shr-width fill-column
            shr-max-width fill-column
@@ -577,6 +594,9 @@
            uniquify-after-kill-buffer-p t
            uniquify-ignore-buffers-re "^\\*"))
 
+(setup variable-pitch-mode
+  (:hook acdw-fonts/adapt-variable-pitch))
+
 (setup view
   (:option view-read-only t)
   
@@ -935,7 +955,11 @@ if ripgrep is installed, otherwise `consult-grep'."
   (:bind "RET" acdw-org/return-dwim
          "<S-return>" acdw-org/org-table-copy-down)
   
-  (add-hook 'before-save-hook #'acdw-org/fix-blank-lines-in-buffer)
+  (defun acdw/org-fix-lines-before-save ()
+    (add-hook 'before-save-hook #'acdw-org/fix-blank-lines-in-buffer 0 :local))
+
+  (:hook variable-pitch-mode
+         acdw/org-fix-lines-before-save)
   
   (advice-add 'org-delete-backward-char
               :override #'acdw-org/delete-backward-char))
@@ -1063,21 +1087,27 @@ if ripgrep is installed, otherwise `consult-grep'."
   (global-whitespace-cleanup-mode +1))
 
 (setup (:straight winum)
-  (:option winum-auto-setup-mode-line nil
+  (:option winum-scope 'frame-local
+           winum-auto-setup-mode-line nil
            winum-ignored-buffers '(" *which-key*"))
 
-  (when (display-graphic-p)
-    (:with-map winum-keymap
-      (:bind "M-0" winum-select-window-0-or-10
-             "M-1" winum-select-window-1
-             "M-2" winum-select-window-2
-             "M-3" winum-select-window-3
-             "M-4" winum-select-window-4
-             "M-5" winum-select-window-5
-             "M-6" winum-select-window-6
-             "M-7" winum-select-window-7
-             "M-8" winum-select-window-8
-             "M-9" winum-select-window-9)))
+  (when-unfocused winum-map-keys
+    (defvar winum--keys-mapped nil
+      "Whether `winum' keys have been mapped already.")
+    (when (and (not winum--keys-mapped)
+               (display-graphic-p))
+      (:with-map winum-keymap
+        (:bind "M-0" winum-select-window-0-or-10
+               "M-1" winum-select-window-1
+               "M-2" winum-select-window-2
+               "M-3" winum-select-window-3
+               "M-4" winum-select-window-4
+               "M-5" winum-select-window-5
+               "M-6" winum-select-window-6
+               "M-7" winum-select-window-7
+               "M-8" winum-select-window-8
+               "M-9" winum-select-window-9))
+      (setq winum--keys-mapped t)))
 
   (winum-mode +1))
 
@@ -127,5 +127,50 @@ This is for emoji fonts."
         (set-fontset-font t 'symbol
                           (font-spec :family font) nil 'append)))))
 
+
+;;; Variable-pitch
+;; from https://github.com/turbana/emacs-config#variable-pitch
+
+(defcustom acdw-fonts/fixed-pitch-faces '(linum
+                                          org-block
+                                          org-block-begin-line
+                                          org-block-end-line
+                                          org-checkbox
+                                          org-code
+                                          org-date
+                                          org-document-info-keyword
+                                          org-hide
+                                          org-indent
+                                          org-link
+                                          org-meta-line
+                                          org-special-keyword
+                                          org-table
+                                          whitespace-space)
+  "Faces to keep fixed-pitch in `acdw/variable-pitch-mode'."
+  :type 'sexp
+  :group 'faces)
+
+(defun acdw-fonts//variable-pitch-add-inherit (attrs parent)
+  "Add `:inherit PARENT' to ATTRS unless already present.
+Handles cases where `:inherit' is already specified."
+  (let ((current-parent (plist-get attrs :inherit)))
+    (unless (or (eq parent current-parent)
+                (and (listp current-parent)
+                     (member parent current-parent)))
+      (plist-put attrs :inherit (if current-parent
+                                    (list current-parent parent)
+                                  parent)))))
+
+(defun acdw-fonts/adapt-variable-pitch ()
+  "Adapt `variable-pitch-mode' to keep some fonts fixed-pitch."
+  (when variable-pitch-mode
+    (mapc (lambda (face)
+            (when (facep face)
+              (apply #'set-face-attribute
+                     face nil (acdw-fonts//variable-pitch-add-inherit
+                               (face-attr-construct face)
+                               'fixed-pitch))))
+          acdw-fonts/fixed-pitch-faces)))
+
 (provide 'acdw-fonts)
 ;;; acdw-fonts.el ends here