OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revisioncd3689efd90a5934dcf2e4e232d97939737414c3 (tree)
Time2005-12-19 07:10:00
Authorvimboss
Commitervimboss

Log Message

updated for version 7.0173

Change Summary

Incremental Difference

diff -r ba54311bc43e -r cd3689efd90a runtime/autoload/ccomplete.vim
--- a/runtime/autoload/ccomplete.vim Sun Dec 18 22:02:33 2005 +0000
+++ b/runtime/autoload/ccomplete.vim Sun Dec 18 22:10:00 2005 +0000
@@ -1,7 +1,7 @@
11 " Vim completion script
22 " Language: C
33 " Maintainer: Bram Moolenaar <Bram@vim.org>
4-" Last Change: 2005 Oct 06
4+" Last Change: 2005 Dec 18
55
66
77 " This function is used for the 'omnifunc' option.
@@ -87,7 +87,7 @@
8787 if diclist[i]['kind'] == 'v'
8888 let line = diclist[i]['cmd']
8989 if line[0] == '/' && line[1] == '^'
90- let col = match(line, items[0])
90+ let col = match(line, '\<' . items[0] . '\>')
9191 call extend(res, s:Nextitem(strpart(line, 2, col - 2), items[1:]))
9292 endif
9393 endif
diff -r ba54311bc43e -r cd3689efd90a runtime/doc/autocmd.txt
--- a/runtime/doc/autocmd.txt Sun Dec 18 22:02:33 2005 +0000
+++ b/runtime/doc/autocmd.txt Sun Dec 18 22:10:00 2005 +0000
@@ -1,4 +1,4 @@
1-*autocmd.txt* For Vim version 7.0aa. Last change: 2005 Dec 11
1+*autocmd.txt* For Vim version 7.0aa. Last change: 2005 Dec 18
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -447,6 +447,8 @@
447447 make some coffee. :) See |CursorHold-example|
448448 for previewing tags.
449449 This event is only triggered in Normal mode.
450+ While recording the CursorHold event is not
451+ triggered. |q|
450452 Note: Interactive commands cannot be used for
451453 this event. There is no hit-enter prompt,
452454 the screen is updated directly (when needed).
diff -r ba54311bc43e -r cd3689efd90a runtime/doc/todo.txt
--- a/runtime/doc/todo.txt Sun Dec 18 22:02:33 2005 +0000
+++ b/runtime/doc/todo.txt Sun Dec 18 22:10:00 2005 +0000
@@ -1,4 +1,4 @@
1-*todo.txt* For Vim version 7.0aa. Last change: 2005 Dec 17
1+*todo.txt* For Vim version 7.0aa. Last change: 2005 Dec 18
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,10 +30,6 @@
3030 *known-bugs*
3131 -------------------- Known bugs and current work -----------------------
3232
33-When 'delcombine' is set in Select mode before a character with a combining
34-char the combining char is deleted when it shouldn't. (Tony Mechelynck, Nov
35-27)
36-
3733 ccomplete:
3834 - When an option is set: In completion mode and the user types (identifier)
3935 characters, advance to the first match instead of removing the popup menu.
@@ -41,10 +37,11 @@
4137 - Complete the longest common match instead of the first match?
4238 For all kinds of completions? Configurable?
4339 - !_TAG_FILE_FORMAT and it's ilk are listed in the global completions
44-- When completing something that is a structure, add the "." or "->".
40+ Can't reproduce it right now...
41+- Window resize when poup is displayed
42+- When completing something that is a structure, add the "." or "->" right
43+ away. How to figure out if it's a pointer or not?
4544 - When a typedef or struct is local to a file only use it in that file?
46-- Window resize when poup is displayed
47-- page-up / page-down
4845
4946 spelling:
5047 - Use KEEPCASE instead of "KEP". It applies to the word including affixes
diff -r ba54311bc43e -r cd3689efd90a runtime/doc/version7.txt
--- a/runtime/doc/version7.txt Sun Dec 18 22:02:33 2005 +0000
+++ b/runtime/doc/version7.txt Sun Dec 18 22:10:00 2005 +0000
@@ -1,4 +1,4 @@
1-*version7.txt* For Vim version 7.0aa. Last change: 2005 Dec 17
1+*version7.txt* For Vim version 7.0aa. Last change: 2005 Dec 18
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1499,4 +1499,11 @@
14991499 the command line was not abandoned but it wasn't used either. Now abandon
15001500 typing the command line.
15011501
1502+'delcombine' was also used in Visual and Select mode and for commands like
1503+"cl". That was illogical and has been disabled.
1504+
1505+When recording while a CursorHold autocommand was defined special keys would
1506+appear in the register. Now the CursorHold event is not triggered while
1507+recording.
1508+
15021509 vim:tw=78:ts=8:ft=help:norl:
diff -r ba54311bc43e -r cd3689efd90a src/edit.c
--- a/src/edit.c Sun Dec 18 22:02:33 2005 +0000
+++ b/src/edit.c Sun Dec 18 22:10:00 2005 +0000
@@ -121,7 +121,9 @@
121121 static int ins_compl_get_exp __ARGS((pos_T *ini, int dir));
122122 static void ins_compl_delete __ARGS((void));
123123 static void ins_compl_insert __ARGS((void));
124-static int ins_compl_next __ARGS((int allow_get_expansion));
124+static int ins_compl_next __ARGS((int allow_get_expansion, int count));
125+static int ins_compl_key2dir __ARGS((int c));
126+static int ins_compl_key2count __ARGS((int c));
125127 static int ins_complete __ARGS((int c));
126128 static int quote_meta __ARGS((char_u *dest, char_u *str, int len));
127129 #endif /* FEAT_INS_EXPAND */
@@ -1043,6 +1045,8 @@
10431045 case K_S_UP: /* <S-Up> */
10441046 case K_PAGEUP:
10451047 case K_KPAGEUP:
1048+ if (pum_visible())
1049+ goto docomplete;
10461050 ins_pageup();
10471051 break;
10481052
@@ -1056,6 +1060,8 @@
10561060 case K_S_DOWN: /* <S-Down> */
10571061 case K_PAGEDOWN:
10581062 case K_KPAGEDOWN:
1063+ if (pum_visible())
1064+ goto docomplete;
10591065 ins_pagedown();
10601066 break;
10611067
@@ -1819,6 +1825,11 @@
18191825 if (c == Ctrl_R)
18201826 return TRUE;
18211827
1828+ /* Accept <PageUp> and <PageDown> if the popup menu is visible. */
1829+ if (pum_visible() && (c == K_PAGEUP || c == K_KPAGEUP || c == K_S_UP
1830+ || c == K_PAGEDOWN || c == K_KPAGEDOWN || c == K_S_DOWN))
1831+ return TRUE;
1832+
18221833 switch (ctrl_x_mode)
18231834 {
18241835 case 0: /* Not in any CTRL-X mode */
@@ -3272,11 +3283,14 @@
32723283 * calls this function with "allow_get_expansion" FALSE.
32733284 */
32743285 static int
3275-ins_compl_next(allow_get_expansion)
3286+ins_compl_next(allow_get_expansion, count)
32763287 int allow_get_expansion;
3288+ int count; /* repeat completion this many times; should
3289+ be at least 1 */
32773290 {
32783291 int num_matches = -1;
32793292 int i;
3293+ int todo = count;
32803294
32813295 if (allow_get_expansion)
32823296 {
@@ -3284,24 +3298,41 @@
32843298 ins_compl_delete();
32853299 }
32863300 compl_pending = FALSE;
3287- if (compl_shows_dir == FORWARD && compl_shown_match->cp_next != NULL)
3288- compl_shown_match = compl_shown_match->cp_next;
3289- else if (compl_shows_dir == BACKWARD && compl_shown_match->cp_prev != NULL)
3290- compl_shown_match = compl_shown_match->cp_prev;
3291- else
3292- {
3293- compl_pending = TRUE;
3294- if (allow_get_expansion)
3295- {
3296- num_matches = ins_compl_get_exp(&compl_startpos, compl_direction);
3297- if (compl_pending)
3298- {
3299- if (compl_direction == compl_shows_dir)
3300- compl_shown_match = compl_curr_match;
3301- }
3301+
3302+ /* Repeat this for when <PageUp> or <PageDown> is typed. But don't wrap
3303+ * around. */
3304+ while (--todo >= 0)
3305+ {
3306+ if (compl_shows_dir == FORWARD && compl_shown_match->cp_next != NULL)
3307+ {
3308+ compl_shown_match = compl_shown_match->cp_next;
3309+ if (compl_shown_match->cp_next != NULL
3310+ && compl_shown_match->cp_next == compl_first_match)
3311+ break;
3312+ }
3313+ else if (compl_shows_dir == BACKWARD
3314+ && compl_shown_match->cp_prev != NULL)
3315+ {
3316+ compl_shown_match = compl_shown_match->cp_prev;
3317+ if (compl_shown_match == compl_first_match)
3318+ break;
33023319 }
33033320 else
3304- return -1;
3321+ {
3322+ compl_pending = TRUE;
3323+ if (allow_get_expansion)
3324+ {
3325+ num_matches = ins_compl_get_exp(&compl_startpos,
3326+ compl_direction);
3327+ if (compl_pending)
3328+ {
3329+ if (compl_direction == compl_shows_dir)
3330+ compl_shown_match = compl_curr_match;
3331+ }
3332+ }
3333+ else
3334+ return -1;
3335+ }
33053336 }
33063337
33073338 /* Insert the text of the new completion */
@@ -3376,17 +3407,49 @@
33763407 if (vim_is_ctrl_x_key(c) && c != Ctrl_X && c != Ctrl_R)
33773408 {
33783409 c = safe_vgetc(); /* Eat the character */
3379- if (c == Ctrl_P || c == Ctrl_L)
3380- compl_shows_dir = BACKWARD;
3381- else
3382- compl_shows_dir = FORWARD;
3383- (void)ins_compl_next(FALSE);
3410+ compl_shows_dir = ins_compl_key2dir(c);
3411+ (void)ins_compl_next(FALSE, ins_compl_key2count(c));
33843412 }
33853413 else if (c != Ctrl_R)
33863414 compl_interrupted = TRUE;
33873415 }
33883416 if (compl_pending && !got_int)
3389- (void)ins_compl_next(FALSE);
3417+ (void)ins_compl_next(FALSE, 1);
3418+}
3419+
3420+/*
3421+ * Decide the direction of Insert mode complete from the key typed.
3422+ * Returns BACKWARD or FORWARD.
3423+ */
3424+ static int
3425+ins_compl_key2dir(c)
3426+ int c;
3427+{
3428+ if (c == Ctrl_P || c == Ctrl_L || (pum_visible()
3429+ && (c == K_PAGEUP || c == K_KPAGEUP || c == K_S_UP)))
3430+ return BACKWARD;
3431+ return FORWARD;
3432+}
3433+
3434+/*
3435+ * Decide the number of completions to move forward.
3436+ * Returns 1 for most keys, height of the popup menu for page-up/down keys.
3437+ */
3438+ static int
3439+ins_compl_key2count(c)
3440+ int c;
3441+{
3442+ int h;
3443+
3444+ if (pum_visible() && (c == K_PAGEUP || c == K_KPAGEUP || c == K_S_UP
3445+ || c == K_PAGEDOWN || c == K_KPAGEDOWN || c == K_S_DOWN))
3446+ {
3447+ h = pum_get_height();
3448+ if (h > 3)
3449+ h -= 2; /* keep some context */
3450+ return h;
3451+ }
3452+ return 1;
33903453 }
33913454
33923455 /*
@@ -3403,10 +3466,7 @@
34033466 colnr_T curs_col; /* cursor column */
34043467 int n;
34053468
3406- if (c == Ctrl_P || c == Ctrl_L)
3407- compl_direction = BACKWARD;
3408- else
3409- compl_direction = FORWARD;
3469+ compl_direction = ins_compl_key2dir(c);
34103470 if (!compl_started)
34113471 {
34123472 /* First time we hit ^N or ^P (in a row, I mean) */
@@ -3783,7 +3843,7 @@
37833843 /*
37843844 * Find next match.
37853845 */
3786- n = ins_compl_next(TRUE);
3846+ n = ins_compl_next(TRUE, ins_compl_key2count(c));
37873847
37883848 /* may undisplay the popup menu */
37893849 ins_compl_upd_pum();
diff -r ba54311bc43e -r cd3689efd90a src/misc1.c
--- a/src/misc1.c Sun Dec 18 22:02:33 2005 +0000
+++ b/src/misc1.c Sun Dec 18 22:10:00 2005 +0000
@@ -2110,7 +2110,7 @@
21102110 return del_chars(1L, fixpos);
21112111 }
21122112 #endif
2113- return del_bytes(1L, fixpos);
2113+ return del_bytes(1L, fixpos, TRUE);
21142114 }
21152115
21162116 #if defined(FEAT_MBYTE) || defined(PROTO)
@@ -2134,7 +2134,7 @@
21342134 bytes += l;
21352135 p += l;
21362136 }
2137- return del_bytes(bytes, fixpos);
2137+ return del_bytes(bytes, fixpos, TRUE);
21382138 }
21392139 #endif
21402140
@@ -2146,9 +2146,10 @@
21462146 * return FAIL for failure, OK otherwise
21472147 */
21482148 int
2149-del_bytes(count, fixpos)
2149+del_bytes(count, fixpos, use_delcombine)
21502150 long count;
21512151 int fixpos;
2152+ int use_delcombine; /* 'delcombine' option applies */
21522153 {
21532154 char_u *oldp, *newp;
21542155 colnr_T oldlen;
@@ -2169,7 +2170,8 @@
21692170 #ifdef FEAT_MBYTE
21702171 /* If 'delcombine' is set and deleting (less than) one character, only
21712172 * delete the last combining character. */
2172- if (p_deco && enc_utf8 && utfc_ptr2len(oldp + col) >= count)
2173+ if (p_deco && use_delcombine && enc_utf8
2174+ && utfc_ptr2len(oldp + col) >= count)
21732175 {
21742176 int c1, c2;
21752177 int n;
diff -r ba54311bc43e -r cd3689efd90a src/ops.c
--- a/src/ops.c Sun Dec 18 22:02:33 2005 +0000
+++ b/src/ops.c Sun Dec 18 22:10:00 2005 +0000
@@ -1843,7 +1843,8 @@
18431843 curwin->w_cursor.coladd = 0;
18441844 }
18451845 #endif
1846- (void)del_bytes((long)n, restart_edit == NUL && !virtual_op);
1846+ (void)del_bytes((long)n, restart_edit == NUL && !virtual_op,
1847+ oap->op_type == OP_DELETE && !oap->is_VIsual);
18471848 }
18481849 else /* delete characters between lines */
18491850 {
@@ -1863,7 +1864,8 @@
18631864 /* delete from start of line until op_end */
18641865 curwin->w_cursor.col = 0;
18651866 (void)del_bytes((long)(oap->end.col + 1 - !oap->inclusive),
1866- restart_edit == NUL && !virtual_op);
1867+ restart_edit == NUL && !virtual_op,
1868+ oap->op_type == OP_DELETE && !oap->is_VIsual);
18671869 curwin->w_cursor = curpos; /* restore curwin->w_cursor */
18681870
18691871 (void)do_join(FALSE);
@@ -4509,7 +4511,7 @@
45094511 if (line_count < 0 && u_save_cursor() == FAIL)
45104512 break;
45114513 #ifdef FEAT_COMMENTS
4512- (void)del_bytes((long)next_leader_len, FALSE);
4514+ (void)del_bytes((long)next_leader_len, FALSE, FALSE);
45134515 if (next_leader_len > 0)
45144516 mark_col_adjust(curwin->w_cursor.lnum, (colnr_T)0, 0L,
45154517 (long)-next_leader_len);
diff -r ba54311bc43e -r cd3689efd90a src/os_amiga.c
--- a/src/os_amiga.c Sun Dec 18 22:02:33 2005 +0000
+++ b/src/os_amiga.c Sun Dec 18 22:10:00 2005 +0000
@@ -139,8 +139,7 @@
139139 if (WaitForChar(raw_in, p_ut * 1000L) == 0)
140140 {
141141 #ifdef FEAT_AUTOCMD
142- if (!did_cursorhold && has_cursorhold()
143- && get_real_state() == NORMAL_BUSY && maxlen >= 3)
142+ if (trigger_cursorhold() && maxlen >= 3)
144143 {
145144 buf[0] = K_SPECIAL;
146145 buf[1] = KS_EXTRA;
diff -r ba54311bc43e -r cd3689efd90a src/os_msdos.c
--- a/src/os_msdos.c Sun Dec 18 22:02:33 2005 +0000
+++ b/src/os_msdos.c Sun Dec 18 22:10:00 2005 +0000
@@ -1037,8 +1037,7 @@
10371037 if (WaitForChar(p_ut) == 0)
10381038 {
10391039 #ifdef FEAT_AUTOCMD
1040- if (!did_cursorhold && has_cursorhold()
1041- && get_real_state() == NORMAL_BUSY && maxlen >= 3)
1040+ if (trigger_cursorhold() && maxlen >= 3)
10421041 {
10431042 buf[0] = K_SPECIAL;
10441043 buf[1] = KS_EXTRA;
diff -r ba54311bc43e -r cd3689efd90a src/popupmenu.c
--- a/src/popupmenu.c Sun Dec 18 22:02:33 2005 +0000
+++ b/src/popupmenu.c Sun Dec 18 22:10:00 2005 +0000
@@ -237,12 +237,28 @@
237237
238238 if (pum_selected >= 0)
239239 {
240- if (pum_first > pum_selected)
241- /* scroll down */
242- pum_first = pum_selected;
243- else if (pum_first < pum_selected - pum_height + 1)
244- /* scroll up */
245- pum_first = pum_selected - pum_height + 1;
240+ if (pum_first > pum_selected - 4)
241+ {
242+ /* scroll down; when we did a jump it's probably a PageUp then
243+ * scroll to put the selected entry at the bottom */
244+ if (pum_first > pum_selected - 2)
245+ {
246+ pum_first = pum_selected - pum_height + 1;
247+ if (pum_first < 0)
248+ pum_first = 0;
249+ }
250+ else
251+ pum_first = pum_selected;
252+ }
253+ else if (pum_first < pum_selected - pum_height + 5)
254+ {
255+ /* scroll up; when we did a jump it's probably a PageDown then
256+ * scroll to put the selected entry at the top */
257+ if (pum_first < pum_selected - pum_height + 1 + 2)
258+ pum_first = pum_selected;
259+ else
260+ pum_first = pum_selected - pum_height + 1;
261+ }
246262
247263 if (pum_height > 6)
248264 {
@@ -298,4 +314,14 @@
298314 return pum_array != NULL;
299315 }
300316
317+/*
318+ * Return the height of the popup menu, the number of entries visible.
319+ * Only valid when pum_visible() returns TRUE!
320+ */
321+ int
322+pum_get_height()
323+{
324+ return pum_height;
325+}
326+
301327 #endif
diff -r ba54311bc43e -r cd3689efd90a src/proto/fileio.pro
--- a/src/proto/fileio.pro Sun Dec 18 22:02:33 2005 +0000
+++ b/src/proto/fileio.pro Sun Dec 18 22:10:00 2005 +0000
@@ -36,6 +36,7 @@
3636 int apply_autocmds __ARGS((EVENT_T event, char_u *fname, char_u *fname_io, int force, buf_T *buf));
3737 int apply_autocmds_retval __ARGS((EVENT_T event, char_u *fname, char_u *fname_io, int force, buf_T *buf, int *retval));
3838 int has_cursorhold __ARGS((void));
39+int trigger_cursorhold __ARGS((void));
3940 int has_autocmd __ARGS((EVENT_T event, char_u *sfname, buf_T *buf));
4041 char_u *get_augroup_name __ARGS((expand_T *xp, int idx));
4142 char_u *set_context_in_autocmd __ARGS((expand_T *xp, char_u *arg, int doautocmd));
diff -r ba54311bc43e -r cd3689efd90a src/proto/misc1.pro
--- a/src/proto/misc1.pro Sun Dec 18 22:02:33 2005 +0000
+++ b/src/proto/misc1.pro Sun Dec 18 22:10:00 2005 +0000
@@ -1,94 +1,94 @@
11 /* misc1.c */
2-extern int get_indent __ARGS((void));
3-extern int get_indent_lnum __ARGS((linenr_T lnum));
4-extern int get_indent_buf __ARGS((buf_T *buf, linenr_T lnum));
5-extern int get_indent_str __ARGS((char_u *ptr, int ts));
6-extern int set_indent __ARGS((int size, int flags));
7-extern int get_number_indent __ARGS((linenr_T lnum));
8-extern int open_line __ARGS((int dir, int flags, int old_indent));
9-extern int get_leader_len __ARGS((char_u *line, char_u **flags, int backward));
10-extern int plines __ARGS((linenr_T lnum));
11-extern int plines_win __ARGS((win_T *wp, linenr_T lnum, int winheight));
12-extern int plines_nofill __ARGS((linenr_T lnum));
13-extern int plines_win_nofill __ARGS((win_T *wp, linenr_T lnum, int winheight));
14-extern int plines_win_nofold __ARGS((win_T *wp, linenr_T lnum));
15-extern int plines_win_col __ARGS((win_T *wp, linenr_T lnum, long column));
16-extern int plines_m_win __ARGS((win_T *wp, linenr_T first, linenr_T last));
17-extern void ins_bytes __ARGS((char_u *p));
18-extern void ins_bytes_len __ARGS((char_u *p, int len));
19-extern void ins_char __ARGS((int c));
20-extern void ins_char_bytes __ARGS((char_u *buf, int charlen));
21-extern void ins_str __ARGS((char_u *s));
22-extern int del_char __ARGS((int fixpos));
23-extern int del_chars __ARGS((long count, int fixpos));
24-extern int del_bytes __ARGS((long count, int fixpos));
25-extern int truncate_line __ARGS((int fixpos));
26-extern void del_lines __ARGS((long nlines, int undo));
27-extern int gchar_pos __ARGS((pos_T *pos));
28-extern int gchar_cursor __ARGS((void));
29-extern void pchar_cursor __ARGS((int c));
30-extern int inindent __ARGS((int extra));
31-extern char_u *skip_to_option_part __ARGS((char_u *p));
32-extern void changed __ARGS((void));
33-extern void changed_bytes __ARGS((linenr_T lnum, colnr_T col));
34-extern void appended_lines __ARGS((linenr_T lnum, long count));
35-extern void appended_lines_mark __ARGS((linenr_T lnum, long count));
36-extern void deleted_lines __ARGS((linenr_T lnum, long count));
37-extern void deleted_lines_mark __ARGS((linenr_T lnum, long count));
38-extern void changed_lines __ARGS((linenr_T lnum, colnr_T col, linenr_T lnume, long xtra));
39-extern void unchanged __ARGS((buf_T *buf, int ff));
40-extern void check_status __ARGS((buf_T *buf));
41-extern void change_warning __ARGS((int col));
42-extern int ask_yesno __ARGS((char_u *str, int direct));
43-extern int get_keystroke __ARGS((void));
44-extern int get_number __ARGS((int colon, int *mouse_used));
45-extern int prompt_for_number __ARGS((int *mouse_used));
46-extern void msgmore __ARGS((long n));
47-extern void beep_flush __ARGS((void));
48-extern void vim_beep __ARGS((void));
49-extern void init_homedir __ARGS((void));
50-extern void free_homedir __ARGS((void));
51-extern void expand_env __ARGS((char_u *src, char_u *dst, int dstlen));
52-extern void expand_env_esc __ARGS((char_u *srcp, char_u *dst, int dstlen, int esc, char_u *startstr));
53-extern char_u *vim_getenv __ARGS((char_u *name, int *mustfree));
54-extern char_u *expand_env_save __ARGS((char_u *src));
55-extern void vim_setenv __ARGS((char_u *name, char_u *val));
56-extern char_u *get_env_name __ARGS((expand_T *xp, int idx));
57-extern void home_replace __ARGS((buf_T *buf, char_u *src, char_u *dst, int dstlen, int one));
58-extern char_u *home_replace_save __ARGS((buf_T *buf, char_u *src));
59-extern int fullpathcmp __ARGS((char_u *s1, char_u *s2, int checkname));
60-extern char_u *gettail __ARGS((char_u *fname));
61-extern char_u *gettail_sep __ARGS((char_u *fname));
62-extern char_u *getnextcomp __ARGS((char_u *fname));
63-extern char_u *get_past_head __ARGS((char_u *path));
64-extern int vim_ispathsep __ARGS((int c));
65-extern int vim_ispathlistsep __ARGS((int c));
66-extern int dir_of_file_exists __ARGS((char_u *fname));
67-extern int vim_fnamecmp __ARGS((char_u *x, char_u *y));
68-extern int vim_fnamencmp __ARGS((char_u *x, char_u *y, size_t len));
69-extern char_u *concat_fnames __ARGS((char_u *fname1, char_u *fname2, int sep));
70-extern char_u *concat_str __ARGS((char_u *str1, char_u *str2));
71-extern void add_pathsep __ARGS((char_u *p));
72-extern char_u *FullName_save __ARGS((char_u *fname, int force));
73-extern pos_T *find_start_comment __ARGS((int ind_maxcomment));
74-extern void do_c_expr_indent __ARGS((void));
75-extern int cin_islabel __ARGS((int ind_maxcomment));
76-extern int cin_iscase __ARGS((char_u *s));
77-extern int cin_isscopedecl __ARGS((char_u *s));
78-extern int get_c_indent __ARGS((void));
79-extern int get_expr_indent __ARGS((void));
80-extern int get_lisp_indent __ARGS((void));
81-extern void prepare_to_exit __ARGS((void));
82-extern void preserve_exit __ARGS((void));
83-extern int vim_fexists __ARGS((char_u *fname));
84-extern void line_breakcheck __ARGS((void));
85-extern void fast_breakcheck __ARGS((void));
86-extern int expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
87-extern int match_suffix __ARGS((char_u *fname));
88-extern int unix_expandpath __ARGS((garray_T *gap, char_u *path, int wildoff, int flags, int didstar));
89-extern int gen_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
90-extern void addfile __ARGS((garray_T *gap, char_u *f, int flags));
91-extern char_u *get_cmd_output __ARGS((char_u *cmd, char_u *infile, int flags));
92-extern void FreeWild __ARGS((int count, char_u **files));
93-extern int goto_im __ARGS((void));
2+int get_indent __ARGS((void));
3+int get_indent_lnum __ARGS((linenr_T lnum));
4+int get_indent_buf __ARGS((buf_T *buf, linenr_T lnum));
5+int get_indent_str __ARGS((char_u *ptr, int ts));
6+int set_indent __ARGS((int size, int flags));
7+int get_number_indent __ARGS((linenr_T lnum));
8+int open_line __ARGS((int dir, int flags, int old_indent));
9+int get_leader_len __ARGS((char_u *line, char_u **flags, int backward));
10+int plines __ARGS((linenr_T lnum));
11+int plines_win __ARGS((win_T *wp, linenr_T lnum, int winheight));
12+int plines_nofill __ARGS((linenr_T lnum));
13+int plines_win_nofill __ARGS((win_T *wp, linenr_T lnum, int winheight));
14+int plines_win_nofold __ARGS((win_T *wp, linenr_T lnum));
15+int plines_win_col __ARGS((win_T *wp, linenr_T lnum, long column));
16+int plines_m_win __ARGS((win_T *wp, linenr_T first, linenr_T last));
17+void ins_bytes __ARGS((char_u *p));
18+void ins_bytes_len __ARGS((char_u *p, int len));
19+void ins_char __ARGS((int c));
20+void ins_char_bytes __ARGS((char_u *buf, int charlen));
21+void ins_str __ARGS((char_u *s));
22+int del_char __ARGS((int fixpos));
23+int del_chars __ARGS((long count, int fixpos));
24+int del_bytes __ARGS((long count, int fixpos, int use_delcombine));
25+int truncate_line __ARGS((int fixpos));
26+void del_lines __ARGS((long nlines, int undo));
27+int gchar_pos __ARGS((pos_T *pos));
28+int gchar_cursor __ARGS((void));
29+void pchar_cursor __ARGS((int c));
30+int inindent __ARGS((int extra));
31+char_u *skip_to_option_part __ARGS((char_u *p));
32+void changed __ARGS((void));
33+void changed_bytes __ARGS((linenr_T lnum, colnr_T col));
34+void appended_lines __ARGS((linenr_T lnum, long count));
35+void appended_lines_mark __ARGS((linenr_T lnum, long count));
36+void deleted_lines __ARGS((linenr_T lnum, long count));
37+void deleted_lines_mark __ARGS((linenr_T lnum, long count));
38+void changed_lines __ARGS((linenr_T lnum, colnr_T col, linenr_T lnume, long xtra));
39+void unchanged __ARGS((buf_T *buf, int ff));
40+void check_status __ARGS((buf_T *buf));
41+void change_warning __ARGS((int col));
42+int ask_yesno __ARGS((char_u *str, int direct));
43+int get_keystroke __ARGS((void));
44+int get_number __ARGS((int colon, int *mouse_used));
45+int prompt_for_number __ARGS((int *mouse_used));
46+void msgmore __ARGS((long n));
47+void beep_flush __ARGS((void));
48+void vim_beep __ARGS((void));
49+void init_homedir __ARGS((void));
50+void free_homedir __ARGS((void));
51+void expand_env __ARGS((char_u *src, char_u *dst, int dstlen));
52+void expand_env_esc __ARGS((char_u *srcp, char_u *dst, int dstlen, int esc, char_u *startstr));
53+char_u *vim_getenv __ARGS((char_u *name, int *mustfree));
54+char_u *expand_env_save __ARGS((char_u *src));
55+void vim_setenv __ARGS((char_u *name, char_u *val));
56+char_u *get_env_name __ARGS((expand_T *xp, int idx));
57+void home_replace __ARGS((buf_T *buf, char_u *src, char_u *dst, int dstlen, int one));
58+char_u *home_replace_save __ARGS((buf_T *buf, char_u *src));
59+int fullpathcmp __ARGS((char_u *s1, char_u *s2, int checkname));
60+char_u *gettail __ARGS((char_u *fname));
61+char_u *gettail_sep __ARGS((char_u *fname));
62+char_u *getnextcomp __ARGS((char_u *fname));
63+char_u *get_past_head __ARGS((char_u *path));
64+int vim_ispathsep __ARGS((int c));
65+int vim_ispathlistsep __ARGS((int c));
66+int dir_of_file_exists __ARGS((char_u *fname));
67+int vim_fnamecmp __ARGS((char_u *x, char_u *y));
68+int vim_fnamencmp __ARGS((char_u *x, char_u *y, size_t len));
69+char_u *concat_fnames __ARGS((char_u *fname1, char_u *fname2, int sep));
70+char_u *concat_str __ARGS((char_u *str1, char_u *str2));
71+void add_pathsep __ARGS((char_u *p));
72+char_u *FullName_save __ARGS((char_u *fname, int force));
73+pos_T *find_start_comment __ARGS((int ind_maxcomment));
74+void do_c_expr_indent __ARGS((void));
75+int cin_islabel __ARGS((int ind_maxcomment));
76+int cin_iscase __ARGS((char_u *s));
77+int cin_isscopedecl __ARGS((char_u *s));
78+int get_c_indent __ARGS((void));
79+int get_expr_indent __ARGS((void));
80+int get_lisp_indent __ARGS((void));
81+void prepare_to_exit __ARGS((void));
82+void preserve_exit __ARGS((void));
83+int vim_fexists __ARGS((char_u *fname));
84+void line_breakcheck __ARGS((void));
85+void fast_breakcheck __ARGS((void));
86+int expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
87+int match_suffix __ARGS((char_u *fname));
88+int unix_expandpath __ARGS((garray_T *gap, char_u *path, int wildoff, int flags, int didstar));
89+int gen_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
90+void addfile __ARGS((garray_T *gap, char_u *f, int flags));
91+char_u *get_cmd_output __ARGS((char_u *cmd, char_u *infile, int flags));
92+void FreeWild __ARGS((int count, char_u **files));
93+int goto_im __ARGS((void));
9494 /* vim: set ft=c : */
diff -r ba54311bc43e -r cd3689efd90a src/version.h
--- a/src/version.h Sun Dec 18 22:02:33 2005 +0000
+++ b/src/version.h Sun Dec 18 22:10:00 2005 +0000
@@ -36,5 +36,5 @@
3636 #define VIM_VERSION_NODOT "vim70aa"
3737 #define VIM_VERSION_SHORT "7.0aa"
3838 #define VIM_VERSION_MEDIUM "7.0aa ALPHA"
39-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 17)"
40-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 17, compiled "
39+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 18)"
40+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 18, compiled "
Show on old repository browser