# HG changeset patch # User vimboss # Date 1134246226 0 # Node ID 3686831cf3da094c66ca4d2ab2c671d3d2e2d497 # Parent 86379a738de4b607bfc4c9fe62c31a96f1341486 updated for version 7.0166 diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 7.0aa. Last change: 2005 Nov 26 +*spell.txt* For Vim version 7.0aa. Last change: 2005 Dec 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -124,8 +124,8 @@ is set. Finding suggestions for bad words: - *z?* -z? For the word under/after the cursor suggest correctly + *z=* +z= For the word under/after the cursor suggest correctly spelled words. This also works to find alternatives for a word that is not highlighted as a bad word, e.g., when the word after it is bad. @@ -143,7 +143,7 @@ z? For the word under/after the cursor first line (the header) to cancel. If a count is used that suggestion is used, without - prompting. For example, "1z?" always takes the first + prompting. For example, "1z=" always takes the first suggestion. If 'verbose' is non-zero a score will be displayed @@ -156,7 +156,7 @@ z? For the word under/after the cursor and other languages without spaces between words. *:spellr* *:spellrepall* *E752* *E753* -:spellr[epall] Repeat the replacement done by |z?| for all matches +:spellr[epall] Repeat the replacement done by |z=| for all matches with the replaced word in the current window. In Insert mode, when the cursor is after a badly spelled word, you can use @@ -1194,7 +1194,7 @@ white space is replaced by one space. S SOFOFROM are replaced by one. You can use the |soundfold()| function to try out the results. Or set the -'verbose' option to see the score in the output of the |z?| command. +'verbose' option to see the score in the output of the |z=| command. vim:tw=78:sw=4:ts=8:ft=help:norl: diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0aa. Last change: 2005 Dec 08 +*todo.txt* For Vim version 7.0aa. Last change: 2005 Dec 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,8 +30,8 @@ be worked on, but only if you sponsor Vi *known-bugs* -------------------- Known bugs and current work ----------------------- -Cygwin and Mac OS/X may preserve case for file names but ignore case -differences. Use Amiga code? +When a buffer has no name, ":w >>fname" uses "fname" for the buffer, that is +not logical. SwapExists with editexisting plugin: Is there a simple way to detect ":tag function" and have the remote Vim jump to the tag? @@ -86,9 +86,6 @@ ccomplete: - page-up / page-down spelling: -- "z?" was to be used for searching in folded text. Use something else for - suggestions. "z="? -- When a recognized word ends in a . don't have 'spellcapcheck" match it. - Use KEEPCASE instead of "KEP". It applies to the word including affixes Hunspell also uses it. - Hunspell has NOSUGGEST flag (use for obscene words?) @@ -96,7 +93,6 @@ spelling: - Look into hungarian dictionary: http://magyarispell.sourceforge.net/rc3-beta2.zip - Support breakpoint character · 0xb7 and ignore it? -- Dutch word list should be available here: http://www.woordenlijst.org/ 8 Alternate Dutch word list at www.nederlandsewoorden.nl (use script to obtain). But new Myspell wordlist will come (Hagen) - Finding suggestions with sound folding is slow. Somehow store the @@ -1965,7 +1961,7 @@ 8 Syntax highlighting is slow when del - highlighting "~/vim/test/longline.tex", "~/vim/test/scwoop.tcl" and "~/vim/test/lockup.pl". - loading a syntax file to highlight all words not from a dictionary. - - editing a vim script with syntax highlighting on (loading vim.vim). + - editing a Vim script with syntax highlighting on (loading vim.vim). 7 Screen updating can be further improved by only redrawing lines that were changed (and lines after them, when syntax highlighting was used, and it changed). @@ -2026,7 +2022,7 @@ 8 Make it possible to ignore errors fo typing, error messages must be switched back on. Also a flag to ignore error messages for shell commands (for mappings). - Option to set time for emsg() sleep. Interrupt sleep when key is typed? - sleep before second message? + Sleep before second message? 8 In Ex silent mode or when reading commands from a file, what exactly is not printed and what is? Check ":print", ":set all", ":args", ":vers", etc. At least there should be no prompt. (Smulders) And don't clear the @@ -2620,7 +2616,7 @@ 7 Use Tabs for the indent of starting continuation lines. Allows changing 'tabstop' without messing up the indents. And/or: Add option to copy indent as-is, without changing spaces to tabs. - also for 'autoindent'. 'keeptabs': when set don't change the tabs and + Also for 'autoindent'. 'keeptabs': when set don't change the tabs and spaces used for indent, when the indent remains the same or increases. @@ -2703,7 +2699,7 @@ Visual mode: behave like 'scrolloff' is one, so that the text scrolls when the pointer is in the top line. 8 When using "I" or "A" in Visual block mode, short lines do not get the new - text. make it possible to add the text to short lines too, with padding + text. Make it possible to add the text to short lines too, with padding where needed. 7 With a Visual block selected, "2x" deletes a block of double the width, "3y" yanks a block of triple width, etc. diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.0aa. Last change: 2005 Dec 07 +*version7.txt* For Vim version 7.0aa. Last change: 2005 Dec 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -631,6 +631,10 @@ few more important commands. Used ideas Unix: When libcall() fails obtain an error message with dlerror() and display it. (Johannes Zellner) +Mac and Cygwin: When editing an existing file make the file name the same case +of the edited file. Thus when typing ":e os_UNIX.c" the file name becomes +"os_unix.c". + Added "nbsp" in 'listchars'. (David Blanchet) Added the "acwrite" value for the 'buftype' option. This is for a buffer that diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim --- a/runtime/syntax/tex.vim +++ b/runtime/syntax/tex.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: TeX " Maintainer: Dr. Charles E. Campbell, Jr. -" Last Change: Sep 14, 2005 -" Version: 30 +" Last Change: Dec 07, 2005 +" Version: 31 " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " " Notes: {{{1 @@ -394,10 +394,12 @@ endif syn region texZone matchgroup=texStatement start="@samp{" end="}\|%stopzone\>" contains=@texRefGroup syn region texRefZone matchgroup=texStatement start="\\nocite{" end="}\|%stopzone\>" contains=@texRefGroup syn region texRefZone matchgroup=texStatement start="\\bibliography{" end="}\|%stopzone\>" contains=@texRefGroup -syn region texRefZone matchgroup=texStatement start="\\cite\([tp]\*\=\)\={" end="}\|%stopzone\>" contains=@texRefGroup syn region texRefZone matchgroup=texStatement start="\\label{" end="}\|%stopzone\>" contains=@texRefGroup syn region texRefZone matchgroup=texStatement start="\\\(page\|eq\)ref{" end="}\|%stopzone\>" contains=@texRefGroup syn region texRefZone matchgroup=texStatement start="\\v\=ref{" end="}\|%stopzone\>" contains=@texRefGroup +syn match texRefZone '\\cite\%([tp]\*\=\)\=' nextgroup=texRefOption,texCite +syn region texRefOption contained matchgroup=Delimiter start='\[' end=']' contains=@texRefGroup nextgroup=texRefOption,texCite +syn region texCite contained matchgroup=Delimiter start='{' end='}' contains=@texRefGroup " Handle newcommand, newenvironment : {{{1 syn match texNewCmd "\\newcommand\>" nextgroup=texCmdName skipwhite skipnl @@ -465,6 +467,7 @@ if did_tex_syntax_inits == 1 HiLink texError Error endif + HiLink texCite texRefZone HiLink texDefCmd texDef HiLink texDefName texDef HiLink texDocType texCmdName diff --git a/src/ex_cmds.c b/src/ex_cmds.c --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -4123,6 +4123,7 @@ do_sub(eap) } do_error = TRUE; do_print = FALSE; + do_count = FALSE; do_ic = 0; } while (*cmd) diff --git a/src/main.c b/src/main.c --- a/src/main.c +++ b/src/main.c @@ -2061,6 +2061,12 @@ scripterror: mch_exit(2); } #endif + +#ifdef USE_FNAME_CASE + /* Make the case of the file name match the actual file. */ + fname_case(p, 0); +#endif + alist_add(&global_alist, p, #if (!defined(UNIX) && !defined(__EMX__)) || defined(ARCHIE) parmp->literal ? 2 : 0 /* add buffer nr after exp. */ diff --git a/src/misc1.c b/src/misc1.c --- a/src/misc1.c +++ b/src/misc1.c @@ -8576,7 +8576,7 @@ unix_expandpath(gap, path, wildoff, flag } /* compile the regexp into a program */ -#ifdef MACOS_X /* Can/Should we use CASE_INSENSITIVE_FILENAME instead ?*/ +#ifdef CASE_INSENSITIVE_FILENAME regmatch.rm_ic = TRUE; /* Behave like Terminal.app */ #else regmatch.rm_ic = FALSE; /* Don't ever ignore case */ diff --git a/src/proto/os_unix.pro b/src/proto/os_unix.pro --- a/src/proto/os_unix.pro +++ b/src/proto/os_unix.pro @@ -1,72 +1,73 @@ /* os_unix.c */ -void mch_write __ARGS((char_u *s, int len)); -int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt)); -int mch_char_avail __ARGS((void)); -long_u mch_total_mem __ARGS((int special)); -void mch_delay __ARGS((long msec, int ignoreinput)); -int mch_stackcheck __ARGS((char *p)); -void mch_startjmp __ARGS((void)); -void mch_endjmp __ARGS((void)); -void mch_didjmp __ARGS((void)); -void mch_suspend __ARGS((void)); -void mch_init __ARGS((void)); -void reset_signals __ARGS((void)); -int vim_handle_signal __ARGS((int sig)); -int mch_check_win __ARGS((int argc, char **argv)); -int mch_input_isatty __ARGS((void)); -int mch_can_restore_title __ARGS((void)); -int mch_can_restore_icon __ARGS((void)); -void mch_settitle __ARGS((char_u *title, char_u *icon)); -void mch_restore_title __ARGS((int which)); -int vim_is_xterm __ARGS((char_u *name)); -int use_xterm_mouse __ARGS((void)); -int vim_is_iris __ARGS((char_u *name)); -int vim_is_vt300 __ARGS((char_u *name)); -int vim_is_fastterm __ARGS((char_u *name)); -int mch_get_user_name __ARGS((char_u *s, int len)); -int mch_get_uname __ARGS((uid_t uid, char_u *s, int len)); -void mch_get_host_name __ARGS((char_u *s, int len)); -long mch_get_pid __ARGS((void)); -int mch_dirname __ARGS((char_u *buf, int len)); -void slash_adjust __ARGS((char_u *p)); -int mch_FullName __ARGS((char_u *fname, char_u *buf, int len, int force)); -int mch_isFullName __ARGS((char_u *fname)); -long mch_getperm __ARGS((char_u *name)); -int mch_setperm __ARGS((char_u *name, long perm)); -vim_acl_T mch_get_acl __ARGS((char_u *fname)); -void mch_set_acl __ARGS((char_u *fname, vim_acl_T aclent)); -void mch_free_acl __ARGS((vim_acl_T aclent)); -void mch_hide __ARGS((char_u *name)); -int mch_isdir __ARGS((char_u *name)); -int mch_can_exe __ARGS((char_u *name)); -int mch_nodetype __ARGS((char_u *name)); -void mch_early_init __ARGS((void)); -void mch_free_mem __ARGS((void)); -void mch_exit __ARGS((int r)); -void mch_settmode __ARGS((int tmode)); -void get_stty __ARGS((void)); -void mch_setmouse __ARGS((int on)); -void check_mouse_termcode __ARGS((void)); -int mch_screenmode __ARGS((char_u *arg)); -int mch_get_shellsize __ARGS((void)); -void mch_set_shellsize __ARGS((void)); -void mch_new_shellsize __ARGS((void)); -int mch_call_shell __ARGS((char_u *cmd, int options)); -void mch_breakcheck __ARGS((void)); -int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags)); -int mch_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags)); -int mch_has_exp_wildcard __ARGS((char_u *p)); -int mch_has_wildcard __ARGS((char_u *p)); -int mch_libcall __ARGS((char_u *libname, char_u *funcname, char_u *argstring, int argint, char_u **string_result, int *number_result)); -void setup_term_clip __ARGS((void)); -void start_xterm_trace __ARGS((int button)); -void stop_xterm_trace __ARGS((void)); -void clear_xterm_clip __ARGS((void)); -int clip_xterm_own_selection __ARGS((VimClipboard *cbd)); -void clip_xterm_lose_selection __ARGS((VimClipboard *cbd)); -void clip_xterm_request_selection __ARGS((VimClipboard *cbd)); -void clip_xterm_set_selection __ARGS((VimClipboard *cbd)); -int xsmp_handle_requests __ARGS((void)); -void xsmp_init __ARGS((void)); -void xsmp_close __ARGS((void)); +extern void mch_write __ARGS((char_u *s, int len)); +extern int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt)); +extern int mch_char_avail __ARGS((void)); +extern long_u mch_total_mem __ARGS((int special)); +extern void mch_delay __ARGS((long msec, int ignoreinput)); +extern int mch_stackcheck __ARGS((char *p)); +extern void mch_startjmp __ARGS((void)); +extern void mch_endjmp __ARGS((void)); +extern void mch_didjmp __ARGS((void)); +extern void mch_suspend __ARGS((void)); +extern void mch_init __ARGS((void)); +extern void reset_signals __ARGS((void)); +extern int vim_handle_signal __ARGS((int sig)); +extern int mch_check_win __ARGS((int argc, char **argv)); +extern int mch_input_isatty __ARGS((void)); +extern int mch_can_restore_title __ARGS((void)); +extern int mch_can_restore_icon __ARGS((void)); +extern void mch_settitle __ARGS((char_u *title, char_u *icon)); +extern void mch_restore_title __ARGS((int which)); +extern int vim_is_xterm __ARGS((char_u *name)); +extern int use_xterm_mouse __ARGS((void)); +extern int vim_is_iris __ARGS((char_u *name)); +extern int vim_is_vt300 __ARGS((char_u *name)); +extern int vim_is_fastterm __ARGS((char_u *name)); +extern int mch_get_user_name __ARGS((char_u *s, int len)); +extern int mch_get_uname __ARGS((uid_t uid, char_u *s, int len)); +extern void mch_get_host_name __ARGS((char_u *s, int len)); +extern long mch_get_pid __ARGS((void)); +extern int mch_dirname __ARGS((char_u *buf, int len)); +extern void slash_adjust __ARGS((char_u *p)); +extern int mch_FullName __ARGS((char_u *fname, char_u *buf, int len, int force)); +extern int mch_isFullName __ARGS((char_u *fname)); +extern void fname_case __ARGS((char_u *name, int len)); +extern long mch_getperm __ARGS((char_u *name)); +extern int mch_setperm __ARGS((char_u *name, long perm)); +extern vim_acl_T mch_get_acl __ARGS((char_u *fname)); +extern void mch_set_acl __ARGS((char_u *fname, vim_acl_T aclent)); +extern void mch_free_acl __ARGS((vim_acl_T aclent)); +extern void mch_hide __ARGS((char_u *name)); +extern int mch_isdir __ARGS((char_u *name)); +extern int mch_can_exe __ARGS((char_u *name)); +extern int mch_nodetype __ARGS((char_u *name)); +extern void mch_early_init __ARGS((void)); +extern void mch_free_mem __ARGS((void)); +extern void mch_exit __ARGS((int r)); +extern void mch_settmode __ARGS((int tmode)); +extern void get_stty __ARGS((void)); +extern void mch_setmouse __ARGS((int on)); +extern void check_mouse_termcode __ARGS((void)); +extern int mch_screenmode __ARGS((char_u *arg)); +extern int mch_get_shellsize __ARGS((void)); +extern void mch_set_shellsize __ARGS((void)); +extern void mch_new_shellsize __ARGS((void)); +extern int mch_call_shell __ARGS((char_u *cmd, int options)); +extern void mch_breakcheck __ARGS((void)); +extern int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags)); +extern int mch_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags)); +extern int mch_has_exp_wildcard __ARGS((char_u *p)); +extern int mch_has_wildcard __ARGS((char_u *p)); +extern int mch_libcall __ARGS((char_u *libname, char_u *funcname, char_u *argstring, int argint, char_u **string_result, int *number_result)); +extern void setup_term_clip __ARGS((void)); +extern void start_xterm_trace __ARGS((int button)); +extern void stop_xterm_trace __ARGS((void)); +extern void clear_xterm_clip __ARGS((void)); +extern int clip_xterm_own_selection __ARGS((VimClipboard *cbd)); +extern void clip_xterm_lose_selection __ARGS((VimClipboard *cbd)); +extern void clip_xterm_request_selection __ARGS((VimClipboard *cbd)); +extern void clip_xterm_set_selection __ARGS((VimClipboard *cbd)); +extern int xsmp_handle_requests __ARGS((void)); +extern void xsmp_init __ARGS((void)); +extern void xsmp_close __ARGS((void)); /* vim: set ft=c : */