updated for version 7.0112

diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 6158bbc5d831e719b09df5fc4a85d1da2ae7a88f..8969b4c19617a6e9fbc1a9ae91a23b702c09c37c 100644 (file)
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.0aa.  Last change: 2005 Jul 07
+*gui.txt*       For Vim version 7.0aa.  Last change: 2005 Jul 21
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -736,9 +736,9 @@ from the main menu bar.  You must then use the |:popup| or |:tearoff| command
 to display it.
 
                                                        *popup-menu*
-In the Win32, KDE, GTK+, Motif, Athena and Photon GUI, you can define the special
-menu "PopUp".  This is the menu that is displayed when the right mouse button
-is pressed, if 'mousemodel' is set to popup or popup_setpos.
+In the Win32, KDE, GTK+, Motif, Athena and Photon GUI, you can define the
+special menu "PopUp".  This is the menu that is displayed when the right mouse
+button is pressed, if 'mousemodel' is set to popup or popup_setpos.
 
 
 5.3 Showing What Menus Are Mapped To                   *showing-menus*

diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index a42b744afcff80c110ea8fc1fe3f6267ef78af90..19a9d531c07effa20507deb6d97240b89a4150e7 100644 (file)
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.0aa.  Last change: 2005 Jun 03
+*map.txt*       For Vim version 7.0aa.  Last change: 2005 Jul 21
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -974,7 +974,7 @@ the 'path' option: >
     :com -nargs=1 -bang -complete=customlist,EditFileComplete
                        \ EditFile edit<bang> <args>
     :fun EditFileComplete(A,L,P)
-    :    return split(globpath(&path, a:ArgLead))
+    :    return split(globpath(&path, a:ArgLead), "\n")
     :endfun
 <
 Range handling                                         *E177* *E178*

diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 1c0a09dda5212c80e559d2cbac78e0fb438d03fb..7084d1eab79a18c64785ea9d4dcc60edee10c009 100644 (file)
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -692,6 +692,7 @@ Buffers, windows and the argument list:
        winnr()                 get the window number for the current window
        bufwinnr()              get the window number of a specific buffer
        winbufnr()              get the buffer number of a specific window
+       getbufline()            get a list of lines from the specified buffer
        getbufvar()             get a variable value from a specific buffer
        setbufvar()             set a variable in a specific buffer
        getwinvar()             get a variable value from a specific window

diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index ead13c740157e8dc927c39ac02223bf5f366865a..690627335d8dbc5e82060f7ef25543467707d854 100644 (file)
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -354,7 +354,7 @@ endif
 CFLAGS += -s
 endif
 
-LIB = -lkernel32 -luser32 -lgdi32 -ladvapi32 -lcomdlg32 -lcomctl32
+LIB = -lkernel32 -luser32 -lgdi32 -ladvapi32 -lcomdlg32 -lcomctl32 -lversion
 GUIOBJ =  $(OUTDIR)/gui.o $(OUTDIR)/gui_w32.o $(OUTDIR)/gui_beval.o $(OUTDIR)/os_w32exe.o
 OBJ = \
        $(OUTDIR)/buffer.o \

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index c1aeeb830b152e29938dd69de479dd2f86661d17..599767bb53beaf183c4cc707d32db2ec3783936d 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -469,7 +469,7 @@ GUI_OBJ = \
        $(OUTDIR)\gui_w32.obj \
        $(OUTDIR)\os_w32exe.obj
 GUI_LIB = \
-       oldnames.lib kernel32.lib gdi32.lib $(IME_LIB) \
+       oldnames.lib kernel32.lib gdi32.lib version.lib $(IME_LIB) \
        winspool.lib comctl32.lib advapi32.lib shell32.lib \
        /machine:$(CPU) /nodefaultlib
 !else

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index b5c636c76af7503541d184604a362c36eb9b00d3..5b07cf613d9aab9a0cc49b8e6f49baa4f37e9eab 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4341,6 +4341,7 @@ repl_cmdline(eap, src, srclen, repl, cmdlinep)
      */
     i = (int)(src - *cmdlinep);        /* length of part before match */
     mch_memmove(new_cmdline, *cmdlinep, (size_t)i);
+
     mch_memmove(new_cmdline + i, repl, (size_t)len);
     i += len;                          /* remember the end of the string */
     STRCPY(new_cmdline + i, src + srclen);

diff --git a/src/fileio.c b/src/fileio.c
index dc2606b93dff14818d295adf6560a74c6f5091b3..460e389932485f5c7bc287ef1a13f39bd99c1932 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6731,6 +6731,7 @@ static struct event_name
     {"InsertChange",   EVENT_INSERTCHANGE},
     {"InsertEnter",    EVENT_INSERTENTER},
     {"InsertLeave",    EVENT_INSERTLEAVE},
+    {"MenuPopup",      EVENT_MENUPOPUP},
     {"QuickFixCmdPost",        EVENT_QUICKFIXCMDPOST},
     {"QuickFixCmdPre", EVENT_QUICKFIXCMDPRE},
     {"RemoteReply",    EVENT_REMOTEREPLY},

diff --git a/src/os_mswin.c b/src/os_mswin.c
index 77affc0c3944ea9ee96264d9aa97441596973363..ce4420b33428bda292e87d3bd968e746772e8a66 100644 (file)
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -473,13 +473,12 @@ mch_isFullName(char_u *fname)
 slash_adjust(p)
     char_u  *p;
 {
-    if (p != NULL)
-       while (*p)
-       {
-           if (*p == psepcN)
-               *p = psepc;
-           mb_ptr_adv(p);
-       }
+    while (*p)
+    {
+       if (*p == psepcN)
+           *p = psepc;
+       mb_ptr_adv(p);
+    }
 }
 
 

diff --git a/src/os_win32.c b/src/os_win32.c
index c2d5ebbd72e688a0e4296f904dda5eec5e590e93..66d6d3b5c9c0946ab59a776e629f3ed58e7570c0 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -2251,7 +2251,7 @@ fname_case(
     HANDLE             hFind;
     int                        c;
 
-    flen = (name != NULL) ? (int)STRLEN(name) : 0;
+    flen = (int)STRLEN(name);
     if (flen == 0 || flen > _MAX_PATH)
        return;
 

diff --git a/src/po/Make_cyg.mak b/src/po/Make_cyg.mak
index d8b507d3376fe9344336955ac2eee005bf2c0284..15258f48ce5c9aa99d35169b897ecde45aed038a 100644 (file)
--- a/src/po/Make_cyg.mak
+++ b/src/po/Make_cyg.mak
@@ -12,14 +12,65 @@ ifndef VIMRUNTIME
 VIMRUNTIME = ../../runtime
 endif
 
-LANGUAGES =    af ca cs de en_GB es fr ga it ja ko no pl ru sk sv uk vi zh_TW \
-               cs.cp1250 pl.cp1250 ru.cp1251 sk.cp1250 uk.cp1251 \
-               zh_TW.UTF-8 zh_CN zh_CN.cp936 zh_CN.UTF-8 ja.sjis
-MOFILES =      af.mo ca.mo cs.mo de.mo en_GB.mo es.mo fr.mo ga.mo it.mo ja.mo \
-               ko.mo no.mo pl.mo ru.mo sk.mo sv.mo uk.mo vi.mo \
-               cs.cp1250.mo pl.cp1250.mo ru.cp1251.mo sk.cp1250.mo uk.cp1251.mo \
-               zh_TW.mo zh_TW.UTF-8.mo zh_CN.mo zh_CN.cp936.mo zh_CN.UTF-8.mo \
-               ja.sjis.mo
+LANGUAGES =    af \
+               ca \
+               cs \
+               cs.cp1250 \
+               de \
+               en_GB \
+               es \
+               fr \
+               ga \
+               it \
+               ja \
+               ja.sjis \
+               ko \
+               no \
+               pl \
+               pl.cp1250 \
+               ru \
+               ru.cp1251 \
+               sk \
+               sk.cp1250 \
+               sv \
+               uk \
+               uk.cp1251 \
+               vi \
+               zh_CN \
+               zh_CN.UTF-8 \
+               zh_CN.cp936 \
+               zh_TW \
+               zh_TW.UTF-8 \
+
+MOFILES =      af.mo \
+               ca.mo \
+               cs.cp1250.mo \
+               cs.mo \
+               de.mo \
+               en_GB.mo \
+               es.mo \
+               fr.mo \
+               ga.mo \
+               it.mo \
+               ja.mo \
+               ja.sjis.mo \
+               ko.mo \
+               no.mo \
+               pl.cp1250.mo \
+               pl.mo \
+               ru.cp1251.mo \
+               ru.mo \
+               sk.cp1250.mo \
+               sk.mo \
+               sv.mo \
+               uk.cp1251.mo \
+               uk.mo \
+               vi.mo \
+               zh_CN.UTF-8.mo \
+               zh_CN.cp936.mo \
+               zh_CN.mo \
+               zh_TW.UTF-8.mo \
+               zh_TW.mo \
 
 PACKAGE = vim
 

diff --git a/src/po/Make_ming.mak b/src/po/Make_ming.mak
index acd18e5468c7ba425ba9b132a549b58f145de248..574bdd256729a129894e8e1a79a02b7d95092fa8 100644 (file)
--- a/src/po/Make_ming.mak
+++ b/src/po/Make_ming.mak
@@ -10,11 +10,53 @@
 # language (xx) and add it to the next three lines.
 #
 
-LANGUAGES =    af ca cs de en_GB es fr ga it ja ko no pl ru sk sv uk vi zh_TW \
-               zh_TW.UTF-8 zh_CN zh_CN.UTF-8
-MOFILES =      af.mo ca.mo cs.mo de.mo en_GB.mo es.mo fr.mo ga.mo it.mo ja.mo \
-               ko.mo no.mo pl.mo ru.mo sk.mo sv.mo uk.mo vi.mo \
-               zh_TW.mo zh_TW.UTF-8.mo zh_CN.mo zh_CN.UTF-8.mo
+LANGUAGES = \
+               af \
+               ca \
+               cs \
+               de \
+               en_GB \
+               es \
+               fr \
+               ga \
+               it \
+               ja \
+               ko \
+               no \
+               pl \
+               ru \
+               sk \
+               sv \
+               uk \
+               vi \
+               zh_CN \
+               zh_CN.UTF-8\
+               zh_TW \
+               zh_TW.UTF-8 \
+
+MOFILES = \
+               af.mo \
+               ca.mo \
+               cs.mo \
+               de.mo \
+               en_GB.mo \
+               es.mo \
+               fr.mo \
+               ga.mo \
+               it.mo \
+               ja.mo \
+               ko.mo \
+               no.mo \
+               pl.mo \
+               ru.mo \
+               sk.mo \
+               sv.mo \
+               uk.mo \
+               vi.mo \
+               zh_CN.UTF-8.mo \
+               zh_CN.mo \
+               zh_TW.UTF-8.mo \
+               zh_TW.mo \
 
 PACKAGE = vim
 

diff --git a/src/po/Makefile b/src/po/Makefile
index 4ff49db9debe1113827051c333b99e47b2797af9..7320a605da9c87ab779e3a0711af7ce6cf98073c 100644 (file)
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -4,11 +4,53 @@
 # Note: ja.sjis, *.cp1250 and zh_CN.cp936 are only for MS-Windows, they are
 # not installed on Unix
 
-LANGUAGES =    af ca cs de en_GB es fr ga it ja ko no pl ru sk sv uk vi zh_TW \
-               zh_TW.UTF-8 zh_CN zh_CN.UTF-8
-MOFILES =      af.mo ca.mo cs.mo de.mo en_GB.mo es.mo fr.mo ga.mo it.mo ja.mo \
-               ko.mo no.mo pl.mo ru.mo sk.mo sv.mo uk.mo vi.mo \
-               zh_TW.mo zh_TW.UTF-8.mo zh_CN.mo zh_CN.UTF-8.mo
+LANGUAGES = \
+               af \
+               ca \
+               cs \
+               de \
+               en_GB \
+               es \
+               fr \
+               ga \
+               it \
+               ja \
+               ko \
+               no \
+               pl \
+               ru \
+               sk \
+               sv \
+               uk \
+               vi \
+               zh_CN \
+               zh_CN.UTF-8 \
+               zh_TW \
+               zh_TW.UTF-8 \
+
+MOFILES = \
+               af.mo \
+               ca.mo \
+               cs.mo \
+               de.mo \
+               en_GB.mo \
+               es.mo \
+               fr.mo \
+               ga.mo \
+               it.mo \
+               ja.mo \
+               ko.mo \
+               no.mo \
+               pl.mo \
+               ru.mo \
+               sk.mo \
+               sv.mo \
+               uk.mo \
+               vi.mo \
+               zh_CN.UTF-8.mo \
+               zh_CN.mo \
+               zh_TW.UTF-8.mo \
+               zh_TW.mo \
 
 PACKAGE = vim
 SHELL = /bin/sh
@@ -55,8 +97,14 @@ uninstall:
          rm -f $(LOCALEDIR)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
        done
 
-converted: ja.sjis.mo cs.cp1250.mo pl.cp1250.mo sk.cp1250.mo zh_CN.cp936.mo \
-               ru.cp1251.mo uk.cp1251.mo
+converted: \
+               cs.cp1250.mo \
+               ja.sjis.mo \
+               pl.cp1250.mo \
+               ru.cp1251.mo \
+               sk.cp1250.mo \
+               uk.cp1251.mo \
+               zh_CN.cp936.mo \
 
 # Convert ja.po to create ja.sjis.po.  Requires doubling backslashes in the
 # second byte.  Don't depend on sjiscorr, it should only be compiled when

diff --git a/src/proto/gui_w32.pro b/src/proto/gui_w32.pro
index 680a9f55c4501551428ff0def3c8691fce78fa50..c10b9a24a3f21f0589086c23fcb482d42f9ce95b 100644 (file)
--- a/src/proto/gui_w32.pro
+++ b/src/proto/gui_w32.pro
@@ -88,4 +88,5 @@ void gui_mch_post_balloon __ARGS((BalloonEval *beval, char_u *mesg));
 BalloonEval *gui_mch_create_beval_area __ARGS((void *target, char_u *mesg, void (*mesgCB)(BalloonEval *, int), void *clientData));
 void gui_mch_destroy_beval_area __ARGS((BalloonEval *beval));
 void netbeans_draw_multisign_indicator __ARGS((int row));
+int multiline_balloon_available __ARGS((void));
 /* vim: set ft=c : */

diff --git a/src/vim.h b/src/vim.h
index d8cd69973d3c625fccc230d4de4c9a7502c547e6..51b7c109d075d652f757ca6a41d72ab76f302e1e 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -1080,6 +1080,7 @@ enum auto_event
     EVENT_INSERTCHANGE,                /* when changing Insert/Replace mode */
     EVENT_INSERTENTER,         /* when entering Insert mode */
     EVENT_INSERTLEAVE,         /* when leaving Insert mode */
+    EVENT_MENUPOPUP,           /* just before popup menu is displayed */
     EVENT_QUICKFIXCMDPOST,     /* after :make, :grep etc */
     EVENT_QUICKFIXCMDPRE,      /* before :make, :grep etc */
     EVENT_STDINREADPOST,       /* after reading from stdin */