Emacs: Split ediff window horizontally
parent
da20efb859
commit
ee9dacd2f9
|
@ -57,7 +57,6 @@ To view where the bindings are set in your config files, lookup
|
|||
|
||||
;; Minor modes
|
||||
(add-hook 'dired-mode-hook (lambda () (require 'mode-dired)))
|
||||
(add-hook 'ediff-mode-hook (lambda () (require 'mode-ediff)))
|
||||
(add-hook 'eshell-load-hook (lambda () (require 'mode-eshell)))
|
||||
(add-hook 'gud-mode-hook (lambda () (require 'mode-gud)))
|
||||
(add-hook 'octave-mode-hook (lambda () (require 'mode-octave)))
|
||||
|
|
|
@ -360,6 +360,9 @@
|
|||
;; Replace `kill-buffer' binding by `kill-this-buffer'.
|
||||
(define-key mickey-minor-mode-map (kbd "C-x k") 'kill-this-buffer)
|
||||
|
||||
(setq ediff-window-setup-function 'ediff-setup-windows-plain
|
||||
ediff-split-window-function 'split-window-horizontally)
|
||||
|
||||
(provide 'main)
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
;; Ediff
|
||||
|
||||
;; In one frame.
|
||||
(setq ediff-window-setup-function 'ediff-setup-windows-plain)
|
||||
|
||||
;; Ediff split horizontally by default. ediff split does not seem to
|
||||
;; work. Looks like the variable is never used in the source file.
|
||||
(add-hook
|
||||
'ediff-mode-hook
|
||||
(lambda ()
|
||||
(setq ediff-merge-split-window-function 'split-window-vertically)))
|
||||
|
||||
(provide 'mode-ediff)
|
Loading…
Reference in New Issue