From: Bram Moolenaar Date: Mon, 1 Aug 2005 07:19:10 +0000 (+0000) Subject: updated for version 7.0121 X-Git-Tag: v7.0121 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78984f503c0404ea36674a74076b091b27a9e528;p=vim updated for version 7.0121 --- diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 09f203a0c..8494c8e83 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 7.0aa. Last change: 2005 Jul 19 +*motion.txt* For Vim version 7.0aa. Last change: 2005 Jul 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -72,13 +72,13 @@ and end position. Generally, motions that move between lines affect lines characterwise). However, there are some exceptions. *exclusive* *inclusive* -A character motion is either inclusive or exclusive. When inclusive, the start -and end position of the motion are included in the operation. When exclusive, -the last character towards the end of the buffer is not included. Linewise -motions always include the start and end position. +A character motion is either inclusive or exclusive. When inclusive, the +start and end position of the motion are included in the operation. When +exclusive, the last character towards the end of the buffer is not included. +Linewise motions always include the start and end position. -Which motions are linewise, inclusive or exclusive is mentioned below. There -are however, two general exceptions: +Which motions are linewise, inclusive or exclusive is mentioned with the +command. There are however, two general exceptions: 1. If the motion is exclusive and the end of the motion is in column 1, the end of the motion is moved to the end of the previous line and the motion becomes inclusive. Example: "}" moves to the first line after a paragraph, @@ -247,7 +247,7 @@ f{char} To [count]'th occurrence of {char} to the right. The *F* F{char} To the [count]'th occurrence of {char} to the left. - The cursor is placed on {char} |inclusive|. + The cursor is placed on {char} |exclusive|. {char} can be entered like with the |f| command. *t* @@ -259,7 +259,7 @@ t{char} Till before [count]'th occurrence of {char} to the *T* T{char} Till after [count]'th occurrence of {char} to the left. The cursor is placed on the character right of - {char} |inclusive|. + {char} |exclusive|. {char} can be entered like with the |f| command. *;* diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index f85a49a2b..573a9429d 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 7.0aa. Last change: 2005 Jul 21 +*spell.txt* For Vim version 7.0aa. Last change: 2005 Jul 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -691,7 +691,10 @@ in the .aff file: PFXPOSTPONE ~ Only prefixes without a chop string can be postponed, prefixes with a chop -string will still be included in the word list. +string will still be included in the word list. An exception if the chop +string is one character and equal to the last character of the added string, +but in lower case. Thus when the chop string is used to allow the following +word to start with an upper case letter. KEEP-CASE WORDS diff --git a/runtime/doc/tags b/runtime/doc/tags index 2700fdc31..580a6f171 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -5162,6 +5162,7 @@ hebrew hebrew.txt /*hebrew* hebrew.txt hebrew.txt /*hebrew.txt* help various.txt /*help* help-context help.txt /*help-context* +help-tags tags 1 help-translated various.txt /*help-translated* help-xterm-window various.txt /*help-xterm-window* help.txt help.txt /*help.txt* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index ac5f17f1c..e91b8b819 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0aa. Last change: 2005 Jul 30 +*todo.txt* For Vim version 7.0aa. Last change: 2005 Jul 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,6 +30,11 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- +Spell: For Italian we also need to postpone prefixes with a chop string. +Or handle upper/lower case specially? + +":w! /tmp/tt" gives ATTENTION message but no prompt. + Mac unicode patch (Da Woon Jung): - selecting proportional font breaks display - UTF-8 text causes display problems. Font replacement causes this. @@ -66,6 +71,8 @@ PLANNED FOR VERSION 7.0: make it work for all completion methods. First cleanup the Insert-mode completion. + - check security of 'completefunc'. + - use callback to interrupt searching for matches. UI: - At first: use 'wildmenu' kind of thing. @@ -208,6 +215,12 @@ PLANNED FOR VERSION 7.0: Adjust src/main.aap for installing manpages like in Makefile. +When editing a file with both utf-8 and latin1 text Vim always falls back to +latin1. Add a command to convert the latin1 characters to utf-8? + :unmix utf-8,latin1 filename +Would only work when 'encoding' is utf-8. +Also: command to search for illegal utf-8 byte sequence? + Also generate the .pdb file that can be used to generate a useful crash report on MS-Windows. (George Reilly) diff --git a/runtime/spell/de/main.aap b/runtime/spell/de/main.aap index 6340d4320..80bfcea9b 100644 --- a/runtime/spell/de/main.aap +++ b/runtime/spell/de/main.aap @@ -4,7 +4,7 @@ @if os.path.exists('../../../src/vim'): VIM = ../../../src/vim @else: - VIM = vim + :progsearch VIM vim SPELLDIR = .. FILES = de_DE.aff de_DE.dic @@ -41,8 +41,9 @@ de_DE.aff de_DE.dic: {buildcheck=} @if not os.path.exists('de_DE.orig.aff'): :copy de_DE.aff de_DE.orig.aff @if not os.path.exists('de_DE.orig.dic'): - :copy de_DE.aff de_DE.orig.dic - :sys patch it_IT.diff + :sys {force} diff -a -C 1 it_IT.orig.dic it_IT.dic >>it_IT.diff + + +# Check for updated OpenOffice spell files. When there are changes the +# ".new.aff" and ".new.dic" files are left behind for manual inspection. + +check: + :assertpkg unzip diff + :fetch it_IT.zip + :mkdir tmp + :cd tmp + @try: + @import stat + :sys $(UNZIP) ../it_IT.zip + :sys {force} diff ../it_IT.orig.aff it_IT.aff >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy it_IT.aff ../it_IT.new.aff + :sys {force} diff ../it_IT.orig.dic it_IT.dic >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy it_IT.dic ../it_IT.new.dic + @finally: + :cd .. + :delete {r}{f}{q} tmp + :delete it_IT.zip + + +# vim: set sts=4 sw=4 : diff --git a/runtime/spell/main.aap b/runtime/spell/main.aap index ded1bc098..34768b660 100644 --- a/runtime/spell/main.aap +++ b/runtime/spell/main.aap @@ -1,6 +1,10 @@ -:child de/main.aap -:child en/main.aap -:child fr/main.aap -:child he/main.aap -:child nl/main.aap -:child pl/main.aap +# "aap": generate all the .spl files +# "aap diff" create all the diff files + +LANG = de en fr he it nl pl + +diff: $*LANG/diff + :print done + +@for l in string.split(_no.LANG): + :child $l/main.aap diff --git a/runtime/spell/nl/main.aap b/runtime/spell/nl/main.aap index f398cb6cd..b41416143 100644 --- a/runtime/spell/nl/main.aap +++ b/runtime/spell/nl/main.aap @@ -4,7 +4,7 @@ @if os.path.exists('../../../src/vim'): VIM = ../../../src/vim @else: - VIM = vim + :progsearch VIM vim SPELLDIR = .. FILES = nl_NL.aff nl_NL.dic @@ -38,8 +38,9 @@ nl_NL.aff nl_NL.dic: {buildcheck=} @if not os.path.exists('nl_NL.orig.aff'): :copy nl_NL.aff nl_NL.orig.aff @if not os.path.exists('nl_NL.orig.dic'): - :copy nl_NL.aff nl_NL.orig.dic - :sys patch config.log +exec 5>auto/config.log cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -14861,7 +14861,7 @@ echo "$as_me:$LINENO: checking how to create tags" >&5 echo $ECHO_N "checking how to create tags... $ECHO_C" >&6 test -f tags && mv tags tags.save if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then - TAGPRG="ctags" + TAGPRG="ctags -I INIT+" else (eval etags /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags" (eval etags -c /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags -c" @@ -16404,7 +16404,7 @@ exec 6>&1 # Open the log real soon, to keep \$[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. Logging --version etc. is OK. -exec 5>>config.log +exec 5>>auto/config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX @@ -17244,7 +17244,7 @@ if test "$no_create" != yes; then ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log + exec 5>>auto/config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } diff --git a/src/configure.in b/src/configure.in index 3280e1763..e9f21a2ca 100644 --- a/src/configure.in +++ b/src/configure.in @@ -2902,7 +2902,7 @@ dnl -i+m to test for older Exuberant ctags AC_MSG_CHECKING(how to create tags) test -f tags && mv tags tags.save if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then - TAGPRG="ctags" + TAGPRG="ctags -I INIT+" else (eval etags /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags" (eval etags -c /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags -c" diff --git a/src/if_python.c b/src/if_python.c index 8aca83518..1b5d0e33b 100644 --- a/src/if_python.c +++ b/src/if_python.c @@ -19,8 +19,6 @@ #include "vim.h" -#include -#include #include /* Python.h defines _POSIX_THREADS itself (if needed) */ diff --git a/src/macros.h b/src/macros.h index 0e258dfc2..69c32ca80 100644 --- a/src/macros.h +++ b/src/macros.h @@ -251,15 +251,18 @@ * mb_ptr_back(): backup a pointer to the previous character, taking care of * multi-byte characters if needed. * MB_COPY_CHAR(f, t): copy one char from "f" to "t" and advance the pointers. + * PTR2CHAR(): get character from pointer. */ #ifdef FEAT_MBYTE # define mb_ptr_adv(p) p += has_mbyte ? (*mb_ptr2len_check)(p) : 1 # define mb_ptr_back(s, p) p -= has_mbyte ? ((*mb_head_off)(s, p - 1) + 1) : 1 # define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++ # define MB_CHARLEN(p) (has_mbyte ? mb_charlen(p) : STRLEN(p)) +# define PTR2CHAR(p) (has_mbyte ? mb_ptr2char(p) : *(p)) #else -# define mb_ptr_adv(p) ++p -# define mb_ptr_back(s, p) --p -# define MB_COPY_CHAR(f, t) *t++ = *f++ -# define MB_CHARLEN(p) STRLEN(p) +# define mb_ptr_adv(p) ++p +# define mb_ptr_back(s, p) --p +# define MB_COPY_CHAR(f, t) *t++ = *f++ +# define MB_CHARLEN(p) STRLEN(p) +# define PTR2CHAR(p) (*(p)) #endif diff --git a/src/nbdebug.c b/src/nbdebug.c index 7c7564558..d73a5e5e8 100644 --- a/src/nbdebug.c +++ b/src/nbdebug.c @@ -27,8 +27,6 @@ #ifdef NBDEBUG -#include - #include "vim.h" FILE *nb_debug = NULL; diff --git a/src/testdir/test58.in b/src/testdir/test58.in index e03c8e05c..e05326137 100644 --- a/src/testdir/test58.in +++ b/src/testdir/test58.in @@ -342,7 +342,7 @@ PFX I N 1 PFX I 0 in . PFX O Y 1 -PFX O 0 out . +PFX O 0 out [a-z] SFX S Y 2 SFX S 0 s [^s] diff --git a/src/testdir/test59.in b/src/testdir/test59.in index 6b3a30d96..a49514fa5 100644 --- a/src/testdir/test59.in +++ b/src/testdir/test59.in @@ -346,7 +346,7 @@ PFX I N 1 PFX I 0 in . PFX O Y 1 -PFX O 0 out . +PFX O 0 out [a-z] SFX S Y 2 SFX S 0 s [^s] diff --git a/src/version.h b/src/version.h index 661dc4f29..cd5bf8b54 100644 --- a/src/version.h +++ b/src/version.h @@ -36,5 +36,5 @@ #define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_MEDIUM "7.0aa ALPHA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 30)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 30, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 31)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 31, compiled " diff --git a/src/workshop.c b/src/workshop.c index 27323d4b1..66365b102 100644 --- a/src/workshop.c +++ b/src/workshop.c @@ -13,7 +13,6 @@ #endif #include #include -#include #include #include #include diff --git a/src/wsdebug.c b/src/wsdebug.c index 2707fae20..f41299a54 100644 --- a/src/wsdebug.c +++ b/src/wsdebug.c @@ -31,8 +31,6 @@ #ifdef WSDEBUG -#include - #include "vim.h" FILE *ws_debug = NULL;