aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-06-19 20:18:30 -0400
committerGitHub <noreply@github.com>2021-06-19 20:18:30 -0400
commit997a9c879215bc01a928de3e762955878314ec6a (patch)
tree041537bcec28a3337feab4803fe31bb78bff0953
parentc16afaa1f8e9f120e7362d045cad96927dede4e7 (diff)
parent41332f618789c973c7646a39b693947cdb7a2d3a (diff)
downloadrneovim-997a9c879215bc01a928de3e762955878314ec6a.tar.gz
rneovim-997a9c879215bc01a928de3e762955878314ec6a.tar.bz2
rneovim-997a9c879215bc01a928de3e762955878314ec6a.zip
Merge pull request #14849 from seandewar/demethod-curwin
fix(doc): various fixes
-rw-r--r--runtime/doc/change.txt17
-rw-r--r--runtime/doc/cmdline.txt3
-rw-r--r--runtime/doc/index.txt13
-rw-r--r--runtime/doc/map.txt2
-rw-r--r--runtime/doc/tips.txt2
-rw-r--r--runtime/doc/various.txt3
-rw-r--r--runtime/doc/vim_diff.txt3
7 files changed, 13 insertions, 30 deletions
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 49c6d06fbf..7a63a89986 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -913,22 +913,7 @@ This replaces an end-of-line with a new line containing the value of $HOME. >
This replaces each 'E' character with a euro sign. Read more in |<Char->|.
-4.3 Search and replace *search-replace*
-
- *:pro* *:promptfind*
-:promptf[ind] [string]
- Put up a Search dialog. When [string] is given, it is
- used as the initial search string.
- {only for Win32 GUI}
-
- *:promptr* *:promptrepl*
-:promptr[epl] [string]
- Put up a Search/Replace dialog. When [string] is
- given, it is used as the initial search string.
- {only for Win32 GUI}
-
-
-4.4 Changing tabs *change-tabs*
+4.3 Changing tabs *change-tabs*
*:ret* *:retab* *:retab!*
:[range]ret[ab][!] [new_tabstop]
Replace all sequences of white-space containing a
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index dcdc2384dc..2db694cf07 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -532,7 +532,6 @@ that see the '"' as part of their argument:
:normal
:ownsyntax
:popup
- :promptfind (and the like)
:registers
:return
:sort
@@ -571,8 +570,6 @@ followed by another Vim command:
:make
:normal
:perlfile
- :promptfind
- :promptrepl
:pyfile
:python
:registers
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index c54b588e6b..2aafc075a6 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1201,6 +1201,7 @@ tag command action ~
|:cgetfile| :cg[etfile] read file with error messages
|:changes| :changes print the change list
|:chdir| :chd[ir] change directory
+|:checkhealth| :checkh[ealth] run healthchecks
|:checkpath| :che[ckpath] list included files
|:checktime| :checkt[ime] check timestamp of loaded buffers
|:chistory| :chi[story] list the error lists
@@ -1278,6 +1279,7 @@ tag command action ~
|:endtry| :endt[ry] end previous :try
|:endwhile| :endw[hile] end previous :while
|:enew| :ene[w] edit a new, unnamed buffer
+|:eval| :ev[al] evaluate an expression and discard the result
|:ex| :ex same as ":edit"
|:execute| :exe[cute] execute result of expressions
|:exit| :exi[t] same as ":xit"
@@ -1451,14 +1453,12 @@ tag command action ~
|:packloadall| :packl[oadall] load all packages under 'packpath'
|:pclose| :pc[lose] close preview window
|:pedit| :ped[it] edit file in the preview window
-|:perl| :perl execute perl command
-|:perldo| :perldo execute perl command for each line
-|:perfile| :perlfile execute perl script file
+|:perl| :pe[rl] execute perl command
+|:perldo| :perld[o] execute perl command for each line
+|:perlfile| :perlf[ile] execute perl script file
|:print| :p[rint] print lines
|:profdel| :profd[el] stop profiling a function or script
|:profile| :prof[ile] profiling functions and scripts
-|:promptfind| :pro[mptfind] open GUI dialog for searching
-|:promptrepl| :promptr[epl] open GUI dialog for search/replace
|:pop| :po[p] jump to older entry in tag stack
|:popup| :popu[p] popup a menu by name
|:ppop| :pp[op] ":pop" in preview window
@@ -1537,7 +1537,6 @@ tag command action ~
buffer list
|:scriptnames| :scr[iptnames] list names of all sourced Vim scripts
|:scriptencoding| :scripte[ncoding] encoding used in sourced Vim script
-|:scriptversion| :scriptv[ersion] version of Vim script used
|:scscope| :scs[cope] split window and execute cscope command
|:set| :se[t] show or set options
|:setfiletype| :setf[iletype] set 'filetype', unless it was set already
@@ -1549,8 +1548,6 @@ tag command action ~
|:sign| :sig[n] manipulate signs
|:silent| :sil[ent] run a command silently
|:sleep| :sl[eep] do nothing for a few seconds
-|:sleep!| :sl[eep]! do nothing for a few seconds, without the
- cursor visible
|:slast| :sla[st] split window and go to last file in the
argument list
|:smagic| :sm[agic] :substitute with 'magic'
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 77cbf7d9b7..10d503e180 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -855,7 +855,7 @@ Here is an example that counts the number of spaces with <F4>: >
set clipboard= selection=inclusive
let commands = #{line: "'[V']y", char: "`[v`]y", block: "`[\<c-v>`]y"}
silent exe 'noautocmd keepjumps normal! ' .. get(commands, a:type, '')
- echom getreg('"')->count(' ')
+ echom count(getreg('"'), ' ')
finally
call setreg('"', reg_save)
call setpos("'<", visual_marks_save[0])
diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt
index bcb2e48cbf..27b6ca2885 100644
--- a/runtime/doc/tips.txt
+++ b/runtime/doc/tips.txt
@@ -462,7 +462,7 @@ the current window, try this custom `:HelpCurwin` command:
execute mods .. ' helpclose'
let s:did_open_help = v:true
endif
- if !getcompletion(a:subject, 'help')->empty()
+ if !empty(getcompletion(a:subject, 'help'))
execute mods .. ' edit ' .. &helpfile
endif
return 'help ' .. a:subject
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index d5c07d9622..ec91b6e29a 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -506,7 +506,8 @@ gO Show a filetype-specific, navigable "outline" of the
Queued messages are processed during the sleep.
*:sl!* *:sleep!*
-:[N]sl[eep]! [N] [m] Same as above, but hide the cursor.
+:[N]sl[eep]! [N] [m] Same as above. Unlike Vim, it does not hide the
+ cursor. |vim-differences|
==============================================================================
2. Using Vim like less or more *less*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index bb30495d77..27c4b82aca 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -421,7 +421,10 @@ Commands:
:mode (no longer accepts an argument)
:open
:Print
+ :promptfind
+ :promptrepl
:shell
+ :sleep! (does not hide the cursor; same as :sleep)
:smile
:tearoff