.emacs.d

commit aec488f4f063e7a393f719390ed95f1a133e1462
parent 67383cb373b3deb2f7b54d6a97af2ad0ebdffe22
Author: andsy10 <andsy1016@gmail.com>
Date:   Sun,  4 Oct 2026 08:55:17 +0800

Update ediff config

Diffstat:
M
lisp/init-base.el
 | 
4
+++-
M
lisp/init-completion.el
 | 
1
+
M
lisp/init-package.el
 | 
2
++

3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/lisp/init-base.el b/lisp/init-base.el
@@ -219,7 +219,9 @@
                     (name . "^*Diff")
                     (mode . diff-mode)
                     (mode . ediff-mode)
-                    (mode . vundo-diff-mode)))
+                    (mode . vundo-diff-mode)
+                    (name . "^\\*ediff-")
+                    (name . "\\*Ediff Registry\\*")))
            ("Process" (predicate get-buffer-process (current-buffer))))))
 
   (defun my-ibuffer-setup ()
diff --git a/lisp/init-completion.el b/lisp/init-completion.el
@@ -115,6 +115,7 @@
                     "^\\*helpful"
                     "^\\*Help"
                     "^\\*Diff"
+                    "^\\*Ediff"
                     "^\\*straight"
                     "\\*Messages\\*"
                     "\\*Chinese-word-segmentation\\*"
diff --git a/lisp/init-package.el b/lisp/init-package.el
@@ -172,6 +172,8 @@ With a prefix ARG create a new *scratch* buffer."
 ;; ediff
 (use-package ediff
   :straight nil
+  :hook ((ediff-prepare-buffer . outline-show-all)
+         (ediff-quit . winner-undo))
   :config
   (setq ediff-window-setup-function 'ediff-setup-windows-plain
         ediff-split-window-function 'split-window-horizontally))