TakeV/spacemacs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
This repository has been archived on 2024-10-22. You can view files and clone it, but cannot push or open issues or pull requests.
spacemacs/layers/+source-control/version-control/config.el

83 lines
2.3 KiB
EmacsLisp
Raw Normal View History

git and github: reorganize key bindings gd is now "diff" gh is now "github" gg is not changed for "github gist" (updated the prefix name) Inverts gc and gC since commit is more frequent than checkout
2015-11-02 05:16:13 +00:00
;;; config.el --- Version Control configuration File for Spacemacs
;;
Happy New Year 2018!
2018-01-04 07:00:25 +00:00
;; Copyright (c) 2012-2018 Sylvain Benner & Contributors
git and github: reorganize key bindings gd is now "diff" gh is now "github" gg is not changed for "github gist" (updated the prefix name) Inverts gc and gC since commit is more frequent than checkout
2015-11-02 05:16:13 +00:00
;;
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
;; URL: https://github.com/syl20bnr/spacemacs
;;
;; This file is not part of GNU Emacs.
;;
;;; License: GPLv3
Show conflicts in smerge ts hint Use a dynamic hint for the smerge transient state in order to show the current and total numbers of conflicts, and make the full hint toggleable. * CHANGELOG.develop: Add an entry for this change. * layers/+source-control/version-control/config.el (spacemacs--smerge-ts-full-hint-toggle): New variable. * layers/+source-control/version-control/funcs.el (spacemacs//smerge-ts-hint): New function. Return a string indicating the index of the current conflict and the total number of conflicts detected by smerge-mode. If spacemacs--smerge-ts-full-hint-toggle is true, append the smerge transient state's full hint. (spacemacs//smerge-ts-toggle-hint): Toggle showing the full hint for the smerge transient state. * layers/+source-control/version-control/packages.el (version-control/init-smerge-mode): Define the transient state in :init so we can use spacemacs|transient-state-format-hint. Use spacemacs//smerge-ts-hint to display a dynamic hint. Bind the ? key to spacemacs//smerge-ts-toggle-hint.
2019-10-13 03:13:49 +00:00
(defvar spacemacs--smerge-ts-full-hint-toggle nil
"Display smerge transient-state documentation.")
VCS micro-state / Customizable diff margins
2015-11-15 19:01:58 +00:00
(defvar version-control-global-margin t
"If non-nil, will show diff margins globally.")
git and github: reorganize key bindings gd is now "diff" gh is now "github" gg is not changed for "github gist" (updated the prefix name) Inverts gc and gC since commit is more frequent than checkout
2015-11-02 05:16:13 +00:00
VCS micro-state / Customizable diff margins
2015-11-15 19:01:58 +00:00
(defvar version-control-diff-tool 'git-gutter+
version-control: minor changes to respect 80th column
2015-11-30 04:00:57 +00:00
"Options are `git-gutter', `git-gutter+', and `diff-hl' to show
version-control markers.")
VCS micro-state / Customizable diff margins
2015-11-15 19:01:58 +00:00
Rename and add missing definition of version-control-diff-side
2016-11-05 11:03:23 +00:00
(defvar version-control-diff-side 'right
"Side on which to show version-control markers.
Options are `left' and `right'.")
VCS micro-state / Customizable diff margins
2015-11-15 19:01:58 +00:00
;; unchanged face
(defface git-gutter+-unchanged
'((t (:background "yellow")))
"face for unchanged lines"
:group 'git-gutter+)
(defface git-gutter:unchanged
'((t (:background "yellow")))
"face for unchanged lines"
:group 'git-gutter+)
;; change face
(defface git-gutter+-modified
'((t (:foreground "magenta" :weight bold)))
"face for modified lines"
:group 'git-gutter+)
(defface git-gutter:modified
'((t (:foreground "magenta" :weight bold)))
"face for modified lines"
:group 'git-gutter+)
(defface diff-hl-change
'((default :foreground "blue3")
(((class color) (min-colors 88) (background light))
:background "#ddddff")
(((class color) (min-colors 88) (background dark))
:background "#333355"))
"Face used to highlight changed lines."
:group 'diff-hl)
;; added face
(defface git-gutter+-added
'((t (:foreground "green" :weight bold)))
"face for added lines"
:group 'git-gutter+)
(defface git-gutter:added
'((t (:foreground "green" :weight bold)))
"face for added lines"
:group 'git-gutter+)
(defface diff-hl-insert
'((default :inherit diff-added)
(((class color)) :foreground "green4"))
"Face used to highlight inserted lines."
:group 'diff-hl)
;; deleted face
(defface git-gutter+-deleted
'((t (:foreground "red" :weight bold)))
"face for deleted lines"
:group 'git-gutter+)
(defface git-gutter:deleted
'((t (:foreground "red" :weight bold)))
"face for deleted lines"
:group 'git-gutter+)
(defface diff-hl-delete
'((default :inherit diff-removed)
(((class color)) :foreground "red3"))
"Face used to highlight deleted lines."
:group 'diff-hl)
Reference in a new issue Copy permalink