Merge branch 'develop'
* develop: (64 commits) Prepare for v2.0.5 Temporarily disable doom-themes-visual-bell-config Fix neotree always changing root Update changelog Fix wrong-type-argument error from +org/insert-item Make +ivy-buffer-transformer autoloadable General refactor & cleanup Correct troubleshooting link in README org: set org-ellipsis to downward chevron Add elfeed-(show|search)-mode to evil-snipe-disabled-modes Autoload json library Rethink smartparens config #181 README: expand troubleshooting Fix wiki links in README (again) Correct intro in README Fix wiki links in README Prevent private commands from affecting projectile cache Remove recentf-filename-handlers fix for projectile-recentf-files lang/sh: remove unused setup.sh Convert +ivy/switch-buffer to transformers + add mode icons #169 ...
This commit is contained in:
commit
d2d71795e5
75 changed files with 1165 additions and 954 deletions
|
@ -1,12 +1,17 @@
|
|||
;;; 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)
|
||||
|
||||
(defvar +vcs-auto-hydra-smerge t
|
||||
"When entering `smerge-mode' automatically open associated hydra.")
|
||||
|
||||
(load! +git)
|
||||
;; (load! +hg)
|
||||
|
||||
(after! vc-annotate
|
||||
(set! :popup
|
||||
|
|
|
@ -5,11 +5,12 @@
|
|||
;; n/a
|
||||
|
||||
;;; +git
|
||||
(package! git-gutter-fringe)
|
||||
(package! git-link)
|
||||
(package! git-timemachine)
|
||||
(package! gitconfig-mode)
|
||||
(package! gitignore-mode)
|
||||
(package! magit)
|
||||
(unless (featurep! -git)
|
||||
(package! git-gutter-fringe)
|
||||
(package! git-link)
|
||||
(package! git-timemachine)
|
||||
(package! gitconfig-mode)
|
||||
(package! gitignore-mode)
|
||||
(package! magit))
|
||||
|
||||
;;; TODO +hg
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue