Merge branch 'prepare-for-1.6.0'

kana · Apr 10, 2015 · c0a1eef · c0a1eef
2 parents 6becfaa + fb5cafd
commit c0a1eef
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/after/indent/vim.vim b/after/indent/vim.vim
@@ -1,5 +1,5 @@
 " Vim additional indent settings: vim/vspec - indent vspec commands
-" Version: 1.5.0
+" Version: 1.6.0
 " Copyright (C) 2012-2015 Kana Natsuno <http://whileimautomaton.net/>
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining

diff --git a/after/syntax/vim/vspec.vim b/after/syntax/vim/vspec.vim
@@ -1,5 +1,5 @@
 " Vim additional syntax: vim/vspec - highlight vspec commands
-" Version: 1.5.0
+" Version: 1.6.0
 " Copyright (C) 2010-2015 Kana Natsuno <http://whileimautomaton.net/>
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining

diff --git a/autoload/vspec.vim b/autoload/vspec.vim
@@ -1,5 +1,5 @@
 " vspec - Testing framework for Vim script
-" Version: 1.5.0
+" Version: 1.6.0
 " Copyright (C) 2009-2015 Kana Natsuno <http://whileimautomaton.net/>
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining

diff --git a/bin/prove-vspec b/bin/prove-vspec
@@ -1,6 +1,6 @@
 #!/bin/bash
 # bin/prove-vspec - Utility to run many tests on Vim script at once
-# Version: 1.5.0
+# Version: 1.6.0
 # Copyright (C) 2015 Kana Natsuno <http://whileimautomaton.net/>
 # License: MIT license  {{{
 #     Permission is hereby granted, free of charge, to any person obtaining

diff --git a/bin/vspec b/bin/vspec
@@ -1,6 +1,6 @@
 #!/bin/bash
 # bin/vspec - Driver script to test Vim script
-# Version: 1.5.0
+# Version: 1.6.0
 # Copyright (C) 2009-2015 Kana Natsuno <http://whileimautomaton.net/>
 # License: MIT license  {{{
 #     Permission is hereby granted, free of charge, to any person obtaining

diff --git a/doc/vspec.txt b/doc/vspec.txt
@@ -1,6 +1,6 @@
 *vspec.txt*	Testing framework for Vim script
 
-Version 1.5.0
+Version 1.6.0
 Script ID: 3012
 Copyright (C) 2009-2015 Kana Natsuno <http://whileimautomaton.net/>
 License: MIT license  {{{
@@ -531,6 +531,15 @@ BUGS						*vspec-bugs*
 ==============================================================================
 CHANGELOG					*vspec-changelog*
 
+1.6.0	2015-04-10T23:45:09+09:00		*vspec-changelog-1.6.0*
+	- Revise syntax highlighting:
+	  - Support highlighting of "expr" in |:Expect|.
+	  - Fix to highlight "not" only if it is used in |:Expect|.
+	  - Fix |:Expect| arguments to be highlighted as expressions.
+	- Revise output of |:SKIP| and |:TODO|.
+	- Support also a double-quoted string for |:SKIP|.
+	- Tidy up the internal structure a bit.
+
 1.5.0	2015-03-27T23:29:59+09:00		*vspec-changelog-1.5.0*
 	- Revise |bin/vspec|:
 	  - Reduce the number of temporary file generations.