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 (require 'git-gutter-fringe)
  10
  11 (setq git-gutter:ask-p nil)
  12
  13 (defun git-gutter:popup-hunk (&optional diffinfo)
  14   "MODIFIED!! Popup current diff hunk. Removed the `save-window-excursion' so I can control it with shackle."
  15   (interactive)
  16   (git-gutter:awhen (or diffinfo
  17                         (git-gutter:search-here-diffinfo git-gutter:diffinfos))
  18     (pop-to-buffer (git-gutter:update-popuped-buffer it))))
  19
  20 (global-git-gutter-mode)
  21
  22
  23
  24 (defun my/git-reset-buffer ()
  25   "Runs git-reset to unstage all changes on the current file. Then updates the git-gutter."
  26   (interactive)
  27   (call-process "git" nil nil nil "reset" (buffer-file-name))
  28   (git-gutter)
  29   (message "Finished git reset"))
  30
  31
  32
  33 (require 'ibuffer-vc)
  34
  35 (add-hook 'ibuffer-hook
  36           (lambda ()
  37             (ibuffer-vc-set-filter-groups-by-vc-root)
  38             (unless (eq ibuffer-sorting-mode 'alphabetic)
  39               (ibuffer-do-sort-by-alphabetic))))
  40
  41
  42
  43 (require 'vc)
  44 (setq vc-follow-symlinks t)