updated for version 7.0040

3 files changed, 19 insertions, 6 deletions

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index da1625608..5de6a41bd 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jan 15
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jan 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -260,7 +260,9 @@ examples: >
 	:call add(list, [1, 2])		" append List as one new item
 	:call extend(list, [1, 2])	" extend the list with two more items
 	:let i = remove(list, 3)	" remove item 3
+	:unlet list[3]			" idem
 	:let l = remove(list, 3, -1)	" remove items 3 to last item
+	:unlet list[3 : ]		" idem
 	:call filter(list, 'v:val =~ "x"')  " remove items with an 'x'
 
 Changing the oder of items in a list: >
@@ -416,8 +418,11 @@ use |:let| this way: >
 	:let dict[4] = "four"
 	:let dict['one'] = item
 
-Removing an entry from a Dictionary is done with |remove()|: >
-	:let i = remove(dict, 'aaa')	" remove item with key 'aaa'
+Removing an entry from a Dictionary is done with |remove()| or |:unlet|.
+Three ways to remove the entry with key "aaa" from dict: >
+	:let i = remove(dict, 'aaa')
+	:unlet dict.aaa
+	:unlet dict['aaa']
 
 Merging a Dictionary with another is done with |extend()|: >
 	:call extend(adict, bdict)	" extend adict with entries from bdict
@@ -4313,6 +4318,12 @@ This would call the function "my_func_whizz(parameter)".
 			variable names can be given, they are all removed.
 			With [!] no error message is given for non-existing
 			variables.
+			One or more items from a List can be removed: >
+				:unlet list[3]	  " remove fourth item
+				:unlet list[3:]   " remove fourth item to last
+<			One item from a Dictionary can be removed at a time: >
+				:unlet dict['two']
+				:unlet dict.two
 
 :if {expr1}			*:if* *:endif* *:en* *E171* *E579* *E580*
 :en[dif]		Execute the commands until the next matching ":else"
diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim
index 796bf08fa..24c287357 100644
--- a/src/testdir/test49.vim
+++ b/src/testdir/test49.vim
@@ -1,6 +1,6 @@
 " Vim script language tests
 " Author:	Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com>
-" Last Change:	2005 Jan 15
+" Last Change:	2005 Jan 16
 
 "-------------------------------------------------------------------------------
 " Test environment							    {{{1
@@ -8515,6 +8515,7 @@ function! MATCH(expected, msg, enr, emsg)
 	    else
 		let msg = escape(msg, '"')
 		Xout "Unexpected message:" msg
+		Xout "Expected:" a:enr . ": " . a:emsg
 	    endif
 	endif
     else
@@ -8522,6 +8523,7 @@ function! MATCH(expected, msg, enr, emsg)
 	if !a:expected		" match although not expected
 	    let msg = escape(msg, '"')
 	    Xout "Unexpected message:" msg
+	    Xout "Expected none."
 	endif
     endif
     return match
diff --git a/src/version.h b/src/version.h
index 1e3f818c4..fbf243c83 100644
--- a/src/version.h
+++ b/src/version.h
@@ -36,5 +36,5 @@
 #define VIM_VERSION_NODOT	"vim70aa"
 #define VIM_VERSION_SHORT	"7.0aa"
 #define VIM_VERSION_MEDIUM	"7.0aa ALPHA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 15)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 15, compiled "
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 16)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 16, compiled "