Merge remote-tracking branch 'upstream/master' into tabsidebar

runtime/autoload/netrw.vim

@@ -20,6 +20,7 @@
 "   2024 Jul 23 by Vim Project: escape filename before trying to delete it (#15330)
 "   2024 Jul 30 by Vim Project: handle mark-copy to same target directory (#12112)
 "   2024 Aug 02 by Vim Project: honor g:netrw_alt{o,v} for :{S,H,V}explore (#15417)
+"   2024 Aug 15 by Vim Project: style changes, prevent E121 (#15501)
 "   }}}
 " Former Maintainer:	Charles E Campbell
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
@@ -63,11 +64,6 @@ if exists("s:needspatches")
 endif
 
 let g:loaded_netrw = "v173"
-if !exists("s:NOTE")
- let s:NOTE    = 0
- let s:WARNING = 1
- let s:ERROR   = 2
-endif
 
 let s:keepcpo= &cpo
 setl cpo&vim
@@ -105,7 +101,7 @@ fun! netrw#ErrorMsg(level,msg,errnum)
   endif
 "  call Decho("level=".level,'~'.expand("<slnum>"))
 
-  if g:netrw_use_errorwindow == 2 && (v:version > 802 || (v:version == 802 && has("patch486")))
+  if g:netrw_use_errorwindow == 2 && exists("*popup_atcursor")
    " use popup window
    if type(a:msg) == 3
     let msg = [level]+a:msg
@@ -221,6 +217,11 @@ if !exists("s:LONGLIST")
  call s:NetrwInit("s:MAXLIST" ,4)
 endif
 
+let s:NOTE    = 0
+let s:WARNING = 1
+let s:ERROR   = 2
+call s:NetrwInit("g:netrw_errorlvl", s:NOTE)
+
 " ---------------------------------------------------------------------
 " Default option values: {{{2
 let g:netrw_localcopycmdopt    = ""
@@ -230,7 +231,10 @@ let g:netrw_localmovecmdopt    = ""
 
 " ---------------------------------------------------------------------
 " Default values for netrw's global protocol variables {{{2
-if (v:version > 802 || (v:version == 802 && has("patch486"))) && has("balloon_eval") && !exists("s:initbeval") && !exists("g:netrw_nobeval") && has("syntax") && exists("g:syntax_on") && has("mouse")
+if exists("*popup_atcursor")
+\   && has("syntax")
+\   && exists("g:syntax_on")
+\   && has("mouse")
   call s:NetrwInit("g:netrw_use_errorwindow",2)
 else
   call s:NetrwInit("g:netrw_use_errorwindow",1)
@@ -348,7 +352,6 @@ call s:NetrwInit("s:didstarstar",0)
 call s:NetrwInit("g:netrw_dirhistcnt"      , 0)
 call s:NetrwInit("g:netrw_decompress"       , '{ ".gz" : "gunzip", ".bz2" : "bunzip2", ".zip" : "unzip", ".tar" : "tar -xf", ".xz" : "unxz" }')
 call s:NetrwInit("g:netrw_dirhistmax"       , 10)
-call s:NetrwInit("g:netrw_errorlvl"  , s:NOTE)
 call s:NetrwInit("g:netrw_fastbrowse"       , 1)
 call s:NetrwInit("g:netrw_ftp_browse_reject", '^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$')
 if !exists("g:netrw_ftp_list_cmd")
@@ -12822,54 +12825,3 @@ unlet s:keepcpo
 " Modelines: {{{1
 " ===============
 " vim:ts=8 fdm=marker
-" doing autoload/netrw.vim version v172g ~57
-" varname<g:netrw_dirhistcnt> value=0 ~1
-" varname<s:THINLIST> value=0 ~1
-" varname<s:LONGLIST> value=1 ~1
-" varname<s:WIDELIST> value=2 ~1
-" varname<s:TREELIST> value=3 ~1
-" varname<s:MAXLIST> value=4 ~1
-" varname<g:netrw_use_errorwindow> value=2 ~1
-" varname<g:netrw_http_xcmd> value=-q -O ~1
-" varname<g:netrw_http_put_cmd> value=curl -T ~1
-" varname<g:netrw_keepj> value=keepj ~1
-" varname<g:netrw_rcp_cmd> value=rcp ~1
-" varname<g:netrw_rsync_cmd> value=rsync ~1
-" varname<g:netrw_rsync_sep> value=/ ~1
-" varname<g:netrw_scp_cmd> value=scp -q ~1
-" varname<g:netrw_sftp_cmd> value=sftp ~1
-" varname<g:netrw_ssh_cmd> value=ssh ~1
-" varname<g:netrw_alto> value=0 ~1
-" varname<g:netrw_altv> value=1 ~1
-" varname<g:netrw_banner> value=1 ~1
-" varname<g:netrw_browse_split> value=0 ~1
-" varname<g:netrw_bufsettings> value=noma nomod nonu nobl nowrap ro nornu ~1
-" varname<g:netrw_chgwin> value=-1 ~1
-" varname<g:netrw_clipboard> value=1 ~1
-" varname<g:netrw_compress> value=gzip ~1
-" varname<g:netrw_ctags> value=ctags ~1
-" varname<g:netrw_cursor> value=2 ~1
-" (netrw) COMBAK: cuc=0 cul=0 initialization of s:netrw_cu[cl]
-" varname<g:netrw_cygdrive> value=/cygdrive ~1
-" varname<s:didstarstar> value=0 ~1
-" varname<g:netrw_dirhistcnt> value=0 ~1
-" varname<g:netrw_decompress> value={ ".gz" : "gunzip", ".bz2" : "bunzip2", ".zip" : "unzip", ".tar" : "tar -xf", ".xz" : "unxz" } ~1
-" varname<g:netrw_dirhistmax> value=10 ~1
-" varname<g:netrw_errorlvl> value=0 ~1
-" varname<g:netrw_fastbrowse> value=1 ~1
-" varname<g:netrw_ftp_browse_reject> value=^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$ ~1
-" varname<g:netrw_ftpmode> value=binary ~1
-" varname<g:netrw_hide> value=1 ~1
-" varname<g:netrw_keepdir> value=1 ~1
-" varname<g:netrw_list_hide> value= ~1
-" varname<g:netrw_localmkdir> value=mkdir ~1
-" varname<g:netrw_remote_mkdir> value=mkdir ~1
-" varname<g:netrw_liststyle> value=0 ~1
-" varname<g:netrw_markfileesc> value=*./[\~ ~1
-" varname<g:netrw_maxfilenamelen> value=32 ~1
-" varname<g:netrw_menu> value=1 ~1
-" varname<g:netrw_mkdir_cmd> value=ssh USEPORT HOSTNAME mkdir ~1
-" varname<g:netrw_mousemaps> value=1 ~1
-" varname<g:netrw_retmap> value=0 ~1
-" varname<g:netrw_chgperm> value=chmod PERM FILENAME ~1
-" varname<g:netrw_preview> value=0 ~1

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 9.1.  Last change: 2024 Apr 27
+*cmdline.txt*   For Vim version 9.1.  Last change: 2024 Aug 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -379,7 +379,7 @@ terminals)
 
 :keepp[atterns] {command}			*:keepp* *:keeppatterns*
 		Execute {command}, without adding anything to the search
-		history
+		history or modifying the last substitute pattern.
 
 ==============================================================================
 2. Command-line completion				*cmdline-completion*

runtime/doc/evim.1

@@ -1,4 +1,4 @@
-.TH EVIM 1 "2002 February 16"
+.TH EVIM 1 "2024 August 12"
 .SH NAME
 evim \- easy Vim, edit a file with Vim and setup for modeless editing
 .SH SYNOPSIS
@@ -34,8 +34,12 @@ Use CTRL-Q to obtain the original meaning of CTRL-V.
 See vim(1).
 .SH FILES
 .TP 15
-/usr/local/lib/vim/evim.vim
+/usr/local/share/vim/vim??/evim.vim
 The script loaded to initialize eVim.
+.br
+.I vim??
+is short version number, like vim91 for
+.B Vim 9.1
 .SH AKA
 Also Known As "Vim for gumbies".
 When using evim you are expected to take a handkerchief,

runtime/doc/evim.man

@@ -1,4 +1,4 @@
-EVIM(1)                                                                EVIM(1)
+EVIM(1)                     General Commands Manual                    EVIM(1)
 
 
 
@@ -10,7 +10,7 @@ SYNOPSIS
        eview
 
 DESCRIPTION
-       eVim starts Vim and sets options to make it behave like a modeless edi-
+       eVim starts Vim and sets options to make it behave like a modeless edi‐
        tor.  This is still Vim but used as  a  point-and-click  editor.   This
        feels  a lot like using Notepad on MS-Windows.  eVim will always run in
        the GUI, to enable the use of menus and toolbar.
@@ -32,8 +32,9 @@ OPTIONS
        See vim(1).
 
 FILES
-       /usr/local/lib/vim/evim.vim
+       /usr/local/share/vim/vim??/evim.vim
                       The script loaded to initialize eVim.
+                      vim??  is short version number, like vim91 for Vim 9.1
 
 AKA
        Also Known As "Vim for gumbies".  When using evim you are  expected  to
@@ -49,4 +50,4 @@ AUTHOR
 
 
 
-                               2002 February 16                        EVIM(1)
+                                2024 August 12                         EVIM(1)

runtime/doc/sponsor.txt

@@ -1,4 +1,4 @@
-*sponsor.txt*   For Vim version 9.1.  Last change: 2024 Apr 22
+*sponsor.txt*   For Vim version 9.1.  Last change: 2024 Aug 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -76,16 +76,14 @@ How much money should I send?
 
 That is up to you.  The more you give, the more children will be helped.
 An indication for individuals that use Vim at home: 10 Euro per year.  For
-professional use: 30 Euro per year per person.  Send at least 10 euro to be
-able to vote for features.
+professional use: 30 Euro per year per person.
 
 
 How do I become a Vim sponsor or registered Vim user?
 
 Send money, as explained above |send-money| and include your e-mail address.
 When the money has been received you will receive a unique registration key.
-This key can be used on the Vim website to activate voting on your Vim
-account.  You will then get an extra page where you can vote for features and
+This key can be used on the Vim website to get an extra page where you can
 choose whether others will be able to see that you donated.  There is a link
 to this page on your "My Account" page.
 
@@ -127,8 +125,7 @@ the developer |maillist|, for reporting bugs see |bugs|.
 How about Charityware?
 
 Currently the Vim donations go to |uganda| anyway.  Thus it doesn't matter if
-you sponsor Vim or ICCF.  Except that Vim sponsoring will allow you to vote
-for features.
+you sponsor Vim or ICCF.
 
 
 I donated $$$, now please add feature XYZ!

runtime/doc/syntax.txt

@@ -2376,7 +2376,7 @@ have the following in your .vimrc: >
 
 MEDIAWIKI					*ft-mediawiki-syntax*
 
-Be default, syntax highlighting includes basic HTML tags like style and
+By default, syntax highlighting includes basic HTML tags like style and
 headers |html.vim|. For strict Mediawiki syntax highlighting: >
 
 	let g:html_no_rendering = 1

runtime/doc/uganda.txt

@@ -1,4 +1,4 @@
-*uganda.txt*    For Vim version 9.1.  Last change: 2024 Apr 22
+*uganda.txt*    For Vim version 9.1.  Last change: 2024 Aug 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -15,8 +15,8 @@ below or visit the ICCF web site, available at these URLs:
 	https://www.vim.org/iccf/
 	https://www.iccf.nl/
 
-You can also sponsor the development of Vim.  Vim sponsors can vote for
-features.  See |sponsor|.  The money goes to Uganda anyway.
+You can also sponsor the development of Vim, see |sponsor|.  The money goes to
+Uganda anyway.
 
 The Open Publication License applies to the Vim documentation, see
 |manual-copyright|.

runtime/doc/version9.txt

@@ -1,4 +1,4 @@
-*version9.txt*  For Vim version 9.1.  Last change: 2024 Jul 30
+*version9.txt*  For Vim version 9.1.  Last change: 2024 Aug 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -41592,6 +41592,7 @@ Changed~
   mark deprecated attributes from LSP server) |complete-items|
 - the regex engines match correctly case-insensitive multi-byte characters
   (and apply proper case folding)
+- |:keeppatterns| preserves the last substitute pattern when used with |:s|
 
 							*added-9.2*
 Added ~