From b5f7107a3515efd10e1098cc97152f17a379dfef Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro@gmail.com>
Date: Sun, 7 Apr 2013 12:09:23 +0200
Subject: [PATCH] fix handling of sign text options

These options weren't used properly, because the s:line_* functions were
overwriting the sign texts. Now we initialize them only once at plugin
start.

Added Otto Modinos as contributor. Thanks for reporting.

Closes pull request #19.
---
 doc/signify.txt    |  1 +
 plugin/signify.vim | 65 ++++++++++++++--------------------------------
 2 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/doc/signify.txt b/doc/signify.txt
index f7c6e9f..1876e50 100644
--- a/doc/signify.txt
+++ b/doc/signify.txt
@@ -274,6 +274,7 @@ Martin Hoch       (rtwo)
 fritzophrenic     (fritzophrenic)
 Morgan Fouesneau  (mfouesneau)
 Zhao Cai          (zhaocai)
+Otto Modinos      (otommod)
 
 
 ==============================================================================
diff --git a/plugin/signify.vim b/plugin/signify.vim
index 0747746..c0a8847 100644
--- a/plugin/signify.vim
+++ b/plugin/signify.vim
@@ -19,6 +19,16 @@ let s:vcs_list       = get(g:, 'signify_vcs_list', [ 'git', 'hg', 'svn', 'darcs'
 let s:id_start = 0x100
 let s:id_top   = s:id_start
 
+let s:line_color_add    = get(g:, 'signify_line_color_add',    'DiffAdd')
+let s:line_color_delete = get(g:, 'signify_line_color_delete', 'DiffDelete')
+let s:line_color_change = get(g:, 'signify_line_color_change', 'DiffChange')
+
+let s:sign_add               = get(g:, 'signify_sign_add',               '+')
+let s:sign_delete            = get(g:, 'signify_sign_delete',            '_')
+let s:sign_delete_first_line = get(g:, 'signify_sign_delete_first_line', '‾')
+let s:sign_change            = get(g:, 'signify_sign_change',            '!')
+let s:sign_change_delete     = get(g:, 'signify_sign_change_delete',     '!_')
+
 if has('win32')
   if $VIMRUNTIME =~ ' '
     let s:difftool = (&sh =~ '\<cmd') ? ('"'. $VIMRUNTIME .'\diff"') : (substitute($VIMRUNTIME, ' ', '" ', '') .'\diff"')
@@ -33,37 +43,6 @@ else
   let s:difftool = 'diff'
 endif
 
-" Init: signs {{{1
-if exists('g:signify_sign_add')
-  execute 'sign define SignifyAdd text='. g:signify_sign_add .' texthl=SignifyAdd linehl=none'
-else
-  sign define SignifyAdd text=+ texthl=SignifyAdd linehl=none
-endif
-
-if exists('g:signify_sign_delete')
-  execute 'sign define SignifyDelete text='. g:signify_sign_delete .' texthl=SignifyDelete linehl=none'
-else
-  sign define SignifyDelete text=_ texthl=SignifyDelete linehl=none
-endif
-
-if exists('g:signify_sign_delete_first_line')
-  execute 'sign define SignifyDeleteFirstLine text='. g:signify_sign_delete_first_line .' texthl=SignifyDeleteFirstLine linehl=none'
-else
-  sign define SignifyDeleteFirstLine text=‾ texthl=SignifyDelete linehl=none
-endif
-
-if exists('g:signify_sign_change')
-  execute 'sign define SignifyChange text='. g:signify_sign_change .' texthl=SignifyChange linehl=none'
-else
-  sign define SignifyChange text=! texthl=SignifyChange linehl=none
-endif
-
-if exists('g:signify_sign_change_delete')
-  execute 'sign define SignifyChangeDelete text='. g:signify_sign_change_delete .' texthl=SignifyChange linehl=none'
-else
-  sign define SignifyChangeDelete text=!_ texthl=SignifyChange linehl=none
-endif
-
 sign define SignifyPlaceholder text=. texthl=SignifyChange linehl=none
 
 " Init: autocmds {{{1
@@ -476,26 +455,22 @@ endfunction
 
 " Function: s:line_highlighting_enable {{{1
 function! s:line_highlighting_enable() abort
-  let add    = get(g:, 'signify_line_color_add',    'DiffAdd')
-  let delete = get(g:, 'signify_line_color_delete', 'DiffDelete')
-  let change = get(g:, 'signify_line_color_change', 'DiffChange')
-
-  execute 'sign define SignifyAdd             text=+  texthl=SignifyAdd    linehl='. add
-  execute 'sign define SignifyChange          text=!  texthl=SignifyChange linehl='. change
-  execute 'sign define SignifyChangeDelete    text=!_ texthl=SignifyChange linehl='. change
-  execute 'sign define SignifyDelete          text=_  texthl=SignifyDelete linehl='. delete
-  execute 'sign define SignifyDeleteFirstLine text=‾  texthl=SignifyDelete linehl='. delete
+  execute 'sign define SignifyAdd text='. s:sign_add .' texthl=SignifyAdd linehl='. s:line_color_add
+  execute 'sign define SignifyChange text='. s:sign_change .' texthl=SignifyChange linehl='. s:line_color_change
+  execute 'sign define SignifyChangeDelete text='. s:sign_delete .' texthl=SignifyChange linehl='. s:line_color_change
+  execute 'sign define SignifyDelete text='. s:sign_delete .' texthl=SignifyDelete linehl='. s:line_color_delete
+  execute 'sign define SignifyDeleteFirstLine text='. s:sign_delete_first_line .' texthl=SignifyDelete linehl='. s:line_color_delete
 
   let s:line_highlight = 1
 endfunction
 
 " Function: s:line_highlighting_disable {{{1
 function! s:line_highlighting_disable() abort
-  sign define SignifyAdd             text=+  texthl=SignifyAdd    linehl=none
-  sign define SignifyChange          text=!  texthl=SignifyChange linehl=none
-  sign define SignifyChangeDelete    text=!_ texthl=SignifyChange linehl=none
-  sign define SignifyDelete          text=_  texthl=SignifyDelete linehl=none
-  sign define SignifyDeleteFirstLine text=‾  texthl=SignifyDelete linehl=none
+  execute 'sign define SignifyAdd text='. s:sign_add .' texthl=SignifyAdd linehl=none'
+  execute 'sign define SignifyChange text='. s:sign_change .' texthl=SignifyChange linehl=none'
+  execute 'sign define SignifyChangeDelete text='. s:sign_delete .' texthl=SignifyChange linehl=none'
+  execute 'sign define SignifyDelete text='. s:sign_delete .' texthl=SignifyDelete linehl=none'
+  execute 'sign define SignifyDeleteFirstLine text='. s:sign_delete_first_line .' texthl=SignifyDelete linehl=none'
 
   let s:line_highlight = 0
 endfunction