awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-03 12:27:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update :feature version-control to support module flags

Browse Source
This commit is contained in:
Henrik Lissner
2017-07-29 00:27:20 +02:00
parent 87ee1a06e3
commit 5849a1fe38
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/feature/version-control/config.el
View File

@ -1,12 +1,17 @@
;;; feature/version-control/config.el -*- lexical-binding: t; -*- ;;; feature/version-control/config.el -*- lexical-binding: t; -*-
(unless (featurep! -git)
(load! +git))
;; TODO hg support
;; (unless (featurep! -hg)
;; (load! +hg))
;;
(setq vc-make-backup-files nil) (setq vc-make-backup-files nil)
(defvar +vcs-auto-hydra-smerge t (defvar +vcs-auto-hydra-smerge t
"When entering `smerge-mode' automatically open associated hydra.") "When entering `smerge-mode' automatically open associated hydra.")
(load! +git)
;; (load! +hg)
(after! vc-annotate (after! vc-annotate
(set! :popup (set! :popup

13
modules/feature/version-control/packages.el
View File

@ -5,11 +5,12 @@
;; n/a ;; n/a
;;; +git ;;; +git
(package! git-gutter-fringe) (when (featurep! +git)
(package! git-link) (package! git-gutter-fringe)
(package! git-timemachine) (package! git-link)
(package! gitconfig-mode) (package! git-timemachine)
(package! gitignore-mode) (package! gitconfig-mode)
(package! magit) (package! gitignore-mode)
(package! magit))
;;; TODO +hg ;;; TODO +hg