0
0
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00

updated for version 7.0141

This commit is contained in:
Bram Moolenaar
2005-09-05 22:11:52 +00:00
parent 8b96d64cb5
commit 92d640fad1
12 changed files with 217 additions and 168 deletions

View File

@@ -1,4 +1,4 @@
*eval.txt* For Vim version 7.0aa. Last change: 2005 Aug 31 *eval.txt* For Vim version 7.0aa. Last change: 2005 Sep 05
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1607,6 +1607,7 @@ repeat( {expr}, {count}) String repeat {expr} {count} times
resolve( {filename}) String get filename a shortcut points to resolve( {filename}) String get filename a shortcut points to
reverse( {list}) List reverse {list} in-place reverse( {list}) List reverse {list} in-place
search( {pattern} [, {flags}]) Number search for {pattern} search( {pattern} [, {flags}]) Number search for {pattern}
searchdecl({name} [, {global}]) Number search for variable declaration
searchpair( {start}, {middle}, {end} [, {flags} [, {skip}]]) searchpair( {start}, {middle}, {end} [, {flags} [, {skip}]])
Number search for other end of start/end pair Number search for other end of start/end pair
server2client( {clientid}, {string}) server2client( {clientid}, {string})
@@ -3709,6 +3710,18 @@ search({pattern} [, {flags}]) *search()*
: let n = n + 1 : let n = n + 1
:endwhile :endwhile
< <
searchdecl({name} [, {global}]) *searchdecl()*
Search for the declaration of {name}. Without {global} or
with a zero {global} argument this works like |gd|. With a
non-zero {global} argument it works like |gD|.
Moves the cursor to the found match.
Returns zero for success, non-zero for failure.
Example: >
if searchdecl('myvar') == 0
echo getline('.')
endif
<
*searchpair()* *searchpair()*
searchpair({start}, {middle}, {end} [, {flags} [, {skip}]]) searchpair({start}, {middle}, {end} [, {flags} [, {skip}]])
Search for the match of a nested start-end pair. This can be Search for the match of a nested start-end pair. This can be
@@ -4668,7 +4681,8 @@ builtin functions. To prevent from using the same name in different scripts
avoid obvious, short names. A good habit is to start the function name with avoid obvious, short names. A good habit is to start the function name with
the name of the script, e.g., "HTMLcolor()". the name of the script, e.g., "HTMLcolor()".
It's also possible to use curly braces, see |curly-braces-names|. It's also possible to use curly braces, see |curly-braces-names|. And the
|autoload| facility is useful to define a function only when it's called.
*local-function* *local-function*
A function local to a script must start with "s:". A local script function A function local to a script must start with "s:". A local script function
@@ -4684,6 +4698,10 @@ instead of "s:" when the mapping is expanded outside of the script.
{name} can also be a Dictionary entry that is a {name} can also be a Dictionary entry that is a
Funcref: > Funcref: >
:function dict.init :function dict.init
:fu[nction] /{pattern} List functions with a name matching {pattern}.
Example that lists all functions ending with "File": >
:function /File$
< <
*:function-verbose* *:function-verbose*
When 'verbose' is non-zero, listing a function will also display where it was When 'verbose' is non-zero, listing a function will also display where it was

View File

@@ -218,6 +218,12 @@ Specific exception: For German these special regions are used:
de_at Austria de_at Austria
de_ch Switzerland de_ch Switzerland
*spell-russian*
Specific exception: For Russian these special regions are used:
ru all Russian words accepted
ru_ru "IE" letter spelling
ru_yo "YO" letter spelling
*spell-yiddish* *spell-yiddish*
Yiddish requires using "utf-8" encoding, because of the special characters Yiddish requires using "utf-8" encoding, because of the special characters
used. If you are using latin1 Vim will use transliterated (romanized) Yiddish used. If you are using latin1 Vim will use transliterated (romanized) Yiddish

View File

@@ -5291,7 +5291,6 @@ hebrew hebrew.txt /*hebrew*
hebrew.txt hebrew.txt /*hebrew.txt* hebrew.txt hebrew.txt /*hebrew.txt*
help various.txt /*help* help various.txt /*help*
help-context help.txt /*help-context* help-context help.txt /*help-context*
help-tags tags 1
help-translated various.txt /*help-translated* help-translated various.txt /*help-translated*
help-xterm-window various.txt /*help-xterm-window* help-xterm-window various.txt /*help-xterm-window*
help.txt help.txt /*help.txt* help.txt help.txt /*help.txt*
@@ -6457,6 +6456,7 @@ spell-midword spell.txt /*spell-midword*
spell-mkspell spell.txt /*spell-mkspell* spell-mkspell spell.txt /*spell-mkspell*
spell-quickstart spell.txt /*spell-quickstart* spell-quickstart spell.txt /*spell-quickstart*
spell-remarks spell.txt /*spell-remarks* spell-remarks spell.txt /*spell-remarks*
spell-russian spell.txt /*spell-russian*
spell-syntax spell.txt /*spell-syntax* spell-syntax spell.txt /*spell-syntax*
spell-wordlist-format spell.txt /*spell-wordlist-format* spell-wordlist-format spell.txt /*spell-wordlist-format*
spell-yiddish spell.txt /*spell-yiddish* spell-yiddish spell.txt /*spell-yiddish*

View File

@@ -1,7 +1,7 @@
" Vim filetype plugin file " Vim filetype plugin file
" Language: Verilog HDL " Language: Verilog HDL
" Maintainer: Chih-Tsun Huang <cthuang@larc.ee.nthu.edu.tw> " Maintainer: Chih-Tsun Huang <cthuang@larc.ee.nthu.edu.tw>
" Last Change: Wed Oct 31 16:16:19 CST 2001 " Last Change: Mon Sep 5 11:05:54 CST 2005
" URL: http://larc.ee.nthu.edu.tw/~cthuang/vim/ftplugin/verilog.vim " URL: http://larc.ee.nthu.edu.tw/~cthuang/vim/ftplugin/verilog.vim
" Only do this when not done yet for this buffer " Only do this when not done yet for this buffer
@@ -12,6 +12,10 @@ endif
" Don't load another plugin for this buffer " Don't load another plugin for this buffer
let b:did_ftplugin = 1 let b:did_ftplugin = 1
" Undo the plugin effect
let b:undo_ftplugin = "setlocal fo< com< tw<"
\ . "| unlet b:browsefilter b:match_ignorecase b:match_words"
" Set 'formatoptions' to break comment lines but not other lines, " Set 'formatoptions' to break comment lines but not other lines,
" and insert the comment leader when hitting <CR> or using "o". " and insert the comment leader when hitting <CR> or using "o".
setlocal fo-=t fo+=croqlm1 setlocal fo-=t fo+=croqlm1
@@ -20,7 +24,9 @@ setlocal fo-=t fo+=croqlm1
setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,:// setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
" Format comments to be up to 78 characters long " Format comments to be up to 78 characters long
setlocal tw=75 if &textwidth == 0
setlocal tw=78
endif
set cpo-=C set cpo-=C

View File

@@ -6,7 +6,7 @@
@else: @else:
:progsearch VIM vim :progsearch VIM vim
REGIONS = RU IE YO REGIONS = RU YO
SPELLDIR = .. SPELLDIR = ..
FILES = ru_$*(REGIONS).aff ru_$*(REGIONS).dic FILES = ru_$*(REGIONS).aff ru_$*(REGIONS).dic
@@ -14,21 +14,18 @@ all: $SPELLDIR/ru.koi8-r.spl $SPELLDIR/ru.utf-8.spl \
$SPELLDIR/ru.cp1251.spl ../README_ru.txt $SPELLDIR/ru.cp1251.spl ../README_ru.txt
$SPELLDIR/ru.koi8-r.spl : $FILES $SPELLDIR/ru.koi8-r.spl : $FILES
:sys env LANG=ru_RU.KOI8-R $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_IE ru_YO" -c q :sys env LANG=ru_RU.KOI8-R $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_YO" -c q
$SPELLDIR/ru.utf-8.spl : $FILES $SPELLDIR/ru.utf-8.spl : $FILES
:sys env LANG=ru_RU.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_IE ru_YO" -c q :sys env LANG=ru_RU.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_YO" -c q
$SPELLDIR/ru.cp1251.spl : $FILES $SPELLDIR/ru.cp1251.spl : $FILES
:sys env LANG=ru_RU.CP1251 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_IE ru_YO" -c q :sys env LANG=ru_RU.CP1251 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_YO" -c q
../README_ru.txt: README_ru_$*(REGIONS).txt ../README_ru.txt: README_ru_$*(REGIONS).txt
:print ru_RU >! $target :print ru_RU >! $target
:cat README_ru_RU.txt >> $target :cat README_ru_RU.txt >> $target
:print =================================================== >>$target :print =================================================== >>$target
:print ru_IE >> $target
:cat README_ru_IE.txt >> $target
:print =================================================== >>$target
:print ru_YO >> $target :print ru_YO >> $target
:cat README_ru_YO.txt >> $target :cat README_ru_YO.txt >> $target
@@ -36,7 +33,7 @@ $SPELLDIR/ru.cp1251.spl : $FILES
# Fetching the files from OpenOffice.org. # Fetching the files from OpenOffice.org.
# #
OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
:attr {fetch = $OODIR/%file%} ru_RU.zip ru_RU_ye.zip ru_RU_yo.zip :attr {fetch = $OODIR/%file%} ru_RU.zip ru_RU_yo.zip
# The files don't depend on the .zip file so that we can delete it. # The files don't depend on the .zip file so that we can delete it.
# Only download the zip file if the targets don't exist. # Only download the zip file if the targets don't exist.
@@ -53,21 +50,6 @@ ru_RU.aff ru_RU.dic: {buildcheck=}
@if os.path.exists('ru_RU.diff'): @if os.path.exists('ru_RU.diff'):
:sys patch <ru_RU.diff :sys patch <ru_RU.diff
ru_IE.aff ru_IE.dic: {buildcheck=}
:assertpkg unzip
:fetch ru_RU_ye.zip
:sys unzip ru_RU_ye.zip
:delete ru_RU_ye.zip
:move ru_RU_ie.aff ru_IE.aff
:move ru_RU_ie.dic ru_IE.dic
:move README_ru_RU_ie.txt README_ru_IE.txt
@if not os.path.exists('ru_IE.orig.aff'):
:copy ru_IE.aff ru_IE.orig.aff
@if not os.path.exists('ru_IE.orig.dic'):
:copy ru_IE.dic ru_IE.orig.dic
@if os.path.exists('ru_IE.diff'):
:sys patch <ru_IE.diff
ru_YO.aff ru_YO.dic: {buildcheck=} ru_YO.aff ru_YO.dic: {buildcheck=}
:assertpkg unzip :assertpkg unzip
:fetch ru_RU_yo.zip :fetch ru_RU_yo.zip
@@ -91,8 +73,6 @@ diff:
:assertpkg diff :assertpkg diff
:sys {force} diff -a -C 1 ru_RU.orig.aff ru_RU.aff >ru_RU.diff :sys {force} diff -a -C 1 ru_RU.orig.aff ru_RU.aff >ru_RU.diff
:sys {force} diff -a -C 1 ru_RU.orig.dic ru_RU.dic >>ru_RU.diff :sys {force} diff -a -C 1 ru_RU.orig.dic ru_RU.dic >>ru_RU.diff
:sys {force} diff -a -C 1 ru_IE.orig.aff ru_IE.aff >ru_IE.diff
:sys {force} diff -a -C 1 ru_IE.orig.dic ru_IE.dic >>ru_IE.diff
:sys {force} diff -a -C 1 ru_YO.orig.aff ru_YO.aff >ru_YO.diff :sys {force} diff -a -C 1 ru_YO.orig.aff ru_YO.aff >ru_YO.diff
:sys {force} diff -a -C 1 ru_YO.orig.dic ru_YO.dic >>ru_YO.diff :sys {force} diff -a -C 1 ru_YO.orig.dic ru_YO.dic >>ru_YO.diff

View File

@@ -1,5 +1,21 @@
*** ru_RU.orig.dic Sat Aug 27 22:54:55 2005 *** ru_RU.orig.aff Sun Aug 28 21:12:27 2005
--- ru_RU.dic Sun Aug 28 11:46:34 2005 --- ru_RU.aff Sun Sep 4 17:21:40 2005
***************
*** 3,4 ****
--- 3,13 ----
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+ SOFOFROM <20><><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ SOFOTO <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'<27><><EFBFBD>
+
+ MIDWORD '-
+
SFX L Y 52
*** ru_RU.orig.dic Sun Aug 28 21:12:27 2005
--- ru_RU.dic Sun Sep 4 17:23:27 2005
*************** ***************
*** 8767,8769 **** *** 8767,8769 ****
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/F <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/F
@@ -13,11 +29,15 @@
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/A <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/A
--- 98085,98086 ---- --- 98085,98086 ----
*************** ***************
*** 115007,115009 **** *** 115006,115009 ****
<20><><EFBFBD><EFBFBD><EFBFBD>/B <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/A
- <20><><EFBFBD><EFBFBD><EFBFBD>/O ! <20><><EFBFBD><EFBFBD><EFBFBD>/B
! <20><><EFBFBD><EFBFBD><EFBFBD>/O
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/L
--- 115004,115006 ----
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/A
! <20><><EFBFBD><EFBFBD><EFBFBD>/BO
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/L <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/L
--- 115005,115006 ----
*************** ***************
*** 119209,119211 **** *** 119209,119211 ****
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/ASX <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/ASX

View File

@@ -1,5 +1,21 @@
*** ru_YO.orig.dic Sat Aug 27 22:54:55 2005 *** ru_YO.orig.aff Sun Aug 28 21:12:35 2005
--- ru_YO.dic Sun Aug 28 11:46:58 2005 --- ru_YO.aff Sun Sep 4 17:23:51 2005
***************
*** 3,4 ****
--- 3,13 ----
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+ SOFOFROM <20><><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ SOFOTO <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'<27><><EFBFBD>
+
+ MIDWORD '-
+
SFX L Y 56
*** ru_YO.orig.dic Sun Aug 28 21:12:35 2005
--- ru_YO.dic Sun Sep 4 17:24:26 2005
*************** ***************
*** 86471,86473 **** *** 86471,86473 ****
<20><><EFBFBD>ԣ<EFBFBD><D4A3><EFBFBD><EFBFBD>/AS <20><><EFBFBD>ԣ<EFBFBD><D4A3><EFBFBD><EFBFBD>/AS
@@ -7,8 +23,12 @@
<20><><EFBFBD><EFBFBD><EFBFBD>/B <20><><EFBFBD><EFBFBD><EFBFBD>/B
--- 86471,86472 ---- --- 86471,86472 ----
*************** ***************
*** 115246,115248 **** *** 115245,115248 ****
<20><><EFBFBD><EFBFBD><EFBFBD>/B <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/A
- <20><><EFBFBD><EFBFBD><EFBFBD>/O ! <20><><EFBFBD><EFBFBD><EFBFBD>/B
! <20><><EFBFBD><EFBFBD><EFBFBD>/O
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/L
--- 115244,115246 ----
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/A
! <20><><EFBFBD><EFBFBD><EFBFBD>/BO
<20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/L <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/L
--- 115245,115246 ----

View File

@@ -1423,6 +1423,9 @@ EXTERN char_u e_bufloaded[] INIT(=N_("E139: File is loaded in another buffer"));
EXTERN short disallow_gui INIT(= FALSE); EXTERN short disallow_gui INIT(= FALSE);
#endif #endif
EXTERN char top_bot_msg[] INIT(= N_("search hit TOP, continuing at BOTTOM"));
EXTERN char bot_top_msg[] INIT(= N_("search hit BOTTOM, continuing at TOP"));
/* /*
* Comms. with the session manager (XSMP) * Comms. with the session manager (XSMP)
*/ */

View File

@@ -16,6 +16,7 @@ void push_showcmd __ARGS((void));
void pop_showcmd __ARGS((void)); void pop_showcmd __ARGS((void));
void do_check_scrollbind __ARGS((int check)); void do_check_scrollbind __ARGS((int check));
void check_scrollbind __ARGS((linenr_T topline_diff, long leftcol_diff)); void check_scrollbind __ARGS((linenr_T topline_diff, long leftcol_diff));
int find_decl __ARGS((char_u *ptr, int len, int locally, int searchflags));
void scroll_redraw __ARGS((int up, long count)); void scroll_redraw __ARGS((int up, long count));
void do_nv_ident __ARGS((int c1, int c2)); void do_nv_ident __ARGS((int c1, int c2));
int get_visual_text __ARGS((cmdarg_T *cap, char_u **pp, int *lenp)); int get_visual_text __ARGS((cmdarg_T *cap, char_u **pp, int *lenp));

View File

@@ -3423,13 +3423,16 @@ win_line(wp, lnum, startrow, endrow)
else if (mb_l > 1) else if (mb_l > 1)
mb_c = (c << 8) + p_extra[1]; mb_c = (c << 8) + p_extra[1];
} }
if (mb_l == 0) /* at the NUL at end-of-line */
mb_l = 1;
/* If a double-width char doesn't fit display a '>' in the /* If a double-width char doesn't fit display a '>' in the
* last column. */ * last column. */
if ( if ((
# ifdef FEAT_RIGHTLEFT # ifdef FEAT_RIGHTLEFT
wp->w_p_rl ? (col <= 0) : wp->w_p_rl ? (col <= 0) :
# endif # endif
(col >= W_WIDTH(wp) - 1) (col >= W_WIDTH(wp) - 1))
&& (*mb_char2cells)(mb_c) == 2) && (*mb_char2cells)(mb_c) == 2)
{ {
c = '>'; c = '>';

View File

@@ -34,9 +34,6 @@ static void show_pat_in_path __ARGS((char_u *, int,
static void wvsp_one __ARGS((FILE *fp, int idx, char *s, int sc)); static void wvsp_one __ARGS((FILE *fp, int idx, char *s, int sc));
#endif #endif
static char_u *top_bot_msg = (char_u *)N_("search hit TOP, continuing at BOTTOM");
static char_u *bot_top_msg = (char_u *)N_("search hit BOTTOM, continuing at TOP");
/* /*
* This file contains various searching-related routines. These fall into * This file contains various searching-related routines. These fall into
* three groups: * three groups:
@@ -854,17 +851,12 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use)
* written. * written.
*/ */
if (dir == BACKWARD) /* start second loop at the other end */ if (dir == BACKWARD) /* start second loop at the other end */
{
lnum = buf->b_ml.ml_line_count; lnum = buf->b_ml.ml_line_count;
if (!shortmess(SHM_SEARCH) && (options & SEARCH_MSG))
give_warning((char_u *)_(top_bot_msg), TRUE);
}
else else
{
lnum = 1; lnum = 1;
if (!shortmess(SHM_SEARCH) && (options & SEARCH_MSG)) if (!shortmess(SHM_SEARCH) && (options & SEARCH_MSG))
give_warning((char_u *)_(bot_top_msg), TRUE); give_warning((char_u *)_(dir == BACKWARD
} ? top_bot_msg : bot_top_msg), TRUE);
} }
if (got_int || called_emsg || break_loop) if (got_int || called_emsg || break_loop)
break; break;
@@ -2519,8 +2511,8 @@ found:
* Return TRUE if the next paragraph or section was found. * Return TRUE if the next paragraph or section was found.
*/ */
int int
findpar(oap, dir, count, what, both) findpar(pincl, dir, count, what, both)
oparg_T *oap; int *pincl; /* Return: TRUE if last char is to be included */
int dir; int dir;
long count; long count;
int what; int what;
@@ -2586,7 +2578,7 @@ findpar(oap, dir, count, what, both)
if ((curwin->w_cursor.col = (colnr_T)STRLEN(ml_get(curr))) != 0) if ((curwin->w_cursor.col = (colnr_T)STRLEN(ml_get(curr))) != 0)
{ {
--curwin->w_cursor.col; --curwin->w_cursor.col;
oap->inclusive = TRUE; *pincl = TRUE;
} }
} }
else else

View File

@@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA" #define VIM_VERSION_MEDIUM "7.0aa ALPHA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 1)" #define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 5)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 1, compiled " #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 5, compiled "