updated for version 7.0184

diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 604447bdab6e432528186002b1c09e360ae8fe9f..8f71ee51717d9b5f26c6ff204ffff94216487cb7 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: 2006 Jan 20
+*version7.txt*  For Vim version 7.0aa.  Last change: 2006 Jan 21
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1596,4 +1596,7 @@ autocommands were triggered to notify about the change in the buffer list.
 In the quickfix buffer 'bufhidden' was set to "delete", which caused closing
 the quickfix window to leave an unlisted "No Name" buffer behind every time.
 
+Win32: when using two screens of different size, setting 'lines' to a large
+value didn't fill the whole screen. (SungHyun Nam)
+
  vim:tw=78:ts=8:ft=help:norl:

diff --git a/src/eval.c b/src/eval.c
index 737dfa64c654f805ba3b817d6a3e1dccc65b111a..e93182f87d8357062a9808c1beda8fb95ac21c44 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -13579,8 +13579,10 @@ f_setqflist(argvars, rettv)
     typval_T   *argvars;
     typval_T   *rettv;
 {
+#ifdef FEAT_QUICKFIX
     char_u     *act;
     int                action = ' ';
+#endif
 
     rettv->vval.v_number = -1;
 

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index c8912cae0e5ff78fa02a027b93f20d5cdda77d54..dff491a379c95031840349a16b7b6f38bb5e0574 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2637,7 +2637,7 @@ check_overwrite(eap, buf, fname, ffname, other)
        if (!eap->forceit && !eap->append)
        {
 #ifdef UNIX
-               /* with UNIX it is possible to open a directory */
+           /* with UNIX it is possible to open a directory */
            if (mch_isdir(ffname))
            {
                EMSG2(_(e_isadir2), ffname);

diff --git a/src/globals.h b/src/globals.h
index 6a46485fb59acec78006977527ffc390daf53370..b41c9e055446fac72c5bc1d53887830fa3146193 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -1288,7 +1288,7 @@ EXTERN char_u e_invexpr2[]        INIT(= N_("E15: Invalid expression: %s"));
 #endif
 EXTERN char_u e_invrange[]     INIT(= N_("E16: Invalid range"));
 EXTERN char_u e_invcmd[]       INIT(= N_("E476: Invalid command"));
-#if defined(UNIX) || (defined(FEAT_SYN_HL) && defined(FEAT_MBYTE))
+#if defined(UNIX) || defined(FEAT_SYN_HL)
 EXTERN char_u e_isadir2[]      INIT(= N_("E17: \"%s\" is a directory"));
 #endif
 #ifdef FEAT_LIBCALL

diff --git a/src/if_python.c b/src/if_python.c
index c1b3bf81762904e451ddaa1e617a637fa613829a..d0ce4015a90eec33363c5791cec292c3c798a19b 100644 (file)
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -93,11 +93,13 @@ struct PyMethodDef { int a; };
 # define PyInt_FromLong dll_PyInt_FromLong
 # define PyInt_Type (*dll_PyInt_Type)
 # define PyList_GetItem dll_PyList_GetItem
+# define PyList_Append dll_PyList_Append
 # define PyList_New dll_PyList_New
 # define PyList_SetItem dll_PyList_SetItem
 # define PyList_Size dll_PyList_Size
 # define PyList_Type (*dll_PyList_Type)
 # define PyImport_ImportModule dll_PyImport_ImportModule
+# define PyDict_New dll_PyDict_New
 # define PyDict_GetItemString dll_PyDict_GetItemString
 # define PyModule_GetDict dll_PyModule_GetDict
 # define PyRun_SimpleString dll_PyRun_SimpleString
@@ -149,11 +151,13 @@ static long(*dll_PyInt_AsLong)(PyObject *);
 static PyObject*(*dll_PyInt_FromLong)(long);
 static PyTypeObject* dll_PyInt_Type;
 static PyObject*(*dll_PyList_GetItem)(PyObject *, int);
+static PyObject*(*dll_PyList_Append)(PyObject *, PyObject *);
 static PyObject*(*dll_PyList_New)(int size);
 static int(*dll_PyList_SetItem)(PyObject *, int, PyObject *);
 static int(*dll_PyList_Size)(PyObject *);
 static PyTypeObject* dll_PyList_Type;
 static PyObject*(*dll_PyImport_ImportModule)(const char *);
+static PyObject*(*dll_PyDict_New)(void);
 static PyObject*(*dll_PyDict_GetItemString)(PyObject *, const char *);
 static PyObject*(*dll_PyModule_GetDict)(PyObject *);
 static int(*dll_PyRun_SimpleString)(char *);
@@ -227,12 +231,14 @@ static struct
     {"PyInt_FromLong", (PYTHON_PROC*)&dll_PyInt_FromLong},
     {"PyInt_Type", (PYTHON_PROC*)&dll_PyInt_Type},
     {"PyList_GetItem", (PYTHON_PROC*)&dll_PyList_GetItem},
+    {"PyList_Append", (PYTHON_PROC*)&dll_PyList_Append},
     {"PyList_New", (PYTHON_PROC*)&dll_PyList_New},
     {"PyList_SetItem", (PYTHON_PROC*)&dll_PyList_SetItem},
     {"PyList_Size", (PYTHON_PROC*)&dll_PyList_Size},
     {"PyList_Type", (PYTHON_PROC*)&dll_PyList_Type},
     {"PyImport_ImportModule", (PYTHON_PROC*)&dll_PyImport_ImportModule},
     {"PyDict_GetItemString", (PYTHON_PROC*)&dll_PyDict_GetItemString},
+    {"PyDict_New", (PYTHON_PROC*)&dll_PyDict_New},
     {"PyModule_GetDict", (PYTHON_PROC*)&dll_PyModule_GetDict},
     {"PyRun_SimpleString", (PYTHON_PROC*)&dll_PyRun_SimpleString},
     {"PyString_AsString", (PYTHON_PROC*)&dll_PyString_AsString},