updated for version 7.0034

diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 4245b634830f0b1533d8c4d5b2d178631f37f2ff..d0183b654159f323dfe1522b75ea1746312a47c4 100644 (file)
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.0aa.  Last change: 2004 Aug 26
+*message.txt*   For Vim version 7.0aa.  Last change: 2005 Jan 08
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -55,7 +55,7 @@ or view a list of recent messages with: >
 LIST OF MESSAGES
                        *E222* *E228* *E232* *E256* *E293* *E298* *E304* *E317*
                        *E318* *E356* *E438* *E439* *E440* *E316* *E320* *E322*
-                       *E323* *E341* *E473* *E570*  >
+                       *E323* *E341* *E473* *E570* *E685* >
   Add to read buffer
   makemap: Illegal mode
   Cannot create BalloonEval with both message and callback
@@ -74,6 +74,7 @@ LIST OF MESSAGES
   line number out of range: {N} past the end
   line count wrong in block {N}
   Internal error
+  Internal error: {function}
   fatal error in cs_manage_matches
 
 This is an internal error.  If you can reproduce it, please send in a bug

diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index f2e4c5a2cfbadea048e6243a71e043a46001f534..0ea3fa499f18af000c166324d2aafa35de9c8776 100644 (file)
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -1,6 +1,6 @@
 #
 # Makefile for VIM on Win32, using Cygnus gcc
-# Last updated by Dan Sharp.  Last Change: 2004 Dec 17
+# Last updated by Dan Sharp.  Last Change: 2005 Jan 08
 #
 # This compiles Vim as a Windows application.  If you want Vim to run as a
 # Cygwin application use the Makefile (just like on Unix).
@@ -430,7 +430,7 @@ tags:
 clean:
        -$(DEL) $(OUTDIR)$(DIRSLASH)*.o
        -rmdir $(OUTDIR)
-       -$(DEL) *.exe
+       -$(DEL) $(EXE) vimrun.exe install.exe uninstal.exe
 ifdef PERL
        -$(DEL) if_perl.c
 endif
@@ -438,6 +438,17 @@ endif
        $(MAKE) -C xxd -f Make_cyg.mak clean
        $(MAKE) -C GvimExt -f Make_ming.mak clean
 
+distclean: clean
+       -$(DEL) obj$(DIRSLASH)*.o
+       -rmdir obj
+       -$(DEL) gobj$(DIRSLASH)*.o
+       -rmdir gobj
+       -$(DEL) objd$(DIRSLASH)*.o
+       -rmdir objd
+       -$(DEL) gobjd$(DIRSLASH)*.o
+       -rmdir gobjd
+       -$(DEL) *.exe
+
 ###########################################################################
 
 $(OUTDIR)/%.o : %.c $(INCL)
@@ -456,8 +467,9 @@ $(OUTDIR)/if_ole.o: if_ole.cpp $(INCL)
        $(CC) -c $(CFLAGS) -D__IID_DEFINED__ if_ole.cpp -o $(OUTDIR)/if_ole.o
 
 if_perl.c: if_perl.xs typemap
-       perl $(PERL)/lib/ExtUtils/xsubpp -prototypes -typemap \
-            $(PERL)/lib/ExtUtils/typemap if_perl.xs > $@
+       $(PERL)/bin/perl `cygpath -d $(PERL)/lib/ExtUtils/xsubpp` \
+               -prototypes -typemap \
+               `cygpath -d $(PERL)/lib/ExtUtils/typemap` if_perl.xs > $@
 
 $(OUTDIR)/if_perl.o:   if_perl.c $(INCL)
 ifeq (yes, $(USEDLL))

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index df71a77782593cbb6ed7db2f33c041ef64fe13d6..62e875650b7f6278b9fca110230521b747479019 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -55,7 +55,7 @@
 #       PostScript printing: POSTSCRIPT=yes (default is no)
 #       Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is BIG)
 #       Version Support: WINVER=[0x0400, 0x0500] (default is 0x0400)
-#       Processor Version: CPUNR=[i386, i486, i586, i686, P4] (default is i386)
+#       Processor Version: CPUNR=[i386, i486, i586, i686, pentium4] (default is i386)
 #       Optimization: OPTIMIZE=[SPACE, SPEED, MAXSPEED] (default is MAXSPEED)
 #       Netbeans Support: NETBEANS=[yes or no] (default is yes if GUI is yes)
 #       Netbeans Debugging Support: NBDEBUG=[yes or no] (default is no)
@@ -276,7 +276,7 @@ CPUARG = /G4
 CPUARG = /G5
 !elseif "$(CPUNR)" == "i686"
 CPUARG = /G6
-!elseif "$(CPUNR)" == "P4"
+!elseif "$(CPUNR)" == "pentium4"
 CPUARG = /G7 /arch:SSE2
 !else
 CPUARG =

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index fcc24d26b439d0bb3cfd9796c21e131a24ae76d7..2b43dc51fbdb266a2e3bee00296c934753b1ff79 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -712,10 +712,10 @@ do_cmdline(cmdline, getline, cookie, flags)
 #ifdef FEAT_EVAL
     /* For every pair of do_cmdline()/do_one_cmd() calls, use an extra memory
      * location for storing error messages to be converted to an exception.
-     * This ensures that the do_errthrow() call in do_one_cmd() does not combine
-     * the messages stored by an earlier invocation of do_one_cmd() with the
-     * command name of the later one.  This would happen when BufWritePost
-     * autocommands are executed after a write error. */
+     * This ensures that the do_errthrow() call in do_one_cmd() does not
+     * combine the messages stored by an earlier invocation of do_one_cmd()
+     * with the command name of the later one.  This would happen when
+     * BufWritePost autocommands are executed after a write error. */
     saved_msg_list = msg_list;
     msg_list = &private_msg_list;
     private_msg_list = NULL;

diff --git a/src/normal.c b/src/normal.c
index e62648f8a45aac5936ea367e0728fda99bceff94..16f65be2bf5dcf0fa1b8a55ae243ec0f282f174e 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -8411,6 +8411,7 @@ nv_put(cap)
 #ifdef FEAT_VISUAL
     int                regname = 0;
     void       *reg1 = NULL, *reg2 = NULL;
+    int                empty = FALSE;
 #endif
     int                dir;
     int                flags = 0;
@@ -8467,6 +8468,7 @@ nv_put(cap)
            cap->oap->regname = NUL;
            nv_operator(cap);
            do_pending_operator(cap, 0, FALSE);
+           empty = (curbuf->b_ml.ml_flags & ML_EMPTY);
 
            /* delete PUT_LINE_BACKWARD; */
            cap->oap->regname = regname;
@@ -8504,6 +8506,10 @@ nv_put(cap)
        /* If a register was saved, put it back now. */
        if (reg2 != NULL)
            put_register(regname, reg2);
+       /* When all lines were selected and deleted do_put() leaves an empty
+        * line that needs to delete now. */
+       if (empty && *ml_get(curbuf->b_ml.ml_line_count) == NUL)
+           ml_delete(curbuf->b_ml.ml_line_count, TRUE);
 #endif
        auto_format(FALSE, TRUE);
     }