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

2 files changed, 61 insertions, 45 deletions

@@ -173,7 +173,10 @@
            disabled-command-function nil
            load-prefer-newer t
            comp-async-report-warnings-errors nil
-           frame-title-format '("%b %+%* GNU Emacs"
+           frame-title-format '((:eval (if-let ((bn buffer-file-name))
+                                           (abbreviate-file-name bn)
+                                         "%b"))
+                                " %+%* GNU Emacs"
                                 (:eval (when (frame-parameter
                                               nil 'client)
                                          " Client")))
@@ -321,17 +324,23 @@
            eldoc-echo-area-use-multiline-p nil))
 
 (setup flyspell
-  (:option ispell-program-name "hunspell"
-           ispell-dictionary "en_US"
-           ispell-personal-dictionary "~/.hunspell_personal")
+  (setq-default ispell-program-name "hunspell"
+                ispell-dictionary "en_US"
+                ispell-personal-dictionary "~/.hunspell_personal")
   (:needs ispell-program-name) ; don't proceed if not installed
   
-  (ispell-set-spellchecker-params)
   (unless (file-exists-p ispell-personal-dictionary)
     (write-region "" nil ispell-personal-dictionary nil 0))
 
-  (add-hook 'text-mode-hook #'flyspell-mode)
-  (add-hook 'prog-mode-hook #'flyspell-prog-mode))
+  (defun flyspell-start ()
+    "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))
 
 (setup scratch
   (hook-defun immortal-scratch kill-buffer-query-functions
@@ -394,13 +403,13 @@
            ediff-split-window-function 'split-window-horizontally))
 
 (setup browse-url
-  (:option browse-url-browser-function 'eww-browse-url
-           browse-url-secondary-browser-function
-           (if (executable-find "firefox")
-               'browse-url-firefox
-             'browse-url-default-browser)
-           browse-url-new-window-flag t
-           browse-url-firefox-new-window-is-tab t)
+  (setq-default browse-url-browser-function 'eww-browse-url
+                browse-url-secondary-browser-function
+                (if (executable-find "firefox")
+                    'browse-url-firefox
+                  'browse-url-default-browser)
+                browse-url-new-window-flag t
+                browse-url-firefox-new-window-is-tab t)
   (when (eq acdw/system :work)
     (add-to-list 'exec-path "C:/Program Files/Mozilla Firefox")))
 
@@ -439,17 +448,17 @@
   (:mode "\\.\\(gemini\\|gmi\\)\\'"))
 
 (setup dired
-  (:option dired-recursive-copies 'always
-           dired-recursive-deletes 'always
-           delete-by-moving-to-trash t
-           dired-listing-switches "-Al"
-           ls-lisp-dirs-first t
-           dired-ls-F-marks-symlinks t
-           dired-no-confirm '(byte-compile
-                              chgrp chmod chown copy
-                              hardlink load move
-                              shell touch symlink)
-           dired-dwim-target t)
+  (setq-default dired-recursive-copies 'always
+                dired-recursive-deletes 'always
+                delete-by-moving-to-trash t
+                dired-listing-switches "-Al"
+                ls-lisp-dirs-first t
+                dired-ls-F-marks-symlinks t
+                dired-no-confirm '(byte-compile
+                                   chgrp chmod chown copy
+                                   hardlink load move
+                                   shell touch symlink)
+                dired-dwim-target t)
   (:also-load dired-x)
   (:hook dired-hide-details-mode
          hl-line-mode)
@@ -466,7 +475,7 @@
       (:hook-into dired-mode))
 
     (setup (:straight trashed)
-      (:option trashed-action-confirmer 'y-or-n-p))))
+      (setq-default trashed-action-confirmer 'y-or-n-p))))
 
 (setup (:straight magit)
   (:leader "g" magit-status)
@@ -558,16 +567,23 @@ call `zzz-to-char'."
   
   (global-undo-fu-session-mode +1))
 
-(setup (:straight icomplete-vertical)
-  (:with-map icomplete-minibuffer-map
-    (:bind "<down>" icomplete-forward-completions
-           "C-n" icomplete-forward-completions
-           "<up>" icomplete-backward-completions
-           "C-p" icomplete-backward-completions
-           "C-v" icomplete-vertical-toggle
-           "RET" icomplete-force-complete-and-exit
-           "C-RET" minibuffer-complete-and-exit))
-  (icomplete-vertical-mode +1))
+;; (setup (:straight icomplete-vertical)
+;;   (:with-map icomplete-minibuffer-map
+;;     (:bind "<down>" icomplete-forward-completions
+;;            "C-n" icomplete-forward-completions
+;;            "<up>" icomplete-backward-completions
+;;            "C-p" icomplete-backward-completions
+;;            "C-v" icomplete-vertical-toggle
+;;            "RET" icomplete-force-complete-and-exit
+;;            "C-RET" minibuffer-complete-and-exit))
+;;   (icomplete-vertical-mode +1))
+
+(setup (:straight vertico)
+  (if (bound-and-true-p comp-deferred-compilation-deny-list)
+      (add-to-list 'comp-deferred-compilation-deny-list 'vertico))
+  (icomplete-mode -1)
+  (icomplete-vertical-mode -1)
+  (vertico-mode +1))
 
 (setup (:straight orderless)
   (:option (prepend completion-styles) 'orderless))
@@ -736,9 +752,7 @@ if ripgrep is installed, otherwise `consult-grep'."
 
   (:global "M-/" company-complete)
   (:with-map company-active-map
-    (:bind "C-n" company-select-next
-           "C-p" company-select-previous
-           "C-d" company-show-doc-buffer
+    (:bind "C-d" company-show-doc-buffer
            "M-." company-show-location)))
 
 ;;; Lisps
@@ -38,6 +38,12 @@ lists, insert a new item or end the list, with checkbox if
 appropriate.  In tables, insert a new row or end the table."
   ;; Inspired by John Kitchin: http://kitchingroup.cheme.cmu.edu/blog/2017/04/09/A-better-return-in-org-mode/
   (interactive "P")
+  ;; Auto-fill if enabled
+  (when auto-fill-function
+    (if (listp auto-fill-function)
+        (dolist (func auto-fill-function)
+          (funcall func))
+      (funcall auto-fill-function)))
   (if default
       (org-return)
     (cond
@@ -87,10 +93,6 @@ appropriate.  In tables, insert a new row or end the table."
                          (org-element-property :contents-end context)))
              (item-child-p
               (unpackaged/org-element-descendant-of 'item context)))
-        (message "(or %S (and %S %S) %S)"
-                 first-item-p
-                 itemp (not emptyp)
-                 item-child-p)
         ;; The original function from unpackaged just tested the (or ...) test
         ;; in this cond, in an if.  However, that doesn't auto-end nested
         ;; lists.  So I made this form a cond and added the (and...) test in
@@ -99,13 +101,13 @@ appropriate.  In tables, insert a new row or end the table."
         ;; for now, it works well enough.
         (cond ((and itemp emptyp)
                (delete-region (line-beginning-position) (line-end-position))
-               (newline 2))
+               (insert "\n\n"))
               ((or first-item-p
                    (and itemp (not emptyp))
                    item-child-p)
                (org-insert-item))
               (t (delete-region (line-beginning-position) (line-end-position))
-                 (newline)))))
+                 (insert "\n")))))
 
      ((when (fboundp 'org-inlinetask-in-task-p)
         (org-inlinetask-in-task-p))