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

1 files changed, 70 insertions, 10 deletions

@@ -149,7 +149,7 @@
 (setup completion
   (:option completion-ignore-case t
            read-buffer-completion-ignore-case t
-           completion-styles '(partial-completion substring flex)
+           completion-styles '(substring partial-completion)
            completion-category-defaults nil
            completion-category-overrides
            '((file (styles . (partial-completion)))))
@@ -564,8 +564,12 @@ like a dumbass."
            '(read-only t cursor-intangible t face minibuffer-prompt)
            enable-recursive-minibuffers t
            file-name-shadow-properties '(invisible t intangible t)
-           read-answer-short t)
+           read-answer-short t
+           read-extended-command-predicate ; used on >28
+           #'command-completion-default-include-p)
 
+  (add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
+  
   (add-hook 'minibuffer-setup-hook #'acdw/gc-disable)
   (add-hook 'minibuffer-exit-hook #'acdw/gc-enable)
   
@@ -929,9 +933,24 @@ if ripgrep is installed, otherwise `consult-grep'."
 
   ;; Competion-at-point (complete-region)
   (:global "M-/" completion-at-point)
-  (:option completion-in-region-function #'consult-completion-in-region
+  (:option completion-in-region-function
+           (lambda (&rest args)
+             (apply (if vertico-mode
+                        #'consult-completion-in-region
+                      #'completion--in-region)
+                    args))
            completion-cycle-threshold 3
-           tab-always-indent 'complete))
+           tab-always-indent 'complete)
+
+  ;; Completing-read-multple
+  (if (fboundp #'consult-completing-read-multiple)
+      (:advise completing-read-multple
+               :override #'consult-completing-read-multiple)
+
+    (defun crm-indicator (args)
+      (cons (concat "[CRM] " (car args)) (cdr args)))
+    (:advise completing-read-multiple
+             :filter-args #'crm-indicator)))
 
 (setup (:straight crux)
   
@@ -984,6 +1003,30 @@ if ripgrep is installed, otherwise `consult-grep'."
                       :branch "main"))
      (require 'gemini-write))))
 
+(setup (:straight embark)
+  (:global "C-." embark-act
+           "C-;" embark-dwim)
+  (:option prefix-help-command #'embark-prefix-help-command
+           (append display-buffer-alist)
+           '("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
+             nil
+             (window-parameters (mode-line-format . none)))
+           embark-prompter #'embark-keymap-prompter
+           embark-verbose-indicator-display-action
+           '(display-buffer-at-bottom (window-height . fit-window-to-buffer)))
+
+  (setq embark-action-indicator
+        (lambda (map _target)
+          (which-key--show-keymap "Embark" map nil nil 'no-paging)
+          #'which-key--hide-popup-ignore-command)
+        embark-become-indicator embark-action-indicator)
+  
+  (with-eval-after-load 'embark
+    (with-eval-after-load 'consult
+      (setup (:straight embark-consult)
+        (add-hook 'embark-collect-mode-hook
+                  #'consult-preview-at-point-mode)))))
+
 (setup (:straight epithet)
   (add-hook 'Info-selection-hook #'epithet-rename-buffer)
   (add-hook 'eww-after-render-hook #'epithet-rename-buffer)
@@ -1062,9 +1105,6 @@ if ripgrep is installed, otherwise `consult-grep'."
            "<help> o" helpful-symbol
            "C-c C-d" helpful-at-point))
 
-(setup (:straight imenu-anywhere)
-  (:global "C-." imenu-anywhere))
-
 (setup (:straight iscroll)
   (:hook-into text-mode))
 
@@ -1141,7 +1181,7 @@ if ripgrep is installed, otherwise `consult-grep'."
                    :host github
                    :repo "oantolin/orderless"))
   (require 'orderless)
-  (:option (prepend completion-styles) 'orderless))
+  (:option (append completion-styles) 'orderless))
 
 (setup (:straight org)
   (:straight org-contrib)
@@ -1164,7 +1204,9 @@ if ripgrep is installed, otherwise `consult-grep'."
            org-hide-emphasis-markers t
            org-html-coding-system  'utf-8-unix
            org-imenu-depth 3
+           org-outline-path-complete-in-steps nil
            org-pretty-entities t
+           org-refile-use-outline-path 'file
            org-special-ctrl-a/e t
            org-special-ctrl-k t
            org-src-fontify-natively t
@@ -1297,13 +1339,31 @@ if ripgrep is installed, otherwise `consult-grep'."
 
 (setup (:straight (vertico
                    :host github
-                   :repo "minad/vertico"))
+                   :repo "minad/vertico"
+                   :files ("*" "extensions/*"
+                           (:exclude ".git"))))
+
   (:option resize-mini-windows 'grow-only
            vertico-count-format nil
            vertico-cycle t)
+
   (if (boundp 'comp-deferred-compilation-deny-list)
       (add-to-list 'comp-deferred-compilation-deny-list "vertico"))
-  (vertico-mode +1))
+
+  (vertico-mode +1)
+
+  ;; Extensions!
+  (:also-load vertico-mouse)
+  (vertico-mouse-mode +1)
+
+  ;; Workarounds!
+  (when (version< org-version "9.5")
+    (defun disable-selection ()
+      (when (eq minibuffer-completion-table #'org-tags-completion-function)
+        (setq-local vertico-map minibuffer-local-completion-map
+                    completion-cycle-threshold nil
+                    completion-styles '(basic))))
+    (advice-add #'vertico--setup :before #'disable-selection)))
 
 (setup (:straight vuiet)
   (:needs "youtube-dl"