diff options
34 files changed, 73 insertions, 327 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f8978d74f..398dfdc303 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,6 +153,12 @@ endif() if(BUSTED_PRG) get_property(TEST_INCLUDE_DIRS DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) + + # Set policy CMP0026 to OLD so we avoid CMake warnings on newer + # versions of cmake. + if(POLICY CMP0026) + cmake_policy(SET CMP0026 OLD) + endif() get_target_property(TEST_LIBNVIM_PATH nvim-test LOCATION) configure_file( @@ -171,7 +177,8 @@ if(BUSTED_PRG) DEPENDS nvim-test unittest-headers) endif() -install(DIRECTORY runtime DESTINATION share/nvim/) +install(DIRECTORY runtime DESTINATION share/nvim) +install(SCRIPT ${CMAKE_MODULE_PATH}/GenerateHelptags.cmake) # Unfortunately, the below does not work under Ninja. Ninja doesn't use a # pseudo-tty when launching processes, because it can put many jobs in parallel diff --git a/cmake/GenerateHelptags.cmake b/cmake/GenerateHelptags.cmake new file mode 100644 index 0000000000..4101ff6cbf --- /dev/null +++ b/cmake/GenerateHelptags.cmake @@ -0,0 +1,20 @@ +file(TO_CMAKE_PATH + "$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc" + HELPTAGS_WORKING_DIRECTORY) + +message(STATUS "Generating helptags in ${HELPTAGS_WORKING_DIRECTORY}.") + +execute_process( + COMMAND "${CMAKE_CURRENT_BINARY_DIR}/bin/nvim" + -u NONE + -esX + -c "helptags ++t ." + -c quit + WORKING_DIRECTORY "${HELPTAGS_WORKING_DIRECTORY}" + OUTPUT_VARIABLE err + ERROR_VARIABLE err + RESULT_VARIABLE res) + +if(NOT res EQUAL 0) + message(FATAL_ERROR "Generating helptags failed: ${err}") +endif() diff --git a/runtime/autoload/ada.vim b/runtime/autoload/ada.vim index 1f8234a575..cc5191fa43 100644 --- a/runtime/autoload/ada.vim +++ b/runtime/autoload/ada.vim @@ -447,7 +447,7 @@ function ada#Switch_Session (New_Session) if a:New_Session != v:this_session " - " We actualy got a new session - otherwise there + " We actually got a new session - otherwise there " is nothing to do. " if strlen (v:this_session) > 0 diff --git a/runtime/autoload/sqlcomplete.vim b/runtime/autoload/sqlcomplete.vim index 9326c15bb3..4a8863e15f 100644 --- a/runtime/autoload/sqlcomplete.vim +++ b/runtime/autoload/sqlcomplete.vim @@ -588,7 +588,7 @@ function! sqlcomplete#DrillIntoTable() else " If the popup is not visible, simple perform the normal " key behaviour. - " Must use exec since they key must be preceeded by "\" + " Must use exec since the key must be preceded by "\" " or feedkeys will simply push each character of the string " rather than the "key press". exec 'call feedkeys("\'.g:ftplugin_sql_omni_key_right.'", "n")' @@ -605,7 +605,7 @@ function! sqlcomplete#DrillOutOfColumns() else " If the popup is not visible, simple perform the normal " key behaviour. - " Must use exec since they key must be preceeded by "\" + " Must use exec since the key must be preceded by "\" " or feedkeys will simply push each character of the string " rather than the "key press". exec 'call feedkeys("\'.g:ftplugin_sql_omni_key_left.'", "n")' @@ -831,7 +831,7 @@ function! s:SQLCGetColumns(table_name, list_type) " Start characterwise visual mode " Advance right one character - " Search foward until one of the following: + " Search forward until one of the following: " 1. Another select/update/delete statement " 2. A ; at the end of a line (the delimiter) " 3. The end of the file (incase no delimiter) diff --git a/runtime/autoload/syntaxcomplete.vim b/runtime/autoload/syntaxcomplete.vim index a18c3c360c..0ce3e6e154 100644 --- a/runtime/autoload/syntaxcomplete.vim +++ b/runtime/autoload/syntaxcomplete.vim @@ -548,7 +548,7 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full ) " let syn_list = substitute( @l, '^.*xxx\s*\%(contained\s*\)\?', "", '' ) " let syn_list = substitute( @l, '^.*xxx\s*', "", '' ) - " We only want the words for the lines begining with + " We only want the words for the lines beginning with " containedin, but there could be other items. " Tried to remove all lines that do not begin with contained diff --git a/runtime/compiler/checkstyle.vim b/runtime/compiler/checkstyle.vim index eac461bb2d..ccab3c585d 100644 --- a/runtime/compiler/checkstyle.vim +++ b/runtime/compiler/checkstyle.vim @@ -14,6 +14,6 @@ endif CompilerSet makeprg=java\ com.puppycrawl.tools.checkstyle.Main\ -f\ plain -" sample error: WebTable.java:282: '+=' is not preceeded with whitespace. +" sample error: WebTable.java:282: '+=' is not preceded with whitespace. " WebTable.java:201:1: '{' should be on the previous line. CompilerSet errorformat=%f:%l:%v:\ %m,%f:%l:\ %m,%-G%.%# diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index a6610a937a..d36490a75f 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -65,7 +65,6 @@ DOCS = \ os_dos.txt \ os_mac.txt \ os_mint.txt \ - os_msdos.txt \ os_os2.txt \ os_qnx.txt \ os_risc.txt \ @@ -197,7 +196,6 @@ HTMLS = \ os_dos.html \ os_mac.html \ os_mint.html \ - os_msdos.html \ os_os2.html \ os_qnx.html \ os_risc.html \ @@ -412,9 +410,6 @@ os_mac.txt: os_mint.txt: touch os_mint.txt -os_msdos.txt: - touch os_msdos.txt - os_os2.txt: touch os_os2.txt diff --git a/runtime/doc/os_dos.txt b/runtime/doc/os_dos.txt index 245a31846f..03170cf1d8 100644 --- a/runtime/doc/os_dos.txt +++ b/runtime/doc/os_dos.txt @@ -5,8 +5,8 @@ *dos* *DOS* -This file documents the common particularities of the MS-DOS and Win32 -versions of Vim. Also see |os_win32.txt| and |os_msdos.txt|. +This file documents some particularities of the Win32 +version of Vim. Also see |os_win32.txt|. 1. File locations |dos-locations| 2. Using backslashes |dos-backslash| diff --git a/runtime/doc/os_msdos.txt b/runtime/doc/os_msdos.txt deleted file mode 100644 index bd996be0c3..0000000000 --- a/runtime/doc/os_msdos.txt +++ /dev/null @@ -1,276 +0,0 @@ -*os_msdos.txt* For Vim version 7.4. Last change: 2005 Mar 29 - - - VIM REFERENCE MANUAL by Bram Moolenaar - - - *msdos* *ms-dos* *MSDOS* *MS-DOS* -This file contains the particularities for the MS-DOS version of Vim. - -1. Two versions for MS-DOS |msdos-versions| -2. Known problems |msdos-problems| -3. Long file names |msdos-longfname| -4. Termcap codes |msdos-termcap| -5. Shifted arrow keys |msdos-arrows| -6. Filename extensions |msdos-fname-extensions| -7. Memory usage and limitations |msdos-limitations| -8. Symbolically linked files |msdos-linked-files| -9. Copy/paste in a dos box |msdos-copy-paste| - -Additionally, there are a number of common Win32 and DOS items: -File locations |dos-locations| -Using backslashes |dos-backslash| -Standard mappings |dos-standard-mappings| -Screen output and colors |dos-colors| -File formats |dos-file-formats| -:cd command |dos-:cd| -Interrupting |dos-CTRL-Break| -Temp files |dos-temp-files| -Shell option default |dos-shell| - -For compiling Vim see src/INSTALL.pc. *msdos-compiling* - -============================================================================== -1. Two versions for MS-DOS *msdos-versions* - -There are two versions of Vim that can be used with MS-DOS machines: - - *dos16* -Dos16 version Can be used on any MS-DOS system, only uses up to 640 Kbyte of - memory. Also runs on OS/2, Windows 95, and NT. Excludes some - Vim-specific features (autocommands, syntax highlighting, - etc.). Recommended for use on pre-386 machines. - *dos32* -Dos32 version Requires 386 processor and a |DPMI| driver, uses all - available memory. Supports long file names and the Windows - clipboard, but NOT on Windows NT. Recommended for MS-DOS, - Windows 3.1 and Windows 95. - -There are also two versions that run under Windows: -Win32 version Requires Windows 95 or Windows NT, uses all available - memory, supports long file names, etc. Has some problems on - Windows 95. Recommended for Windows NT. See |os_win32.txt| -Win32 GUI Requirements like the Win32 version, but runs in its own - window, instead of a console. Has scrollbars, menu, etc. - Recommended for Windows 95 and Windows NT. See |gui-w32|. - -It is recommended to use the Dos32 or Win32 version. Although the Dos16 -version is able to edit very big files, it quickly runs out of memory when -making big changes. Disabling undo helps: ":set ul=-1". The screen updating -of the Dos16 version is the fastest of the three on DOS or Windows 95; on -Windows NT, the Win32 version is just as fast. - - *DPMI* -For the Dos32 version, you may need a DPMI driver when running in MS-DOS. If -you are running Windows or installed a clever memory manager, it will probably -work already. If you get the message "No DPMI", you need to install a DPMI -driver. Such a driver is included with the executable in CSDPMI4B.ZIP. Run -"cwsdpmi" just before starting Vim each time. Or you might want to include -"cwsdpmi -p" in your autoexec.bat to make it resident. The latest version of -"CSDPMI*.ZIP" can be obtained from: "ftp.neosoft.com:pub/users/s/sandmann". - - *minimal-features* -The 16 bit DOS version has been compiled with minimal features. Check the -|+feature-list| which ones are included (marked with a "T"). -You can include more features by editing feature.h and recompiling. - -============================================================================== -2. Known problems *msdos-problems* - -When using smartdrive (MS-DOS 6.x) with write-behind caching, it is possible -that Vim will try to create a swap file on a read-only file system (e.g. -write protected floppy). You will then be given the message > - A serious disk error has occurred .., Retry (r)? -There is nothing you can do but unprotect the floppy or switch off the -computer. Even CTRL-ALT-DEL will not get you out of this. This is really a -problem of smartdrive, not Vim. Smartdrive works fine otherwise. If this -bothers you, don't use the write-behind caching. - -Vim can't read swap files that have been opened already, unless the "share" -command has been used. If you see stray warnings for existing swap files, -include the "share" command in your config.sys or autoexec.bat (see your MSDOS -documentation). - -The Dos16 version can only have about 10 files open (in a window or hidden) at -one time. With more files you will get error messages when trying to read or -write a file, and for filter commands. Or Vim runs out of memory, and random -problems may result. - -The Dos32 version cannot have an unlimited number of files open at any one -time. The limit depends on the setting of FILES in your CONFIG.SYS. This -defaults to 15; if you need to edit a lot of files, you should increase this. -If you do not set FILES high enough, you can get strange errors, and shell -commands may cause a crash! - -The Dos32 version can work with long file names. When doing file name -completion, matches for the short file name will also be found. But this will -result in the corresponding long file name. For example, if you have the long -file name "this_is_a_test" with the short file name "this_i~1", the command -":e *1" will start editing "this_is_a_test". - -When using the Dos32 version and you run into problems with DPMI support, -check if there is a program in your config.sys that eats resources. One -program known to cause this problem is "netx", which says "NetWare v. 3.26 -Workstation shell". Replace it with version 3.32 to fix the problem. - -The Dos32 version will parse its arguments to handle quotation. This is good -to edit a file with spaces in its name, for example: > - vim "program files\accessories\ppp.scp" -A side effect is that single quotes are removed. Insert a backslash to avoid -that. For example, to edit the file "fi'le.txt": > - vim fi\'le.txt - -============================================================================== -3. Long file names *msdos-longfname* - -If the Dos32 version is run on Windows 95, it can use long file names. It -will work by default. If you want to disable this, use this setting: - set LFN=N -You can put this in your autoexec.bat file. - -Note: If you have installed DJGPP on your machine, you probably have a -"djgpp.env" file, which contains "LFN=n". You need to use "LFN=Y" to switch -on using long file names then. - -============================================================================== -4. Termcap codes *msdos-termcap* - -If you want to use another output method (e.g., when using a terminal on a COM -port), set the terminal name to "pcansi". You can change the termcap options -when needed (see |terminal-options|). Note that the -normal IBM ansi.sys does not support all the codes of the builtin pcansi -terminal. If you use ansi.sys, you will need to delete the termcap entries -t_al and t_dl with > - :set t_al= t_dl= -Otherwise, the screen will not be updated correctly. It is better to use -nansi.sys, nnansi.sys, or the like instead of ansi.sys. - -If you want to use Vim on a terminal connected to a COM: port, reset the -'bioskey' option. Otherwise the commands will be read from the PC keyboard. -CTRL-C and CTRL-P may not work correctly with 'bioskey' reset. - -============================================================================== -5. Shifted arrow keys *msdos-arrows* - -Use CTRL-arrow-left and CTRL-arrow-right instead of SHIFT-arrow-left and -SHIFT-arrow-right. The arrow-up and arrow-down cannot be used with SHIFT or -CTRL. - -============================================================================== -6. Filename extensions *msdos-fname-extensions* - -MS-DOS allows for only one file name extension. Therefore, when appending an -extension, the '.' in the original file name is replaced with a '_', the name -is truncated to 8 characters, and the new extension (e.g., ".swp") is -appended. Two examples: "test.c" becomes "test_c.bak", "thisisat.est" -becomes "thisisat.bak". To reduce these problems, the default for -'backupext' is "~" instead of ".bak". The backup file for "thisisat.est" -then becomes "thisisat.es~". The 'shortname' option is not available, -because it would always be set. - -============================================================================== -7. Memory usage and limitations *msdos-limitations* - -A swap file is used to store most of the text. You should be able to edit -very large files. However, memory is used for undo and other things. If you -delete a lot of text, you can still run out of memory in the Dos16 version. - -If Vim gives an "Out of memory" warning, you should stop editing. The result -of further editing actions is unpredictable. Setting 'undolevels' to 0 saves -some memory. Running the maze macros on a big maze is guaranteed to run out -of memory, because each change is remembered for undo. In this case set -'undolevels' to a negative number. This will switch off undo completely. - - *msdos-clipboard-limits* -In the Dos32 version, extended memory is used to avoid these problems. -However, if you are using the clipboard, you can still run into memory -limitations because the Windows clipboard can only communicate with Vim using -Dos memory. This means that the largest amount of text that can be sent to -or received from the Windows clipboard is limited by how much free Dos memory -is available on your system. - -You can usually maximize the amount of available Dos memory by adding the -following lines to Dos's "config.sys" file: > - - DOS=HIGH,UMB - DEVICE=C:\WINDOWS\himem.sys - DEVICE=C:\WINDOWS\emm386.exe RAM - -Modifying config.sys in this way will also help to make more memory available -for the Dos16 version, if you are using that. - -In the Dos16 version the line length is limited to about 32000 characters. -When reading a file the lines are automatically split. But editing a line -in such a way that it becomes too long may give unexpected results. - -============================================================================== -8. Symbolically linked files *msdos-linked-files* - -When using Vim to edit a symbolically linked file on a unix NFS file server, -you may run into problems. When writing the file, Vim does not "write -through" the symlink. Instead, it deletes the symbolic link and creates a new -file in its place. - -On Unix, Vim is prepared for links (symbolic or hard). A backup copy of the -original file is made and then the original file is overwritten. This assures -that all properties of the file remain the same. On non-Unix systems, the -original file is renamed and a new file is written. Only the protection bits -are set like the original file. However, this doesn't work properly when -working on an NFS-mounted file system where links and other things exist. The -only way to fix this in the current version is not making a backup file, by -":set nobackup nowritebackup" |'writebackup'| - -A similar problem occurs when mounting a Unix filesystem through Samba or a -similar system. When Vim creates a new file it will get the default user ID -for the mounted file system. This may be different from the original user ID. -To avoid this set the 'backupcopy' option to "yes". - -============================================================================== -9. Copy/paste in a dos box *msdos-copy-paste* - - *E450* *E451* *E452* *E453* *E454* -The 32 bit version can copy/paste from/to the Windows clipboard directly. Use -the "* register. Large amounts of text can be copied this way, but it must be -possible to allocate memory for it, see |msdos-clipboard-limits|. When moving -text from one Vim to another, the type of the selection -(characterwise/linewise/blockwise) is passed on. - -In other versions, the following can be used. - -(posted to comp.editors by John Velman <velman@igate1.hac.com>) - -How to copy/paste text from/to vim in a dos box: - -1) To get VIM to run in a window, instead of full screen, press alt+enter. - This toggles back and forth between full screen and a dos window. - NOTE: In Windows 95 you must have the property "Fast Pasting" unchecked! - In the properties dialog box for the MS-DOS window, go to "MS-DOS - Prompt/Misc/Fast pasting" and make sure that it is NOT checked. - To make this permanent, change the properties for - "\windows\system\conagent.exe" (from Philip Nelson, unverified). - -2) To paste something _into_ Vim, put Vim in insert mode. - -3) Put the text you want to paste on the windows clipboard. - -4) Click the control box in the upper left of the Vim window. (This looks - like a big minus sign.) If you don't want to use the mouse, you can get - this with alt+spacebar. -5) On the resulting dropdown menu choose "Edit". -6) On the child dropdown menu choose "Paste". - -To copy something from the Vim window to the clipboard, - -1) Select the control box to get the control drop down menu. -2) Select "Edit". -3) Select "Mark". -4) Using either the keys or the mouse, select the part of the Vim window that - you want to copy. To use the keys, use the arrow keys, and hold down shift - to extend the selection. -5) When you've completed your selection, press 'enter'. The selection - is now in the windows clipboard. By the way, this can be any - rectangular selection, for example columns 4-25 in rows 7-10. It can - include anything in the VIM window: the output of a :!dir, for - example. - - vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt index a01a06c8ec..22e763a08e 100644 --- a/runtime/doc/os_win32.txt +++ b/runtime/doc/os_win32.txt @@ -334,7 +334,7 @@ A. You have two possible solutions depending on what you want: :!start /min ctags -R . < When it has finished you should see file named "tags" in your current directory. You should notice the window title blinking on your taskbar. - This is more noticable for commands that take longer. + This is more noticeable for commands that take longer. Now delete the "tags" file and run this command: > :!start /b ctags -R . < You should have the same "tags" file, but this time there will be no diff --git a/runtime/indent/ada.vim b/runtime/indent/ada.vim index 03fbaa3a18..a553756715 100644 --- a/runtime/indent/ada.vim +++ b/runtime/indent/ada.vim @@ -219,7 +219,7 @@ function GetAdaIndent() " Move indent in twice (next 'when' will move back) let ind = ind + 2 * &sw elseif line =~ '^\s*end\s*record\>' - " Move indent back to tallying 'type' preceeding the 'record'. + " Move indent back to tallying 'type' preceding the 'record'. " Allow indent to be equal to 'end record's. let ind = s:MainBlockIndent( ind+&sw, lnum, 'type\>', '' ) elseif line =~ '\(^\s*new\>.*\)\@<!)\s*[;,]\s*$' diff --git a/runtime/syntax/asm68k.vim b/runtime/syntax/asm68k.vim index 8463e487e1..cd23517cad 100644 --- a/runtime/syntax/asm68k.vim +++ b/runtime/syntax/asm68k.vim @@ -223,7 +223,7 @@ syn match asm68kOperator "<>" " inequality syn match asm68kOperator "=" " must be before other ops containing '=' syn match asm68kOperator ">=" syn match asm68kOperator "<=" -syn match asm68kOperator "==" " operand existance - used in macro definitions +syn match asm68kOperator "==" " operand existence - used in macro definitions " Condition code style operators syn match asm68kOperator "<[CV][CS]>" diff --git a/runtime/syntax/aspvbs.vim b/runtime/syntax/aspvbs.vim index 07c129e463..f1435cb04b 100644 --- a/runtime/syntax/aspvbs.vim +++ b/runtime/syntax/aspvbs.vim @@ -40,7 +40,7 @@ syn match AspVBSVariableComplex contained "\<\(arr\|ary\|obj\)\u\w*" " Functions and methods that are in VB but will cause errors in an ASP page -" This is helpfull if your porting VB code to ASP +" This is helpful if you're porting VB code to ASP " I removed (Count, Item) because these are common variable names in AspVBScript syn keyword AspVBSError contained Val Str CVar CVDate DoEvents GoSub Return GoTo syn keyword AspVBSError contained Stop LinkExecute Add Type LinkPoke @@ -62,7 +62,7 @@ syn match AspVBSError contained "\<Option\s\+\(Base\|Compare\|Private\s\+Module\ syn match AspVBSError contained "Respon\?ce\.\S*" syn match AspVBSError contained "Respose\.\S*" " When I looked up the VBScript syntax it mentioned that Property Get/Set/Let -" statements are illegal, however, I have recived reports that they do work. +" statements are illegal, however, I have received reports that they do work. " So I commented it out for now. " syn match AspVBSError contained "\<Property\s\+\(Get\|Let\|Set\)\>" diff --git a/runtime/syntax/chill.vim b/runtime/syntax/chill.vim index ca00cd95e8..e5200fe722 100644 --- a/runtime/syntax/chill.vim +++ b/runtime/syntax/chill.vim @@ -27,7 +27,7 @@ syn keyword chillLogical NOT not syn keyword chillRepeat while WHILE for FOR do DO od OD TO to syn keyword chillProcess START start STACKSIZE stacksize PRIORITY priority THIS this STOP stop syn keyword chillBlock PROC proc PROCESS process -syn keyword chillSignal RECEIVE receive SEND send NONPERSISTENT nonpersistent PERSISTENT peristent SET set EVER ever +syn keyword chillSignal RECEIVE receive SEND send NONPERSISTENT nonpersistent PERSISTENT persistent SET set EVER ever syn keyword chillTodo contained TODO FIXME XXX diff --git a/runtime/syntax/clipper.vim b/runtime/syntax/clipper.vim index 1a10a2dca2..6ee3892845 100644 --- a/runtime/syntax/clipper.vim +++ b/runtime/syntax/clipper.vim @@ -109,7 +109,7 @@ else endif syntax match clipperCommentError "\*/" -" Lines beggining with an "*" are comments too +" Lines beginning with an "*" are comments too syntax match clipperComment "^\*.*" diff --git a/runtime/syntax/d.vim b/runtime/syntax/d.vim index 52c83bf913..07a299fa55 100644 --- a/runtime/syntax/d.vim +++ b/runtime/syntax/d.vim @@ -387,7 +387,7 @@ hi def link dPragmaIdentifier Identifier hi def link dExtern dExternal hi def link dExternIdentifier Identifier -" Marks contents of the asm statment body as special +" Marks contents of the asm statement body as special syn match dAsmStatement "\<asm\>" syn region dAsmBody start="asm[\n]*\s*{"hs=e+1 end="}"he=e-1 contains=dAsmStatement,dAsmOpCode,@dComment,DUserLabel diff --git a/runtime/syntax/dtrace.vim b/runtime/syntax/dtrace.vim index 2f2d6e2cc7..493de1ed0f 100644 --- a/runtime/syntax/dtrace.vim +++ b/runtime/syntax/dtrace.vim @@ -47,7 +47,7 @@ exec 'syn match dtraceProbe "'.s:oneProbe.'\%(,\_s*'.s:oneProbe.'\)*\ze\_s\%({\| " Also be careful not to eat `c = a / b; b = a / 2;`. We use the same " technique as the dtrace lexer: a predicate has to be followed by {, ;, or " EOF. Also note that dtrace doesn't allow an empty predicate // (we do). -" This regex doesn't allow a divison operator in the predicate. +" This regex doesn't allow a division operator in the predicate. " Make sure that this matches the empty predicate as well. " XXX: This doesn't work if followed by a comment. syn match dtracePredicate "/\*\@!\_[^/]*/\ze\_s*\%({\|;\|\%$\)" diff --git a/runtime/syntax/ia64.vim b/runtime/syntax/ia64.vim index f0d510b945..ebfdc95bae 100644 --- a/runtime/syntax/ia64.vim +++ b/runtime/syntax/ia64.vim @@ -56,7 +56,7 @@ syn keyword ia64opcode pshradd2 psub4 rfi rsm rum shl shladd shladdp4 syn keyword ia64opcode shrp ssm sub sum sync.i tak thash syn keyword ia64opcode tpa ttag xor -"put to override these being recognized as floats. They are orignally from masm.vim +"put to override these being recognized as floats. They are originally from masm.vim "put here to avoid confusion with float syn match ia64Directive "\.186" syn match ia64Directive "\.286" diff --git a/runtime/syntax/kix.vim b/runtime/syntax/kix.vim index 62dc3253e8..800e286042 100644 --- a/runtime/syntax/kix.vim +++ b/runtime/syntax/kix.vim @@ -10,7 +10,7 @@ " 26 April 2001: RMH " Removed development comments from distro version " Renamed "Kix*" to "kix*" for consistancy -" Changes made in preperation for VIM version 5.8/6.00 +" Changes made in preparation for VIM version 5.8/6.00 " TODO: " Handle arrays highlighting diff --git a/runtime/syntax/mel.vim b/runtime/syntax/mel.vim index dab894865c..a668e70378 100644 --- a/runtime/syntax/mel.vim +++ b/runtime/syntax/mel.vim @@ -18,7 +18,7 @@ if exists("mel_space_errors") sy match melSpaceError " \+\t"me=e-1 endif -" A bunch of usefull MEL keyworks +" A bunch of useful MEL keywords sy keyword melBoolean true false yes no on off sy keyword melFunction proc diff --git a/runtime/syntax/php.vim b/runtime/syntax/php.vim index f27d923400..26d60a9382 100644 --- a/runtime/syntax/php.vim +++ b/runtime/syntax/php.vim @@ -110,7 +110,7 @@ if exists( "php_htmlInStrings") syn cluster phpAddStrings add=@htmlTop endif -" make sure we can use \ at the begining of the line to do a continuation +" make sure we can use \ at the beginning of the line to do a continuation let s:cpo_save = &cpo set cpo&vim diff --git a/runtime/syntax/postscr.vim b/runtime/syntax/postscr.vim index fddfe4c947..8b051d33b3 100644 --- a/runtime/syntax/postscr.vim +++ b/runtime/syntax/postscr.vim @@ -503,11 +503,11 @@ if postscr_level == 2 || postscr_level == 3 " Page duplexing operators syn keyword postscrL2Operator duplexmode firstside newsheet setduplexmode settumble tumble -" Device compatability operators +" Device compatibility operators syn keyword postscrL2Operator devdismount devformat devmount devstatus syn keyword postscrL2Repeat devforall -" Imagesetter compatability operators +" Imagesetter compatibility operators syn keyword postscrL2Operator accuratescreens checkscreen pagemargin pageparams setaccuratescreens setpage syn keyword postscrL2Operator setpagemargin setpageparams diff --git a/runtime/syntax/redif.vim b/runtime/syntax/redif.vim index 1b83c07790..1a44a9f479 100644 --- a/runtime/syntax/redif.vim +++ b/runtime/syntax/redif.vim @@ -934,7 +934,7 @@ highlight redifFieldDeprecated term=undercurl cterm=undercurl gui=undercurl guis " Sync: The template-type (ReDIF-Paper, ReDIF-Archive, etc.) influences which " fields can follow. Thus sync must search backwards for it. " -" I would like to simply ask VIM to search backward for the first occurence of +" I would like to simply ask VIM to search backward for the first occurrence of " /^Template-Type:/, but it does not seem to be possible, so I have to start " from the beginning of the file... This might slow down a lot for files that " contain a lot of Template-Type statements. diff --git a/runtime/syntax/samba.vim b/runtime/syntax/samba.vim index dae4040ec5..93029cc202 100644 --- a/runtime/syntax/samba.vim +++ b/runtime/syntax/samba.vim @@ -55,7 +55,7 @@ syn keyword sambaKeyword contained only open oplock oplocks options order os syn keyword sambaKeyword contained output packet page panic passwd password syn keyword sambaKeyword contained passwords path permissions pipe port ports syn keyword sambaKeyword contained postexec postscript prediction preexec -syn keyword sambaKeyword contained prefered preferred preload preserve print +syn keyword sambaKeyword contained preferred preload preserve print syn keyword sambaKeyword contained printable printcap printer printers syn keyword sambaKeyword contained printing program protocol proxy public syn keyword sambaKeyword contained queuepause queueresume raw read readonly diff --git a/runtime/syntax/sather.vim b/runtime/syntax/sather.vim index 759591bf84..103cf0b8cd 100644 --- a/runtime/syntax/sather.vim +++ b/runtime/syntax/sather.vim @@ -4,7 +4,7 @@ " URL: http://www.fleiner.com/vim/syntax/sather.vim " Last Change: 2003 May 11 -" Sather is a OO-language developped at the International Computer Science +" Sather is a OO-language developed at the International Computer Science " Institute (ICSI) in Berkeley, CA. pSather is a parallel extension to Sather. " Homepage: http://www.icsi.berkeley.edu/~sather " Sather files use .sa as suffix diff --git a/runtime/syntax/specman.vim b/runtime/syntax/specman.vim index 3fb77a2afa..93fb4a86c6 100644 --- a/runtime/syntax/specman.vim +++ b/runtime/syntax/specman.vim @@ -111,8 +111,8 @@ syn region specmanString start=+"+ end=+"+ "********************************************************************** -" I took this section from c.vim but I didnt succeded to make it work -" ANY one who dare jumping to this deep watter is more than welocome! +" I took this section from c.vim, but I didn't succeed in making it work +" ANY one who dares to jump into this deep water is more than welcome! "********************************************************************** ""catch errors caused by wrong parenthesis and brackets diff --git a/runtime/syntax/spup.vim b/runtime/syntax/spup.vim index 07e9708eaa..8d7a9e525c 100644 --- a/runtime/syntax/spup.vim +++ b/runtime/syntax/spup.vim @@ -38,7 +38,7 @@ endif " one line comment syntax (# comments) " 1. allow appended code after comment, do not complain -" 2. show code beginnig with the second # as an error +" 2. show code beginning with the second # as an error " 3. show whole lines with more than one # as an error if !exists("oneline_comments") let oneline_comments = 2 diff --git a/runtime/syntax/tcl.vim b/runtime/syntax/tcl.vim index 3c598267dc..06629d077f 100644 --- a/runtime/syntax/tcl.vim +++ b/runtime/syntax/tcl.vim @@ -171,7 +171,7 @@ syn region tcltkCommand matchgroup=tcltkCommandColor start="\<format\>" matchgro " PACK " commands associated with pack -syn keyword tcltkPackSwitch contained forget info propogate slaves +syn keyword tcltkPackSwitch contained forget info propagate slaves syn keyword tcltkPackConfSwitch contained after anchor before expand fill in ipadx ipady padx pady side syn region tcltkCommand matchgroup=tcltkCommandColor start="\<pack\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1 contains=tclLineContinue,tcltkPackSwitch,tcltkPackConf,tcltkPackConfSwitch,tclNumber,tclVarRef,tclString,tcltkCommand keepend diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c index 548d8171a5..1ab441bed3 100644 --- a/src/nvim/api/window.c +++ b/src/nvim/api/window.c @@ -35,7 +35,7 @@ Buffer window_get_buffer(Window window, Error *err) /// @return the (row, col) tuple Position window_get_cursor(Window window, Error *err) { - Position rv = {.row = 0, .col = 0}; + Position rv = POSITION_INIT; win_T *win = find_window_by_handle(window, err); if (win) { @@ -245,7 +245,7 @@ void window_set_option(Window window, String name, Object value, Error *err) /// @return The (row, col) tuple with the window position Position window_get_position(Window window, Error *err) { - Position rv; + Position rv = POSITION_INIT; win_T *win = find_window_by_handle(window, err); if (win) { diff --git a/src/nvim/option.c b/src/nvim/option.c index a878ba6455..6eac1033c4 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -6850,7 +6850,7 @@ void check_win_options(win_T *win) /* * Check for NULL pointers in a winopt_T and replace them with empty_option. */ -void check_winopt(winopt_T *wop) +static void check_winopt(winopt_T *wop) { check_string_option(&wop->wo_fdi); check_string_option(&wop->wo_fdm); diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index db88755a01..92fd47ff6b 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -90,7 +90,7 @@ $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) test1.out RM_ON_RUN := test.out X* viminfo RM_ON_START := tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok -RUN_VIM := export VIMRUNTIME=$(SCRIPTSOURCE); $(TOOL) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in +RUN_VIM := VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(TOOL) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in clean: -rm -rf *.out \ diff --git a/src/nvim/testdir/test105.in b/src/nvim/testdir/test105.in index 73d92e899d..bfb4b65fbb 100644 --- a/src/nvim/testdir/test105.in +++ b/src/nvim/testdir/test105.in @@ -7,7 +7,7 @@ STARTTEST :set shellslash :let tab="\t" :command -nargs=1 Put :let expr=<q-args> | $put =expr.tab.strtrans(string(eval(expr))) -:let $HOME=fnamemodify('.', ':p:h:h:h:h') +:let $HOME=fnamemodify('.', ':p:h:h:h') :Put fnamemodify('.', ':p' )[-1:] :Put fnamemodify('.', ':p:h' )[-1:] :Put fnamemodify('test.out', ':p' )[-1:] @@ -23,7 +23,7 @@ STARTTEST :Put fnamemodify('abc.fb2.tar.gz', ':r' ) :Put fnamemodify('abc.fb2.tar.gz', ':r:r' ) :Put fnamemodify('abc.fb2.tar.gz', ':r:r:r' ) -:Put substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(src/nvim/testdir/.*\)', '\1', '') +:Put substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(nvim/testdir/.*\)', '\1', '') :Put fnamemodify('abc.fb2.tar.gz', ':e' ) :Put fnamemodify('abc.fb2.tar.gz', ':e:e' ) :Put fnamemodify('abc.fb2.tar.gz', ':e:e:e' ) diff --git a/src/nvim/testdir/test105.ok b/src/nvim/testdir/test105.ok index be1eca8f8f..0b30ee4281 100644 --- a/src/nvim/testdir/test105.ok +++ b/src/nvim/testdir/test105.ok @@ -3,8 +3,8 @@ fnamemodify('.', ':p:h' )[-1:] 'r' fnamemodify('test.out', ':p' )[-1:] 't' fnamemodify('test.out', ':.' ) 'test.out' fnamemodify('../testdir/a', ':.' ) 'a' -fnamemodify('test.out', ':~' ) '~/src/nvim/testdir/test.out' -fnamemodify('../testdir/a', ':~' ) '~/src/nvim/testdir/a' +fnamemodify('test.out', ':~' ) '~/nvim/testdir/test.out' +fnamemodify('../testdir/a', ':~' ) '~/nvim/testdir/a' fnamemodify('../testdir/a', ':t' ) 'a' fnamemodify('.', ':p:t' ) '' fnamemodify('test.out', ':p:t' ) 'test.out' @@ -13,7 +13,7 @@ fnamemodify('test.out', ':p:t:e' ) 'out' fnamemodify('abc.fb2.tar.gz', ':r' ) 'abc.fb2.tar' fnamemodify('abc.fb2.tar.gz', ':r:r' ) 'abc.fb2' fnamemodify('abc.fb2.tar.gz', ':r:r:r' ) 'abc' -substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(src/nvim/testdir/.*\)', '\1', '') 'src/nvim/testdir/abc.fb2' +substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(nvim/testdir/.*\)', '\1', '') 'nvim/testdir/abc.fb2' fnamemodify('abc.fb2.tar.gz', ':e' ) 'gz' fnamemodify('abc.fb2.tar.gz', ':e:e' ) 'tar.gz' fnamemodify('abc.fb2.tar.gz', ':e:e:e' ) 'fb2.tar.gz' diff --git a/src/nvim/version.c b/src/nvim/version.c index 5684a3f8d8..b164f94bb1 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -256,7 +256,7 @@ static int included_patches[] = { //342 NA //341, //340 NA - //339, + 339, 338, //337, //336, @@ -299,7 +299,7 @@ static int included_patches[] = { //299 NA 298, //297, - //296, + 296, 295, 294, 293, @@ -375,7 +375,7 @@ static int included_patches[] = { //223 NA //222 NA 221, - //220, + 220, 219, 218, //217 NA @@ -406,11 +406,11 @@ static int included_patches[] = { 192, 191, //190 NA - //189, + //189 NA //188 NA 187, 186, - //185, + //185 NA 184, //183 NA //182 NA @@ -419,7 +419,7 @@ static int included_patches[] = { //179 NA 178, //177 NA - //176, + //176 NA //175 NA //174 NA 173, |