daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Daniel Weschke
2021-01-27 21:50:40 +01:00
parent d8336fbbae
commit 34f76c13d8
25 changed files with 109 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
settings/version-control-settings.el
View File

@@ -21,7 +21,7 @@
;;; Code:
;; see also Diff-Hl (diff-hl-mode) to see VC diff highlighting in fringes.
(use-package magit
:load-path (lambda() (concat user-emacs-directory "lisp/magit"))
:load-path "lisp/magit"
:bind (("C-c M-g" . magit-file-dispatch))
:config
;; (setq magit-completing-read-function 'magit-builtin-completing-read) ;; if ivy-mode is on then it uses it otherwise set to 'ivy-completing-read
@@ -32,8 +32,7 @@
(interactive "e")
(mouse-set-point evt)
(magit-section-toggle (magit-current-section)))
(define-key magit-mode-map [left-fringe mouse-1] 'my-magit-fringe-click)
)
(define-key magit-mode-map [left-fringe mouse-1] 'my-magit-fringe-click))
;; On Windows, we must use Git GUI to enter username and password
;; See: https://github.com/magit/magit/wiki/FAQ#windows-cannot-push-via-https
@@ -48,16 +47,13 @@
)
(use-package orgit
:after (magit org)
)
:after (magit org))
(use-package diff-hl
:load-path (lambda() (concat user-emacs-directory "lisp/diff-hl"))
:hook (
((prog-mode vc-dir-mode org-mode) . turn-on-diff-hl-mode)
:load-path "lisp/diff-hl"
:hook (((prog-mode vc-dir-mode org-mode) . turn-on-diff-hl-mode)
(magit-pre-refresh . diff-hl-magit-pre-refresh)
(magit-post-refresh . diff-hl-magit-post-refresh)
)
(magit-post-refresh . diff-hl-magit-post-refresh))
;;:config
;;(global-diff-hl-mode)
)