From a8567cbed34f5ba72cf18836e90a320d2f1b7a0b Mon Sep 17 00:00:00 2001 From: Voleking Date: Sun, 20 Jan 2019 12:40:33 +0800 Subject: [PATCH] Fix diff-hl-highlight function is set to nil --- CHANGELOG.develop | 5 ++++- layers/+source-control/version-control/packages.el | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.develop b/CHANGELOG.develop index 6801d810f..6f575437a 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -1996,11 +1996,14 @@ Benner and Paweł Siudak): - ~SPC g v v~ to do the next logical VC operation (=vc-next-action=) - ~SPC g v I~ to ignore file (=vc-ignore=) - ~SPC g v r~ to resolve conflicts in file - - Define key bindings with leader key for vim editing style in =diff-mode= (thanks to miyabinomuratic) + - Define key bindings with leader key for vim editing style in =diff-mode= + (thanks to miyabinomuratic) - New packages: - =browse-at-remote= which replaces =github-browse-file= (thanks Eugene Yaremenko) - Avoid loading all the diff packages (thanks to Sylvain Benner) +- Fixes error on =diff-hl-margin-mode= function being nil during startup (thanks + to Voleking) **** Ycmd - Search for =compile_commands.json= in build sub-directory (thanks to Amos Bird and Eivind Fonn) diff --git a/layers/+source-control/version-control/packages.el b/layers/+source-control/version-control/packages.el index 5f6a06760..8e3d335a9 100644 --- a/layers/+source-control/version-control/packages.el +++ b/layers/+source-control/version-control/packages.el @@ -135,8 +135,7 @@ (progn (spacemacs|do-after-display-system-init (setq diff-hl-side (if (eq version-control-diff-side 'left) - 'left 'right)) - (diff-hl-margin-mode -1))))) + 'left 'right)))))) (defun version-control/post-init-evil-unimpaired () (define-key evil-normal-state-map (kbd "[ h") 'spacemacs/vcs-previous-hunk)