diff options
| -rw-r--r-- | runtime/doc/vim_diff.txt | 1 | ||||
| -rw-r--r-- | scripts/genvimvim.lua | 2 | ||||
| -rwxr-xr-x | scripts/git-log-pretty-since.sh | 2 | ||||
| -rwxr-xr-x | scripts/release.sh | 5 |
4 files changed, 7 insertions, 3 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 8ed8a7f64c..dd4dbc1272 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -111,6 +111,7 @@ Events: Highlight groups: |hl-EndOfBuffer| + |hl-QuickFixLine| |hl-TermCursor| |hl-TermCursorNC| diff --git a/scripts/genvimvim.lua b/scripts/genvimvim.lua index 2a82181841..667af7be6c 100644 --- a/scripts/genvimvim.lua +++ b/scripts/genvimvim.lua @@ -1,5 +1,5 @@ if arg[1] == '--help' then - print('Usage: genoptions.lua src/nvim runtime/syntax/vim/generated.vim') + print('Usage: lua genvimvim.lua src/nvim runtime/syntax/vim/generated.vim') os.exit(0) end diff --git a/scripts/git-log-pretty-since.sh b/scripts/git-log-pretty-since.sh index d8e3282fb3..6281127542 100755 --- a/scripts/git-log-pretty-since.sh +++ b/scripts/git-log-pretty-since.sh @@ -19,7 +19,7 @@ is_merge_commit() { git log $1^2 >/dev/null 2>&1 && return 0 || return 1 } -for commit in $(git log --format='%H' --first-parent --since $__SINCE); do +for commit in $(git log --format='%H' --first-parent "$__SINCE"..HEAD); do if is_merge_commit ${commit} ; then if [ -z "$__INVMATCH" ] || ! git log --oneline ${commit}^1..${commit}^2 \ | grep -E "$__INVMATCH" >/dev/null 2>&1 ; then diff --git a/scripts/release.sh b/scripts/release.sh index 41a246c041..9bd1b2b950 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -52,7 +52,10 @@ git commit --edit -m "${__RELEASE_MSG} ${__CHANGELOG}" git tag -a v"${__VERSION}" -m "NVIM v${__VERSION}" sed -i -r 's/(NVIM_VERSION_PRERELEASE) ""/\1 "-dev"/' CMakeLists.txt -nvim -c '/NVIM_VERSION' -c 'echo "Update version numbers"' CMakeLists.txt +sed -i -r 's/set\((NVIM_VERSION_PATCH) [[:digit:]]/set(\1 ?/' CMakeLists.txt +nvim +'/NVIM_VERSION' +10new +'exe "norm! iUpdate version numbers!!!\<CR>"' \ + +'norm! 10.' CMakeLists.txt + git add CMakeLists.txt git commit -m "$__BUMP_MSG" |