updated for version 7.0176

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index ff1f0f46d45fd13adcdc949e91f0fdcd868929d6..8ce42e3b618ef248335697e565c91f27fd5e1779 100644 (file)
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Dec 22
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Dec 23
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -30,13 +30,6 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
                                                        *known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-ln -s b a
-vim a
-[insert some text]
-:w
-:sp b
-[there are now two buffers for the same file and two swapfiles]
-
 ccomplete:
 - When an option is set: In completion mode and the user types (identifier)
   characters, advance to the first match instead of removing the popup menu.

diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 0be816d521967457516ce3bcdbd45ca06931a33a..953c7e74855e55cdb2127da8d8cd275dab7b6ac2 100644 (file)
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Dec 20
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Dec 23
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -917,7 +917,7 @@ inserted after the CTRL-O.  Allows using CTRL-O commands to move the cursor
 without losing the last inserted text.
 
 The exists() function now supports checking for autocmd group definition
-and for supported autocommands. (Yegappan Lakshmanan)
+and for supported autocommand events. (Yegappan Lakshmanan)
 
 ==============================================================================
 COMPILE TIME CHANGES                                   *compile-changes-7*
@@ -1512,4 +1512,9 @@ recording.
 Unix: the src/configure script used ${srcdir-.}, not all shells understand
 that.  Use ${srcdir:-.} instead.
 
+When editing file "a" which is a symlink to file "b" that doesn't exist,
+writing file "a" to create "b" and then ":split b" resulted in two buffers on
+the same file with two different swapfile names.  Now set the inode in the
+buffer when creating a new file.
+
  vim:tw=78:ts=8:ft=help:norl:

diff --git a/runtime/syntax/sql.vim b/runtime/syntax/sql.vim
index 6d8bca356306bef48b774e9d7af8530fba7f49ad..f9a7c19e3beffb92d810b9b5ecc1a5257f959e1c 100644 (file)
--- a/runtime/syntax/sql.vim
+++ b/runtime/syntax/sql.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:    SQL, PL/SQL (Oracle 8i)
 " Maintainer:  Paul Moore <pf_moore AT yahoo.co.uk>
-" Last Change: 2004 Jul 19
+" Last Change: 2005 Dec 23
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -58,7 +58,7 @@ syn match sqlComment  "--.*$" contains=sqlTodo
 syn sync ccomment sqlComment
 
 " Todo.
-syn keyword sqlTodo TODO FIXME XXX DEBUG NOTE
+syn keyword sqlTodo contained TODO FIXME XXX DEBUG NOTE
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already

diff --git a/src/memline.c b/src/memline.c
index a8e4025be255f9bf39fb0c2dc659377c7e22acbf..3eba98d5982be1f3fe4ab050083e9c67542d7884 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -3419,9 +3419,10 @@ resolve_symlink(fname, buf)
        ret = readlink((char *)tmp, (char *)buf, MAXPATHL - 1);
        if (ret <= 0)
        {
-           if (errno == EINVAL)  /* found non-symlink, stop here */
+           if (errno == EINVAL || errno == ENOENT)
            {
-               /* When at the first level use the unmodifed name, skip the
+               /* Found non-symlink or not existing file, stop here.
+                * When at the first level use the unmodifed name, skip the
                 * call to vim_FullName(). */
                if (depth == 1)
                    return FAIL;