Simplify Emacs config

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 39a97f76fafbdb4371b9594a35aebee5ef80e63d..5581ac086023cce663ca1ea43174a402ce99c352 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -113,16 +113,6 @@
          :pre-build (("./autogen.sh")
                      ("./configure")
                      ("make"))))
-(elpaca (corfu
-         :pre-build (("mv"
-                      "extensions/corfu-indexed.el"
-                      "extensions/corfu-info.el"
-                      "extensions/corfu-popupinfo.el"
-                      ".")
-                     ("rm" "-r" "extensions")
-                     ("emacs" "--batch" "-l" "ox-texinfo" "README.org"
-                      "--eval" "(setq org-babel-confirm-evaluate-answer-no t)"
-                      "-f" "org-texinfo-export-to-texinfo"))))
 (elpaca debbugs)
 (elpaca (devdocs
          :pre-build (("emacs" "--batch" "-l" "ox-texinfo" "README.org"
@@ -435,8 +425,6 @@ DEADLINE: %(format-time-string \"<%Y-%m-%d %H:%M>\" (org-read-date t t))
  completions-max-height 16
  completion-auto-wrap t
  completion-at-point-functions nil
- corfu-cycle t
- corfu-indexed-start     1
  shell-kill-buffer-on-exit t
  compilation-scroll-output t
  display-time-default-load-average nil
@@ -1095,16 +1083,6 @@ as the initial input for completion, and return that directory."
   (add-to-list 'lin-mode-hooks 'gnus-group-mode-hook)
   (add-to-list 'lin-mode-hooks 'gnus-server-mode-hook))
 
-;;; Configure `completion-in-region' UI with `corfu'
-
-(with-eval-after-load 'corfu
-  (defun esy/margin-formatter (metadata)
-    "Format METADATA for `corfu-margin-formatters'."
-    (pcase (cdr (assoc 'category metadata))
-      ('dabbrev (lambda (_) "… "))))
-  (add-to-list 'corfu-margin-formatters #'esy/margin-formatter)
-  (corfu-indexed-mode))
-
 ;;; Enable some global minor modes
 
 (dolist (mode '(
@@ -1126,7 +1104,6 @@ as the initial input for completion, and return that directory."
                 transient-mark-mode
                 winner-mode
                 completions-auto-update-mode
-                global-corfu-mode
                 mode-face-global-mode
                 which-function-mode
                 ))