# HG changeset patch # User vimboss # Date 1178822332 0 # Node ID 82274b2846006453ec6510ad46940d41b5397956 # Parent 35a1d7bd61915661dd5cd5b59b563579e6004ff6 updated for version 7.1b diff --git a/Filelist b/Filelist --- a/Filelist +++ b/Filelist @@ -646,7 +646,7 @@ EXTRA = \ README_extra.txt \ src/VisVim/VisVim.dll \ farsi/README.txt \ - farsi/fonts/*/far* \ + farsi/fonts/*/far-* \ runtime/vimlogo.xpm \ src/swis.s \ src/tee/Makefile* \ diff --git a/README_bindos.txt b/README_bindos.txt --- a/README_bindos.txt +++ b/README_bindos.txt @@ -1,4 +1,4 @@ -README_bindos.txt for version 7.1a of Vim: Vi IMproved. +README_bindos.txt for version 7.1b of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. diff --git a/README_lang.txt b/README_lang.txt --- a/README_lang.txt +++ b/README_lang.txt @@ -1,4 +1,4 @@ -README_lang.txt for version 7.1a of Vim: Vi IMproved. +README_lang.txt for version 7.1b of Vim: Vi IMproved. This file contains files for non-English languages: - Translated messages. diff --git a/README_srcdos.txt b/README_srcdos.txt --- a/README_srcdos.txt +++ b/README_srcdos.txt @@ -1,4 +1,4 @@ -README_srcdos.txt for version 7.1a of Vim: Vi IMproved. +README_srcdos.txt for version 7.1b of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. diff --git a/README_unix.txt b/README_unix.txt --- a/README_unix.txt +++ b/README_unix.txt @@ -1,4 +1,4 @@ -README_unix.txt for version 7.1a of Vim: Vi IMproved. +README_unix.txt for version 7.1b of Vim: Vi IMproved. This file explains the installation of Vim on Unix systems. See "README.txt" for general information about Vim. diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt --- a/runtime/doc/arabic.txt +++ b/runtime/doc/arabic.txt @@ -1,4 +1,4 @@ -*arabic.txt* For Vim version 7.1a. Last change: 2005 Mar 29 +*arabic.txt* For Vim version 7.1b. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Nadim Shaikli diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt --- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -1,4 +1,4 @@ -*usr_11.txt* For Vim version 7.1a. Last change: 2006 Apr 24 +*usr_11.txt* For Vim version 7.1b. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt --- a/runtime/doc/usr_28.txt +++ b/runtime/doc/usr_28.txt @@ -1,4 +1,4 @@ -*usr_28.txt* For Vim version 7.1a. Last change: 2006 Apr 24 +*usr_28.txt* For Vim version 7.1b. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt --- a/runtime/doc/usr_40.txt +++ b/runtime/doc/usr_40.txt @@ -1,4 +1,4 @@ -*usr_40.txt* For Vim version 7.1a. Last change: 2006 Jun 21 +*usr_40.txt* For Vim version 7.1b. Last change: 2006 Jun 21 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1,4 +1,4 @@ -*windows.txt* For Vim version 7.1a. Last change: 2007 Mar 17 +*windows.txt* For Vim version 7.1b. Last change: 2007 Mar 17 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/ftplugin/mp.vim b/runtime/ftplugin/mp.vim --- a/runtime/ftplugin/mp.vim +++ b/runtime/ftplugin/mp.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: MetaPost " Maintainer: Nikolai Weibull -" Latest Revision: 2006-04-19 +" Latest Revision: 2006-07-04 if exists("b:did_ftplugin") finish @@ -12,7 +12,7 @@ let b:undo_ftplugin = "setl com< cms< fo setlocal comments=:% commentstring=%\ %s formatoptions-=t formatoptions+=croql -if !exists(":FixBeginfigs") != 2 +if exists(":FixBeginfigs") != 2 command -nargs=0 FixBeginfigs call s:fix_beginfigs() function! s:fix_beginfigs() diff --git a/runtime/spell/pt/main.aap b/runtime/spell/pt/main.aap --- a/runtime/spell/pt/main.aap +++ b/runtime/spell/pt/main.aap @@ -36,8 +36,9 @@ PT_FNAME = myspell.pt-latest.zip # Fetching the pt_BR files from BrOffice.org (Brazilian OOo) 2.1. Should be # updated really soon. # -BR_DIR = http://www.deso-se.com.br/downloads/download.php?arquivo=pt_BR-2700g -BR_FNAME = pt_BR-2700g.zip +BR_BASENAME = pt_BR-2007-04-11 +BR_DIR = http://www.deso-se.com.br/downloads/download.php?arquivo=$BR_BASENAME +BR_FNAME = $(BR_BASENAME).zip :attr {fetch = $BR_DIR} $BR_FNAME @@ -94,7 +95,7 @@ pt_BR.aff pt_BR.dic: {buildcheck=} # Removing /* ... */ header to avoid warnings. Write it to the README file, it # contains the copyright notice. - :sys $VIM pt_BR.aff -e -c "set ff=unix" -c "/\/\*/,/\*\//w README_pt_BR.txt" -c "/\/\*/,/\*\//+1d" -c update -c q + :sys $VIM pt_BR.aff -e -c "set ff=unix" -c "/\/\*/,/\*\//w! README_pt_BR.txt" -c "/\/\*/,/\*\//+1d" -c update -c q #:sys $VIM README_pt_BR.txt -e -c "set ff=unix" -c update -c q @if not os.path.exists('pt_BR.orig.aff'): diff --git a/runtime/syntax/plaintex.vim b/runtime/syntax/plaintex.vim --- a/runtime/syntax/plaintex.vim +++ b/runtime/syntax/plaintex.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: TeX (plain.tex format) " Maintainer: Nikolai Weibull -" Latest Revision: 2006-04-19 +" Latest Revision: 2006-10-26 if exists("b:current_syntax") finish @@ -14,6 +14,7 @@ syn match plaintexControlSequence \ '\\[a-zA-Z@]\+' runtime! syntax/initex.vim +unlet b:current_syntax syn match plaintexComment display \ contains=ALLBUT,initexComment,plaintexComment @@ -30,8 +31,6 @@ syn match plaintexCommand \ '\\\%(plainoutput\|TeX\)\>' syn match plaintexBoxCommand display contains=@NoSpell \ '\\\%(null\|strut\)\>' -syn match plaintexCharacterCommand display contains=@NoSpell - \ /\\\%(["#$%&'.=^_`~]\|``\|''\|-\{2,3}\|[?!]`\|^^L\|\~\|\%(a[ae]\|A[AE]\|acute\|[cdHoOPStuvijlL]\|copyright\|d\=dag\|folio\|ldotp\|[lr]q\|oe\|OE\|slash\|ss\|underbar\)\>\)/ syn match plaintexDebuggingCommand display contains=@NoSpell \ '\\\%(showhyphens\|tracingall\|wlog\)\>' syn match plaintexFontsCommand display contains=@NoSpell @@ -61,13 +60,17 @@ syn match plaintexTablesCommand if !exists("g:plaintex_no_math") syn region plaintexMath matchgroup=plaintexMath - \ contains=@plaintexMath + \ contains=@plaintexMath,@NoSpell \ start='\$' skip='\\\\\|\\\$' end='\$' syn region plaintexMath matchgroup=plaintexMath - \ contains=@plaintexMath keepend + \ contains=@plaintexMath,@NoSpell keepend \ start='\$\$' skip='\\\\\|\\\$' end='\$\$' endif +" Keep this after plaintexMath, as we don’t want math mode started at a \$. +syn match plaintexCharacterCommand display contains=@NoSpell + \ /\\\%(["#$%&'.=^_`~]\|``\|''\|-\{2,3}\|[?!]`\|^^L\|\~\|\%(a[ae]\|A[AE]\|acute\|[cdHoOPStuvijlL]\|copyright\|d\=dag\|folio\|ldotp\|[lr]q\|oe\|OE\|slash\|ss\|underbar\)\>\)/ + syn cluster plaintexMath \ contains=plaintexMathCommand,plaintexMathBoxCommand, \ plaintexMathCharacterCommand,plaintexMathDelimiter, diff --git a/src/ops.c b/src/ops.c --- a/src/ops.c +++ b/src/ops.c @@ -4094,7 +4094,7 @@ do_do_join(count, insert_space) * "redraw" is TRUE when the screen should be updated. * Caller must have setup for undo. * - * return FAIL for failure, OK ohterwise + * return FAIL for failure, OK otherwise */ int do_join(insert_space) diff --git a/src/option.h b/src/option.h --- a/src/option.h +++ b/src/option.h @@ -150,7 +150,7 @@ #define CPO_CW 'w' /* "cw" only changes one blank */ #define CPO_FWRITE 'W' /* "w!" doesn't overwrite readonly files */ #define CPO_ESC 'x' -#define CPO_REPLCNT 'X' /* "R" with a count only delets chars once */ +#define CPO_REPLCNT 'X' /* "R" with a count only deletes chars once */ #define CPO_YANK 'y' #define CPO_KEEPRO 'Z' /* don't reset 'readonly' on ":w!" */ #define CPO_DOLLAR '$'