Skip to content

Commit 6862b34

Browse files
authored
Merge pull request #2373 from h-east/update-indent
Update indent.{txt,jax}
2 parents 02874aa + a9dce5a commit 6862b34

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

doc/indent.jax

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*indent.txt* For Vim バージョン 9.1. Last change: 2024 Dec 16
1+
*indent.txt* For Vim バージョン 9.1. Last change: 2025 Oct 14
22

33

44
VIMリファレンスマニュアル by Bram Moolenaar

en/indent.txt

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*indent.txt* For Vim version 9.1. Last change: 2024 Dec 16
1+
*indent.txt* For Vim version 9.1. Last change: 2025 Oct 14
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -44,7 +44,8 @@ These five options control C program indenting:
4444
'cinkeys' Specifies which keys trigger reindenting in insert mode.
4545
'cinoptions' Sets your preferred indent style.
4646
'cinwords' Defines keywords that start an extra indent in the next line.
47-
'cinscopedecls' Defines strings that are recognized as a C++ scope declaration.
47+
'cinscopedecls' Defines strings that are recognized as a C++ scope
48+
declaration.
4849

4950
If 'lisp' is not on and 'equalprg' is empty, the "=" operator indents using
5051
Vim's built-in algorithm rather than calling an external program.
@@ -229,8 +230,8 @@ The examples below assume a 'shiftwidth' of 4.
229230
} } }
230231
<
231232
*cino-L*
232-
LN Controls placement of jump labels. If N is negative, the label
233-
will be placed at column 1. If N is non-negative, the indent of
233+
LN Controls placement of jump labels. If N is negative, the label
234+
will be placed at column 1. If N is non-negative, the indent of
234235
the label will be the prevailing indent minus N. (default -1).
235236

236237
cino= cino=L2 cino=Ls >
@@ -291,8 +292,8 @@ The examples below assume a 'shiftwidth' of 4.
291292
<
292293
*cino-g*
293294
gN Place C++ scope declarations N characters from the indent of the
294-
block they are in. (default 'shiftwidth'). By default, a scope
295-
declaration is "public:", "protected:" or "private:". This can
295+
block they are in. (default 'shiftwidth'). By default, a scope
296+
declaration is "public:", "protected:" or "private:". This can
296297
be adjusted with the 'cinscopedecls' option.
297298

298299
cino= cino=g0 >
@@ -714,14 +715,13 @@ FORTRAN *ft-fortran-indent*
714715

715716
Block if, select case, select type, select rank, where, forall, type,
716717
interface, associate, block, enum, critical, and change team constructs are
717-
indented. The indenting of subroutines, functions, modules, and program blocks
718-
is optional. Comments, labeled statements, and continuation lines are indented
719-
if the Fortran is in free source form, whereas they are not indented if the
720-
Fortran is in fixed source form because of the left margin requirements. Hence
721-
manual indent corrections will be necessary for labeled statements and
722-
continuation lines when fixed source form is being used. For further
723-
discussion of the method used for the detection of source format see
724-
|ft-fortran-syntax|.
718+
indented. The indenting of subroutines, functions, modules, and program
719+
blocks is optional. Comments, labeled statements, and continuation lines are
720+
indented in free source form, whereas they are not indented in fixed source
721+
form because of the left margin requirements. Hence manual indent corrections
722+
will be necessary for labeled statements and continuation lines when fixed
723+
source form is being used. For further discussion of the method used for the
724+
detection of source format see |ft-fortran-syntax|.
725725

726726
Do loops ~
727727
All do loops are left unindented by default. Do loops can be unstructured in
@@ -819,19 +819,19 @@ Idris 2 indentation can be configured with several variables that control the
819819
indentation level for different language constructs:
820820

821821
The "g:idris2_indent_if" variable controls the indentation of `then` and `else`
822-
blocks after `if` statements. Defaults to 3.
822+
blocks after `if` statements. Defaults to 3.
823823

824824
The "g:idris2_indent_case" variable controls the indentation of patterns in
825-
`case` expressions. Defaults to 5.
825+
`case` expressions. Defaults to 5.
826826

827827
The "g:idris2_indent_let" variable controls the indentation after `let`
828-
bindings. Defaults to 4.
828+
bindings. Defaults to 4.
829829

830830
The "g:idris2_indent_rewrite" variable controls the indentation after `rewrite`
831-
expressions. Defaults to 8.
831+
expressions. Defaults to 8.
832832

833833
The "g:idris2_indent_where" variable controls the indentation of `where`
834-
blocks. Defaults to 6.
834+
blocks. Defaults to 6.
835835

836836
The "g:idris2_indent_do" variable controls the indentation in `do` blocks.
837837
Defaults to 3.
@@ -951,7 +951,7 @@ To indent 'case:' and 'default:' statements in switch() blocks: >
951951
952952
In PHP braces are not required inside 'case/default' blocks therefore 'case:'
953953
and 'default:' are indented at the same level than the 'switch()' to avoid
954-
meaningless indentation. You can use the above option to return to the
954+
meaningless indentation. You can use the above option to return to the
955955
traditional way.
956956
-------------
957957

@@ -978,7 +978,7 @@ You will obtain the following result: >
978978
Extra indentation levels to add to parameters in multi-line function calls. >
979979
let g:PHP_IndentFunctionCallParameters = 1
980980
981-
Function call arguments will indent 1 extra level. For two-space indentation: >
981+
Function call arguments will indent 1 extra level. For two-space indentation: >
982982
983983
function call_the_thing(
984984
$with_this,
@@ -997,7 +997,7 @@ Extra indentation levels to add to arguments in multi-line function
997997
definitions. >
998998
let g:PHP_IndentFunctionDeclarationParameters = 1
999999
1000-
Function arguments in declarations will indent 1 extra level. For two-space
1000+
Function arguments in declarations will indent 1 extra level. For two-space
10011001
indentation: >
10021002
10031003
function call_the_thing(
@@ -1027,8 +1027,8 @@ Indent after a nested paren: >
10271027
Indent for a continuation line: >
10281028
let g:python_indent.continue = 'shiftwidth() * 2'
10291029
1030-
By default, the closing paren on a multiline construct lines up under the first
1031-
non-whitespace character of the previous line.
1030+
By default, the closing paren on a multiline construct lines up under the
1031+
first non-whitespace character of the previous line.
10321032
If you prefer that it's lined up under the first character of the line that
10331033
starts the multiline construct, reset this key: >
10341034
let g:python_indent.closed_paren_align_last_line = v:false
@@ -1053,15 +1053,15 @@ For backward compatibility, these variables are also supported: >
10531053
10541054
R *ft-r-indent*
10551055

1056-
Function arguments are aligned if they span for multiple lines. If you prefer
1056+
Function arguments are aligned if they span for multiple lines. If you prefer
10571057
do not have the arguments of functions aligned, put in your |vimrc|:
10581058
>
10591059
let r_indent_align_args = 0
10601060
<
10611061
All lines beginning with a comment character, #, get the same indentation
1062-
level of the normal R code. Users of Emacs/ESS may be used to have lines
1062+
level of the normal R code. Users of Emacs/ESS may be used to have lines
10631063
beginning with a single # indented in the 40th column, ## indented as R code,
1064-
and ### not indented. If you prefer that lines beginning with comment
1064+
and ### not indented. If you prefer that lines beginning with comment
10651065
characters are aligned as they are by Emacs/ESS, put in your |vimrc|:
10661066
>
10671067
let r_indent_ess_comments = 1
@@ -1072,8 +1072,8 @@ r_indent_comment_column, as in the example below:
10721072
>
10731073
let r_indent_comment_column = 30
10741074
<
1075-
Any code after a line that ends with "<-" is indented. Emacs/ESS does not
1076-
indent the code if it is a top-level function. If you prefer a behavior like
1075+
Any code after a line that ends with "<-" is indented. Emacs/ESS does not
1076+
indent the code if it is a top-level function. If you prefer a behavior like
10771077
Emacs/ESS one in this regard, put in your |vimrc|:
10781078
>
10791079
let r_indent_ess_compatible = 1
@@ -1088,7 +1088,7 @@ Below is an example of indentation with and without this option enabled:
10881088
} }
10891089
<
10901090
The code will be indented after lines that match the pattern
1091-
`'\(&\||\|+\|-\|\*\|/\|=\|\~\|%\|->\)\s*$'`. If you want indentation after
1091+
`'\(&\||\|+\|-\|\*\|/\|=\|\~\|%\|->\)\s*$'`. If you want indentation after
10921092
lines that match a different pattern, you should set the appropriate value of
10931093
`r_indent_op_pattern` in your |vimrc|.
10941094

@@ -1153,7 +1153,7 @@ Make sure to do ":set cmdheight=2" first to allow the display of the message.
11531153

11541154
VHDL *ft-vhdl-indent*
11551155

1156-
Alignment of generic/port mapping statements are performed by default. This
1156+
Alignment of generic/port mapping statements are performed by default. This
11571157
causes the following alignment example: >
11581158
11591159
ENTITY sync IS
@@ -1183,7 +1183,7 @@ to the .vimrc file, which causes the previous alignment example to change: >
11831183
----------------------------------------
11841184

11851185
Alignment of right-hand side assignment "<=" statements are performed by
1186-
default. This causes the following alignment example: >
1186+
default. This causes the following alignment example: >
11871187
11881188
sig_out <= (bus_a(1) AND
11891189
(sig_b OR sig_c)) OR
@@ -1201,9 +1201,9 @@ to the .vimrc file, which causes the previous alignment example to change: >
12011201
12021202
----------------------------------------
12031203

1204-
Full-line comments (lines that begin with "--") are indented to be aligned with
1205-
the very previous line's comment, PROVIDED that a whitespace follows after
1206-
"--".
1204+
Full-line comments (lines that begin with "--") are indented to be aligned
1205+
with the very previous line's comment, PROVIDED that a whitespace follows
1206+
after "--".
12071207

12081208
For example: >
12091209
@@ -1255,9 +1255,9 @@ results in: >
12551255
Notice that "--debug_code:" does not align with "-- comment 2"
12561256
because there is no whitespace that follows after "--" in "--debug_code:".
12571257

1258-
Given the dynamic nature of indenting comments, indenting should be done TWICE.
1259-
On the first pass, code will be indented. On the second pass, full-line
1260-
comments will be indented according to the correctly indented code.
1258+
Given the dynamic nature of indenting comments, indenting should be done
1259+
TWICE. On the first pass, code will be indented. On the second pass,
1260+
full-line comments will be indented according to the correctly indented code.
12611261

12621262

12631263
VIM *ft-vim-indent*

0 commit comments

Comments
 (0)