;;; -*- lexical-binding: t -*- (require 'ediff) (setq ediff-window-setup-function 'ediff-setup-windows-plain ediff-split-window-function 'split-window-horizontally) (require 'git-gutter) (add-hook 'git-gutter:update-hooks 'magit-revert-buffer-hook) (setq git-gutter:ask-p nil) (defun git-gutter:popup-hunk (&optional diffinfo) "MODIFIED!! Popup current diff hunk. Removed the `save-window-excursion' so I can control it with shackle." (interactive) (git-gutter:awhen (or diffinfo (git-gutter:search-here-diffinfo git-gutter:diffinfos)) (pop-to-buffer (git-gutter:update-popuped-buffer it)))) (global-git-gutter-mode) (require 'magit) (setq magit-completing-read-function 'ivy-completing-read) (setq git-commit-finish-query-functions (delete #'git-commit-check-style-conventions git-commit-finish-query-functions)) (require 'vc) (setq vc-follow-symlinks t) (setq vc-handled-backends nil)