--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 May 22
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 May 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,13 +30,37 @@ be worked on, but only if you sponsor Vi
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+GTK: Hang for "gvim </tmp/tt >&/tmp/ttt".  Ready to read char from stdin but
+it's never read.
+Namsh also has a problem with a hang, coming from the added char_avail() call.
+Temporary fix: check "gui.starting".
+
 Make option like 'verbose' that writes output into a file?  Should make it
 possible to see what's happening without messing up the display.
 
+Errors when compiling with Cygwin (Thomas).
+
+":sort n" sort on decimal number (skipping white space)
+":sort x" sort on hex number
+":sort o" sort on octal number
+Docs: doesn't work well together with :global.
+
+split(): splitting into chars doesn't work.
+
+":qtag" command: make list of matching tags and use like quickfix list.
+This changes the stack of quickfix lists.  Make another list and use ":qnext",
+":qprev", etc.?  Do allow other commands for quickfix list, such as quickfix
+window.
+
 Mac unicode patch (Da Woon Jung):
 - selecting proportional font breaks display
 - UTF-8 text causes display problems.  Font replacement causes this.
 
+Should we always set LC_CTYPE to "C", so that all library functions work on
+bytes?  Avoids problems with sprintf() on MS-Windows. (Yongwei)
+Problem noticed: tooltips are messed up.  Depends on the moment 'encoding' is
+changed.
+
 autoload:
 - Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
   script names and a help file and produces a script that can be sourced to

--- a/runtime/doc/vimdiff.1
+++ b/runtime/doc/vimdiff.1
@@ -33,7 +33,7 @@ changes in a fold.  'foldcolumn' is set 
 folds and open or close them.
 .SH OPTIONS
 Vertical splits are used to align the lines, as if the "\-O" argument was used.
-To use horizontal splits intead, use the "\-o" argument.
+To use horizontal splits instead, use the "\-o" argument.
 .PP
 For all other arguments see vim(1).
 .SH SEE ALSO

--- a/runtime/syntax/logtalk.vim
+++ b/runtime/syntax/logtalk.vim
@@ -2,7 +2,7 @@
 "
 " Language:	Logtalk
 " Maintainer:	Paulo Moura <pmoura@logtalk.org>
-" Last Change:	March 12, 2005
+" Last Change:	April 5, 2005
 
 
 " Quit when a syntax file was already loaded:
@@ -70,6 +70,7 @@ syn region	logtalkEntityRel	matchgroup=l
 " Logtalk directives
 
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- alias("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- encoding("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- initialization("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- info("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- mode("		matchgroup=logtalkDirTag	end=")\."	contains=logtalkOperator, logtalkAtom

--- a/src/eval.c
+++ b/src/eval.c
@@ -12350,7 +12350,7 @@ f_setline(argvars, rettv)
     typval_T	*rettv;
 {
     linenr_T	lnum;
-    char_u	*line;
+    char_u	*line = NULL;
     list_T	*l = NULL;
     listitem_T	*li = NULL;
     long	added = 0;

--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -327,7 +327,14 @@ ex_sort(eap)
 	    sort_ic = TRUE;
 	else if (*p == 'u')
 	    unique = TRUE;
-	else if (!ASCII_ISALPHA(*p))
+	else if (*p == '"')	/* comment start */
+	    break;
+	else if (check_nextcmd(p) != NULL)
+	{
+	    eap->nextcmd = check_nextcmd(p);
+	    break;
+	}
+	else if (!ASCII_ISALPHA(*p) && regmatch.regprog == NULL)
 	{
 	    s = skip_regexp(p + 1, *p, TRUE, NULL);
 	    if (*s != *p)
@@ -339,7 +346,7 @@ ex_sort(eap)
 	    regmatch.regprog = vim_regcomp(p + 1, RE_MAGIC);
 	    if (regmatch.regprog == NULL)
 		goto theend;
-	    p = s + 1;
+	    p = s;		/* continue after the regexp */
 	    regmatch.rm_ic = p_ic;
 	}
 	else