1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
To: vim_dev@googlegroups.com
Subject: Patch 8.1.0858
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 8.1.0858
Problem: 'indentkeys' and 'cinkeys' defaults are different.
Solution: Make them the same, update docs. (close #3882)
Files: src/option.c, runtime/doc/options.txt, runtime/doc/indent.txt
*** ../vim-8.1.0857/src/option.c 2019-01-26 17:28:22.232599086 +0100
--- src/option.c 2019-01-31 13:54:40.403784083 +0100
***************
*** 483,488 ****
--- 483,491 ----
# define DEFAULT_PYTHON_VER 0
#endif
+ // used for 'cinkeys' and 'indentkeys'
+ #define INDENTKEYS_DEFAULT (char_u *)"0{,0},0),0],:,0#,!^F,o,O,e"
+
/*
* options[] is initialized here.
* The order of the options MUST be alphabetic for ":set all" and findoption().
***************
*** 757,763 ****
{"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
#ifdef FEAT_CINDENT
(char_u *)&p_cink, PV_CINK,
! {(char_u *)"0{,0},0),:,0#,!^F,o,O,e", (char_u *)0L}
#else
(char_u *)NULL, PV_NONE,
{(char_u *)0L, (char_u *)0L}
--- 760,766 ----
{"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
#ifdef FEAT_CINDENT
(char_u *)&p_cink, PV_CINK,
! {INDENTKEYS_DEFAULT, (char_u *)0L}
#else
(char_u *)NULL, PV_NONE,
{(char_u *)0L, (char_u *)0L}
***************
*** 1570,1576 ****
{"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
#if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
(char_u *)&p_indk, PV_INDK,
! {(char_u *)"0{,0},:,0#,!^F,o,O,e", (char_u *)0L}
#else
(char_u *)NULL, PV_NONE,
{(char_u *)0L, (char_u *)0L}
--- 1573,1579 ----
{"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
#if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
(char_u *)&p_indk, PV_INDK,
! {INDENTKEYS_DEFAULT, (char_u *)0L}
#else
(char_u *)NULL, PV_NONE,
{(char_u *)0L, (char_u *)0L}
*** ../vim-8.1.0857/runtime/doc/options.txt 2019-01-16 22:41:50.091917818 +0100
--- runtime/doc/options.txt 2019-01-31 13:56:21.531061679 +0100
***************
*** 1560,1566 ****
NOTE: This option is reset when 'compatible' is set.
*'cinkeys'* *'cink'*
! 'cinkeys' 'cink' string (default "0{,0},0),:,0#,!^F,o,O,e")
local to buffer
{not in Vi}
{not available when compiled without the |+cindent|
--- 1564,1570 ----
NOTE: This option is reset when 'compatible' is set.
*'cinkeys'* *'cink'*
! 'cinkeys' 'cink' string (default "0{,0},0),0],:,0#,!^F,o,O,e")
local to buffer
{not in Vi}
{not available when compiled without the |+cindent|
***************
*** 4567,4573 ****
*'indentkeys'* *'indk'*
! 'indentkeys' 'indk' string (default "0{,0},:,0#,!^F,o,O,e")
local to buffer
{not in Vi}
{not available when compiled without the |+cindent|
--- 4607,4613 ----
*'indentkeys'* *'indk'*
! 'indentkeys' 'indk' string (default "0{,0},0),0],:,0#,!^F,o,O,e")
local to buffer
{not in Vi}
{not available when compiled without the |+cindent|
*** ../vim-8.1.0857/runtime/doc/indent.txt 2018-05-17 13:41:41.000000000 +0200
--- runtime/doc/indent.txt 2019-01-31 13:57:05.406749188 +0100
***************
*** 60,71 ****
only triggers C-indenting. When 'indentexpr' is not empty 'indentkeys' is
used instead. The format of 'cinkeys' and 'indentkeys' is equal.
! The default is "0{,0},0),:,0#,!^F,o,O,e" which specifies that indenting occurs
! as follows:
"0{" if you type '{' as the first character in a line
"0}" if you type '}' as the first character in a line
"0)" if you type ')' as the first character in a line
":" if you type ':' after a label or case statement
"0#" if you type '#' as the first character in a line
"!^F" if you type CTRL-F (which is not inserted)
--- 60,72 ----
only triggers C-indenting. When 'indentexpr' is not empty 'indentkeys' is
used instead. The format of 'cinkeys' and 'indentkeys' is equal.
! The default is "0{,0},0),0],:,0#,!^F,o,O,e" which specifies that indenting
! occurs as follows:
"0{" if you type '{' as the first character in a line
"0}" if you type '}' as the first character in a line
"0)" if you type ')' as the first character in a line
+ "0]" if you type ']' as the first character in a line
":" if you type ':' after a label or case statement
"0#" if you type '#' as the first character in a line
"!^F" if you type CTRL-F (which is not inserted)
*** ../vim-8.1.0857/src/version.c 2019-01-31 13:47:51.126632619 +0100
--- src/version.c 2019-01-31 13:57:24.010616842 +0100
***************
*** 785,786 ****
--- 785,788 ----
{ /* Add new patch number below this line */
+ /**/
+ 858,
/**/
--
There are three kinds of people: Those who can count & those who can't.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
