Re: [vim/vim] Update runtime files. (cb80aa2)

[K.Takata]

@cecamp Shouldn't this be "ensure"?

--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -65,7 +65,7 @@ endif
 " zip#Browse: {{{2
 fun! zip#Browse(zipfile)
 "  call Dfunc("zip#Browse(zipfile<".a:zipfile.">)")
-  " sanity check: insure that the zipfile has "PK" as its first two letters
+  " sanity check: ensure that the zipfile has "PK" as its first two letters
   "               (zipped files have a leading PK as a "magic cookie")
   if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK'
    exe "noswapfile noautocmd noswapfile e ".fnameescape(a:zipfile)

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or unsubscribe.

[K.Takata]

An extra space remaining:

--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -848,7 +848,7 @@ if has("digraphs")
 endif
 call <SID>AddOption("tildeop", gettext("the \"~\" command behaves like an operator"))
 call <SID>BinOptionG("top", &top)
-call <SID>AddOption("operatorfunc", gettext("function called for the \"g@\"  operator"))
+call <SID>AddOption("operatorfunc", gettext("function called for the \"g@\" operator"))
 call <SID>OptionG("opfunc", &opfunc)
 call <SID>AddOption("showmatch", gettext("when inserting a bracket, briefly jump to its match"))
 call <SID>BinOptionG("sm", &sm)

[K.Takata]

This is the second time that the fixes to correct "insure" to "ensure" was reverted. :-(

[James McCoy]

This is the second time that the fixes to correct "insure" to "ensure" was reverted. :-(

Either spelling is acceptable.

[Gary Johnson]

On 2020-10-26, James McCoy wrote:
> This is the second time that the fixes to correct "insure" to "ensure" was
> reverted. :-(
>
> Either spelling is acceptable.

They are not just different spellings, they are different words.
From Merriam-Webster,
https://www.merriam-webster.com/dictionary/ensure#note-1:

There is considerable confusion about whether ensure and insure
are distinct words, variants of the same word, or some
combination of the two. They are in fact different words, but
with sufficient overlap in meaning and form as to create
uncertainty as to which should be used when. We define ensure as
“to make sure, certain, or safe” and one sense of insure, “to
make certain especially by taking necessary measures and
precautions,” is quite similar. But insure has the additional
meaning “to provide or obtain insurance on or for,” which is not
shared by ensure. Some usage guides recommend using insure in
financial contexts (as in “she insured her book collection for
a million dollars”) and ensure in the general sense “to make
certain” (as in “she ensured that the book collection was packed
well”).

Regards,
Gary

[vim-dev ML]

[K.Takata]

And one more fix to optwin.vim (missing comma after "utf-8"):

--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1267,7 +1267,7 @@ endif
 
 
 call <SID>Header(gettext("multi-byte characters"))
-call <SID>AddOption("encoding", gettext("character encoding used in Vim: \"latin1\", \"utf-8\"\n\"euc-jp\", \"big5\", etc."))
+call <SID>AddOption("encoding", gettext("character encoding used in Vim: \"latin1\", \"utf-8\",\n\"euc-jp\", \"big5\", etc."))
 call <SID>OptionG("enc", &enc)
 call <SID>AddOption("fileencoding", gettext("character encoding for the current file"))
 call append("$", "\t" .. s:local_to_buffer)

—
You are receiving this because you commented.

[lifecrisis]

I did also send in a patch that adds a test to prove that this is fixed. I'll post it here in case you would like to include it...

diff --git a/src/testdir/test_man.vim b/src/testdir/test_man.vim
index d2f48e8b0..0a7659a5e 100644
--- a/src/testdir/test_man.vim
+++ b/src/testdir/test_man.vim
@@ -132,4 +132,15 @@ func Test_keep_unnamed_register()
   %bw!
 endfunc
 
+" Check that underlying shell command arguments are escaped.
+func Test_shellescape_used()
+  Man `touch\ Xbar` `touch\ Xfoo`
+
+  call assert_false(filereadable('Xbar'))
+  call assert_false(filereadable('Xfoo'))
+
+  call delete('Xbar')
+  call delete('Xfoo')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

[Bram Moolenaar]

> I did also send in a patch that adds a test to prove that this is
> fixed. I'll post it here in case you would like to include it...
>

> ```patch

> diff --git a/src/testdir/test_man.vim b/src/testdir/test_man.vim
> index d2f48e8b0..0a7659a5e 100644
> --- a/src/testdir/test_man.vim
> +++ b/src/testdir/test_man.vim
> @@ -132,4 +132,15 @@ func Test_keep_unnamed_register()
> %bw!
> endfunc
>
> +" Check that underlying shell command arguments are escaped.
> +func Test_shellescape_used()
> + Man `touch\ Xbar` `touch\ Xfoo`
> +
> + call assert_false(filereadable('Xbar'))
> + call assert_false(filereadable('Xfoo'))
> +
> + call delete('Xbar')
> + call delete('Xfoo')
> +endfunc
> +
> " vim: shiftwidth=2 sts=2 expandtab

> ```

Thanks. I'll include something like that.

--
hundred-and-one symptoms of being an internet addict:
144. You eagerly await the update of the "Cool Site of the Day."

/// Bram Moolenaar -- Br...@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 ///