Merge branch 'release/0.1.2'

5 files changed, 19 insertions, 14 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a7e619..c3a42aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 ---
 
+# 0.1.2 (2017-01-01)
+## Bug Fixes
+Fixed a bug where the `g:colors_name` variable has been unset caused by the `syntax reset` call due to the execution
+order. (@shuei72, #5, f8ffce24)
+
 # 0.1.1 (2016-12-26)
 ## Bug Fixes
 Fixed wrong color variables (`*_term` to `*_gui`) for the `guisp` attribute of all `Spell*` highlighting groups which caused error logs while loading `vim`/`gvim`/MacVim. (@kamwitsta, #4, 4d642b9b)
diff --git a/README.md b/README.md
index 91ae945..c8153af 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,9 @@ Based on the <a href="https://github.com/arcticicestudio/nord">Nord</a> color pa
 
 ---
 
-<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-javascript.png"/><br><blockquote>Font: <a href="https://adobe-fonts.github.io/source-code-pro">Source Code Pro</a> 20px</blockquote></p>
+Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with support for many third-party plugins and styles for [lightline.vim](https://github.com/itchyny/lightline.vim) and  [vim-airline](https://github.com/vim-airline/vim-airline).
 
-Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with support for many third-party plugins and styles for [`lightline.vim`](https://github.com/itchyny/lightline.vim) and  [`vim-airline`](https://github.com/vim-airline/vim-airline).
+<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-javascript.png"/><br><blockquote>Font: <a href="https://adobe-fonts.github.io/source-code-pro">Source Code Pro</a> 20px</blockquote></p>
 
 ## Getting started
 ### Installation
@@ -46,7 +46,7 @@ Plug 'arcticicestudio/nord-vim', { 'branch': 'develop' }
 
 A specific version can be installed via git tags.  
 ```sh
-Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.1.1' }
+Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.1.2' }
 ```
 
 Of course it can be installed with any of your favorite tools:  
@@ -118,7 +118,7 @@ Detailed descriptions for supported languages can be found in the [project wiki]
 ![][scrot-lang-ruby]
 
 ## Development
-[![](https://img.shields.io/badge/Changelog-0.1.1-blue.svg)](https://github.com/arcticicestudio/nord-vim/blob/v0.1.1/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-blue.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-blue.svg)](https://github.com/arcticicestudio/arcver)
+[![](https://img.shields.io/badge/Changelog-0.1.2-blue.svg)](https://github.com/arcticicestudio/nord-vim/blob/v0.1.2/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-blue.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-blue.svg)](https://github.com/arcticicestudio/arcver)
 
 ### Contribution
 Please report issues/bugs, feature requests and suggestions for improvements to the [issue tracker](https://github.com/arcticicestudio/nord-vim/issues).
diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim
index c028abc..b579101 100755
--- a/autoload/airline/themes/nord.vim
+++ b/autoload/airline/themes/nord.vim
@@ -6,7 +6,7 @@
 " email      development@arcticicestudio.com             +
 " copyright  Copyright (C) 2016                          +
 " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-let s:nord_vim_version="0.1.1"
+let s:nord_vim_version="0.1.2"
 let g:airline#themes#nord#palette = {}
 
 let s:nord0_gui = "#2E3440"
diff --git a/autoload/lightline/colorscheme/nord.vim b/autoload/lightline/colorscheme/nord.vim
index 9d62541..df35ca4 100755
--- a/autoload/lightline/colorscheme/nord.vim
+++ b/autoload/lightline/colorscheme/nord.vim
@@ -6,7 +6,7 @@
 " email      development@arcticicestudio.com             +
 " copyright  Copyright (C) 2016                          +
 " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-let s:nord_vim_version="0.1.1"
+let s:nord_vim_version="0.1.2"
 let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
 
 let s:nord0 = ["#2E3440", "NONE"]
diff --git a/colors/nord.vim b/colors/nord.vim
index 407d512..2e53fa8 100755
--- a/colors/nord.vim
+++ b/colors/nord.vim
@@ -6,8 +6,15 @@
 " email      development@arcticicestudio.com             +
 " copyright  Copyright (C) 2016                          +
 " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+if version > 580
+  hi clear
+  if exists("syntax_on")
+    syntax reset
+  endif
+endif
+
 let g:colors_name = "nord"
-let s:nord_vim_version="0.1.1"
+let s:nord_vim_version="0.1.2"
 set background=dark
 
 let s:nord0_gui = "#2E3440"
@@ -41,13 +48,6 @@ let s:nord13_term = "3"
 let s:nord14_term = "2"
 let s:nord15_term = "5"
 
-if version > 580
-  hi clear
-  if exists("syntax_on")
-    syntax reset
-  endif
-endif
-
 function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if a:guifg != ""
     exec "hi " . a:group . " guifg=" . a:guifg