diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 12580eae21..0f81f4d6b9 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 9.1. Last change: 2025 Oct 16 +*eval.txt* For Vim version 9.1. Last change: 2025 Oct 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5356,30 +5356,30 @@ OSC52 command: >vim func Available() return "*" endfunc - + func Paste(reg, type) " If implicit access, don't do anything if a:type == "implicit" return "previous" endif - + augroup OSC autocmd! autocmd TermResponseAll osc ++once call feedkeys("\", '!') augroup END - + " Send command call echoraw("\]52;;?\\\") - + " Wait until autocmd is triggered while getchar(-1) != "\" endwhile - + autocmd! OSC - + " Extract the base64 stuff let l:stuff = matchstr(v:termosc, '52;.\+;\zs[A-Za-z0-9+/=]\+') - + return ("", blob2str(base64_decode(l:stuff))) endfunc diff --git a/src/testdir/test_codestyle.vim b/src/testdir/test_codestyle.vim index ea12b6c66d..46f839c069 100644 --- a/src/testdir/test_codestyle.vim +++ b/src/testdir/test_codestyle.vim @@ -137,7 +137,7 @@ def Test_help_files() # Check for unnecessary whitespace at the end of a line cursor(1, 1) while 1 - lnum = search('[^/~\\]\s$') + lnum = search('\%([^/~\\]\|^\)\s\+$') # skip line that are known to have trailing white space if fname == 'map.txt' && getline(lnum) =~ "unmap @@ $" || fname == 'usr_12.txt' && getline(lnum) =~ "^\t/ \t$" diff --git a/src/version.c b/src/version.c index 268d1fc613..2ef00ab81d 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1865, /**/ 1864, /**/