From e15da7ed54cb166222297f04e9aceeb5dd868bb8 Mon Sep 17 00:00:00 2001
From: Wang Shidong <wsdjeg@outlook.com>
Date: Sat, 16 Nov 2019 12:59:40 +0800
Subject: [PATCH] Use textwidth instead of 80 (#3226)

---
 .SpaceVim.d/autoload/SpaceVim/dev/releases.vim | 10 +++++-----
 README.cn.md                                   |  2 +-
 autoload/SpaceVim/layers/ui.vim                |  3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.SpaceVim.d/autoload/SpaceVim/dev/releases.vim b/.SpaceVim.d/autoload/SpaceVim/dev/releases.vim
index 4ac988fa5..0fe3f0652 100644
--- a/.SpaceVim.d/autoload/SpaceVim/dev/releases.vim
+++ b/.SpaceVim.d/autoload/SpaceVim/dev/releases.vim
@@ -20,13 +20,13 @@ scriptencoding utf-8
 
 " 这是所有 ID 小于上一次 release ID，并且还未被合并的 ID，在新的release
 " 之后，需要把已经合并了的删除！
-let s:unmerged_prs_since_last_release = [2014, 2218, 2232, 2242, 2307,
-      \ 2390, 2396, 2407, 2446, 2447, 2541, 2627, 2655, 2664,
-      \ 2732,]
+let s:unmerged_prs_since_last_release = [2014, 2232, 2242, 2307,
+      \ 2390, 2396, 2407, 2447, 2627, 2655, 2664,
+      \ ]
 " these options can be changed when going to release new tag
-let s:last_release_number = 2947
+let s:last_release_number = 3213
 " 当要新建一个 release 时，修改为该release 的ID，通常为 -1。
-let s:current_release_number = 3213
+let s:current_release_number = -1
 " this is a list of pull request number which > last_release_number and <
 " current_release_number
 " next time when I release v1.1.0, only need to update following option
diff --git a/README.cn.md b/README.cn.md
index 22a4755af..b0a668235 100644
--- a/README.cn.md
+++ b/README.cn.md
@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.org/SpaceVim/SpaceVim.svg?branch=dev)](https://travis-ci.org/SpaceVim/SpaceVim)
 [![Build status](https://ci.appveyor.com/api/projects/status/eh3t5oph70abp665/branch/dev?svg=true)](https://ci.appveyor.com/project/wsdjeg/spacevim/branch/master)
 [![codecov](https://codecov.io/gh/SpaceVim/SpaceVim/branch/dev/graph/badge.svg)](https://codecov.io/gh/SpaceVim/SpaceVim/branch/master)
-[![Version](https://img.shields.io/badge/version-1.2.0-8700FF.svg)](https://github.com/SpaceVim/SpaceVim/releases)
+[![Version](https://img.shields.io/badge/version-1.4.0--dev-8700FF.svg)](https://github.com/SpaceVim/SpaceVim/releases)
 [![GPLv3 License](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://github.com/SpaceVim/SpaceVim/blob/master/LICENSE)
 
 SpaceVim 是一个社区驱动的模块化 Vim/Neovim 配置集合，以模块的方式组织管理插件以
diff --git a/autoload/SpaceVim/layers/ui.vim b/autoload/SpaceVim/layers/ui.vim
index ffe59f599..e6bde3e50 100644
--- a/autoload/SpaceVim/layers/ui.vim
+++ b/autoload/SpaceVim/layers/ui.vim
@@ -188,9 +188,10 @@ function! s:toggle_colorcolumn() abort
 endfunction
 
 let s:fcflag = 0
+" use &textwidth option instead of 80
 function! s:toggle_fill_column() abort
   if !s:fcflag
-    let &colorcolumn=join(range(80,999),',')
+    let &colorcolumn=join(range(&textwidth + 1,999),',')
     let s:fcflag = 1
   else
     set cc=