diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | README_os390.txt | 2 | ||||
| -rw-r--r-- | nsis/gvim.nsi | 2 | ||||
| -rw-r--r-- | runtime/autoload/vimball.vim | 18 | ||||
| -rw-r--r-- | runtime/doc/index.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/message.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/os_mint.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/tabpage.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/usr_45.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/version4.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/vi_diff.txt | 4 | ||||
| -rw-r--r-- | runtime/makemenu.vim | 24 | ||||
| -rw-r--r-- | src/glbl_ime.cpp | 6 | ||||
| -rw-r--r-- | src/netbeans.c | 8 | ||||
| -rw-r--r-- | src/vim.def | 2 |
15 files changed, 46 insertions, 38 deletions
@@ -69,7 +69,7 @@ all install uninstall tools config configure reconfig proto depend lint tags typ # Before creating an archive first delete all backup files, *.orig, etc. MAJOR = 7 -MINOR = 1a +MINOR = 1b # Uncomment this line if the Win32s version is to be included. DOSBIN_S = dosbin_s @@ -141,13 +141,13 @@ DOSBIN_S = dosbin_s # - "nmake -f Make_mvc.mak GUI=yes. # - move "gvim.exe" to here (otherwise the OLE version will overwrite it). # - Move gvim.pdb to here. -# - Delete vimrun.exe, install.exe and uninstall.exe. +# - Delete vimrun.exe, install.exe and uninstal.exe. # - Copy "GvimExt/gvimext.dll" to here. # Win32 GUI version with OLE, PERL, TCL, PYTHON and dynamic IME: # - Run src/bigvim.bat ("nmake -f Make_mvc.mak GUI=yes OLE=yes IME=yes ...) # - Rename "gvim.exe" to "gvim_ole.exe". # - Rename gvim.pdb to "gvim_ole.pdb". -# - Delete install.exe and uninstall.exe. +# - Delete install.exe and uninstal.exe. # - If building the Win32s version delete vimrun.exe. # Win32s GUI version: # - Set environment for Visual C++ 4.1 (requires a new console window) diff --git a/README_os390.txt b/README_os390.txt index 85f8e4174..2adfe8fd6 100644 --- a/README_os390.txt +++ b/README_os390.txt @@ -1,4 +1,4 @@ -README_os_390.txt for version 7.1a of Vim: Vi IMproved. +README_os_390.txt for version 7.1b of Vim: Vi IMproved. Welcome to the OS/390 Unix port of VIM. diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index d7cb0eecb..961c6fd8d 100644 --- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -22,7 +22,7 @@ !define HAVE_NLS !define VER_MAJOR 7 -!define VER_MINOR 1a +!define VER_MINOR 1b # ----------- No configurable settings below this line ----------- diff --git a/runtime/autoload/vimball.vim b/runtime/autoload/vimball.vim index d4a27fd6d..5ed34f22c 100644 --- a/runtime/autoload/vimball.vim +++ b/runtime/autoload/vimball.vim @@ -1,7 +1,7 @@ " vimball.vim : construct a file containing both paths and files " Author: Charles E. Campbell, Jr. -" Date: Jan 03, 2007 -" Version: 21 +" Date: May 07, 2007 +" Version: 22 " GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim " Copyright: (c) 2004-2006 by Charles E. Campbell, Jr. " The VIM LICENSE applies to Vimball.vim, and Vimball.txt @@ -15,7 +15,7 @@ if &cp || exists("g:loaded_vimball") || v:version < 700 finish endif let s:keepcpo = &cpo -let g:loaded_vimball = "v21" +let g:loaded_vimball = "v22" set cpo&vim " ===================================================================== @@ -583,13 +583,14 @@ fun! s:SaveSettings() let s:fenkeep = &fen let s:hidkeep = &hidden let s:ickeep = &ic + let s:lzkeep = &lz + let s:pmkeep = &pm let s:repkeep = &report let s:vekeep = &ve - let s:lzkeep = &lz if exists("&acd") - set ei=all ve=all noacd nofen noic report=999 nohid bt= ma lz + set ei=all ve=all noacd nofen noic report=999 nohid bt= ma lz pm= else - set ei=all ve=all nofen noic report=999 nohid bt= ma lz + set ei=all ve=all nofen noic report=999 nohid bt= ma lz pm= endif " call Dret("SaveSettings") endfun @@ -606,6 +607,7 @@ fun! s:RestoreSettings() let &hidden = s:hidkeep let &ic = s:ickeep let &lz = s:lzkeep + let &pm = s:pmkeep let &report = s:repkeep let &ve = s:vekeep let &ei = s:eikeep @@ -615,9 +617,9 @@ fun! s:RestoreSettings() call setpos("'a",s:makeep) endif if exists("&acd") - unlet s:regakeep s:acdkeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep s:lzkeep + unlet s:regakeep s:acdkeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep s:lzkeep s:pmkeep else - unlet s:regakeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep s:lzkeep + unlet s:regakeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep s:lzkeep s:pmkeep endif set bt=nofile noma " call Dret("RestoreSettings") diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 87a7c2707..82f7d0dc1 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.1a. Last change: 2007 May 05 +*index.txt* For Vim version 7.1b. Last change: 2007 May 05 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index 32a76c26f..5b5615b24 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 7.1a. Last change: 2007 Mar 20 +*message.txt* For Vim version 7.1b. Last change: 2007 Mar 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_mint.txt b/runtime/doc/os_mint.txt index 764bda7ba..6b23afa95 100644 --- a/runtime/doc/os_mint.txt +++ b/runtime/doc/os_mint.txt @@ -1,4 +1,4 @@ -*os_mint.txt* For Vim version 7.1a. Last change: 2005 Mar 29 +*os_mint.txt* For Vim version 7.1b. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Jens M. Felderhoff diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt index 432e6a7fe..162875572 100644 --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -1,4 +1,4 @@ -*tabpage.txt* For Vim version 7.1a. Last change: 2007 Mar 11 +*tabpage.txt* For Vim version 7.1b. Last change: 2007 Mar 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt index 9c11bf484..8a8ff171b 100644 --- a/runtime/doc/usr_45.txt +++ b/runtime/doc/usr_45.txt @@ -1,4 +1,4 @@ -*usr_45.txt* For Vim version 7.1a. Last change: 2006 Apr 24 +*usr_45.txt* For Vim version 7.1b. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/version4.txt b/runtime/doc/version4.txt index 04c31a7b6..2a3984565 100644 --- a/runtime/doc/version4.txt +++ b/runtime/doc/version4.txt @@ -1,4 +1,4 @@ -*version4.txt* For Vim version 7.1a. Last change: 2006 Apr 24 +*version4.txt* For Vim version 7.1b. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index 0c9213a8e..cd8ea4edc 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -1,4 +1,4 @@ -*vi_diff.txt* For Vim version 7.1a. Last change: 2006 Nov 18 +*vi_diff.txt* For Vim version 7.1b. Last change: 2007 May 07 VIM REFERENCE MANUAL by Bram Moolenaar @@ -155,7 +155,7 @@ Multi level undo. |undo| considered changed anymore. You can exit it with :q, without <!>. When undoing a few changes and then making a new change Vim will create a branch in the undo tree. This means you can go back to any - state of the text, there is no risc of a change causing text to be + state of the text, there is no risk of a change causing text to be lost forever. |undo-tree| Graphical User Interface (GUI). |gui| diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim index 7a9130e31..1a2cda1c1 100644 --- a/runtime/makemenu.vim +++ b/runtime/makemenu.vim @@ -1,6 +1,6 @@ " Script to define the syntax menu in synmenu.vim " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2007 May 04 +" Last Change: 2007 May 10 " This is used by "make menu" in the src directory. edit <sfile>:p:h/synmenu.vim @@ -87,6 +87,7 @@ SynMenu AB.ASN\.1:asn SynMenu AB.Asterisk\ config:asterisk SynMenu AB.Asterisk\ voicemail\ config:asteriskvm SynMenu AB.Atlas:atlas +SynMenu AB.AutoHotKey:autohotkey SynMenu AB.AutoIt:autoit SynMenu AB.Automake:automake SynMenu AB.Avenue:ave @@ -112,11 +113,9 @@ SynMenu C.C:c SynMenu C.C++:cpp SynMenu C.C#:cs SynMenu C.Calendar:calendar -SynMenu C.CDL:cdl -SynMenu C.Crontab:crontab -SynMenu C.Cyn++:cynpp -SynMenu C.Cynlib:cynlib SynMenu C.Cascading\ Style\ Sheets:css +SynMenu C.CDL:cdl +SynMenu C.Cdrdao\ TOC:cdrtoc SynMenu C.Century\ Term:cterm SynMenu C.CH\ script:ch SynMenu C.ChangeLog:changelog @@ -128,18 +127,22 @@ SynMenu C.Clever:cl SynMenu C.Clipper:clipper SynMenu C.Cmake:cmake SynMenu C.Cmusrc:cmusrc +SynMenu C.Cobol:cobol SynMenu C.Cold\ Fusion:cf +SynMenu C.Conary\ Recipe:conaryrecipe SynMenu C.Config.Cfg\ Config\ file:cfg -SynMenu C.Config.Generic\ Config\ file:conf SynMenu C.Config.Configure\.in:config +SynMenu C.Config.Generic\ Config\ file:conf SynMenu C.CRM114:crm -SynMenu C.Ctrl-H:ctrlh -SynMenu C.Cobol:cobol +SynMenu C.Crontab:crontab SynMenu C.CSP:csp +SynMenu C.Ctrl-H:ctrlh SynMenu C.CUPL.CUPL:cupl SynMenu C.CUPL.Simulation:cuplsim SynMenu C.CVS.commit\ file:cvs SynMenu C.CVS.cvsrc:cvsrc +SynMenu C.Cyn++:cynpp +SynMenu C.Cynlib:cynlib SynMenu DE.D:d SynMenu DE.Debian.Debian\ ChangeLog:debchangelog @@ -193,6 +196,7 @@ SynMenu FG.FORM:form SynMenu FG.Forth:forth SynMenu FG.Fortran:fortran SynMenu FG.FoxPro:foxpro +SynMenu FG.FrameScript:framescript SynMenu FG.Fstab:fstab SynMenu FG.Fvwm.Fvwm\ configuration:fvwm1 SynMenu FG.Fvwm.Fvwm2\ configuration:fvwm2 @@ -261,7 +265,8 @@ SynMenu L-Ma.Lace:lace SynMenu L-Ma.LamdaProlog:lprolog SynMenu L-Ma.Latte:latte SynMenu L-Ma.Ld\ script:ld -SynMenu L-Ma.LDAP\ LDIF:ldif +SynMenu L-Ma.LDAP.LDIF:ldif +SynMenu L-Ma.LDAP.Configuration:ldapconf SynMenu L-Ma.Lex:lex SynMenu L-Ma.LFTP\ config:lftp SynMenu L-Ma.Libao:libao @@ -270,6 +275,7 @@ SynMenu L-Ma.Lilo:lilo SynMenu L-Ma.Limits\ config:limits SynMenu L-Ma.Lisp:lisp SynMenu L-Ma.Lite:lite +SynMenu L-Ma.LiteStep\ RC:litestep SynMenu L-Ma.Locale\ Input:fdcc SynMenu L-Ma.Login\.access:loginaccess SynMenu L-Ma.Login\.defs:logindefs diff --git a/src/glbl_ime.cpp b/src/glbl_ime.cpp index 20247e552..1abfeaf57 100644 --- a/src/glbl_ime.cpp +++ b/src/glbl_ime.cpp @@ -19,10 +19,10 @@ * Global IME makes capability input Chinese, Japanese, and Korean text into * Vim buffer on any language version of Windows 98, Windows 95, and Windows * NT 4.0. See below URL for detail of Global IME. You can also find - * various laguage version of Global IME at same place. + * various language version of Global IME at same place. * * RUNTIME REQUIREMENTS: - * - Internet Exproler 5.01 or higher. + * - Internet Explorer 5.01 or higher. * - Global IME (with language pack?). * - Of course Vim for Windows. * @@ -159,7 +159,7 @@ global_ime_TranslateMessage(CONST MSG *lpMsg) * Set position of IME compotision window. * * You have to call this before starting composition. If once composition - * started, this can take no effect until that composition have finised. So + * started, this can take no effect until that composition have finished. So * you should handle WM_IME_STARTCOMPOSITION and call this function. */ void WINAPI diff --git a/src/netbeans.c b/src/netbeans.c index dbb8b3c46..023e857d5 100644 --- a/src/netbeans.c +++ b/src/netbeans.c @@ -1211,8 +1211,8 @@ static int inAtomic = 0; /* * Do the actual processing of a single netbeans command or function. - * The differance between a command and function is that a function - * gets a response (its required) but a command does not. + * The difference between a command and function is that a function + * gets a response (it's required) but a command does not. * For arguments see comment for nb_parse_cmd(). */ static int @@ -2945,7 +2945,7 @@ netbeans_button_release(int button) /* - * Send a keypress event back to netbeans. This usualy simulates some + * Send a keypress event back to netbeans. This usually simulates some * kind of function key press. This function operates on a key code. */ void @@ -2959,7 +2959,7 @@ netbeans_keycommand(int key) /* - * Send a keypress event back to netbeans. This usualy simulates some + * Send a keypress event back to netbeans. This usually simulates some * kind of function key press. This function operates on a key string. */ static void diff --git a/src/vim.def b/src/vim.def index 37d2e5a09..db319cd6c 100644 --- a/src/vim.def +++ b/src/vim.def @@ -1,4 +1,4 @@ CODE PRELOAD EXECUTEONLY DATA MULTIPLE SHARED -DESCRIPTION 'Vim 7.1a' +DESCRIPTION 'Vim 7.1b' HEAPSIZE 0,0 |