aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2022-05-10 10:55:33 +0200
committerGitHub <noreply@github.com>2022-05-10 10:55:33 +0200
commite50b1fe60d87cbe7798ce921f08ea38a4750fa99 (patch)
tree7f6d742ad5fa4e3f40f4978189f6ce55dad2c8f9
parent5359be78935dc639c481d74f010fe133dd40290c (diff)
downloadrneovim-e50b1fe60d87cbe7798ce921f08ea38a4750fa99.tar.gz
rneovim-e50b1fe60d87cbe7798ce921f08ea38a4750fa99.tar.bz2
rneovim-e50b1fe60d87cbe7798ce921f08ea38a4750fa99.zip
vim-patch:921bde888046 (#18511)
Update runtime files, translations https://github.com/vim/vim/commit/921bde88804663a7cb825d7f7e8a5d8ae6b58650 skip: translations skip: builtin.txt (requires 8.2.4861)
-rw-r--r--runtime/doc/builtin.txt2
-rw-r--r--runtime/doc/map.txt2
-rw-r--r--runtime/ftplugin/abaqus.vim8
-rw-r--r--runtime/pack/dist/opt/termdebug/plugin/termdebug.vim6
4 files changed, 9 insertions, 9 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index b9954dc99c..67989cb49f 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2800,7 +2800,7 @@ getcmdcompltype() *getcmdcompltype()*
Return the type of the current command-line completion.
Only works when the command line is being edited, thus
requires use of |c_CTRL-\_e| or |c_CTRL-R_=|.
- See |command-completion| for the return string.
+ See |:command-completion| for the return string.
Also see |getcmdtype()|, |setcmdpos()| and |getcmdline()|.
Returns an empty string when completion is not defined.
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 6e100e5854..056e6c3b56 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -105,7 +105,7 @@ modes.
command applies.
Use the <buffer> argument to remove buffer-local
mappings |:map-<buffer>|
- Warning: This also removes the default mappings.
+ Warning: This also removes the |default-mappings|.
:map |mapmode-nvo|
:nm[ap] |mapmode-n|
diff --git a/runtime/ftplugin/abaqus.vim b/runtime/ftplugin/abaqus.vim
index b263d0c318..5ce565ef3f 100644
--- a/runtime/ftplugin/abaqus.vim
+++ b/runtime/ftplugin/abaqus.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: Abaqus finite element input file (www.abaqus.com)
" Maintainer: Carl Osterwisch <osterwischc@asme.org>
-" Last Change: 2012 Apr 30
+" Last Change: 2022 May 09
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin") | finish | endif
@@ -86,11 +86,11 @@ let b:undo_ftplugin .= "|unmap <buffer> [[|unmap <buffer> ]]"
\ . "|unmap <buffer> <LocalLeader><LocalLeader>"
" Undo must be done in nocompatible mode for <LocalLeader>.
-let b:undo_ftplugin = "let s:cpo_save = &cpoptions|"
+let b:undo_ftplugin = "let b:cpo_save = &cpoptions|"
\ . "set cpoptions&vim|"
\ . b:undo_ftplugin
- \ . "|let &cpoptions = s:cpo_save"
- \ . "|unlet s:cpo_save"
+ \ . "|let &cpoptions = b:cpo_save"
+ \ . "|unlet b:cpo_save"
" Restore saved compatibility options
let &cpoptions = s:cpo_save
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index ab1871fe60..4f2f7b942d 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -2,7 +2,7 @@
"
" Author: Bram Moolenaar
" Copyright: Vim license applies, see ":help license"
-" Last Change: 2022 May 04
+" Last Change: 2022 May 09
"
" WORK IN PROGRESS - The basics works stable, more to come
" Note: In general you need at least GDB 7.12 because this provides the
@@ -205,8 +205,8 @@ func s:CheckGdbRunning()
return 'ok'
endfunc
+" Open a terminal window without a job, to run the debugged program in.
func s:StartDebug_term(dict)
- " Open a terminal window without a job, to run the debugged program in.
execute s:vertical ? 'vnew' : 'new'
let s:pty_job_id = termopen('tail -f /dev/null;#gdb program')
if s:pty_job_id == 0
@@ -365,8 +365,8 @@ func s:StartDebug_term(dict)
call s:StartDebugCommon(a:dict)
endfunc
+" Open a window with a prompt buffer to run gdb in.
func s:StartDebug_prompt(dict)
- " Open a window with a prompt buffer to run gdb in.
if s:vertical
vertical new
else