kj/confi-emacs-actual
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add ediff config.

Browse Source 
By default ediff shows a ugly floating window.
With this config we improve a lot that default behaviour.
This commit is contained in:
KJ 2024-04-12 08:30:37 -04:00
parent f6633ee2ed
commit 2da8c0346b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configs/init-packages.el
View File

@ -97,6 +97,16 @@
doom-modeline-indent-info nil doom-modeline-indent-info nil
doom-modeline-persp-name t)) doom-modeline-persp-name t))
;; Resolver diferencias entre 2 archivos o versiones del mismo.
(use-package ediff
:defer t
:ensure nil
:config
(setq ediff-diff-options "")
(setq ediff-custom-diff-options "-u")
(setq ediff-window-setup-function 'ediff-setup-windows-plain)
(setq ediff-split-window-function 'split-window-vertically))
;; Emparejamiento automático de comillas, paréntesis, corchetes y llaves ;; Emparejamiento automático de comillas, paréntesis, corchetes y llaves
(use-package electric-pair (use-package electric-pair
:defer t :defer t