mirror of
https://github.com/vim/vim.git
synced 2025-07-04 23:07:33 -04:00
Updated runtime files.
This commit is contained in:
parent
694cac7a35
commit
86ae720d75
@ -94,8 +94,9 @@ INFORMATION
|
|||||||
The latest news about Vim can be found on the Vim home page:
|
The latest news about Vim can be found on the Vim home page:
|
||||||
http://www.vim.org/
|
http://www.vim.org/
|
||||||
|
|
||||||
If you have problems, have a look at the Vim FAQ:
|
If you have problems, have a look at the Vim documentation or tips:
|
||||||
http://vimdoc.sf.net/vimfaq.html
|
http://www.vim.org/docs.php
|
||||||
|
http://vim.wikia.com/wiki/Vim_Tips_Wiki
|
||||||
|
|
||||||
If you still have problems or any other questions, use one of the mailing
|
If you still have problems or any other questions, use one of the mailing
|
||||||
lists to discuss them with Vim users and developers:
|
lists to discuss them with Vim users and developers:
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
" Maintainer: Dávid Szabó ( complex857 AT gmail DOT com )
|
" Maintainer: Dávid Szabó ( complex857 AT gmail DOT com )
|
||||||
" Previous Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
|
" Previous Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
|
||||||
" URL: https://github.com/shawncplus/phpcomplete.vim
|
" URL: https://github.com/shawncplus/phpcomplete.vim
|
||||||
" Last Change: 2015 Apr 02
|
" Last Change: 2015 Jul 03
|
||||||
"
|
"
|
||||||
" OPTIONS:
|
" OPTIONS:
|
||||||
"
|
"
|
||||||
@ -1659,7 +1659,7 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
|
|||||||
|
|
||||||
" function declaration line
|
" function declaration line
|
||||||
if line =~? 'function\(\s\+'.function_name_pattern.'\)\?\s*('
|
if line =~? 'function\(\s\+'.function_name_pattern.'\)\?\s*('
|
||||||
let function_lines = join(reverse(lines), " ")
|
let function_lines = join(reverse(copy(lines)), " ")
|
||||||
" search for type hinted arguments
|
" search for type hinted arguments
|
||||||
if function_lines =~? 'function\(\s\+'.function_name_pattern.'\)\?\s*(.\{-}'.class_name_pattern.'\s\+'.object && !object_is_array
|
if function_lines =~? 'function\(\s\+'.function_name_pattern.'\)\?\s*(.\{-}'.class_name_pattern.'\s\+'.object && !object_is_array
|
||||||
let f_args = matchstr(function_lines, '\cfunction\(\s\+'.function_name_pattern.'\)\?\s*(\zs.\{-}\ze)')
|
let f_args = matchstr(function_lines, '\cfunction\(\s\+'.function_name_pattern.'\)\?\s*(\zs.\{-}\ze)')
|
||||||
@ -1700,7 +1700,7 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
|
|||||||
|
|
||||||
" try to find the next non-comment or string ";" char
|
" try to find the next non-comment or string ";" char
|
||||||
let start_col = match(line, '^\s*'.object.'\C\s*=\zs&\?\s\+\(clone\)\?\s*'.variable_name_pattern)
|
let start_col = match(line, '^\s*'.object.'\C\s*=\zs&\?\s\+\(clone\)\?\s*'.variable_name_pattern)
|
||||||
let filelines = reverse(lines)
|
let filelines = reverse(copy(lines))
|
||||||
let [pos, char] = s:getNextCharWithPos(filelines, [a:start_line - i - 1, start_col])
|
let [pos, char] = s:getNextCharWithPos(filelines, [a:start_line - i - 1, start_col])
|
||||||
let chars_read = 1
|
let chars_read = 1
|
||||||
let last_pos = pos
|
let last_pos = pos
|
||||||
@ -1876,7 +1876,7 @@ function! phpcomplete#GetClassLocation(classname, namespace) " {{{
|
|||||||
let i = 1
|
let i = 1
|
||||||
while i < line('.')
|
while i < line('.')
|
||||||
let line = getline(line('.')-i)
|
let line = getline(line('.')-i)
|
||||||
if line =~? '^\s*\(abstract\s\+\|final\s\+\)*\s*\(class\|interface\|trait\)\s*'.a:classname.'\(\s\+\|$\)' && tolower(current_namespace) == search_namespace
|
if line =~? '^\s*\(abstract\s\+\|final\s\+\)*\s*\(class\|interface\|trait\)\s*'.a:classname.'\(\s\+\|$\|{\)' && tolower(current_namespace) == search_namespace
|
||||||
return expand('%:p')
|
return expand('%:p')
|
||||||
else
|
else
|
||||||
let i += 1
|
let i += 1
|
||||||
@ -2123,7 +2123,7 @@ function! phpcomplete#GetClassContentsStructure(file_path, file_lines, class_nam
|
|||||||
elseif classlocation != '' && filereadable(classlocation)
|
elseif classlocation != '' && filereadable(classlocation)
|
||||||
let full_file_path = fnamemodify(classlocation, ':p')
|
let full_file_path = fnamemodify(classlocation, ':p')
|
||||||
let result += phpcomplete#GetClassContentsStructure(full_file_path, readfile(full_file_path), class)
|
let result += phpcomplete#GetClassContentsStructure(full_file_path, readfile(full_file_path), class)
|
||||||
elseif tolower(current_namespace) == tolower(namespace)
|
elseif tolower(current_namespace) == tolower(namespace) && match(join(a:file_lines, "\n"), '\c\(class\|interface\|trait\)\_s\+'.class.'\(\>\|$\)') != -1
|
||||||
" try to find the declaration in the same file.
|
" try to find the declaration in the same file.
|
||||||
let result += phpcomplete#GetClassContentsStructure(full_file_path, a:file_lines, class)
|
let result += phpcomplete#GetClassContentsStructure(full_file_path, a:file_lines, class)
|
||||||
endif
|
endif
|
||||||
@ -2407,8 +2407,8 @@ function! phpcomplete#GetCurrentNameSpace(file_lines) " {{{
|
|||||||
while i < file_length
|
while i < file_length
|
||||||
let line = file_lines[i]
|
let line = file_lines[i]
|
||||||
|
|
||||||
if line =~? '^\s*namespace\s*'.namespace_name_pattern
|
if line =~? '^\(<?php\)\?\s*namespace\s*'.namespace_name_pattern
|
||||||
let current_namespace = matchstr(line, '\c^\s*namespace\s*\zs'.namespace_name_pattern.'\ze')
|
let current_namespace = matchstr(line, '\c^\(<?php\)\?\s*namespace\s*\zs'.namespace_name_pattern.'\ze')
|
||||||
break
|
break
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -2571,7 +2571,7 @@ endfunction
|
|||||||
|
|
||||||
function! phpcomplete#ExpandClassName(classname, current_namespace, imports) " {{{
|
function! phpcomplete#ExpandClassName(classname, current_namespace, imports) " {{{
|
||||||
" if there's an imported class, just use that class's information
|
" if there's an imported class, just use that class's information
|
||||||
if has_key(a:imports, a:classname) && (a:imports[a:classname].kind == 'c' || a:imports[a:classname].kind == 'i')
|
if has_key(a:imports, a:classname) && (a:imports[a:classname].kind == 'c' || a:imports[a:classname].kind == 'i' || a:imports[a:classname].kind == 't')
|
||||||
let namespace = has_key(a:imports[a:classname], 'namespace') ? a:imports[a:classname].namespace : ''
|
let namespace = has_key(a:imports[a:classname], 'namespace') ? a:imports[a:classname].namespace : ''
|
||||||
return [a:imports[a:classname].name, namespace]
|
return [a:imports[a:classname].name, namespace]
|
||||||
endif
|
endif
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
*autocmd.txt* For Vim version 7.4. Last change: 2015 Mar 21
|
*autocmd.txt* For Vim version 7.4. Last change: 2015 Jul 10
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
*diff.txt* For Vim version 7.4. Last change: 2015 Feb 03
|
*diff.txt* For Vim version 7.4. Last change: 2015 Jul 03
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@ -132,8 +132,9 @@ file for a moment and come back to the same file and be in diff mode again.
|
|||||||
if the current window does not have 'diff' set then no options
|
if the current window does not have 'diff' set then no options
|
||||||
in it are changed.
|
in it are changed.
|
||||||
|
|
||||||
The ":diffoff" command resets the relevant options to the values they had when
|
The `:diffoff` command resets the relevant options to the values they had when
|
||||||
using |:diffsplit|, |:diffpatch| , |:diffthis|. or starting Vim in diff mode.
|
using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode.
|
||||||
|
When using `:diffoff` twice the last saved values are restored.
|
||||||
Otherwise they are set to their default value:
|
Otherwise they are set to their default value:
|
||||||
|
|
||||||
'diff' off
|
'diff' off
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
*eval.txt* For Vim version 7.4. Last change: 2015 Jun 26
|
*eval.txt* For Vim version 7.4. Last change: 2015 Jul 10
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@ -1468,7 +1468,9 @@ v:hlsearch Variable that indicates whether search highlighting is on.
|
|||||||
requires |+extra_search|. Setting this variable to zero acts
|
requires |+extra_search|. Setting this variable to zero acts
|
||||||
the like |:nohlsearch| command, setting it to one acts like >
|
the like |:nohlsearch| command, setting it to one acts like >
|
||||||
let &hlsearch = &hlsearch
|
let &hlsearch = &hlsearch
|
||||||
<
|
< Note that the value is restored when returning from a
|
||||||
|
function. |function-search-undo|.
|
||||||
|
|
||||||
*v:insertmode* *insertmode-variable*
|
*v:insertmode* *insertmode-variable*
|
||||||
v:insertmode Used for the |InsertEnter| and |InsertChange| autocommand
|
v:insertmode Used for the |InsertEnter| and |InsertChange| autocommand
|
||||||
events. Values:
|
events. Values:
|
||||||
@ -4895,7 +4897,7 @@ readfile({fname} [, {binary} [, {max}]])
|
|||||||
separated with CR will result in a single long line (unless a
|
separated with CR will result in a single long line (unless a
|
||||||
NL appears somewhere).
|
NL appears somewhere).
|
||||||
All NUL characters are replaced with a NL character.
|
All NUL characters are replaced with a NL character.
|
||||||
When {binary/append} contains "b" binary mode is used:
|
When {binary} contains "b" binary mode is used:
|
||||||
- When the last line ends in a NL an extra empty list item is
|
- When the last line ends in a NL an extra empty list item is
|
||||||
added.
|
added.
|
||||||
- No CR characters are removed.
|
- No CR characters are removed.
|
||||||
@ -5853,6 +5855,24 @@ strchars({expr} [, {skipcc}]) *strchars()*
|
|||||||
When {skipcc} set to 1, Composing characters are ignored.
|
When {skipcc} set to 1, Composing characters are ignored.
|
||||||
Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
|
Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
|
||||||
|
|
||||||
|
|
||||||
|
{skipcc} is only available after 7.4.755. For backward
|
||||||
|
compatibility, you can define a wrapper function: >
|
||||||
|
if has("patch-7.4.755")
|
||||||
|
function s:strchars(str, skipcc)
|
||||||
|
return strchars(a:str, a:skipcc)
|
||||||
|
endfunction
|
||||||
|
else
|
||||||
|
function s:strchars(str, skipcc)
|
||||||
|
if a:skipcc
|
||||||
|
return strlen(substitute(a:str, ".", "x", "g"))
|
||||||
|
else
|
||||||
|
return strchars(a:str)
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
endif
|
||||||
|
<
|
||||||
|
|
||||||
strdisplaywidth({expr}[, {col}]) *strdisplaywidth()*
|
strdisplaywidth({expr}[, {col}]) *strdisplaywidth()*
|
||||||
The result is a Number, which is the number of display cells
|
The result is a Number, which is the number of display cells
|
||||||
String {expr} occupies on the screen when it starts at {col}.
|
String {expr} occupies on the screen when it starts at {col}.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
*options.txt* For Vim version 7.4. Last change: 2015 Jun 19
|
*options.txt* For Vim version 7.4. Last change: 2015 Jul 10
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
|
@ -5210,6 +5210,7 @@ complete_CTRL-E insert.txt /*complete_CTRL-E*
|
|||||||
complete_CTRL-Y insert.txt /*complete_CTRL-Y*
|
complete_CTRL-Y insert.txt /*complete_CTRL-Y*
|
||||||
complete_add() eval.txt /*complete_add()*
|
complete_add() eval.txt /*complete_add()*
|
||||||
complete_check() eval.txt /*complete_check()*
|
complete_check() eval.txt /*complete_check()*
|
||||||
|
completed_item-variable eval.txt /*completed_item-variable*
|
||||||
completion-functions usr_41.txt /*completion-functions*
|
completion-functions usr_41.txt /*completion-functions*
|
||||||
complex-change change.txt /*complex-change*
|
complex-change change.txt /*complex-change*
|
||||||
complex-repeat repeat.txt /*complex-repeat*
|
complex-repeat repeat.txt /*complex-repeat*
|
||||||
@ -8492,6 +8493,7 @@ v:charconvert_from eval.txt /*v:charconvert_from*
|
|||||||
v:charconvert_to eval.txt /*v:charconvert_to*
|
v:charconvert_to eval.txt /*v:charconvert_to*
|
||||||
v:cmdarg eval.txt /*v:cmdarg*
|
v:cmdarg eval.txt /*v:cmdarg*
|
||||||
v:cmdbang eval.txt /*v:cmdbang*
|
v:cmdbang eval.txt /*v:cmdbang*
|
||||||
|
v:completed_item eval.txt /*v:completed_item*
|
||||||
v:count eval.txt /*v:count*
|
v:count eval.txt /*v:count*
|
||||||
v:count1 eval.txt /*v:count1*
|
v:count1 eval.txt /*v:count1*
|
||||||
v:ctype eval.txt /*v:ctype*
|
v:ctype eval.txt /*v:ctype*
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
*todo.txt* For Vim version 7.4. Last change: 2015 Jun 25
|
*todo.txt* For Vim version 7.4. Last change: 2015 Jul 10
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@ -76,6 +76,12 @@ More info Jul 24. Not clear why.
|
|||||||
Better .ico file for Windows. (Pat Suwalski, 2015 Feb 13)
|
Better .ico file for Windows. (Pat Suwalski, 2015 Feb 13)
|
||||||
Waiting for response on remark from Edward Fox.
|
Waiting for response on remark from Edward Fox.
|
||||||
|
|
||||||
|
Add Tera Term language plugins. (Ken Takata, 2015 Jul 3)
|
||||||
|
|
||||||
|
RXVT sends a different background color response. (Higashi, 2015 Jul 5)
|
||||||
|
|
||||||
|
More tests for :diffoff. Olaf Dabrunz, (2015 Jul 4)
|
||||||
|
|
||||||
Problem that a previous silent ":throw" causes a following try/catch not to
|
Problem that a previous silent ":throw" causes a following try/catch not to
|
||||||
work. (ZyX, 2013 Sep 28)
|
work. (ZyX, 2013 Sep 28)
|
||||||
|
|
||||||
@ -96,11 +102,6 @@ Perhaps we can use ":silent window"?
|
|||||||
C indent: should recognize C11 raw strings. (Mark Lodato, 2015 Mar 1)
|
C indent: should recognize C11 raw strings. (Mark Lodato, 2015 Mar 1)
|
||||||
Need to recognize R"string" for 'cindent'.
|
Need to recognize R"string" for 'cindent'.
|
||||||
|
|
||||||
Updated phpcomplete. (Mikolaj Machowski, 2015 May 6)
|
|
||||||
|
|
||||||
Patch to make ":difoff" not reset the saved values, so that it can be used
|
|
||||||
twice. (Olaf Dabrunz, 2015 Jun 21)
|
|
||||||
|
|
||||||
Crash when changing the 'tags' option from a remote command.
|
Crash when changing the 'tags' option from a remote command.
|
||||||
(Benjamin Fritz, 2015 Mar 18, stack trace Mar 20)
|
(Benjamin Fritz, 2015 Mar 18, stack trace Mar 20)
|
||||||
|
|
||||||
@ -121,9 +122,6 @@ Patch for multi-byte characters in langmap and applying a mapping on them.
|
|||||||
(Christian Brabandt, 2015 Jun 12)
|
(Christian Brabandt, 2015 Jun 12)
|
||||||
Is this the right solution?
|
Is this the right solution?
|
||||||
|
|
||||||
Patch for langmap not working properly with mapping in Command-line mode.
|
|
||||||
Issue 376.
|
|
||||||
|
|
||||||
Patch to add grepfile(). (Scott Prager, 2015 May 26)
|
Patch to add grepfile(). (Scott Prager, 2015 May 26)
|
||||||
Work in progress.
|
Work in progress.
|
||||||
|
|
||||||
@ -136,21 +134,22 @@ inconsistent with the documentation.
|
|||||||
|
|
||||||
Better greek spell checking. Issue 299.
|
Better greek spell checking. Issue 299.
|
||||||
|
|
||||||
Patch to make :diffoff work twice. (Olaf Dabrunz, 2015 Jun 23)
|
Add 'fixeol' option, default on, so that people who have problems with fixing
|
||||||
|
the missing EOL can switch it off?
|
||||||
Patch to add 'completeselect' option. Specifies how to select a candidate in
|
|
||||||
insert completion. (Shougo, 2013 May 29)
|
|
||||||
Update to add to existing 'completeopt'. 2013 May 30
|
|
||||||
Updated update: Shougo 2015 Jun 12
|
|
||||||
|
|
||||||
When complete() first argument is before where insert started and 'backspace'
|
When complete() first argument is before where insert started and 'backspace'
|
||||||
is Vi compatible, the completion fails. (Hirohito Higashi, 2015 Feb 19)
|
is Vi compatible, the completion fails. (Hirohito Higashi, 2015 Feb 19)
|
||||||
|
|
||||||
Patch to fix equivalence classes in regexp. (Dominique Pelle, 2015 Jun 2)
|
Patch to fix equivalence classes in regexp. (Dominique Pelle, 2015 Jun 2)
|
||||||
|
|
||||||
|
Test 44 fails when [[=A=]] is changed to [[=À=]]. Caused by getcmdline() not
|
||||||
|
handling the 0x80 as a second byte correctly? (Dominique Pelle, 2015 Jun 10)
|
||||||
|
|
||||||
Weird encryption problems on Windows. (Ben Fritz, 2015 Feb 13)
|
Weird encryption problems on Windows. (Ben Fritz, 2015 Feb 13)
|
||||||
Goes away when disabling the swap file. (might1, Feb 16)
|
Goes away when disabling the swap file. (might1, Feb 16)
|
||||||
|
|
||||||
|
Patch to add an OptionSet autocommand event. (Christian Brabandt, 2015 Jun 25)
|
||||||
|
|
||||||
MS-Windows: Crash opening very long file name starting with "\\".
|
MS-Windows: Crash opening very long file name starting with "\\".
|
||||||
(Christian Brock, 2012 Jun 29)
|
(Christian Brock, 2012 Jun 29)
|
||||||
|
|
||||||
@ -188,9 +187,6 @@ from two windows? Stopped happening (Feb 5).
|
|||||||
Patch for an extra argument to matchadd() for conceal. (Christian Brabandt,
|
Patch for an extra argument to matchadd() for conceal. (Christian Brabandt,
|
||||||
2015 Feb 17, update Feb 19)
|
2015 Feb 17, update Feb 19)
|
||||||
|
|
||||||
Patch to add v:completed_item. (Shougo Matsu, 2013 Nov 29).
|
|
||||||
Update 2015 Jun 20.
|
|
||||||
|
|
||||||
Patch to add :lockjumps. (Carlo Baldassi, 2015 May 25)
|
Patch to add :lockjumps. (Carlo Baldassi, 2015 May 25)
|
||||||
OK to not block marks?
|
OK to not block marks?
|
||||||
|
|
||||||
@ -430,8 +426,6 @@ Patch to define macros for hardcoded values. (Elias Diem, 2013 Dec 14)
|
|||||||
Several syntax file match "^\s*" which may get underlined if that's in the
|
Several syntax file match "^\s*" which may get underlined if that's in the
|
||||||
highlight group. Add a "\zs" after it?
|
highlight group. Add a "\zs" after it?
|
||||||
|
|
||||||
Go through more coverity reports.
|
|
||||||
|
|
||||||
The undo file name can get too long. (Issue 346)
|
The undo file name can get too long. (Issue 346)
|
||||||
For the path use a hash instead of dir%dir%dir%name hash%name.
|
For the path use a hash instead of dir%dir%dir%name hash%name.
|
||||||
|
|
||||||
@ -639,6 +633,8 @@ after starting up?
|
|||||||
|
|
||||||
Patch to add ":ldo" and ":cdo", execute commands over quickfix list and
|
Patch to add ":ldo" and ":cdo", execute commands over quickfix list and
|
||||||
location list. (Yegappan Lakshmanan, 2013 Jun 2, update 2015 Mar 21)
|
location list. (Yegappan Lakshmanan, 2013 Jun 2, update 2015 Mar 21)
|
||||||
|
Update by Florian Walch, 2015 Jul 1.
|
||||||
|
Yegappan will send an update in July.
|
||||||
|
|
||||||
8 "stl" and "stlnc" in 'fillchars' don't work for multi-byte characters.
|
8 "stl" and "stlnc" in 'fillchars' don't work for multi-byte characters.
|
||||||
Patch by Christian Wellenbrock, 2013 Jul 5.
|
Patch by Christian Wellenbrock, 2013 Jul 5.
|
||||||
@ -1088,8 +1084,8 @@ Dominique can't reproduce it.
|
|||||||
":function f(x) keepjumps" creates a function where every command is executed
|
":function f(x) keepjumps" creates a function where every command is executed
|
||||||
like it has ":keepjumps" before it.
|
like it has ":keepjumps" before it.
|
||||||
|
|
||||||
Coverity: ask someone to create new user: Dominique.
|
Coverity: Check if there are new reported defects:
|
||||||
Check if there are new reported defects: http://scan.coverity.com/rung2.html
|
https://scan.coverity.com/projects/241
|
||||||
|
|
||||||
Patch to support :undo absolute jump to file save number. (Christian Brabandt,
|
Patch to support :undo absolute jump to file save number. (Christian Brabandt,
|
||||||
2010 Nov 5)
|
2010 Nov 5)
|
||||||
@ -1125,7 +1121,7 @@ string value.
|
|||||||
|
|
||||||
Invalid read error in Farsi mode. (Dominique Pelle, 2009 Aug 2)
|
Invalid read error in Farsi mode. (Dominique Pelle, 2009 Aug 2)
|
||||||
|
|
||||||
For running gvim on an USB stick: avoid the OLE registration. Use a command
|
For running gvim on a USB stick: avoid the OLE registration. Use a command
|
||||||
line argument -noregister.
|
line argument -noregister.
|
||||||
|
|
||||||
When using an expression in 'statusline' leading white space sometimes goes
|
When using an expression in 'statusline' leading white space sometimes goes
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
VIM(1) VIM(1)
|
VIM(1) General Commands Manual VIM(1)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -21,7 +21,7 @@ DESCRIPTION
|
|||||||
to edit all kinds of plain text. It is especially useful for editing
|
to edit all kinds of plain text. It is especially useful for editing
|
||||||
programs.
|
programs.
|
||||||
|
|
||||||
There are a lot of enhancements above Vi: multi level undo, multi win-
|
There are a lot of enhancements above Vi: multi level undo, multi win‐
|
||||||
dows and buffers, syntax highlighting, command line editing, filename
|
dows and buffers, syntax highlighting, command line editing, filename
|
||||||
completion, on-line help, visual selection, etc.. See ":help
|
completion, on-line help, visual selection, etc.. See ":help
|
||||||
vi_diff.txt" for a summary of the differences between Vim and Vi.
|
vi_diff.txt" for a summary of the differences between Vim and Vi.
|
||||||
@ -42,7 +42,7 @@ DESCRIPTION
|
|||||||
one or more files to be edited.
|
one or more files to be edited.
|
||||||
|
|
||||||
file .. A list of filenames. The first one will be the current
|
file .. A list of filenames. The first one will be the current
|
||||||
file and read into the buffer. The cursor will be posi-
|
file and read into the buffer. The cursor will be posi‐
|
||||||
tioned on the first line of the buffer. You can get to the
|
tioned on the first line of the buffer. You can get to the
|
||||||
other files with the ":next" command. To edit a file that
|
other files with the ":next" command. To edit a file that
|
||||||
starts with a dash, precede the filelist with "--".
|
starts with a dash, precede the filelist with "--".
|
||||||
@ -67,7 +67,7 @@ DESCRIPTION
|
|||||||
other systems). Further errors can be jumped to with the
|
other systems). Further errors can be jumped to with the
|
||||||
":cn" command. See ":help quickfix".
|
":cn" command. See ":help quickfix".
|
||||||
|
|
||||||
Vim behaves differently, depending on the name of the command (the exe-
|
Vim behaves differently, depending on the name of the command (the exe‐
|
||||||
cutable may still be the same file).
|
cutable may still be the same file).
|
||||||
|
|
||||||
vim The "normal" way, everything is default.
|
vim The "normal" way, everything is default.
|
||||||
@ -87,7 +87,7 @@ DESCRIPTION
|
|||||||
be done with the "-y" argument.
|
be done with the "-y" argument.
|
||||||
|
|
||||||
rvim rview rgvim rgview
|
rvim rview rgvim rgview
|
||||||
Like the above, but with restrictions. It will not be possi-
|
Like the above, but with restrictions. It will not be possi‐
|
||||||
ble to start shell commands, or suspend Vim. Can also be
|
ble to start shell commands, or suspend Vim. Can also be
|
||||||
done with the "-Z" argument.
|
done with the "-Z" argument.
|
||||||
|
|
||||||
@ -99,9 +99,9 @@ OPTIONS
|
|||||||
"num". If "num" is missing, the cursor will be positioned
|
"num". If "num" is missing, the cursor will be positioned
|
||||||
on the last line.
|
on the last line.
|
||||||
|
|
||||||
+/{pat} For the first file the cursor will be positioned on the
|
+/{pat} For the first file the cursor will be positioned in the
|
||||||
first occurrence of {pat}. See ":help search-pattern" for
|
line with the first occurrence of {pat}. See ":help
|
||||||
the available search patterns.
|
search-pattern" for the available search patterns.
|
||||||
|
|
||||||
+{command}
|
+{command}
|
||||||
|
|
||||||
@ -128,7 +128,7 @@ OPTIONS
|
|||||||
this option starts Vim in Arabic mode, i.e. 'arabic' is
|
this option starts Vim in Arabic mode, i.e. 'arabic' is
|
||||||
set. Otherwise an error message is given and Vim aborts.
|
set. Otherwise an error message is given and Vim aborts.
|
||||||
|
|
||||||
-b Binary mode. A few options will be set that makes it pos-
|
-b Binary mode. A few options will be set that makes it pos‐
|
||||||
sible to edit a binary or executable file.
|
sible to edit a binary or executable file.
|
||||||
|
|
||||||
-C Compatible. Set the 'compatible' option. This will make
|
-C Compatible. Set the 'compatible' option. This will make
|
||||||
@ -221,7 +221,7 @@ OPTIONS
|
|||||||
each file.
|
each file.
|
||||||
|
|
||||||
-R Read-only mode. The 'readonly' option will be set. You
|
-R Read-only mode. The 'readonly' option will be set. You
|
||||||
can still edit the buffer, but will be prevented from acci-
|
can still edit the buffer, but will be prevented from acci‐
|
||||||
dently overwriting a file. If you do want to overwrite a
|
dently overwriting a file. If you do want to overwrite a
|
||||||
file, add an exclamation mark to the Ex command, as in
|
file, add an exclamation mark to the Ex command, as in
|
||||||
":w!". The -R option also implies the -n option (see
|
":w!". The -R option also implies the -n option (see
|
||||||
@ -258,14 +258,14 @@ OPTIONS
|
|||||||
all initializations by giving the name "NONE". See ":help
|
all initializations by giving the name "NONE". See ":help
|
||||||
initialization" within vim for more details.
|
initialization" within vim for more details.
|
||||||
|
|
||||||
-U {gvimrc} Use the commands in the file {gvimrc} for GUI initializa-
|
-U {gvimrc} Use the commands in the file {gvimrc} for GUI initializa‐
|
||||||
tions. All the other GUI initializations are skipped. It
|
tions. All the other GUI initializations are skipped. It
|
||||||
can also be used to skip all GUI initializations by giving
|
can also be used to skip all GUI initializations by giving
|
||||||
the name "NONE". See ":help gui-init" within vim for more
|
the name "NONE". See ":help gui-init" within vim for more
|
||||||
details.
|
details.
|
||||||
|
|
||||||
-V[N] Verbose. Give messages about which files are sourced and
|
-V[N] Verbose. Give messages about which files are sourced and
|
||||||
for reading and writing a viminfo file. The optional num-
|
for reading and writing a viminfo file. The optional num‐
|
||||||
ber N is the value for 'verbose'. Default is 10.
|
ber N is the value for 'verbose'. Default is 10.
|
||||||
|
|
||||||
-v Start Vim in Vi mode, just like the executable was called
|
-v Start Vim in Vi mode, just like the executable was called
|
||||||
@ -304,7 +304,7 @@ OPTIONS
|
|||||||
|
|
||||||
--help Give a help message and exit, just like "-h".
|
--help Give a help message and exit, just like "-h".
|
||||||
|
|
||||||
--literal Take file name arguments literally, do not expand wild-
|
--literal Take file name arguments literally, do not expand wild‐
|
||||||
cards. This has no effect on Unix where the shell expands
|
cards. This has no effect on Unix where the shell expands
|
||||||
wildcards.
|
wildcards.
|
||||||
|
|
||||||
@ -350,7 +350,7 @@ OPTIONS
|
|||||||
ON-LINE HELP
|
ON-LINE HELP
|
||||||
Type ":help" in Vim to get started. Type ":help subject" to get help
|
Type ":help" in Vim to get started. Type ":help subject" to get help
|
||||||
on a specific subject. For example: ":help ZZ" to get help for the
|
on a specific subject. For example: ":help ZZ" to get help for the
|
||||||
"ZZ" command. Use <Tab> and CTRL-D to complete subjects (":help cmd-
|
"ZZ" command. Use <Tab> and CTRL-D to complete subjects (":help cmd‐
|
||||||
line-completion"). Tags are present to jump from one place to another
|
line-completion"). Tags are present to jump from one place to another
|
||||||
(sort of hypertext links, see ":help"). All documentation files can be
|
(sort of hypertext links, see ":help"). All documentation files can be
|
||||||
viewed in this way, for example ":help syntax.txt".
|
viewed in this way, for example ":help syntax.txt".
|
||||||
@ -361,7 +361,7 @@ FILES
|
|||||||
to get the complete list.
|
to get the complete list.
|
||||||
|
|
||||||
/usr/local/lib/vim/doc/tags
|
/usr/local/lib/vim/doc/tags
|
||||||
The tags file used for finding information in the docu-
|
The tags file used for finding information in the docu‐
|
||||||
mentation files.
|
mentation files.
|
||||||
|
|
||||||
/usr/local/lib/vim/syntax/syntax.vim
|
/usr/local/lib/vim/syntax/syntax.vim
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
XXD(1) XXD(1)
|
XXD(1) General Commands Manual XXD(1)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -14,7 +14,7 @@ DESCRIPTION
|
|||||||
xxd creates a hex dump of a given file or standard input. It can also
|
xxd creates a hex dump of a given file or standard input. It can also
|
||||||
convert a hex dump back to its original binary form. Like uuencode(1)
|
convert a hex dump back to its original binary form. Like uuencode(1)
|
||||||
and uudecode(1) it allows the transmission of binary data in a `mail-
|
and uudecode(1) it allows the transmission of binary data in a `mail-
|
||||||
safe' ASCII representation, but has the advantage of decoding to stan-
|
safe' ASCII representation, but has the advantage of decoding to stan‐
|
||||||
dard output. Moreover, it can be used to perform binary file patching.
|
dard output. Moreover, it can be used to perform binary file patching.
|
||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
@ -29,7 +29,6 @@ OPTIONS
|
|||||||
Parameters to options can be specified in decimal, hexadecimal or octal
|
Parameters to options can be specified in decimal, hexadecimal or octal
|
||||||
notation. Thus -c8, -c 8, -c 010 and -cols 8 are all equivalent.
|
notation. Thus -c8, -c 8, -c 010 and -cols 8 are all equivalent.
|
||||||
|
|
||||||
|
|
||||||
-a | -autoskip
|
-a | -autoskip
|
||||||
toggle autoskip: A single '*' replaces nul-lines. Default off.
|
toggle autoskip: A single '*' replaces nul-lines. Default off.
|
||||||
|
|
||||||
@ -37,7 +36,7 @@ OPTIONS
|
|||||||
Switch to bits (binary digits) dump, rather than hexdump. This
|
Switch to bits (binary digits) dump, rather than hexdump. This
|
||||||
option writes octets as eight digits "1"s and "0"s instead of a
|
option writes octets as eight digits "1"s and "0"s instead of a
|
||||||
normal hexadecimal dump. Each line is preceded by a line number
|
normal hexadecimal dump. Each line is preceded by a line number
|
||||||
in hexadecimal and followed by an ascii (or ebcdic) representa-
|
in hexadecimal and followed by an ascii (or ebcdic) representa‐
|
||||||
tion. The command line switches -r, -p, -i do not work with this
|
tion. The command line switches -r, -p, -i do not work with this
|
||||||
mode.
|
mode.
|
||||||
|
|
||||||
@ -50,25 +49,34 @@ OPTIONS
|
|||||||
to EBCDIC. This does not change the hexadecimal representation.
|
to EBCDIC. This does not change the hexadecimal representation.
|
||||||
The option is meaningless in combinations with -r, -p or -i.
|
The option is meaningless in combinations with -r, -p or -i.
|
||||||
|
|
||||||
|
-e Switch to little-endian hexdump. This option treats byte groups
|
||||||
|
as words in little-endian byte order. The default grouping of 4
|
||||||
|
bytes may be changed using -g. This option only applies to hex‐
|
||||||
|
dump, leaving the ASCII (or EBCDIC) representation unchanged.
|
||||||
|
The command line switches -r, -p, -i do not work with this mode.
|
||||||
|
|
||||||
-g bytes | -groupsize bytes
|
-g bytes | -groupsize bytes
|
||||||
separate the output of every <bytes> bytes (two hex characters
|
separate the output of every <bytes> bytes (two hex characters
|
||||||
or eight bit-digits each) by a whitespace. Specify -g 0 to sup-
|
or eight bit-digits each) by a whitespace. Specify -g 0 to sup‐
|
||||||
press grouping. <Bytes> defaults to 2 in normal mode and 1 in
|
press grouping. <Bytes> defaults to 2 in normal mode, 4 in lit‐
|
||||||
bits mode. Grouping does not apply to postscript or include
|
tle-endian mode and 1 in bits mode. Grouping does not apply to
|
||||||
style.
|
postscript or include style.
|
||||||
|
|
||||||
-h | -help
|
-h | -help
|
||||||
print a summary of available commands and exit. No hex dumping
|
print a summary of available commands and exit. No hex dumping
|
||||||
is performed.
|
is performed.
|
||||||
|
|
||||||
-i | -include
|
-i | -include
|
||||||
output in C include file style. A complete static array defini-
|
output in C include file style. A complete static array defini‐
|
||||||
tion is written (named after the input file), unless xxd reads
|
tion is written (named after the input file), unless xxd reads
|
||||||
from stdin.
|
from stdin.
|
||||||
|
|
||||||
-l len | -len len
|
-l len | -len len
|
||||||
stop after writing <len> octets.
|
stop after writing <len> octets.
|
||||||
|
|
||||||
|
-o offset
|
||||||
|
add <offset> to the displayed file position.
|
||||||
|
|
||||||
-p | -ps | -postscript | -plain
|
-p | -ps | -postscript | -plain
|
||||||
output in postscript continuous hexdump style. Also known as
|
output in postscript continuous hexdump style. Also known as
|
||||||
plain hexdump style.
|
plain hexdump style.
|
||||||
@ -76,8 +84,8 @@ OPTIONS
|
|||||||
-r | -revert
|
-r | -revert
|
||||||
reverse operation: convert (or patch) hexdump into binary. If
|
reverse operation: convert (or patch) hexdump into binary. If
|
||||||
not writing to stdout, xxd writes into its output file without
|
not writing to stdout, xxd writes into its output file without
|
||||||
truncating it. Use the combination -r -p to read plain hexadeci-
|
truncating it. Use the combination -r -p to read plain hexadeci‐
|
||||||
mal dumps without line number information and without a particu-
|
mal dumps without line number information and without a particu‐
|
||||||
lar column layout. Additional Whitespace and line-breaks are
|
lar column layout. Additional Whitespace and line-breaks are
|
||||||
allowed anywhere.
|
allowed anywhere.
|
||||||
|
|
||||||
@ -101,7 +109,7 @@ OPTIONS
|
|||||||
CAVEATS
|
CAVEATS
|
||||||
xxd -r has some builtin magic while evaluating line number information.
|
xxd -r has some builtin magic while evaluating line number information.
|
||||||
If the output file is seekable, then the linenumbers at the start of
|
If the output file is seekable, then the linenumbers at the start of
|
||||||
each hexdump line may be out of order, lines may be missing, or over-
|
each hexdump line may be out of order, lines may be missing, or over‐
|
||||||
lapping. In these cases xxd will lseek(2) to the next position. If the
|
lapping. In these cases xxd will lseek(2) to the next position. If the
|
||||||
output file is not seekable, only gaps are allowed, which will be
|
output file is not seekable, only gaps are allowed, which will be
|
||||||
filled by null-bytes.
|
filled by null-bytes.
|
||||||
@ -112,8 +120,8 @@ CAVEATS
|
|||||||
input line after reading enough columns of hexadecimal data (see option
|
input line after reading enough columns of hexadecimal data (see option
|
||||||
-c). This also means, that changes to the printable ascii (or ebcdic)
|
-c). This also means, that changes to the printable ascii (or ebcdic)
|
||||||
columns are always ignored. Reverting a plain (or postscript) style
|
columns are always ignored. Reverting a plain (or postscript) style
|
||||||
hexdump with xxd -r -p does not depend on the correct number of col-
|
hexdump with xxd -r -p does not depend on the correct number of col‐
|
||||||
umns. Here anything that looks like a pair of hex-digits is inter-
|
umns. Here anything that looks like a pair of hex-digits is inter‐
|
||||||
preted.
|
preted.
|
||||||
|
|
||||||
Note the difference between
|
Note the difference between
|
||||||
@ -218,7 +226,6 @@ EXAMPLES
|
|||||||
% stty < /dev/term/b -echo -opost -isig -icanon min 1
|
% stty < /dev/term/b -echo -opost -isig -icanon min 1
|
||||||
% echo -n foo > /dev/term/b
|
% echo -n foo > /dev/term/b
|
||||||
|
|
||||||
|
|
||||||
RETURN VALUES
|
RETURN VALUES
|
||||||
The following error values are returned:
|
The following error values are returned:
|
||||||
|
|
||||||
@ -256,7 +263,4 @@ AUTHOR
|
|||||||
<tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
|
<tony@sctnugen.ppp.gu.edu.au> <T.Nugent@sct.gu.edu.au>
|
||||||
Small changes by Bram Moolenaar. Edited by Juergen Weigert.
|
Small changes by Bram Moolenaar. Edited by Juergen Weigert.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Manual page for xxd August 1996 XXD(1)
|
Manual page for xxd August 1996 XXD(1)
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
" Vim indent file
|
" Vim indent file
|
||||||
" Language: Shell Script
|
" Language: Shell Script
|
||||||
" Maintainer: Peter Aronoff <telemachus@arpinum.org>
|
" Maintainer: Currently unmaintained. If you want to take it, please
|
||||||
|
" email Bram
|
||||||
|
" Previous Maintainer: Peter Aronoff <telemachus@arpinum.org>
|
||||||
" Original Author: Nikolai Weibull <now@bitwi.se>
|
" Original Author: Nikolai Weibull <now@bitwi.se>
|
||||||
" Latest Revision: 2014-08-22
|
" Latest Revision: 2014-08-22
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user