updated for version 7.0046

3 files changed, 62 insertions, 26 deletions

diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
index e7a9aa06fa..11c24a687a 100644
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 7.0aa.  Last change: 2004 Jun 16
+*netbeans.txt*  For Vim version 7.0aa.  Last change: 2005 Jan 31
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -16,7 +16,8 @@ NetBeans ExternalEditor Integration Features		*netbeans*
 8.  Messages					|netbeans-messages|
 9.  Running Vim from NetBeans			|netbeans-run|
 10. NetBeans protocol				|netbeans-protocol|
-11. Known problems				|netbeans-problems|
+11. NetBeans commands				|netbeans-commands|
+12. Known problems				|netbeans-problems|
 
 {Vi does not have any of these features}
 {only available when compiled with the |+netbeans_intg| feature}
@@ -197,6 +198,14 @@ NetBeans connection lost for this buffer
 		for saving changes to this file and NetBeans will no longer
 		know of these changes.
 
+							*E744*
+NetBeans does not allow changes in read-only files
+		Vim normally allows changes to a read-only file and only
+		enforces the read-only rule if you try to write the file.
+		However, NetBeans does not let you make changes to a file
+		which is read-only and becomes confused if vim does this.
+		So vim does not allow modifications to files when run with
+		NetBeans.
 ==============================================================================
 9. Running Vim from NetBeans				*netbeans-run*
 
@@ -755,7 +764,18 @@ DETACH		IDE -> editor: break the connection without exiting the
 REJECT		Not used.
 
 ==============================================================================
-11. Known problems					*netbeans-problems*
+11. NetBeans Commands					*netbeans-commands*
+
+							*:nbkey*
+:nbkey key			Pass the key to NetBeans for processing
+
+Pass the key to NetBeans for hot-key processing. You should not need to use
+this command directly. However, NetBeans passes a list of hot-keys to Vim at
+startup and when one of these keys is pressed, this command is generated to
+send the key press back to NetBeans.
+
+==============================================================================
+12. Known problems					*netbeans-problems*
 
 NUL bytes are not possible.  For editor -> IDE they will appear as NL
 characters.  For IDE -> editor they cannot be inserted.
diff --git a/runtime/lang/menu_zh.big5.vim b/runtime/lang/menu_zh.big5.vim
index 0810159180..f437ce7c23 100644
--- a/runtime/lang/menu_zh.big5.vim
+++ b/runtime/lang/menu_zh.big5.vim
@@ -1 +1,3 @@
+" Menu Translations:	Traditional Chinese
+
 source <sfile>:p:h/menu_chinese_taiwan.950.vim
diff --git a/runtime/syntax/ipfilter.vim b/runtime/syntax/ipfilter.vim
index 8cdb113ee8..db99812852 100644
--- a/runtime/syntax/ipfilter.vim
+++ b/runtime/syntax/ipfilter.vim
@@ -1,9 +1,9 @@
 " ipfilter syntax file
 " Language: ipfilter configuration file
 " Maintainer: Hendrik Scholz <hendrik@scholz.net>
-" Last Change: 2005 Jan 23
+" Last Change: 2005 Jan 27
 "
-" http://raisdorf.net/files/misc/ipfilter.vim
+" http://www.wormulon.net/files/misc/ipfilter.vim
 "
 " This will also work for OpenBSD pf but there might be some tags that are
 " not correctly identified.
@@ -17,27 +17,41 @@ elseif exists("b:current_syntax")
   finish
 endif
 
-" comments
-"syn match ipfComment /#/
-syn match ipfComment /#.*/
-
-syn keyword ipfQuick quick log dup-to
-syn keyword ipfAny all any
-" rule Action type
-syn region ipfActionBlock start=/^block/ end=/$/ contains=ipfQuick,ipfAny
-syn region ipfActionPass  start=/^pass/ end=/$/ contains=ipfQuick,ipfAny
-syn region ipfActionMisc  start=/^log/ end=/$/ contains=ipfQuick,ipfAny
-syn region ipfActionMisc  start=/^count/ end=/$/ contains=ipfQuick,ipfAny
-syn region ipfActionMisc  start=/^skip/ end=/$/ contains=ipfQuick,ipfAny
-syn region ipfActionMisc  start=/^auth/ end=/$/ contains=ipfQuick,ipfAny
-syn region ipfActionMisc  start=/^call/ end=/$/ contains=ipfQuick,ipfAny
-
-hi def link ipfComment		Comment
+" Comment
+syn match	IPFComment	/#.*$/	contains=ipfTodo
+syn keyword	IPFTodo		TODO XXX FIXME contained
+
+syn keyword IPFActionBlock	block
+syn keyword IPFActionPass	pass
+syn keyword	IPFProto	tcp udp icmp
+syn keyword	IPFSpecial	quick log first
+" how could we use keyword for words with '-' ?
+syn match	IPFSpecial	/return-rst/
+syn match	IPFSpecial	/dup-to/
+"syn match	IPFSpecial	/icmp-type unreach/
+syn keyword IPFAny		all any
+syn match	IPFIPv4		/\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
+syn match	IPFNetmask	/\/\d\+/
+
+" service name constants
+syn keyword IPFService	auth bgp domain finger ftp http https ident
+syn keyword IPFService	imap irc isakmp kerberos mail nameserver nfs
+syn keyword IPFService	nntp ntp pop3 portmap pptp rpcbind rsync smtp
+syn keyword IPFService	snmp snmptrap socks ssh sunrpc syslog telnet
+syn keyword IPFService	tftp www
+
+" Comment
+hi def link IPFComment	Comment
+hi def link IPFTodo		Todo
+
+hi def link IPFService	Constant
+
+hi def link IPFAction	Type
 hi def link ipfActionBlock	String
 hi def link ipfActionPass	Type
-hi def link ipfActionMisc	Label
-"hi def link ipfQuick		Error
-hi def link ipfQuick		Special
-hi def link ipfAny		Statement
-
+hi def link IPFSpecial	Statement
+hi def link IPFIPv4		Label
+hi def link IPFNetmask	String
+hi def link IPFAny		Statement
+hi def link IPFProto	Identifier