From 3d27a45f9a536be76175d5a6c4d0d9ed552f8ebb Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 10 May 2007 17:44:18 +0000 Subject: updated for version 7.1b --- runtime/doc/gui_w16.txt | 2 +- runtime/doc/os_unix.txt | 2 +- runtime/doc/usr_41.txt | 2 +- runtime/doc/usr_90.txt | 2 +- runtime/indent/dictdconf.vim | 3 ++- runtime/syntax/racc.vim | 6 +++++- src/VisVim/DSAddIn.cpp | 2 +- src/feature.h | 4 ++-- src/os_unix.c | 2 +- src/os_unix.h | 2 +- src/tag.c | 6 +++--- 11 files changed, 19 insertions(+), 14 deletions(-) diff --git a/runtime/doc/gui_w16.txt b/runtime/doc/gui_w16.txt index d7eb739714..da566934ef 100644 --- a/runtime/doc/gui_w16.txt +++ b/runtime/doc/gui_w16.txt @@ -1,4 +1,4 @@ -*gui_w16.txt* For Vim version 7.1a. Last change: 2005 Mar 29 +*gui_w16.txt* For Vim version 7.1b. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt index 96d7c14e1d..b9a116f66f 100644 --- a/runtime/doc/os_unix.txt +++ b/runtime/doc/os_unix.txt @@ -1,4 +1,4 @@ -*os_unix.txt* For Vim version 7.1a. Last change: 2005 Mar 29 +*os_unix.txt* For Vim version 7.1b. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index c9dc0efc3e..81a59869c9 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -1,4 +1,4 @@ -*usr_41.txt* For Vim version 7.1a. Last change: 2007 Apr 26 +*usr_41.txt* For Vim version 7.1b. Last change: 2007 Apr 26 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt index 7334b451f2..513e58edda 100644 --- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -1,4 +1,4 @@ -*usr_90.txt* For Vim version 7.1a. Last change: 2006 Apr 24 +*usr_90.txt* For Vim version 7.1b. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/indent/dictdconf.vim b/runtime/indent/dictdconf.vim index 235cecd34d..9427342c7e 100644 --- a/runtime/indent/dictdconf.vim +++ b/runtime/indent/dictdconf.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: dictd(8) configuration file " Maintainer: Nikolai Weibull -" Latest Revision: 2006-04-19 +" Latest Revision: 2006-12-20 if exists("b:did_indent") finish @@ -9,4 +9,5 @@ endif let b:did_indent = 1 setlocal indentkeys=0{,0},!^F,o,O cinwords= autoindent smartindent +setlocal nosmartindent inoremap # X# diff --git a/runtime/syntax/racc.vim b/runtime/syntax/racc.vim index c0bfa303de..795b65243e 100644 --- a/runtime/syntax/racc.vim +++ b/runtime/syntax/racc.vim @@ -1,7 +1,7 @@ " Vim default file " Language: Racc input file " Maintainer: Nikolai Weibull -" Latest Revision: 2006-04-19 +" Latest Revision: 2006-07-09 if exists("b:current_syntax") finish @@ -110,6 +110,10 @@ syn region raccFooter transparent matchgroup=raccPreProc \ start='^---- footer.*' end='^----'he=e-4 \ contains=@raccRuby +syn sync match raccSyncHeader grouphere raccHeader '^---- header' +syn sync match raccSyncInner grouphere raccInner '^---- inner' +syn sync match raccSyncFooter grouphere raccFooter '^---- footer' + hi def link raccTodo Todo hi def link raccComment Comment hi def link raccPrecSpec Type diff --git a/src/VisVim/DSAddIn.cpp b/src/VisVim/DSAddIn.cpp index 3e72544612..b16361b903 100644 --- a/src/VisVim/DSAddIn.cpp +++ b/src/VisVim/DSAddIn.cpp @@ -93,7 +93,7 @@ STDMETHODIMP CDSAddIn::OnDisconnection (VARIANT_BOOL bLastTime) // Add a command to DevStudio // Creates a toolbar button for the command also. -// 'MethodName' is the name of the methode specified in the .odl file +// 'MethodName' is the name of the method specified in the .odl file // 'StrResId' the resource id of the descriptive string // 'GlyphIndex' the image index into the command buttons bitmap // Return true on success diff --git a/src/feature.h b/src/feature.h index 00dd014b8c..aa694e66eb 100644 --- a/src/feature.h +++ b/src/feature.h @@ -1096,7 +1096,7 @@ /* * +termresponse send t_RV to obtain terminal response. Used for xterm * to check if mouse dragging can be used and if term - * codes can be obtaind. + * codes can be obtained. */ #if (defined(FEAT_NORMAL) || defined(FEAT_MOUSE)) && defined(HAVE_TGETENT) # define FEAT_TERMRESPONSE @@ -1155,7 +1155,7 @@ * +python Python interface: "--enable-pythoninterp" * +tcl TCL interface: "--enable-tclinterp" * +sniff Sniff interface: "--enable-sniff" - * +sun_workshop Sun Workshop integegration + * +sun_workshop Sun Workshop integration * +netbeans_intg Netbeans integration */ diff --git a/src/os_unix.c b/src/os_unix.c index beeea3f9ce..2d512b730f 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -490,7 +490,7 @@ mch_total_mem(special) /* avoid overflow as much as possible */ while (shiftright > 0 && (pagesize & 1) == 0) { - pagesize = pagesize >> 1; + pagesize = (long_u)pagesize >> 1; --shiftright; } mem = (long_u)pagesize * pagecount; diff --git a/src/os_unix.h b/src/os_unix.h index 821462cd5d..d99d1c8d3b 100644 --- a/src/os_unix.h +++ b/src/os_unix.h @@ -483,7 +483,7 @@ int mch_rename __ARGS((const char *src, const char *dest)); # endif # ifndef VMS # ifdef __MVS__ - /* on OS390 Unix getenv() doesn't return a pointer to persistant + /* on OS390 Unix getenv() doesn't return a pointer to persistent * storage -> use __getenv() */ # define mch_getenv(x) (char_u *)__getenv((char *)(x)) # else diff --git a/src/tag.c b/src/tag.c index aa1ab755ea..d46239ca1a 100644 --- a/src/tag.c +++ b/src/tag.c @@ -383,7 +383,7 @@ do_tag(tag, type, count, forceit, verbose) /* * Beyond the last one, just give an error message and * go to the last one. Don't store the cursor - * postition. + * position. */ tagstackidx = tagstacklen - 1; EMSG(_(topmsg)); @@ -1330,7 +1330,7 @@ find_tags(pat, num_matches, matchesp, flags, mincount, buf_ffname) } incstack[INCSTACK_SIZE]; int incstack_idx = 0; /* index in incstack */ - char_u *ebuf; /* aditional buffer for etag fname */ + char_u *ebuf; /* additional buffer for etag fname */ int is_etag; /* current file is emaces style */ #endif @@ -2812,7 +2812,7 @@ parse_tag_line(lbuf, * * Static tags produced by the older ctags program have the format: * 'file:tag file /pattern'. - * This is only recognized when both occurences of 'file' are the same, to + * This is only recognized when both occurrence of 'file' are the same, to * avoid recognizing "string::string" or ":exit". * * Static tags produced by the new ctags program have the format: -- cgit v1.2.3