summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2005-12-19 22:14:58 +0000
committervimboss <devnull@localhost>2005-12-19 22:14:58 +0000
commit4940eb47f85fb89b6d1546f4c122c519bbf817bf (patch)
treed8f04d72858166b819689774455b575e601aa958
parent7fd1d81b327891186dbdd093c39ca74be7b8f54b (diff)
downloadvim-4940eb47f85fb89b6d1546f4c122c519bbf817bf.tar.gz
updated for version 7.0174
-rw-r--r--runtime/doc/eval.txt15
-rw-r--r--runtime/doc/tags1
-rw-r--r--runtime/doc/todo.txt8
-rw-r--r--runtime/doc/version7.txt5
-rw-r--r--runtime/lang/menu_czech_czech_republic.1250.vim18
-rw-r--r--src/edit.c5
-rw-r--r--src/ex_getln.c3
-rw-r--r--src/misc1.c1
-rw-r--r--src/ops.c12
-rw-r--r--src/proto/fileio.pro2
-rw-r--r--src/structs.h1
-rw-r--r--src/version.h4
12 files changed, 64 insertions, 11 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index f09e2ef8..47be23fc 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.0aa. Last change: 2005 Dec 12
+*eval.txt* For Vim version 7.0aa. Last change: 2005 Dec 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2200,6 +2200,12 @@ exists({expr}) The result is a Number, which is non-zero if {expr} is
literally and compared to the
autocommand patterns character by
character)
+ #group autocommand group exists
+ #group#event autocommand defined for this group and
+ event.
+ #group#event#pattern
+ autocommand defined for this group,
+ event and pattern.
For checking for a supported feature use |has()|.
Examples: >
@@ -2209,8 +2215,11 @@ exists({expr}) The result is a Number, which is non-zero if {expr} is
exists("*s:MyFunc")
exists("bufcount")
exists(":Make")
- exists("#CursorHold");
+ exists("#CursorHold")
exists("#BufReadPre#*.gz")
+ exists("#filetypeindent")
+ exists("#filetypeindent#FileType")
+ exists("#filetypeindent#FileType#*")
< There must be no space between the symbol (&/$/*/#) and the
name.
Note that the argument must be a string, not the name of the
@@ -4610,7 +4619,7 @@ all_builtin_terms Compiled with all builtin terminals enabled.
amiga Amiga version of Vim.
arabic Compiled with Arabic support |Arabic|.
arp Compiled with ARP support (Amiga).
-autocmd Compiled with autocommands support.
+autocmd Compiled with autocommand support. |autocommand|
balloon_eval Compiled with |balloon-eval| support.
balloon_multiline GUI supports multiline balloons.
beos BeOS version of Vim.
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 300e3b4d..c2ec052d 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5335,6 +5335,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 8b27dde4..30bc26d2 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 Dec 18
+*todo.txt* For Vim version 7.0aa. Last change: 2005 Dec 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -59,6 +59,10 @@ spelling:
- Have "zg" and "zw" report the file that was modified. (Marvin Renich)
- Add a command like "zg" that selects one of the files 'spellfile'.
+GTK: get an X error while exiting quickly after starting (running the tests).
+Caused by new GTK library?
+ X Error: BadWindow (invalid Window parameter) 3
+
Support saving and restoring session for X windows? It should work to do
":mksession" and use "-S fname" for the restart command. The
gui_x11_wm_protocol_handler() already takes care of the rest.
@@ -116,6 +120,8 @@ escape special characters ";&<>(){}". (Adri Verhoef)
Are there more commands where v:swapcommand can be set to something useful?
+Put autocommand event names in a hashtable for faster lookup?
+
Awaiting response:
- Win32: tearoff menu window should have a scrollbar when it's taller than
the screen.
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index b886ead1..474647d5 100644
--- 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 18
+*version7.txt* For Vim version 7.0aa. Last change: 2005 Dec 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -916,6 +916,9 @@ then a cursor key. Now keep the previously inserted text if nothing is
inserted after the CTRL-O. Allows using CTRL-O commands to move the cursor
without losing the last inserted text.
+The exists() function now supports checking for autocmd group definition.
+(Yegappan Lakshmanan)
+
==============================================================================
COMPILE TIME CHANGES *compile-changes-7*
diff --git a/runtime/lang/menu_czech_czech_republic.1250.vim b/runtime/lang/menu_czech_czech_republic.1250.vim
index 408d6ca9..c63c1ab2 100644
--- a/runtime/lang/menu_czech_czech_republic.1250.vim
+++ b/runtime/lang/menu_czech_czech_republic.1250.vim
@@ -88,6 +88,23 @@ menutrans &Jump\ to\ this\ tag<Tab>g^] &Skočit\ na\ tag<Tab>g^]
menutrans Jump\ &back<Tab>^T Skočit\ &zpět<Tab>^T
menutrans Build\ &Tags\ File &Vytvořit\ soubor\ tagů
+menutrans &Spelling &Kontrola\ pravopisu
+menutrans &Spell\ Check\ On Kontrola\ pravopisu\ &zapnuta
+menutrans Spell\ Check\ &Off Kontrola\ pravopisu\ &vypnuta
+menutrans To\ Next\ error<Tab>]s &Další\ chyba<Tab>]s
+menutrans To\ Previous\ error<Tab>[s &Předchozí\ chyba<Tab>[s
+menutrans Suggest\ Corrections<Tab>z? &Návrh\ oprav<Tab>z?
+menutrans Repeat\ correction<Tab>:spellrepall Zopakovat\ &opravu<Tab>:spellrepall
+menutrans Set\ language\ to\ "en" Nastav\ jazyk\ na\ "en"
+menutrans Set\ language\ to\ "en_au" Nastav\ jazyk\ na\ "en_au"
+menutrans Set\ language\ to\ "en_ca" Nastav\ jazyk\ na\ "en_ca"
+menutrans Set\ language\ to\ "en_gb" Nastav\ jazyk\ na\ "en_gb"
+menutrans Set\ language\ to\ "en_nz" Nastav\ jazyk\ na\ "en_nz"
+menutrans Set\ language\ to\ "en_us" Nastav\ jazyk\ na\ "en_us"
+menutrans Set\ language\ to\ "cz" Nastav\ jazyk\ na\ "cz"
+menutrans Set\ language\ to\ "cs_cz" Nastav\ jazyk\ na\ "cs_cz"
+menutrans &Find\ More\ Languages Nalézt\ další\ &jazyky
+
menutrans &Folding &Foldy
menutrans &Enable/Disable\ folds<Tab>zi &Ano/Ne<Tab>zi
menutrans &View\ Cursor\ Line<Tab>zv &Zobrazit\ řádek\ kurzoru<Tab>zv
@@ -119,6 +136,7 @@ menutrans &Previous\ Error<Tab>:cp &Předchozí\ chyba<Tab>:cp
menutrans &Older\ List<Tab>:cold Sta&rší\ seznam<Tab>:cold
menutrans N&ewer\ List<Tab>:cnew N&ovější\ seznam<Tab>:cnew
menutrans Error\ &Window Chybové\ o&kno
+menutrans SeT\ Compiler Nas&tavení\ kompilátoru
menutrans &Update<Tab>:cwin O&bnovit<Tab>:cwin
menutrans &Open<Tab>:copen &Otevřít<Tab>:copen
menutrans &Close<Tab>:cclose &Zavřít<Tab>:cclose
diff --git a/src/edit.c b/src/edit.c
index 53eabe66..f4f3f9a7 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1045,8 +1045,10 @@ doESCkey:
case K_S_UP: /* <S-Up> */
case K_PAGEUP:
case K_KPAGEUP:
+#ifdef FEAT_INS_EXPAND
if (pum_visible())
goto docomplete;
+#endif
ins_pageup();
break;
@@ -1060,8 +1062,10 @@ doESCkey:
case K_S_DOWN: /* <S-Down> */
case K_PAGEDOWN:
case K_KPAGEDOWN:
+#ifdef FEAT_INS_EXPAND
if (pum_visible())
goto docomplete;
+#endif
ins_pagedown();
break;
@@ -5073,6 +5077,7 @@ stop_arrow()
#endif
ResetRedobuff();
AppendToRedobuff((char_u *)"1i"); /* pretend we start an insertion */
+ new_insert_skip = 2;
}
else if (ins_need_undo)
{
diff --git a/src/ex_getln.c b/src/ex_getln.c
index bc5aca56..508c563a 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1105,6 +1105,7 @@ getcmdline(firstc, count, indent)
{
cmdline_paste(c, i == Ctrl_R);
+#ifdef FEAT_EVAL
/* When there was a serious error abort getting the
* command line. */
if (aborting())
@@ -1113,7 +1114,7 @@ getcmdline(firstc, count, indent)
putting it in history */
goto returncmd; /* back to cmd mode */
}
-
+#endif
KeyTyped = FALSE; /* Don't do p_wc completion. */
#ifdef FEAT_EVAL
if (new_cmdpos >= 0)
diff --git a/src/misc1.c b/src/misc1.c
index 85b81fd4..a5a1805c 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2145,6 +2145,7 @@ del_chars(count, fixpos)
*
* return FAIL for failure, OK otherwise
*/
+/*ARGSUSED*/
int
del_bytes(count, fixpos, use_delcombine)
long count;
diff --git a/src/ops.c b/src/ops.c
index 73976d16..0c1e853d 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -1844,7 +1844,11 @@ op_delete(oap)
}
#endif
(void)del_bytes((long)n, restart_edit == NUL && !virtual_op,
- oap->op_type == OP_DELETE && !oap->is_VIsual);
+ oap->op_type == OP_DELETE
+#ifdef FEAT_VISUAL
+ && !oap->is_VIsual
+#endif
+ );
}
else /* delete characters between lines */
{
@@ -1865,7 +1869,11 @@ op_delete(oap)
curwin->w_cursor.col = 0;
(void)del_bytes((long)(oap->end.col + 1 - !oap->inclusive),
restart_edit == NUL && !virtual_op,
- oap->op_type == OP_DELETE && !oap->is_VIsual);
+ oap->op_type == OP_DELETE
+#ifdef FEAT_VISUAL
+ && !oap->is_VIsual
+#endif
+ );
curwin->w_cursor = curpos; /* restore curwin->w_cursor */
(void)do_join(FALSE);
diff --git a/src/proto/fileio.pro b/src/proto/fileio.pro
index 4348d36c..816de42c 100644
--- a/src/proto/fileio.pro
+++ b/src/proto/fileio.pro
@@ -41,7 +41,7 @@ int has_autocmd __ARGS((EVENT_T event, char_u *sfname, buf_T *buf));
char_u *get_augroup_name __ARGS((expand_T *xp, int idx));
char_u *set_context_in_autocmd __ARGS((expand_T *xp, char_u *arg, int doautocmd));
char_u *get_event_name __ARGS((expand_T *xp, int idx));
-int au_exists __ARGS((char_u *name, char_u *name_end, char_u *pattern));
+int au_exists __ARGS((char_u *arg));
int match_file_pat __ARGS((char_u *pattern, regprog_T *prog, char_u *fname, char_u *sfname, char_u *tail, int allow_dirs));
int match_file_list __ARGS((char_u *list, char_u *sfname, char_u *ffname));
char_u *file_pat_to_reg_pat __ARGS((char_u *pat, char_u *pat_end, char *allow_dirs, int no_bslash));
diff --git a/src/structs.h b/src/structs.h
index 208b2d04..5b91cecb 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1392,6 +1392,7 @@ struct file_buffer
int b_start_ffc; /* first char of 'ff' when edit started */
#ifdef FEAT_MBYTE
char_u *b_start_fenc; /* 'fileencoding' when edit started or NULL */
+ int b_bad_char; /* "++bad=" argument when edit started or 0 */
#endif
#ifdef FEAT_EVAL
diff --git a/src/version.h b/src/version.h
index a4293088..cc5a45b0 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 Dec 18)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 18, compiled "
+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 19)"
+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 19, compiled "