Snoooopy/dtos-dotfiles
1
0
Fork 0
mirror of https://gitlab.com/dwt1/dotfiles.git synced 2026-04-13 20:28:35 +10:00
Code Issues Packages Projects Releases Wiki Activity

Minor edits

Browse Source
This commit is contained in:
Derek Taylor
2023-12-10 14:35:36 -06:00
parent c532ff5a4d
commit c779b12688
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.config/emacs/config.el
View File

@@ -75,8 +75,8 @@
(drag-stuff-global-mode 1)
(drag-stuff-define-keys))
;;(setq ediff-split-window-function 'split-window-horizontally
;; ediff-window-setup-function 'ediff-setup-windows-plain)
(setq ediff-split-window-function 'split-window-horizontally
ediff-window-setup-function 'ediff-setup-windows-plain)
(defun dt-ediff-hook ()
(ediff-setup-keymap)

4
.config/emacs/config.org
View File

@@ -183,8 +183,8 @@ This package implements hiding or abbreviation of the modeline displays (lighter
'ediff' is a diff program that is built into Emacs. By default, 'ediff' splits files vertically and places the 'help' frame in its own window. I have changed this so the two files are split horizontally and the 'help' frame appears as a lower split within the existing window. Also, I create my own 'dt-ediff-hook' where I add 'j/k' for moving to next/prev diffs. By default, this is set to 'n/p'.
#+begin_src emacs-lisp
;;(setq ediff-split-window-function 'split-window-horizontally
;; ediff-window-setup-function 'ediff-setup-windows-plain)
(setq ediff-split-window-function 'split-window-horizontally
ediff-window-setup-function 'ediff-setup-windows-plain)
(defun dt-ediff-hook ()
(ediff-setup-keymap)