code.delx.au - dotemacs/blob - lisp/my-vc.el

   1 ;;; -*- lexical-binding: t -*-
   2
   3 (require 'ediff)
   4 (setq ediff-window-setup-function 'ediff-setup-windows-plain
   5       ediff-split-window-function 'split-window-horizontally)
   6
   7
   8 (require 'git-gutter)
   9
  10 (add-hook 'git-gutter:update-hooks 'magit-revert-buffer-hook)
  11
  12 (setq git-gutter:ask-p nil)
  13
  14 (defun git-gutter:popup-hunk (&optional diffinfo)
  15   "MODIFIED!! Popup current diff hunk. Removed the `save-window-excursion' so I can control it with shackle."
  16   (interactive)
  17   (git-gutter:awhen (or diffinfo
  18                         (git-gutter:search-here-diffinfo git-gutter:diffinfos))
  19     (pop-to-buffer (git-gutter:update-popuped-buffer it))))
  20
  21 (global-git-gutter-mode)
  22
  23
  24 (require 'magit)
  25
  26 (setq magit-completing-read-function 'ivy-completing-read)
  27 (setq magit-display-file-buffer-function #'pop-to-buffer)
  28 (setcdr magit-file-mode-map nil)
  29 (global-magit-file-mode)
  30 (setq git-commit-finish-query-functions
  31       (delete #'git-commit-check-style-conventions git-commit-finish-query-functions))
  32
  33
  34 (require 'vc)
  35 (setq vc-follow-symlinks t)
  36 (setq vc-handled-backends nil)