Skip to content

Commit 0537cf2

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 7722623 + b5e7da1 commit 0537cf2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1576
-720
lines changed

.github/workflows/ci-macvim.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,15 +361,15 @@ jobs:
361361
make ${MAKE_BUILD_ARGS} -j${NPROC} -C src unittesttargets
362362
363363
- name: Test Vim
364-
timeout-minutes: 20
364+
timeout-minutes: 25
365365
run: make ${MAKE_BUILD_ARGS} test
366366

367367
- name: Upload failed test files
368368
if: ${{ !cancelled() && failure() }}
369369
uses: ./.github/actions/screendump
370370

371371
- name: Test Vim (GUI)
372-
timeout-minutes: 20
372+
timeout-minutes: 25
373373
run: |
374374
make ${MAKE_BUILD_ARGS} -C src/testdir clean
375375
make ${MAKE_BUILD_ARGS} -C src testgui

runtime/autoload/netrw.vim

Lines changed: 167 additions & 245 deletions
Large diffs are not rendered by default.

runtime/defaults.vim

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,11 @@ if 1
115115
\ | execute "normal! g`\""
116116
\ | endif
117117

118+
" Set the default background for putty to dark. Putty usually sets the
119+
" $TERM to xterm and by default it starts with a dark background which
120+
" makes syntax highlighting often hard to read with bg=light
121+
" undo this using: ":au! vimStartup TermResponse"
122+
autocmd TermResponse * if v:termresponse == "\e[>0;136;0c" | set bg=dark | endif
118123
augroup END
119124

120125
" Quite a few people accidentally type "q:" instead of ":q" and get confused

runtime/doc/autocmd.txt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*autocmd.txt* For Vim version 9.1. Last change: 2024 Aug 18
1+
*autocmd.txt* For Vim version 9.1. Last change: 2024 Oct 27
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1262,10 +1262,19 @@ TerminalWinOpen Just after a terminal buffer was created, with
12621262
TermResponse After the response to |t_RV| is received from
12631263
the terminal. The value of |v:termresponse|
12641264
can be used to do things depending on the
1265-
terminal version. Note that this event may be
1266-
triggered halfway executing another event,
1267-
especially if file I/O, a shell command or
1268-
anything else that takes time is involved.
1265+
terminal version.
1266+
This is used in |defaults.vim| to detect
1267+
putty terminal and set a dark background: >
1268+
1269+
au TermResponse *
1270+
\ if v:termresponse == "\e[>0;136;0c"
1271+
\ set bg=dark
1272+
\ endif
1273+
<
1274+
Note: that this event may be triggered halfway
1275+
executing another event, especially if file
1276+
I/O, a shell command or anything else that
1277+
takes time is involved.
12691278
*TermResponseAll*
12701279
TermResponseAll After the response to |t_RV|, |t_RC|, |t_RS|,
12711280
|t_RB|, |t_RF|, or |t_u7| are received from

runtime/doc/builtin.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*builtin.txt* For Vim version 9.1. Last change: 2024 Oct 16
1+
*builtin.txt* For Vim version 9.1. Last change: 2024 Nov 01
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1627,7 +1627,7 @@ charclass({string}) *charclass()*
16271627
The character class is one of:
16281628
0 blank
16291629
1 punctuation
1630-
2 word character
1630+
2 word character (depends on 'iskeyword')
16311631
3 emoji
16321632
other specific Unicode class
16331633
The class is used in patterns and word motions.
@@ -4838,7 +4838,7 @@ getregion({pos1}, {pos2} [, {opts}]) *getregion()*
48384838
<
48394839
Return type: list<string>
48404840

4841-
<
4841+
48424842
getregionpos({pos1}, {pos2} [, {opts}]) *getregionpos()*
48434843
Same as |getregion()|, but returns a list of positions
48444844
describing the buffer text segments bound by {pos1} and
@@ -4895,6 +4895,7 @@ getregtype([{regname}]) *getregtype()*
48954895
<
48964896
Return type: |String|
48974897

4898+
48984899
getscriptinfo([{opts}]) *getscriptinfo()*
48994900
Returns a |List| with information about all the sourced Vim
49004901
scripts in the order they were sourced, like what

0 commit comments

Comments
 (0)