Skip to content

Commit faf4086

Browse files
splhacksplhack
committed
Merge remote-tracking branch 'vim/master'
2 parents 2f80667 + 3e96c3d commit faf4086

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+2204
-2323
lines changed

‎runtime/tools/xcmdsrv_client.c

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@
2929
#include <X11/Intrinsic.h>
3030
#include <X11/Xatom.h>
3131

32-
#define __ARGS(x) x
33-
3432
/* Client API */
35-
char * sendToVim __ARGS((Display *dpy, char *name, char *cmd, int asKeys, int *code));
33+
char * sendToVim(Display *dpy, char *name, char *cmd, int asKeys, int *code);
3634

3735
#ifdef MAIN
3836
/* A sample program */
@@ -70,15 +68,15 @@ main(int argc, char **argv)
7068
* Forward declarations for procedures defined later in this file:
7169
*/
7270

73-
static int x_error_check __ARGS((Display *dpy, XErrorEvent *error_event));
74-
static int AppendPropCarefully __ARGS((Display *display,
75-
Window window, Atom property, char *value, int length));
76-
static Window LookupName __ARGS((Display *dpy, char *name,
77-
int delete, char **loose));
78-
static int SendInit __ARGS((Display *dpy));
79-
static char *SendEventProc __ARGS((Display *dpy, XEvent *eventPtr,
80-
int expect, int *code));
81-
static int IsSerialName __ARGS((char *name));
71+
static int x_error_check(Display *dpy, XErrorEvent *error_event);
72+
static int AppendPropCarefully(Display *display,
73+
Window window, Atom property, char *value, int length);
74+
static Window LookupName(Display *dpy, char *name,
75+
int delete, char **loose);
76+
static int SendInit(Display *dpy);
77+
static char *SendEventProc(Display *dpy, XEvent *eventPtr,
78+
int expect, int *code);
79+
static int IsSerialName(char *name);
8280

8381
/* Private variables */
8482
static Atom registryProperty = None;

‎src/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1677,10 +1677,11 @@ PRO_AUTO = \
16771677
hashtab.pro \
16781678
hangulin.pro \
16791679
if_cscope.pro \
1680-
if_xcmdsrv.pro \
1680+
if_lua.pro \
16811681
if_python.pro \
16821682
if_python3.pro \
16831683
if_ruby.pro \
1684+
if_xcmdsrv.pro \
16841685
json.pro \
16851686
main.pro \
16861687
mark.pro \
@@ -1695,8 +1696,10 @@ PRO_AUTO = \
16951696
normal.pro \
16961697
ops.pro \
16971698
option.pro \
1699+
os_mac_conv.pro \
16981700
os_unix.pro \
16991701
popupmnu.pro \
1702+
pty.pro \
17001703
quickfix.pro \
17011704
regexp.pro \
17021705
screen.pro \
@@ -2014,6 +2017,7 @@ test_arglist \
20142017
test_cursor_func \
20152018
test_delete \
20162019
test_expand \
2020+
test_glob2regpat \
20172021
test_hardcopy \
20182022
test_increment \
20192023
test_json \

‎src/arabic.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,25 @@
1818
*
1919
*/
2020

21-
static int A_is_a __ARGS((int cur_c));
22-
static int A_is_s __ARGS((int cur_c));
23-
static int A_is_f __ARGS((int cur_c));
24-
static int chg_c_a2s __ARGS((int cur_c));
25-
static int chg_c_a2i __ARGS((int cur_c));
26-
static int chg_c_a2m __ARGS((int cur_c));
27-
static int chg_c_a2f __ARGS((int cur_c));
28-
static int chg_c_i2m __ARGS((int cur_c));
29-
static int chg_c_f2m __ARGS((int cur_c));
30-
static int chg_c_laa2i __ARGS((int hid_c));
31-
static int chg_c_laa2f __ARGS((int hid_c));
32-
static int half_shape __ARGS((int c));
33-
static int A_firstc_laa __ARGS((int c1, int c));
34-
static int A_is_harakat __ARGS((int c));
35-
static int A_is_iso __ARGS((int c));
36-
static int A_is_formb __ARGS((int c));
37-
static int A_is_ok __ARGS((int c));
38-
static int A_is_valid __ARGS((int c));
39-
static int A_is_special __ARGS((int c));
21+
static int A_is_a(int cur_c);
22+
static int A_is_s(int cur_c);
23+
static int A_is_f(int cur_c);
24+
static int chg_c_a2s(int cur_c);
25+
static int chg_c_a2i(int cur_c);
26+
static int chg_c_a2m(int cur_c);
27+
static int chg_c_a2f(int cur_c);
28+
static int chg_c_i2m(int cur_c);
29+
static int chg_c_f2m(int cur_c);
30+
static int chg_c_laa2i(int hid_c);
31+
static int chg_c_laa2f(int hid_c);
32+
static int half_shape(int c);
33+
static int A_firstc_laa(int c1, int c);
34+
static int A_is_harakat(int c);
35+
static int A_is_iso(int c);
36+
static int A_is_formb(int c);
37+
static int A_is_ok(int c);
38+
static int A_is_valid(int c);
39+
static int A_is_special(int c);
4040

4141

4242
/*

‎src/blowfish.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ typedef struct {
5656
} bf_state_T;
5757

5858

59-
static void bf_e_block __ARGS((bf_state_T *state, UINT32_T *p_xl, UINT32_T *p_xr));
60-
static void bf_e_cblock __ARGS((bf_state_T *state, char_u *block));
61-
static int bf_check_tables __ARGS((UINT32_T pax[18], UINT32_T sbx[4][256], UINT32_T val));
62-
static int bf_self_test __ARGS((void));
63-
static void bf_key_init __ARGS((bf_state_T *state, char_u *password, char_u *salt, int salt_len));
64-
static void bf_cfb_init __ARGS((bf_state_T *state, char_u *seed, int seed_len));
59+
static void bf_e_block(bf_state_T *state, UINT32_T *p_xl, UINT32_T *p_xr);
60+
static void bf_e_cblock(bf_state_T *state, char_u *block);
61+
static int bf_check_tables(UINT32_T pax[18], UINT32_T sbx[4][256], UINT32_T val);
62+
static int bf_self_test(void);
63+
static void bf_key_init(bf_state_T *state, char_u *password, char_u *salt, int salt_len);
64+
static void bf_cfb_init(bf_state_T *state, char_u *seed, int seed_len);
6565

6666
/* Blowfish code */
6767
static UINT32_T pax_init[18] = {

‎src/buffer.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,26 @@
2828
#include "vim.h"
2929

3030
#if defined(FEAT_CMDL_COMPL) || defined(FEAT_LISTCMDS) || defined(FEAT_EVAL) || defined(FEAT_PERL)
31-
static char_u *buflist_match __ARGS((regmatch_T *rmp, buf_T *buf, int ignore_case));
31+
static char_u *buflist_match(regmatch_T *rmp, buf_T *buf, int ignore_case);
3232
# define HAVE_BUFLIST_MATCH
33-
static char_u *fname_match __ARGS((regmatch_T *rmp, char_u *name, int ignore_case));
33+
static char_u *fname_match(regmatch_T *rmp, char_u *name, int ignore_case);
3434
#endif
35-
static void buflist_setfpos __ARGS((buf_T *buf, win_T *win, linenr_T lnum, colnr_T col, int copy_options));
36-
static wininfo_T *find_wininfo __ARGS((buf_T *buf, int skip_diff_buffer));
35+
static void buflist_setfpos(buf_T *buf, win_T *win, linenr_T lnum, colnr_T col, int copy_options);
36+
static wininfo_T *find_wininfo(buf_T *buf, int skip_diff_buffer);
3737
#ifdef UNIX
38-
static buf_T *buflist_findname_stat __ARGS((char_u *ffname, struct stat *st));
39-
static int otherfile_buf __ARGS((buf_T *buf, char_u *ffname, struct stat *stp));
40-
static int buf_same_ino __ARGS((buf_T *buf, struct stat *stp));
38+
static buf_T *buflist_findname_stat(char_u *ffname, struct stat *st);
39+
static int otherfile_buf(buf_T *buf, char_u *ffname, struct stat *stp);
40+
static int buf_same_ino(buf_T *buf, struct stat *stp);
4141
#else
42-
static int otherfile_buf __ARGS((buf_T *buf, char_u *ffname));
42+
static int otherfile_buf(buf_T *buf, char_u *ffname);
4343
#endif
4444
#ifdef FEAT_TITLE
45-
static int ti_change __ARGS((char_u *str, char_u **last));
45+
static int ti_change(char_u *str, char_u **last);
4646
#endif
47-
static int append_arg_number __ARGS((win_T *wp, char_u *buf, int buflen, int add_file));
48-
static void free_buffer __ARGS((buf_T *));
49-
static void free_buffer_stuff __ARGS((buf_T *buf, int free_options));
50-
static void clear_wininfo __ARGS((buf_T *buf));
47+
static int append_arg_number(win_T *wp, char_u *buf, int buflen, int add_file);
48+
static void free_buffer(buf_T *);
49+
static void free_buffer_stuff(buf_T *buf, int free_options);
50+
static void clear_wininfo(buf_T *buf);
5151

5252
#ifdef UNIX
5353
# define dev_T dev_t
@@ -56,7 +56,7 @@ static void clear_wininfo __ARGS((buf_T *buf));
5656
#endif
5757

5858
#if defined(FEAT_SIGNS)
59-
static void insert_sign __ARGS((buf_T *buf, signlist_T *prev, signlist_T *next, int id, linenr_T lnum, int typenr));
59+
static void insert_sign(buf_T *buf, signlist_T *prev, signlist_T *next, int id, linenr_T lnum, int typenr);
6060
#endif
6161

6262
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
@@ -1010,7 +1010,7 @@ do_bufdel(command, arg, addr_count, start_bnr, end_bnr, forceit)
10101010
#if defined(FEAT_LISTCMDS) || defined(FEAT_PYTHON) \
10111011
|| defined(FEAT_PYTHON3) || defined(PROTO)
10121012

1013-
static int empty_curbuf __ARGS((int close_others, int forceit, int action));
1013+
static int empty_curbuf(int close_others, int forceit, int action);
10141014

10151015
/*
10161016
* Make the current buffer empty.
@@ -2617,7 +2617,7 @@ buflist_setfpos(buf, win, lnum, col, copy_options)
26172617
}
26182618

26192619
#ifdef FEAT_DIFF
2620-
static int wininfo_other_tab_diff __ARGS((wininfo_T *wip));
2620+
static int wininfo_other_tab_diff(wininfo_T *wip);
26212621

26222622
/*
26232623
* Return TRUE when "wip" has 'diff' set and the diff is only for another tab
@@ -5128,7 +5128,7 @@ ex_buffer_all(eap)
51285128

51295129
#endif /* FEAT_WINDOWS */
51305130

5131-
static int chk_modeline __ARGS((linenr_T, int));
5131+
static int chk_modeline(linenr_T, int);
51325132

51335133
/*
51345134
* do_modelines() - process mode lines for the current file

‎src/channel.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ typedef struct {
9191
#ifdef FEAT_GUI_GTK
9292
gint ch_inputHandler; /* Cookie for input */
9393
#endif
94-
#ifdef FEAT_GUI_W32
94+
#ifdef WIN32
9595
int ch_inputHandler; /* simply ret.value of WSAAsyncSelect() */
9696
#endif
9797
#ifdef FEAT_GUI_MACVIM
@@ -304,14 +304,14 @@ channel_open(char *hostname, int port_in, void (*close_cb)(void))
304304
int sd;
305305
struct sockaddr_in server;
306306
struct hostent * host;
307-
#ifdef FEAT_GUI_W32
307+
#ifdef WIN32
308308
u_short port = port_in;
309309
#else
310310
int port = port_in;
311311
#endif
312312
int idx;
313313

314-
#ifdef FEAT_GUI_W32
314+
#ifdef WIN32
315315
channel_init_winsock();
316316
#endif
317317

@@ -886,7 +886,7 @@ channel_read_block(int idx)
886886
return channel_get(idx);
887887
}
888888

889-
# if defined(FEAT_GUI_W32) || defined(PROTO)
889+
# if defined(WIN32) || defined(PROTO)
890890
/*
891891
* Lookup the channel index from the socket.
892892
* Returns -1 when the socket isn't found.
@@ -990,7 +990,7 @@ channel_poll_check(int ret_in, void *fds_in)
990990
}
991991
# endif /* UNIX && !HAVE_SELECT */
992992

993-
# if (defined(UNIX) && defined(HAVE_SELECT)) || defined(PROTO)
993+
# if (!defined(FEAT_GUI_W32) && defined(HAVE_SELECT)) || defined(PROTO)
994994
/*
995995
* The type of "rfds" is hidden to avoid problems with the function proto.
996996
*/
@@ -1032,6 +1032,6 @@ channel_select_check(int ret_in, void *rfds_in)
10321032

10331033
return ret;
10341034
}
1035-
# endif /* UNIX && HAVE_SELECT */
1035+
# endif /* !FEAT_GUI_W32 && HAVE_SELECT */
10361036

10371037
#endif /* FEAT_CHANNEL */

‎src/charset.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
#include "vim.h"
1111

1212
#ifdef FEAT_LINEBREAK
13-
static int win_chartabsize __ARGS((win_T *wp, char_u *p, colnr_T col));
13+
static int win_chartabsize(win_T *wp, char_u *p, colnr_T col);
1414
#endif
1515

1616
#ifdef FEAT_MBYTE
1717
# if defined(HAVE_WCHAR_H)
1818
# include <wchar.h> /* for towupper() and towlower() */
1919
# endif
20-
static int win_nolbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp));
20+
static int win_nolbr_chartabsize(win_T *wp, char_u *s, colnr_T col, int *headp);
2121
#endif
2222

23-
static unsigned nr2hex __ARGS((unsigned c));
23+
static unsigned nr2hex(unsigned c);
2424

2525
static int chartab_initialized = FALSE;
2626

‎src/crypt_zip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ typedef struct {
3636
} zip_state_T;
3737

3838

39-
static void make_crc_tab __ARGS((void));
39+
static void make_crc_tab(void);
4040

4141
static u32_T crc_32_table[256];
4242

‎src/diff.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ static int diff_bin_works = MAYBE; /* TRUE when "diff --binary" works, FALSE
3535
checked yet */
3636
#endif
3737

38-
static int diff_buf_idx __ARGS((buf_T *buf));
39-
static int diff_buf_idx_tp __ARGS((buf_T *buf, tabpage_T *tp));
40-
static void diff_mark_adjust_tp __ARGS((tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after));
41-
static void diff_check_unchanged __ARGS((tabpage_T *tp, diff_T *dp));
42-
static int diff_check_sanity __ARGS((tabpage_T *tp, diff_T *dp));
43-
static void diff_redraw __ARGS((int dofold));
44-
static int diff_write __ARGS((buf_T *buf, char_u *fname));
45-
static void diff_file __ARGS((char_u *tmp_orig, char_u *tmp_new, char_u *tmp_diff));
46-
static int diff_equal_entry __ARGS((diff_T *dp, int idx1, int idx2));
47-
static int diff_cmp __ARGS((char_u *s1, char_u *s2));
38+
static int diff_buf_idx(buf_T *buf);
39+
static int diff_buf_idx_tp(buf_T *buf, tabpage_T *tp);
40+
static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after);
41+
static void diff_check_unchanged(tabpage_T *tp, diff_T *dp);
42+
static int diff_check_sanity(tabpage_T *tp, diff_T *dp);
43+
static void diff_redraw(int dofold);
44+
static int diff_write(buf_T *buf, char_u *fname);
45+
static void diff_file(char_u *tmp_orig, char_u *tmp_new, char_u *tmp_diff);
46+
static int diff_equal_entry(diff_T *dp, int idx1, int idx2);
47+
static int diff_cmp(char_u *s1, char_u *s2);
4848
#ifdef FEAT_FOLDING
49-
static void diff_fold_update __ARGS((diff_T *dp, int skip_idx));
49+
static void diff_fold_update(diff_T *dp, int skip_idx);
5050
#endif
51-
static void diff_read __ARGS((int idx_orig, int idx_new, char_u *fname));
52-
static void diff_copy_entry __ARGS((diff_T *dprev, diff_T *dp, int idx_orig, int idx_new));
53-
static diff_T *diff_alloc_new __ARGS((tabpage_T *tp, diff_T *dprev, diff_T *dp));
51+
static void diff_read(int idx_orig, int idx_new, char_u *fname);
52+
static void diff_copy_entry(diff_T *dprev, diff_T *dp, int idx_orig, int idx_new);
53+
static diff_T *diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp);
5454

5555
#ifndef USE_CR
5656
# define tag_fgets vim_fgets

‎src/digraph.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ typedef struct digraph
2828
result_T result;
2929
} digr_T;
3030

31-
static int getexactdigraph __ARGS((int, int, int));
32-
static void printdigraph __ARGS((digr_T *));
31+
static int getexactdigraph(int, int, int);
32+
static void printdigraph(digr_T *);
3333

3434
/* digraphs added by the user */
3535
static garray_T user_digraphs = {0, 0, (int)sizeof(digr_T), 10, NULL};
@@ -2357,7 +2357,7 @@ typedef struct
23572357

23582358
#define KMAP_MAXLEN 20 /* maximum length of "from" or "to" */
23592359

2360-
static void keymap_unload __ARGS((void));
2360+
static void keymap_unload(void);
23612361

23622362
/*
23632363
* Set up key mapping tables for the 'keymap' option.

0 commit comments

Comments
 (0)