TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[version-control] Do not activate git-gutter-mode in pdf-view-mode

This commit is contained in:
Maxi Wolff 2021-11-29 22:34:38 +01:00
parent 23367d08f8
commit bdd77bfed6
No known key found for this signature in database
GPG Key ID: 2DD07025BFDBD89A
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
layers/+source-control/version-control/packages.el
View File

@ -20,20 +20,18 @@
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(setq version-control-packages
'(
browse-at-remote
(diff-hl :toggle (eq 'diff-hl version-control-diff-tool))
diff-mode
evil-unimpaired
(git-gutter :toggle (eq 'git-gutter version-control-diff-tool))
(git-gutter-fringe :toggle (eq 'git-gutter version-control-diff-tool))
(git-gutter+ :toggle (eq 'git-gutter+ version-control-diff-tool))
(git-gutter-fringe+ :toggle (eq 'git-gutter+ version-control-diff-tool))
(smerge-mode :location built-in)
(vc :location built-in)))
(defconst version-control-packages
'(
browse-at-remote
(diff-hl :toggle (eq 'diff-hl version-control-diff-tool))
diff-mode
evil-unimpaired
(git-gutter :toggle (eq 'git-gutter version-control-diff-tool))
(git-gutter-fringe :toggle (eq 'git-gutter version-control-diff-tool))
(git-gutter+ :toggle (eq 'git-gutter+ version-control-diff-tool))
(git-gutter-fringe+ :toggle (eq 'git-gutter+ version-control-diff-tool))
(smerge-mode :location built-in)
(vc :location built-in)))
(defun version-control/init-vc ()
(use-package vc
@ -97,7 +95,6 @@
"a" 'vc-annotate-revision-at-line
"p" 'vc-annotate-revision-previous-to-line))))
(defun version-control/init-diff-mode ()
(use-package diff-mode
:defer t
@ -172,7 +169,10 @@
git-gutter:handled-backends '(git hg bzr svn)
git-gutter:hide-gutter t))
:config
(spacemacs|hide-lighter git-gutter-mode)))
(spacemacs|hide-lighter git-gutter-mode)
;; Do not activate git-gutter in pdf-view-mode, see #15106
(when (configuration-layer/layer-used-p 'pdf)
(add-to-list 'git-gutter:disabled-modes 'pdf-view-mode))))
(defun version-control/init-git-gutter-fringe ()
(use-package git-gutter-fringe
@ -208,7 +208,6 @@
".XXX..."
"..X...."))))
(defun version-control/init-git-gutter+ ()
(use-package git-gutter+
:if (eq version-control-diff-tool 'git-gutter+)
@ -228,8 +227,10 @@
git-gutter+-hide-gutter t))
;; identify magit changes
:config
(spacemacs|hide-lighter git-gutter+-mode)))
(spacemacs|hide-lighter git-gutter+-mode)
;; Do not activate git-gutter in pdf-view-mode, see #15106
(when (configuration-layer/layer-used-p 'pdf)
(add-to-list 'git-gutter+-disabled-modes 'pdf-view-mode))))
(defun version-control/init-git-gutter-fringe+ ()
(use-package git-gutter-fringe+
@ -265,8 +266,6 @@
".XXX..."
"..X...."))))
(defun version-control/init-smerge-mode ()
(use-package smerge-mode
:defer t