diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 7c0e74d04cd23aca2cd69d06ae6e59e2d61d8187..556ea4aab771546ee2f41e3510fc0923006642ea 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 04
+*various.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -250,7 +250,9 @@ g8			Print the hex values of the bytes used in the
    *+ARP*		Amiga only: ARP support included
 B  *+arabic*		|Arabic| language support
 N  *+autocmd*		|:autocmd|, automatic commands
-m  *+balloon_eval*	|balloon-eval| support
+m  *+balloon_eval*	|balloon-eval| support. Included when compiling with
+			supported GUI (Motif, GTK, GUI) and either
+			Netbeans/Sun Workshop integration or |+eval| feature.
 N  *+browse*		|:browse| command
 N  *+builtin_terms*	some terminals builtin |builtin-terms|
 B  *++builtin_terms*	maximal terminals builtin |builtin-terms|
diff --git a/src/misc1.c b/src/misc1.c
index 20890bbb11ee24d8d6ab768f7033467e4d77dbf8..3125dfe341fa3ffbc86479864853d16b47b7dc69 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -3628,7 +3628,6 @@ vim_getenv(name, mustfree)
 	    if (pp != NULL)
 	    {
 		p = pp;
-		p[len] = NUL;
 		*mustfree = TRUE;
 	    }
 	}
diff --git a/src/proto/memline.pro b/src/proto/memline.pro
index 4e0382a0066bc980acf36659e10846a8fa611554..1ebd7eb2f1d91ab7757071b034d06e9f5351c9a9 100644
--- a/src/proto/memline.pro
+++ b/src/proto/memline.pro
@@ -26,6 +26,6 @@ linenr_T ml_firstmarked __ARGS((void));
 void ml_clearmarked __ARGS((void));
 char_u *get_file_in_dir __ARGS((char_u *fname, char_u *dname));
 void ml_setflags __ARGS((buf_T *buf));
-long ml_find_line_or_offset __ARGS((buf_T *buf, linenr_T line, long *offp));
+long ml_find_line_or_offset __ARGS((buf_T *buf, linenr_T lnum, long *offp));
 void goto_byte __ARGS((long cnt));
 /* vim: set ft=c : */