emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove emacs/ediff & move to core-ui

Browse source
This commit is contained in:
Henrik Lissner 2019-02-17 18:49:22 -05:00
parent e6debe55f1
commit 3dcd253f71
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/core-ui.el
View file

@ -162,7 +162,25 @@ behavior). Do not set this directly, this is let-bound in `doom|init-theme'.")
;; ;;
;; Built-in packages ;; Built-in packages
(def-package! hl-line ; built-in (def-package! ediff
:defer t
:init
(setq ediff-diff-options "-w" ; turn off whitespace checking
ediff-split-window-function #'split-window-horizontally
ediff-window-setup-function #'ediff-setup-windows-plain)
:config
;; Restore window config after quitting ediff
(defun doom|ediff-save-wconf ()
(setq +ediff--saved-wconf (current-window-configuration)))
(add-hook 'ediff-before-setup-hook #'doom|ediff-save-wconf)
(defun doom|ediff-restore-wconf ()
(set-window-configuration +ediff--saved-wconf))
(add-hook 'ediff-quit-hook #'doom|ediff-restore-wconf 'append)
(add-hook 'ediff-suspend-hook #'doom|ediff-restore-wconf 'append))
(def-package! hl-line
;; Highlights the current line ;; Highlights the current line
:hook ((prog-mode text-mode conf-mode) . hl-line-mode) :hook ((prog-mode text-mode conf-mode) . hl-line-mode)
:config :config

1
init.example.el
View file

@ -54,7 +54,6 @@
;;+ranger ; bringing the goodness of ranger to dired ;;+ranger ; bringing the goodness of ranger to dired
;;+icons ; colorful icons for dired-mode ;;+icons ; colorful icons for dired-mode
) )
ediff ; comparing files in Emacs
electric ; smarter, keyword-based electric-indent electric ; smarter, keyword-based electric-indent
;;eshell ; a consistent, cross-platform shell (WIP) ;;eshell ; a consistent, cross-platform shell (WIP)
hideshow ; basic code-folding support hideshow ; basic code-folding support

17
modules/emacs/ediff/config.el
View file

@ -1,17 +0,0 @@
;;; emacs/ediff/config.el -*- lexical-binding: t; -*-
;; `ediff'
(setq ediff-diff-options "-w" ; turn off whitespace checking
ediff-split-window-function #'split-window-horizontally
ediff-window-setup-function #'ediff-setup-windows-plain)
;; Restore window config after quitting ediff
(defvar +ediff--saved-wconf nil)
(defun +ediff|save-wconf ()
(setq +ediff--saved-wconf (current-window-configuration)))
(defun +ediff|restore-wconf ()
(set-window-configuration +ediff--saved-wconf))
(add-hook 'ediff-before-setup-hook #'+ediff|save-wconf)
(add-hook! :append '(ediff-quit-hook ediff-suspend-hook) #'+ediff|restore-wconf)