updated for version 7.0214

6 files changed, 27 insertions, 13 deletions

diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 7a860a77..8a0f0a4a 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.0aa.  Last change: 2006 Feb 01
+*cmdline.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -970,6 +970,11 @@ that there will be an extra screen redraw.
 The buffer used for the command-line window is deleted.  Any changes to lines
 other than the one that is executed with <CR> are lost.
 
+If you would like to execute the command under the cursor and then have the
+command-line window open again, you may find this mapping useful: >
+
+	:map <F5> <CR>q:
+
 
 VARIOUS
 
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 4d12d166..cf414777 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 7.0aa.  Last change: 2006 Jan 12
+*develop.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -187,8 +187,8 @@ strchr()	vim_strchr()	Accepts special characters
 strrchr()	vim_strrchr()	Accepts special characters
 isspace()	vim_isspace()	Can handle characters > 128
 iswhite()	vim_iswhite()	Only TRUE for Tab and space
-memcpy()	vim_memmove()	Handles overlapped copies
-bcopy()		vim_memmove()	Handles overlapped copies
+memcpy()	mch_memmove()	Handles overlapped copies
+bcopy()		mch_memmove()	Handles overlapped copies
 memset()	vim_memset()	Uniform for all systems
 
 
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 0f4436c2..7d904a81 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 02
+*insert.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1142,9 +1142,9 @@ Completion of C code requires a tags file.  You should use Exuberant ctags,
 because it adds extra information that is needed for completion.  You can find
 it here: http://ctags.sourceforge.net/
 For version 5.5.4 you should add a patch that adds the "typename:" field:
-ftp://ftp.vim.org/pub/vim/unstable/patches/ctags-5.5.4.patch
+	ftp://ftp.vim.org/pub/vim/unstable/patches/ctags-5.5.4.patch
 A compiled .exe for MS-Windows can be found at:
-http://georgevreilly.com/vim/ctags.html
+	http://georgevreilly.com/vim/ctags.html
 
 If you want to complete system functions you can do something like this.  Use
 ctags to generate a tags file for all the system header files: >
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim
index 0af2f95f..c27cf512 100644
--- a/runtime/plugin/matchparen.vim
+++ b/runtime/plugin/matchparen.vim
@@ -1,6 +1,6 @@
 " Vim plugin for showing matching parens
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Mar 03
+" Last Change: 2006 Mar 04
 
 " Exit quickly when:
 " - this plugin was already loaded (or disabled)
@@ -32,6 +32,11 @@ function! s:Highlight_Matching_Pair()
     let s:paren_hl_on = 0
   endif
 
+  " Avoid that we remove the popup menu.
+  if pumvisible()
+    return
+  endif
+
   " Get the character under the cursor and check if it's in 'matchpairs'.
   let c_lnum = line('.')
   let c_col = col('.')
diff --git a/runtime/spell/cleanadd.vim b/runtime/spell/cleanadd.vim
index 14eb83a1..cb7620fb 100644
--- a/runtime/spell/cleanadd.vim
+++ b/runtime/spell/cleanadd.vim
@@ -3,17 +3,20 @@
 " Last Update:	2006 Jan 19
 
 " Time in seconds after last time an ll.xxxxx.add file was updated
-" Default is one hour.
+" Default is one second.
+" If you invoke this script often set it to something bigger, e.g. 60 * 60
+" (one hour)
 if !exists("g:spell_clean_limit")
-  let g:spell_clean_limit = 60 * 60
+  let g:spell_clean_limit = 1
 endif
 
 " Loop over all the runtime/spell/*.add files.
+" Delete all comment lines, except the ones starting with ##.
 for s:fname in split(globpath(&rtp, "spell/*.add"), "\n")
   if filewritable(s:fname) && localtime() - getftime(s:fname) > g:spell_clean_limit
-    silent exe "split " . escape(s:fname, ' \')
+    silent exe "tab split " . escape(s:fname, ' \')
     echo "Processing" s:fname
-    silent! g/^#/d
+    silent! g/^#[^#]/d
     silent update
     close
   endif
diff --git a/runtime/syntax/objc.vim b/runtime/syntax/objc.vim
index 1c296ddb..3aa1177b 100644
--- a/runtime/syntax/objc.vim
+++ b/runtime/syntax/objc.vim
@@ -3,7 +3,7 @@
 " Maintainer:	    Kazunobu Kuriyama <kazunobu.kuriyama@nifty.com>
 " Ex-maintainer:    Anthony Hodsdon <ahodsdon@fastmail.fm>
 " First Author:	    Valentino Kyriakides <1kyriaki@informatik.uni-hamburg.de>
-" Last Change:	    2005 Apr 13
+" Last Change:	    2006 Mar 4
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -44,6 +44,7 @@ syn match  objcScopeDecl    "@public\|@private\|@protected"
 syn match  objcDirective    "@interface\|@implementation"
 syn match  objcDirective    "@class\|@end\|@defs"
 syn match  objcDirective    "@encode\|@protocol\|@selector"
+syn match  objcDirective    "@try\|@catch\|@finally\|@throw\|@synchronized"
 
 " Match the ObjC method types
 "