updated for version 7.0162

diff --git a/Makefile b/Makefile
index 6fa4e4501356f48aa437edbe6d4493985fa8e9f2..75b53ec17cc57a90e7485d3e1c7df5478e51b633 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,8 +80,8 @@ MINOR = 0aa
 #
 # - Update Vim version number.  For a test version in: src/version.h, Contents,
 #   MAJOR/MINOR above, VIMRTDIR and VERSION in src/Makefile, README*.txt,
-#   runtime/doc/*.txt and nsis/gvim.nsi.  For a minor/major version:
-#   src/GvimExt/GvimExt.reg, src/vim16.def.
+#   runtime/doc/*.txt and nsis/gvim.nsi. Other things in README_os2.txt.  For a
+#   minor/major version: src/GvimExt/GvimExt.reg, src/vim.def, src/vim16.def.
 # - Correct included_patches[] in src/version.c.
 # - Compile Vim with GTK, Perl, Python, TCL, Ruby, Cscope and "huge" features.
 # - With these features: "make proto" (requires cproto and Motif installed;
@@ -125,7 +125,7 @@ MINOR = 0aa
 #   "uninstald16.exe".
 # 32 bit DOS version:
 # - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak".
-# - "rm testdir/*.out", "make -f Make_djg.mak test" and check the output.
+# - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output.
 # - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and
 #   "uninstald32.exe".
 # Win32 console version:

diff --git a/runtime/compiler/rst.vim b/runtime/compiler/rst.vim
index 828f99e350ae5c7f44dc38d3d146682d49b6b4f6..d0ff88b37bc83abd8ab5173a71dd2a46be3a9200 100644 (file)
--- a/runtime/compiler/rst.vim
+++ b/runtime/compiler/rst.vim
@@ -11,7 +11,7 @@ let current_compiler = "rst"
 let s:cpo_save = &cpo
 set cpo-=C
 
-setlocal errorformat=
+CompilerSet errorformat=
       \%f:%l:\ (%tEBUG/0)\ %m,
       \%f:%l:\ (%tNFO/1)\ %m,
       \%f:%l:\ (%tARNING/2)\ %m,

diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 623e613817ea32af4183b959c644b7c876661026..99fb8d04f92aa506eae3131e804093e0039a3111 100644 (file)
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.0aa.  Last change: 2005 Nov 27
+*index.txt*     For Vim version 7.0aa.  Last change: 2005 Nov 30
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -343,9 +343,9 @@ tag         char          note action in Normal mode        ~
                                   "yy"
 |ZZ|           ZZ                 store current file if modified, and exit
 |ZQ|           ZQ                 exit current file always
-|[|            [{char}            square bracket command (see below)
+|[|            [{char}            square bracket command (see |[| below)
                \                  not used
-|]|            ]{char}            square bracket command (see below)
+|]|            ]{char}            square bracket command (see |]| below)
 |^|            ^               1  cursor to the first CHAR of the line
 |_|            _               1  cursor to the first CHAR N - 1 lines lower
 |`|            `{a-zA-Z0-9}    1  cursor to the mark {a-zA-Z0-9}
@@ -373,7 +373,7 @@ tag         char          note action in Normal mode        ~
 |e|            e               1  cursor forward to the end of word N
 |f|            f{char}         1  cursor to Nth occurrence of {char} to the
                                   right
-|g|            g{char}            extended commands, see below
+|g|            g{char}            extended commands, see |g| below
 |h|            h               1  cursor N chars to the left
 |i|            i               2  insert text before the cursor N times
 |j|            j               1  cursor N lines downward
@@ -403,7 +403,7 @@ tag         char          note action in Normal mode        ~
                                   cursor [into buffer x]
 |y|            ["x]y{motion}      yank Nmove text [into buffer x]
 |yy|           ["x]yy             yank N lines [into buffer x]
-|z|            z{char}            commands starting with 'z', see below
+|z|            z{char}            commands starting with 'z', see |z| below
 |{|            {               1  cursor N paragraphs backward
 |bar|          |               1  cursor to column N
 |}|            }               1  cursor N paragraphs forward

diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 7084d1eab79a18c64785ea9d4dcc60edee10c009..0df95013c03e3d97da21b79cbe2ad6454e3e2788 100644 (file)
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*   For Vim version 7.0aa.  Last change: 2005 Jun 09
+*usr_41.txt*   For Vim version 7.0aa.  Last change: 2005 Nov 30
 
                     VIM USER MANUAL - by Bram Moolenaar
 
@@ -2114,7 +2114,7 @@ a user to overrule or add to the default file.  The default files start with: >
 When you write a compiler file and put it in your personal runtime directory
 (e.g., ~/.vim/compiler for Unix), you set the "current_compiler" variable to
 make the default file skip the settings.
-
+                                                       *:CompilerSet*
 The second mechanism is to use ":set" for ":compiler!" and ":setlocal" for
 ":compiler".  Vim defines the ":CompilerSet" user command for this.  However,
 older Vim versions don't, thus your plugin should define it then.  This is an
@@ -2139,7 +2139,7 @@ that could be ~/.vim/after/compiler.
 *41.14*        Writing a plugin that loads quickly     *write-plugin-quickload*
 
 A plugin may grow and become quite long.  The startup delay may become
-noticable, while you hardly every use the plugin.  Then it's time for a
+noticeable, while you hardly every use the plugin.  Then it's time for a
 quickload plugin.
 
 The basic idea is that the plugin is loaded twice.  The first time user

diff --git a/runtime/lang/menu_es_es.latin1.vim b/runtime/lang/menu_es_es.latin1.vim
index b3e667a0fcb59c23f02d3cb12a2af7f33d6fe199..8001100451984d1f5b0b8f9d920754e6efbd7607 100644 (file)
--- a/runtime/lang/menu_es_es.latin1.vim
+++ b/runtime/lang/menu_es_es.latin1.vim
@@ -1,6 +1,7 @@
 " Menu Translations:   Español
-" Maintainer:          Alejandro López-Valencia <dradul@yahoo.com>
-" Last Change:         2004 May 12
+" Maintainer:          Alejandro López-Valencia <dradul@users.sourceforge.net>
+" Version:             6.4.p0-1
+" Last Change:         2005 Dec 01
 "
 
 " Quit when menu translations have already been done.
@@ -86,7 +87,7 @@ menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!       Activar/Desactivar\ compatiblida
 
 menutrans Search\ &Path\.\.\.          Ruta\ de\ &búsqueda\.\.\.
 
-menutrans Ta&g\ Files\.\.\.            Ficheros\ de\ «ta&gs»\.\.\.
+menutrans Ta&g\ Files\.\.\.            Ficheros\ de\ &etiquetas\.\.\.
 
 " GUI options
 menutrans Toggle\ &Toolbar             Ocultar/Mostrar\ barra\ de\ &herramientas
@@ -102,7 +103,7 @@ menutrans F&ile\ Settings           Opciones\ del\ &fichero
 
 " Boolean options
 menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!       Activar/Desactivar\ &numeración\ de\ líneas<Tab>:set\ nu!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!          Activar/Desactivar\ modo\ «&list»<Tab>:set\ list!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!          Activar/Desactivar\ modo\ de\ lista<Tab>:set\ list!
 menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!          Activar/Desactivar\ &quiebre\ de\ líneas<Tab>:set\ wrap!
 menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!       Activar/Desactivar\ quiebre\ entre\ &palabras<Tab>:set\ lbr!
 menutrans Toggle\ &expand-tab<Tab>:set\ et!            Activar/Desactivar\ &expansión\ de\ marcas\ de\ \tabulado<Tab>:set\ et!
@@ -151,9 +152,9 @@ menutrans slovak    eslovaco
 
 " Programming menu
 menutrans &Tools                       &Herramientas
-menutrans &Jump\ to\ this\ tag<Tab>g^] &Saltar\ a\ este\ «tag»<Tab>g^]
+menutrans &Jump\ to\ this\ tag<Tab>g^] &Saltar\ a\ este\ etiqueta<Tab>g^]
 menutrans Jump\ &back<Tab>^T           Saltar\ &atrás<Tab>^T
-menutrans Build\ &Tags\ File           Crear\ fichero\ de\ «&tags»\
+menutrans Build\ &Tags\ File           Crear\ fichero\ de\ &etiquetas\
 menutrans &Diff                                Modo\ de\ &diferencias
 menutrans &Folding                     &Plegado
 menutrans &Make<Tab>:make              Ejecutar\ «&Make»<Tab>:make
@@ -260,8 +261,8 @@ if has("toolbar")
     if 0       " disabled; These are in the Windows menu
       tmenu ToolBar.New                Ventana nueva
       tmenu ToolBar.WinSplit   Dividir ventana
-      tmenu ToolBar.WinMax     Ventana máxima
-      tmenu ToolBar.WinMin     Ventana mínima
+      tmenu ToolBar.WinMax     Altura máxima
+      tmenu ToolBar.WinMin     Altura mínima
       tmenu ToolBar.WinVSplit  Dividir verticalmente
       tmenu ToolBar.WinMaxWidth        Anchura máxima
       tmenu ToolBar.WinMinWidth        Anchura mínima
@@ -269,11 +270,11 @@ if has("toolbar")
     endif
     tmenu ToolBar.LoadSesn     Cargar sesión
     tmenu ToolBar.SaveSesn     Guardar sesión
-    tmenu ToolBar.RunScript    Ejecutar un «script»
+    tmenu ToolBar.RunScript    Ejecutar un archivo de órdenes
     tmenu ToolBar.Make         Ejecutar «Make»
-    tmenu ToolBar.Shell                Abrir una «Shell»
-    tmenu ToolBar.RunCtags     Generar un fichero de «tags»
-    tmenu ToolBar.TagJump      Saltar a un «tag»
+    tmenu ToolBar.Shell                Abrir un intérprete de comandos
+    tmenu ToolBar.RunCtags     Generar un fichero de etiquetas
+    tmenu ToolBar.TagJump      Saltar a una etiqueta
     tmenu ToolBar.Help         Ayuda
     tmenu ToolBar.FindHelp     Buscar en la ayuda...
   endfun
@@ -282,15 +283,15 @@ endif
 " Syntax menu
 menutrans &Syntax                      &Sintaxis
 menutrans &Show\ filetypes\ in\ menu   &Mostrar\ listas\ de\ «tipo\ de\ fichero»
-menutrans Set\ '&syntax'\ only         Activar\ sólo\ «sintaxis»
+menutrans Set\ '&syntax'\ only         Activar\ sólo\ sintaxis
 menutrans Set\ '&filetype'\ too                Activar\ también\ «tipo\ de\ fichero»
-menutrans &Off                         &Desactivar\ «sintaxis»
-menutrans &Manual                      «sintaxis»\ &manual
-menutrans A&utomatic                   «sintaxis»\ a&utomática
+menutrans &Off                         &Desactivar\ sintaxis
+menutrans &Manual                      sintaxis\ &manual
+menutrans A&utomatic                   sintaxis\ a&utomática
 menutrans on/off\ for\ &This\ file     Activar/Desactivar\ en\ es&te\ fichero
 menutrans Co&lor\ test                 &Prueba\ de\ colores
 menutrans &Highlight\ test             Prueba\ de\ &realzado
-menutrans &Convert\ to\ HTML           &Convertir\ en\ HTML
+menutrans &Convert\ to\ HTML           &Convertir\ a\ HTML
 
 " Find Help dialog text
 let g:menutrans_help_dialog = "Introduzca un nombre de comando o palabra para obtener ayuda;\n\nAnteponga i_ para comandos de entrada (e.g.: i_CTRL-X)\nAnteponga c_ para comandos de la línea de comandos (e.g.: c_<Del>)\nAnteponga ` para un nombre de opción (e.g.: `shiftwidth`)"

diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim
index f866594a8dcd2466129e9aea08cf121b216573ee..4cb0ddfb9246a57c233cbe6a0256e079a1529c9a 100644 (file)
--- a/runtime/makemenu.vim
+++ b/runtime/makemenu.vim
@@ -1,6 +1,6 @@
 " Script to define the syntax menu in synmenu.vim
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last Change: 2004 Dec 17
+" Last Change: 2005 Dec 01
 
 " This is used by "make menu" in the src directory.
 edit <sfile>:p:h/synmenu.vim
@@ -155,7 +155,10 @@ SynMenu DE.Elinks\ config:elinks
 SynMenu DE.Elm\ filter\ rules:elmfilt
 SynMenu DE.Embedix\ Component\ Description:ecd
 SynMenu DE.ERicsson\ LANGuage:erlang
+SynMenu DE.ESMTP\ rc:esmtprc
+SynMenu DE.ESQL-C:esqlc
 SynMenu DE.Essbase\ script:csc
+SynMenu DE.Esterel:esterel
 SynMenu DE.Eterm\ config:eterm
 SynMenu DE.Exim\ conf:exim
 SynMenu DE.Expect:expect
@@ -194,6 +197,7 @@ SynMenu HIJK.Hex\ dump.XXD:xxd
 SynMenu HIJK.Hex\ dump.Intel\ MCS51:hex
 SynMenu HIJK.HTML.HTML:html
 SynMenu HIJK.HTML.HTML\ with\ M4:htmlm4
+SynMenu HIJK.HTML.HTML\ with\ Ruby\ (eRuby):eruby
 SynMenu HIJK.HTML.Cheetah\ HTML\ template:htmlcheetah
 SynMenu HIJK.HTML.HTML/OS:htmlos
 SynMenu HIJK.HTML.XHTML:xhtml
@@ -279,6 +283,7 @@ SynMenu Me-NO.MUSHcode:mush
 SynMenu Me-NO.Muttrc:muttrc
 SynMenu Me-NO.Nastran\ input/DMAP:nastran
 SynMenu Me-NO.Natural:natural
+SynMenu Me-NO.Netrc:netrc
 SynMenu Me-NO.Novell\ NCF\ batch:ncf
 SynMenu Me-NO.Not\ Quite\ C\ (LEGO):nqc
 SynMenu Me-NO.Nroff:nroff
@@ -307,6 +312,7 @@ SynMenu PQ.Pike:pike
 SynMenu PQ.Pine\ RC:pine
 SynMenu PQ.Pinfo\ RC:pinfo
 SynMenu PQ.PL/M:plm
+SynMenu PQ.PL/SQL:plsql
 SynMenu PQ.PLP:plp
 SynMenu PQ.PO\ (GNU\ gettext):po
 SynMenu PQ.Postfix\ main\ config:pfmain
@@ -314,6 +320,7 @@ SynMenu PQ.PostScript.PostScript:postscr
 SynMenu PQ.PostScript.PostScript\ Printer\ Description:ppd
 SynMenu PQ.Povray.Povray\ scene\ descr:pov
 SynMenu PQ.Povray.Povray\ configuration:povini
+SynMenu PQ.Prescribe\ (Kyocera):prescribe
 SynMenu PQ.Printcap:pcap
 SynMenu PQ.Procmail:procmail
 SynMenu PQ.Product\ Spec\ File:psf
@@ -433,6 +440,7 @@ SynMenu TUV.TSS.Optics:tssop
 SynMenu TUV.UIT/UIL:uil
 SynMenu TUV.UnrealScript:uc
 SynMenu TUV.Valgrind:valgrind
+SynMenu TUV.Verilog-AMS\ HDL:verilogams
 SynMenu TUV.Verilog\ HDL:verilog
 SynMenu TUV.Vgrindefs:vgrindefs
 SynMenu TUV.VHDL:vhdl

diff --git a/src/bigvim.bat b/src/bigvim.bat
index 12b109d10e5fa572971c120f57ec108a0b8c588a..ded5bc41d635bea454feb87296f881b47d816a84 100644 (file)
--- a/src/bigvim.bat
+++ b/src/bigvim.bat
@@ -1,3 +1,3 @@
 :: command to build big Vim with OLE, Perl, Python, Ruby and Tcl
-nmake -f Make_mvc.mak GUI=yes OLE=yes PERL=E:\perl58 DYNAMIC_PERL=yes PERL_VER=58 PYTHON=e:\python23 DYNAMIC_PYTHON=yes PYTHON_VER=23 RUBY=e:\ruby18 DYNAMIC_RUBY=yes RUBY_VER=18 RUBY_VER_LONG=1.8 TCL=e:\tcl DYNAMIC_TCL=yes %1 IME=yes CSCOPE=yes XPM=e:\xpm
+nmake -f Make_mvc.mak GUI=yes OLE=yes PERL=E:\perl58 DYNAMIC_PERL=yes PERL_VER=58 PYTHON=e:\python24 DYNAMIC_PYTHON=yes PYTHON_VER=24 RUBY=e:\ruby18 DYNAMIC_RUBY=yes RUBY_VER=18 RUBY_VER_LONG=1.8 TCL=e:\tcl DYNAMIC_TCL=yes %1 IME=yes CSCOPE=yes XPM=e:\xpm
 

diff --git a/src/fileio.c b/src/fileio.c
index 302e93a5174cd140d6c2dcb6e4dbb856f8405bc0..eaa2bd1b4d121fe2cf4725b42715fff531495eaa 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5800,7 +5800,9 @@ vim_rename(from, to)
        errmsg = _("E210: Error reading \"%s\"");
        to = from;
     }
+#ifndef UNIX       /* for Unix mch_open() already set ther permission */
     mch_setperm(to, perm);
+#endif
 #ifdef HAVE_ACL
     mch_set_acl(to, acl);
 #endif

diff --git a/src/normal.c b/src/normal.c
index 2d574d5c048ae446a8661e6aad27c74fbf549b98..405ac3dab6fe46b7b70af3ae8ed90acaea0c3fb1 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -1140,7 +1140,7 @@ getcount:
 #endif
     }
 
-    /* get the length of mapped chars again after typing a count, second
+    /* Get the length of mapped chars again after typing a count, second
      * character or "z333<cr>". */
     if (old_mapped_len > 0)
        old_mapped_len = typebuf_maplen();

diff --git a/src/vim.def b/src/vim.def
index fec09c7190cb71bbad4abaff1b553615ca205748..9fb80f7280e4e208c1e6503e01c6b609f28906de 100644 (file)
--- a/src/vim.def
+++ b/src/vim.def
@@ -1,4 +1,4 @@
 CODE PRELOAD EXECUTEONLY
 DATA MULTIPLE SHARED
-DESCRIPTION 'Vim 6.0'
+DESCRIPTION 'Vim 7.0'
 HEAPSIZE 0,0

diff --git a/src/vim16.def b/src/vim16.def
index 13b8c044ec777f78b19c81733f2e7c7bce778d6b..452325cb24a2c7a48488cdcfde70b374bc18e12c 100644 (file)
--- a/src/vim16.def
+++ b/src/vim16.def
@@ -1,5 +1,5 @@
 CODE PRELOAD EXECUTEONLY
 DATA MULTIPLE SHARED
-DESCRIPTION 'Vim 7.0aa'
+DESCRIPTION 'Vim 7.0'
 STACKSIZE 16000
 HEAPSIZE 10000