awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-01 12:17:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

New emacs/ediff module

Browse Source 
Ediff config was moved out of core. Also includes evil compatibility
(mvoed out of feature/evil) & wconf save/restore.
This commit is contained in:
Henrik Lissner
2018-05-27 12:40:13 +02:00
parent e2d055a40b
commit bdee28609a
5 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/core-editor.el
View File

@ -45,11 +45,6 @@ successfully sets indent_style/indent_size.")
truncate-lines t
truncate-partial-width-windows 50)
;; ediff
(setq ediff-diff-options "-w"
ediff-split-window-function #'split-window-horizontally
ediff-window-setup-function #'ediff-setup-windows-plain)
(defun doom|check-large-file ()
"Check if the buffer's file is large (see `doom-large-file-size'). If so, ask
for confirmation to open it literally (read-only, disabled undo and in