Add basic ediff layer
This commit is contained in:
parent
ab956fd1fd
commit
7dbdd5051a
23
contrib/ediff/README.md
Normal file
23
contrib/ediff/README.md
Normal file
|
@ -0,0 +1,23 @@
|
|||
# Ediff Mode
|
||||
|
||||
This contribution layer adds some support for ediff-mode into spacemacs
|
||||
|
||||
## Key Bindings
|
||||
|
||||
## TODO:
|
||||
We currently just set a few variables to make it look nicer.
|
||||
Here is my first attempt at evilifying the buffer, does not work correctly, help is very much welcome.
|
||||
|
||||
```
|
||||
(defun ediff/setup-ediff-keymaps ()
|
||||
"setup the evil ediff keymap"
|
||||
(progn
|
||||
(add-to-list 'evil-emacs-state-modes 'Ediff)
|
||||
(spacemacs|evilify ediff-mode-map)
|
||||
(spacemacs/activate-evil-leader-for-map 'ediff-mode-map)
|
||||
)
|
||||
)
|
||||
|
||||
;; inside the use-package function
|
||||
(add-hook 'ediff-keymap-setup-hook 'ediff/setup-ediff-keymaps)
|
||||
```
|
35
contrib/ediff/packages.el
Normal file
35
contrib/ediff/packages.el
Normal file
|
@ -0,0 +1,35 @@
|
|||
;;; packages.el --- ediff Layer packages File for Spacemacs
|
||||
;;
|
||||
;; Copyright (c) 2012-2014 Sylvain Benner
|
||||
;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
|
||||
;;
|
||||
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
|
||||
;; URL: https://github.com/syl20bnr/spacemacs
|
||||
;;
|
||||
;; This file is not part of GNU Emacs.
|
||||
;;
|
||||
;;; License: GPLv3
|
||||
|
||||
(defvar ediff-packages
|
||||
'(
|
||||
ediff
|
||||
)
|
||||
"List of all packages to install and/or initialize. Built-in packages
|
||||
which require an initialization must be listed explicitly in the list.")
|
||||
|
||||
|
||||
(defun ediff/init-ediff ()
|
||||
"Initialize my package"
|
||||
(use-package ediff
|
||||
:defer t
|
||||
:init
|
||||
(progn
|
||||
;; first we set some sane defaults
|
||||
(setq-default
|
||||
ediff-window-setup-function 'ediff-setup-windows-plain
|
||||
;; emacs is evil and decrees that vertical shall henceforth be horizontal
|
||||
ediff-split-window-function 'split-window-horizontally
|
||||
ediff-merge-split-window-function 'split-window-horizontally)
|
||||
)
|
||||
)
|
||||
)
|
Loading…
Reference in a new issue