diff options
| author | Felipe Morales <hel.sheep@gmail.com> | 2015-05-16 02:23:16 -0300 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-05-21 01:28:20 -0400 |
| commit | eca51bbfa033f4956f5430fa15fa18c91a5fffef (patch) | |
| tree | c02a5b4cc498fea6034bf2af6c3d033ca5d9c121 | |
| parent | 1add7a422f12526a073a960a189bf8fe1e4d09e8 (diff) | |
| download | rneovim-eca51bbfa033f4956f5430fa15fa18c91a5fffef.tar.gz rneovim-eca51bbfa033f4956f5430fa15fa18c91a5fffef.tar.bz2 rneovim-eca51bbfa033f4956f5430fa15fa18c91a5fffef.zip | |
options: Include "j" in default 'formatoptions' #2669
| -rw-r--r-- | runtime/doc/change.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 1 | ||||
| -rw-r--r-- | src/nvim/option_defs.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 9a67361915..373431b481 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1450,9 +1450,8 @@ By default, "b:#" is included. This means that a line that starts with *fo-table* You can use the 'formatoptions' option to influence how Vim formats text. -'formatoptions' is a string that can contain any of the letters below. The -default setting is "tcq". You can separate the option letters with commas for -readability. +'formatoptions' is a string that can contain any of the letters below. You +can separate the option letters with commas for readability. letter meaning when present in 'formatoptions' ~ diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index deea6b50c9..bb58feb1d5 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2910,7 +2910,7 @@ A jump table for the options with a short description can be found at |Q_op|. evaluating 'foldtext' |textlock|. *'formatoptions'* *'fo'* -'formatoptions' 'fo' string (Vim default: "tcq", Vi default: "vt") +'formatoptions' 'fo' string (default: "tcqj", Vi default: "vt") local to buffer This is a sequence of letters which describes how automatic formatting is to be done. See |fo-table|. When the 'paste' option is diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index a10fff0b98..a14a6d5f4f 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -30,6 +30,7 @@ these differences. - 'backspace' defaults to "indent,eol,start" - 'encoding' defaults to "utf-8" +- 'formatoptions' defaults to "tcqj" - 'nocompatible' is always set - 'tags' defaults to "./tags;,tags" - 'ttyfast' is always set diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 70e3df0060..5e85b4bbea 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -79,7 +79,7 @@ #define FO_REMOVE_COMS 'j' /* remove comment leaders when joining lines */ #define DFLT_FO_VI "vt" -#define DFLT_FO_VIM "tcq" +#define DFLT_FO_VIM "tcqj" #define FO_ALL "tcroq2vlb1mMBn,awj" /* for do_set() */ /* characters for the p_cpo option: */ |