From 3b8defd0a52fc1276816608e7bb24b628ab14c2e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 13:03:11 +0200 Subject: [PATCH 01/14] patch 8.1.0375: cannot use diff mode with Cygwin diff.exe Problem: Cannot use diff mode with Cygwin diff.exe. (Igor Forca) Solution: Skip over unrecognized lines in the diff output. --- src/diff.c | 4 ++++ src/testdir/test_diffmode.vim | 4 +++- src/version.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/diff.c b/src/diff.c index 0055cba5ac..59daf1eeb0 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1600,6 +1600,10 @@ diff_read( && (tag_fgets(linebuf, LBUFLEN, fd) == 0) && (STRNCMP(line, "@@ ", 3) == 0)) diffstyle = DIFF_UNIFIED; + else + // Format not recognized yet, skip over this line. Cygwin diff + // may put a warning at the start of the file. + continue; } if (diffstyle == DIFF_ED) diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index c3c1eaf4a5..0022a73b3f 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -519,7 +519,9 @@ func Test_diffexpr() endif func DiffExpr() - silent exe '!diff ' . v:fname_in . ' ' . v:fname_new . '>' . v:fname_out + " Prepent some text to check diff type detection + call writefile(['warning', ' message'], v:fname_out) + silent exe '!diff ' . v:fname_in . ' ' . v:fname_new . '>>' . v:fname_out endfunc set diffexpr=DiffExpr() set diffopt=foldcolumn:0 diff --git a/src/version.c b/src/version.c index ca6ac59f06..c103339126 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 375, /**/ 374, /**/ From c787539747f6bb2510a56aa14dbf6808aff5681a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 14:57:41 +0200 Subject: [PATCH 02/14] patch 8.1.0376: compiler warning for uninitialized variable Problem: Compiler warning for uninitialized variable. (Tony Mechelynck) Solution: Initialize the variable. --- src/screen.c | 4 +--- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/screen.c b/src/screen.c index 2586ad03c0..51f53c311b 100644 --- a/src/screen.c +++ b/src/screen.c @@ -3147,7 +3147,7 @@ win_line( static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ int cur_checked_col = 0; /* checked column for current line */ #endif - int extra_check; /* has syntax or linebreak */ + int extra_check = 0; // has syntax or linebreak #ifdef FEAT_MBYTE int multi_attr = 0; /* attributes desired by multibyte */ int mb_l = 1; /* multi-byte byte length */ @@ -3271,8 +3271,6 @@ win_line( */ #ifdef FEAT_LINEBREAK extra_check = wp->w_p_lbr; -#else - extra_check = 0; #endif #ifdef FEAT_SYN_HL if (syntax_present(wp) && !wp->w_s->b_syn_error diff --git a/src/version.c b/src/version.c index c103339126..89a134bf82 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 376, /**/ 375, /**/ From 42335f50bc6fac444a8af74c81df8369d722a6fb Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 15:33:43 +0200 Subject: [PATCH 03/14] patch 8.1.0377: xdiff doesn't use the Vim memory allocation functions Problem: Xdiff doesn't use the Vim memory allocation functions. Solution: Change the xdl_ defines. Check for out-of-memory. Rename "ignored" to "vim_ignored". --- src/channel.c | 6 +++--- src/diff.c | 4 ++-- src/evalfunc.c | 2 +- src/ex_cmds.c | 2 +- src/fileio.c | 12 ++++++------ src/globals.h | 4 ++-- src/main.c | 2 +- src/mbyte.c | 2 +- src/netbeans.c | 4 ++-- src/os_unix.c | 42 +++++++++++++++++++++--------------------- src/os_win32.c | 3 ++- src/term.c | 2 +- src/ui.c | 8 ++++---- src/version.c | 2 ++ src/window.c | 2 +- src/xdiff/xdiff.h | 7 ++++--- src/xdiff/xdiffi.c | 12 ++++++------ src/xdiff/xpatience.c | 4 ++++ 18 files changed, 64 insertions(+), 56 deletions(-) diff --git a/src/channel.c b/src/channel.c index 793dbaa833..aa0a0d38ca 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1858,7 +1858,7 @@ channel_save(channel_T *channel, ch_part_T part, char_u *buf, int len, { ch_log_lead(lead, channel, part); fprintf(log_fd, "'"); - ignored = (int)fwrite(buf, len, 1, log_fd); + vim_ignored = (int)fwrite(buf, len, 1, log_fd); fprintf(log_fd, "'\n"); } return OK; @@ -2388,7 +2388,7 @@ append_to_buffer(buf_T *buffer, char_u *msg, channel_T *channel, ch_part_T part) u_sync(TRUE); /* ignore undo failure, undo is not very useful here */ - ignored = u_save(lnum - empty, lnum + 1); + vim_ignored = u_save(lnum - empty, lnum + 1); if (empty) { @@ -3730,7 +3730,7 @@ channel_send( { ch_log_lead("SEND ", channel, part); fprintf(log_fd, "'"); - ignored = (int)fwrite(buf_arg, len_arg, 1, log_fd); + vim_ignored = (int)fwrite(buf_arg, len_arg, 1, log_fd); fprintf(log_fd, "'\n"); fflush(log_fd); did_log_msg = TRUE; diff --git a/src/diff.c b/src/diff.c index 59daf1eeb0..0bf0ef2cfa 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1203,10 +1203,10 @@ ex_diffpatch(exarg_T *eap) { # ifdef TEMPDIRNAMES if (vim_tempdir != NULL) - ignored = mch_chdir((char *)vim_tempdir); + vim_ignored = mch_chdir((char *)vim_tempdir); else # endif - ignored = mch_chdir("/tmp"); + vim_ignored = mch_chdir("/tmp"); shorten_fnames(TRUE); } #endif diff --git a/src/evalfunc.c b/src/evalfunc.c index 19e2657bac..ff545893e9 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -14016,7 +14016,7 @@ f_writefile(typval_T *argvars, typval_T *rettv) else if (do_fsync) /* Ignore the error, the user wouldn't know what to do about it. * May happen for a device. */ - ignored = fsync(fileno(fd)); + vim_ignored = fsync(fileno(fd)); #endif fclose(fd); } diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 6e713c49a3..0a87f7b38f 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2117,7 +2117,7 @@ write_viminfo(char_u *file, int forceit) if (st_old.st_uid != tmp_st.st_uid) /* Changing the owner might fail, in which case the * file will now owned by the current user, oh well. */ - ignored = fchown(fileno(fp_out), st_old.st_uid, -1); + vim_ignored = fchown(fileno(fp_out), st_old.st_uid, -1); if (st_old.st_gid != tmp_st.st_gid && fchown(fileno(fp_out), -1, st_old.st_gid) == -1) /* can't set the group to what it should be, remove diff --git a/src/fileio.c b/src/fileio.c index 056ac914d7..d7e05bfbe0 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2408,7 +2408,7 @@ failed: { /* Use stderr for stdin, makes shell commands work. */ close(0); - ignored = dup(2); + vim_ignored = dup(2); } #endif @@ -3751,7 +3751,7 @@ buf_write( { # ifdef UNIX # ifdef HAVE_FCHOWN - ignored = fchown(fd, st_old.st_uid, st_old.st_gid); + vim_ignored = fchown(fd, st_old.st_uid, st_old.st_gid); # endif if (mch_stat((char *)IObuff, &st) < 0 || st.st_uid != st_old.st_uid @@ -4509,7 +4509,7 @@ restore_backup: #endif #ifdef HAVE_FTRUNCATE if (!append) - ignored = ftruncate(fd, (off_t)0); + vim_ignored = ftruncate(fd, (off_t)0); #endif #if defined(WIN3264) @@ -4789,7 +4789,7 @@ restore_backup: || st.st_gid != st_old.st_gid) { /* changing owner might not be possible */ - ignored = fchown(fd, st_old.st_uid, -1); + vim_ignored = fchown(fd, st_old.st_uid, -1); /* if changing group fails clear the group permissions */ if (fchown(fd, -1, st_old.st_gid) == -1 && perm > 0) perm &= ~070; @@ -6482,9 +6482,9 @@ vim_fgets(char_u *buf, int size, FILE *fp) { tbuf[FGETS_SIZE - 2] = NUL; #ifdef USE_CR - ignoredp = fgets_cr((char *)tbuf, FGETS_SIZE, fp); + vim_ignoredp = fgets_cr((char *)tbuf, FGETS_SIZE, fp); #else - ignoredp = fgets((char *)tbuf, FGETS_SIZE, fp); + vim_ignoredp = fgets((char *)tbuf, FGETS_SIZE, fp); #endif } while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n'); } diff --git a/src/globals.h b/src/globals.h index 3f5b61ff78..511479d862 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1621,8 +1621,8 @@ EXTERN FILE *time_fd INIT(= NULL); /* where to write startup timing */ * can't do anything useful with the value. Assign to this variable to avoid * the warning. */ -EXTERN int ignored; -EXTERN char *ignoredp; +EXTERN int vim_ignored; +EXTERN char *vim_ignoredp; #ifdef FEAT_EVAL /* set by alloc_fail(): ID */ diff --git a/src/main.c b/src/main.c index cb0676ce56..bf9b842f54 100644 --- a/src/main.c +++ b/src/main.c @@ -2632,7 +2632,7 @@ read_stdin(void) * Is there any other system that cannot do this? */ close(0); - ignored = dup(2); + vim_ignored = dup(2); #endif } diff --git a/src/mbyte.c b/src/mbyte.c index 0014119ad7..895f3b799b 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -756,7 +756,7 @@ codepage_invalid: * where mblen() returns 0 for invalid character. * Therefore, following condition includes 0. */ - ignored = mblen(NULL, 0); /* First reset the state. */ + vim_ignored = mblen(NULL, 0); // First reset the state. if (mblen(buf, (size_t)1) <= 0) n = 2; else diff --git a/src/netbeans.c b/src/netbeans.c index a753a4f974..1c916b5bf6 100644 --- a/src/netbeans.c +++ b/src/netbeans.c @@ -1988,10 +1988,10 @@ nb_do_cmd( pos = get_off_or_lnum(buf->bufp, &args); cp = (char *)args; - ignored = (int)strtol(cp, &cp, 10); + vim_ignored = (int)strtol(cp, &cp, 10); args = (char_u *)cp; # ifdef NBDEBUG - if (ignored != -1) + if (vim_ignored != -1) { nbdebug((" partial line annotation -- Not Yet Implemented!\n")); } diff --git a/src/os_unix.c b/src/os_unix.c index aee3a35ff7..bd7b219961 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -357,7 +357,7 @@ mch_chdir(char *path) void mch_write(char_u *s, int len) { - ignored = (int)write(1, (char *)s, len); + vim_ignored = (int)write(1, (char *)s, len); if (p_wd) /* Unix is too fast, slow down a bit more */ RealWaitForChar(read_cmd_fd, p_wd, NULL, NULL); } @@ -4693,9 +4693,9 @@ mch_call_shell_fork( */ if (fd >= 0) { - ignored = dup(fd); /* To replace stdin (fd 0) */ - ignored = dup(fd); /* To replace stdout (fd 1) */ - ignored = dup(fd); /* To replace stderr (fd 2) */ + vim_ignored = dup(fd); /* To replace stdin (fd 0) */ + vim_ignored = dup(fd); /* To replace stdout (fd 1) */ + vim_ignored = dup(fd); /* To replace stderr (fd 2) */ /* Don't need this now that we've duplicated it */ close(fd); @@ -4752,13 +4752,13 @@ mch_call_shell_fork( /* set up stdin/stdout/stderr for the child */ close(0); - ignored = dup(pty_slave_fd); + vim_ignored = dup(pty_slave_fd); close(1); - ignored = dup(pty_slave_fd); + vim_ignored = dup(pty_slave_fd); if (gui.in_use) { close(2); - ignored = dup(pty_slave_fd); + vim_ignored = dup(pty_slave_fd); } close(pty_slave_fd); /* has been dupped, close it now */ @@ -4769,13 +4769,13 @@ mch_call_shell_fork( /* set up stdin for the child */ close(fd_toshell[1]); close(0); - ignored = dup(fd_toshell[0]); + vim_ignored = dup(fd_toshell[0]); close(fd_toshell[0]); /* set up stdout for the child */ close(fd_fromshell[0]); close(1); - ignored = dup(fd_fromshell[1]); + vim_ignored = dup(fd_fromshell[1]); close(fd_fromshell[1]); # ifdef FEAT_GUI @@ -4783,7 +4783,7 @@ mch_call_shell_fork( { /* set up stderr for the child */ close(2); - ignored = dup(1); + vim_ignored = dup(1); } # endif } @@ -4920,7 +4920,7 @@ mch_call_shell_fork( && (lnum != curbuf->b_ml.ml_line_count || curbuf->b_p_eol))) - ignored = write(toshell_fd, "\n", + vim_ignored = write(toshell_fd, "\n", (size_t)1); ++lnum; if (lnum > curbuf->b_op_end.lnum) @@ -5611,34 +5611,34 @@ mch_job_start(char **argv, job_T *job, jobopt_T *options, int is_terminal) /* set up stdin for the child */ close(0); if (use_null_for_in && null_fd >= 0) - ignored = dup(null_fd); + vim_ignored = dup(null_fd); else if (fd_in[0] < 0) - ignored = dup(pty_slave_fd); + vim_ignored = dup(pty_slave_fd); else - ignored = dup(fd_in[0]); + vim_ignored = dup(fd_in[0]); /* set up stderr for the child */ close(2); if (use_null_for_err && null_fd >= 0) { - ignored = dup(null_fd); + vim_ignored = dup(null_fd); stderr_works = FALSE; } else if (use_out_for_err) - ignored = dup(fd_out[1]); + vim_ignored = dup(fd_out[1]); else if (fd_err[1] < 0) - ignored = dup(pty_slave_fd); + vim_ignored = dup(pty_slave_fd); else - ignored = dup(fd_err[1]); + vim_ignored = dup(fd_err[1]); /* set up stdout for the child */ close(1); if (use_null_for_out && null_fd >= 0) - ignored = dup(null_fd); + vim_ignored = dup(null_fd); else if (fd_out[1] < 0) - ignored = dup(pty_slave_fd); + vim_ignored = dup(pty_slave_fd); else - ignored = dup(fd_out[1]); + vim_ignored = dup(fd_out[1]); if (fd_in[0] >= 0) close(fd_in[0]); diff --git a/src/os_win32.c b/src/os_win32.c index 9d36dec4a5..b665815f80 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -4388,7 +4388,8 @@ sub_process_writer(LPVOID param) && (lnum != curbuf->b_ml.ml_line_count || curbuf->b_p_eol))) { - WriteFile(g_hChildStd_IN_Wr, "\n", 1, (LPDWORD)&ignored, NULL); + WriteFile(g_hChildStd_IN_Wr, "\n", 1, + (LPDWORD)&vim_ignored, NULL); } ++lnum; diff --git a/src/term.c b/src/term.c index b2e2b0381c..a92f04ec37 100644 --- a/src/term.c +++ b/src/term.c @@ -7013,7 +7013,7 @@ gui_get_color_cmn(char_u *name) size_t len; int pos; - ignoredp = fgets(line, LINE_LEN, fd); + vim_ignoredp = fgets(line, LINE_LEN, fd); len = strlen(line); if (len <= 1 || line[len - 1] != '\n') diff --git a/src/ui.c b/src/ui.c index 8e3f0deee1..176562055c 100644 --- a/src/ui.c +++ b/src/ui.c @@ -403,7 +403,7 @@ ui_breakcheck(void) void ui_breakcheck_force(int force) { - int save_us = updating_screen; + int save_updating_screen = updating_screen; /* We do not want gui_resize_shell() to redraw the screen here. */ ++updating_screen; @@ -415,8 +415,8 @@ ui_breakcheck_force(int force) #endif mch_breakcheck(force); - if (save_us) - updating_screen = save_us; + if (save_updating_screen) + updating_screen = TRUE; else reset_updating_screen(FALSE); } @@ -1885,7 +1885,7 @@ fill_input_buf(int exit_on_error UNUSED) #ifdef HAVE_DUP /* Use stderr for stdin, also works for shell commands. */ close(0); - ignored = dup(2); + vim_ignored = dup(2); #else read_cmd_fd = 2; /* read from stderr instead of stdin */ #endif diff --git a/src/version.c b/src/version.c index 89a134bf82..18acc39b30 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 377, /**/ 376, /**/ diff --git a/src/window.c b/src/window.c index 5671cf900e..a481af8b95 100644 --- a/src/window.c +++ b/src/window.c @@ -4436,7 +4436,7 @@ win_enter_ext( { /* Window doesn't have a local directory and we are not in the global * directory: Change to the global directory. */ - ignored = mch_chdir((char *)globaldir); + vim_ignored = mch_chdir((char *)globaldir); VIM_CLEAR(globaldir); shorten_fnames(TRUE); } diff --git a/src/xdiff/xdiff.h b/src/xdiff/xdiff.h index 2356da5f78..476b20c72c 100644 --- a/src/xdiff/xdiff.h +++ b/src/xdiff/xdiff.h @@ -108,10 +108,11 @@ typedef struct s_bdiffparam { long bsize; } bdiffparam_t; +#include "vim.h" -#define xdl_malloc(x) malloc(x) -#define xdl_free(ptr) free(ptr) -#define xdl_realloc(ptr,x) realloc(ptr,x) +#define xdl_malloc(x) lalloc((x), TRUE) +#define xdl_free(ptr) vim_free(ptr) +#define xdl_realloc(ptr,x) vim_realloc((ptr),(x)) void *xdl_mmfile_first(mmfile_t *mmf, long *size); long xdl_mmfile_size(mmfile_t *mmf); diff --git a/src/xdiff/xdiffi.c b/src/xdiff/xdiffi.c index 3dc90ae513..96d5277027 100644 --- a/src/xdiff/xdiffi.c +++ b/src/xdiff/xdiffi.c @@ -392,9 +392,9 @@ static int recs_match(xrecord_t *rec1, xrecord_t *rec2, long flags) } /* - * If a line is indented more than this, get_indent() just returns this value. + * If a line is indented more than this, xget_indent() just returns this value. * This avoids having to do absurd amounts of work for data that are not - * human-readable text, and also ensures that the output of get_indent fits within + * human-readable text, and also ensures that the output of xget_indent fits within * an int. */ #define MAX_INDENT 200 @@ -404,7 +404,7 @@ static int recs_match(xrecord_t *rec1, xrecord_t *rec2, long flags) * columns. Return -1 if line is empty or contains only whitespace. Clamp the * output value at MAX_INDENT. */ -static int get_indent(xrecord_t *rec) +static int xget_indent(xrecord_t *rec) { long i; int ret = 0; @@ -492,13 +492,13 @@ static void measure_split(const xdfile_t *xdf, long split, m->indent = -1; } else { m->end_of_file = 0; - m->indent = get_indent(xdf->recs[split]); + m->indent = xget_indent(xdf->recs[split]); } m->pre_blank = 0; m->pre_indent = -1; for (i = split - 1; i >= 0; i--) { - m->pre_indent = get_indent(xdf->recs[i]); + m->pre_indent = xget_indent(xdf->recs[i]); if (m->pre_indent != -1) break; m->pre_blank += 1; @@ -511,7 +511,7 @@ static void measure_split(const xdfile_t *xdf, long split, m->post_blank = 0; m->post_indent = -1; for (i = split + 1; i < xdf->nrec; i++) { - m->post_indent = get_indent(xdf->recs[i]); + m->post_indent = xget_indent(xdf->recs[i]); if (m->post_indent != -1) break; m->post_blank += 1; diff --git a/src/xdiff/xpatience.c b/src/xdiff/xpatience.c index 1052d10a38..c1871296af 100644 --- a/src/xdiff/xpatience.c +++ b/src/xdiff/xpatience.c @@ -210,6 +210,10 @@ static struct entry *find_longest_common_sequence(struct hashmap *map) int longest = 0, i; struct entry *entry; + /* Added to silence Coverity. */ + if (sequence == NULL) + return map->first; + /* * If not -1, this entry in sequence must never be overridden. * Therefore, overriding entries before this has no effect, so From 0d5f21c3dfaceed08b4cdb33a73eb16f680ff49b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 15:58:58 +0200 Subject: [PATCH 04/14] patch 8.1.0378: CI build failure Problem: CI build failure. Solution: Include vim.h as ../vim.h. Fix compiler warning. --- src/version.c | 2 ++ src/xdiff/xdiff.h | 2 +- src/xdiff/xpatience.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/version.c b/src/version.c index 18acc39b30..2e64eecbc7 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 378, /**/ 377, /**/ diff --git a/src/xdiff/xdiff.h b/src/xdiff/xdiff.h index 476b20c72c..a8bc1dced4 100644 --- a/src/xdiff/xdiff.h +++ b/src/xdiff/xdiff.h @@ -108,7 +108,7 @@ typedef struct s_bdiffparam { long bsize; } bdiffparam_t; -#include "vim.h" +#include "../vim.h" #define xdl_malloc(x) lalloc((x), TRUE) #define xdl_free(ptr) vim_free(ptr) diff --git a/src/xdiff/xpatience.c b/src/xdiff/xpatience.c index c1871296af..00af0ff11c 100644 --- a/src/xdiff/xpatience.c +++ b/src/xdiff/xpatience.c @@ -206,7 +206,7 @@ static int binary_search(struct entry **sequence, int longest, */ static struct entry *find_longest_common_sequence(struct hashmap *map) { - struct entry **sequence = xdl_malloc(map->nr * sizeof(struct entry *)); + struct entry **sequence = (struct entry **)xdl_malloc(map->nr * sizeof(struct entry *)); int longest = 0, i; struct entry *entry; From 78dcd4f002c41fff9c15434336f57210edc384f2 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 17:23:28 +0200 Subject: [PATCH 05/14] patch 8.1.0379: build dependencies are incomplete Problem: Build dependencies are incomplete. Solution: Update the build dependencies, mainly for xdiff. Adjust object directory for libvterm and xdiff. --- src/Make_cyg_ming.mak | 38 +- src/Make_mvc.mak | 36 +- src/Makefile | 674 +++++++++++--------- src/auto/configure | 4 +- src/configure.ac | 4 +- src/libvterm/src/{screen.c => termscreen.c} | 0 src/version.c | 2 + 7 files changed, 422 insertions(+), 336 deletions(-) rename src/libvterm/src/{screen.c => termscreen.c} (100%) diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 2308135b52..b9ce390cf9 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -818,15 +818,15 @@ endif ifeq ($(TERMINAL),yes) OBJ += $(OUTDIR)/terminal.o \ - $(OUTDIR)/term_encoding.o \ - $(OUTDIR)/term_keyboard.o \ - $(OUTDIR)/term_mouse.o \ - $(OUTDIR)/term_parser.o \ - $(OUTDIR)/term_pen.o \ - $(OUTDIR)/term_screen.o \ - $(OUTDIR)/term_state.o \ - $(OUTDIR)/term_unicode.o \ - $(OUTDIR)/term_vterm.o + $(OUTDIR)/encoding.o \ + $(OUTDIR)/keyboard.o \ + $(OUTDIR)/mouse.o \ + $(OUTDIR)/parser.o \ + $(OUTDIR)/pen.o \ + $(OUTDIR)/termscreen.o \ + $(OUTDIR)/state.o \ + $(OUTDIR)/unicode.o \ + $(OUTDIR)/vterm.o endif # Include xdiff @@ -1064,31 +1064,31 @@ CCCTERM = $(CC) -c $(CFLAGS) -Ilibvterm/include -DINLINE="" \ -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ -DWCWIDTH_FUNCTION=utf_uint2cells -$(OUTDIR)/term_encoding.o: libvterm/src/encoding.c $(TERM_DEPS) +$(OUTDIR)/encoding.o: libvterm/src/encoding.c $(TERM_DEPS) $(CCCTERM) libvterm/src/encoding.c -o $@ -$(OUTDIR)/term_keyboard.o: libvterm/src/keyboard.c $(TERM_DEPS) +$(OUTDIR)/keyboard.o: libvterm/src/keyboard.c $(TERM_DEPS) $(CCCTERM) libvterm/src/keyboard.c -o $@ -$(OUTDIR)/term_mouse.o: libvterm/src/mouse.c $(TERM_DEPS) +$(OUTDIR)/mouse.o: libvterm/src/mouse.c $(TERM_DEPS) $(CCCTERM) libvterm/src/mouse.c -o $@ -$(OUTDIR)/term_parser.o: libvterm/src/parser.c $(TERM_DEPS) +$(OUTDIR)/parser.o: libvterm/src/parser.c $(TERM_DEPS) $(CCCTERM) libvterm/src/parser.c -o $@ -$(OUTDIR)/term_pen.o: libvterm/src/pen.c $(TERM_DEPS) +$(OUTDIR)/pen.o: libvterm/src/pen.c $(TERM_DEPS) $(CCCTERM) libvterm/src/pen.c -o $@ -$(OUTDIR)/term_screen.o: libvterm/src/screen.c $(TERM_DEPS) - $(CCCTERM) libvterm/src/screen.c -o $@ +$(OUTDIR)/termscreen.o: libvterm/src/termscreen.c $(TERM_DEPS) + $(CCCTERM) libvterm/src/termscreen.c -o $@ -$(OUTDIR)/term_state.o: libvterm/src/state.c $(TERM_DEPS) +$(OUTDIR)/state.o: libvterm/src/state.c $(TERM_DEPS) $(CCCTERM) libvterm/src/state.c -o $@ -$(OUTDIR)/term_unicode.o: libvterm/src/unicode.c $(TERM_DEPS) +$(OUTDIR)/unicode.o: libvterm/src/unicode.c $(TERM_DEPS) $(CCCTERM) libvterm/src/unicode.c -o $@ -$(OUTDIR)/term_vterm.o: libvterm/src/vterm.c $(TERM_DEPS) +$(OUTDIR)/vterm.o: libvterm/src/vterm.c $(TERM_DEPS) $(CCCTERM) libvterm/src/vterm.c -o $@ $(OUTDIR)/xdiffi.o: xdiff/xdiffi.c $(XDIFF_DEPS) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 1131f2b05f..f5588dc3b8 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -380,15 +380,15 @@ TERMINAL = no !if "$(TERMINAL)" == "yes" TERM_OBJ = \ $(OBJDIR)/terminal.obj \ - $(OBJDIR)/term_encoding.obj \ - $(OBJDIR)/term_keyboard.obj \ - $(OBJDIR)/term_mouse.obj \ - $(OBJDIR)/term_parser.obj \ - $(OBJDIR)/term_pen.obj \ - $(OBJDIR)/term_screen.obj \ - $(OBJDIR)/term_state.obj \ - $(OBJDIR)/term_unicode.obj \ - $(OBJDIR)/term_vterm.obj + $(OBJDIR)/encoding.obj \ + $(OBJDIR)/keyboard.obj \ + $(OBJDIR)/mouse.obj \ + $(OBJDIR)/parser.obj \ + $(OBJDIR)/pen.obj \ + $(OBJDIR)/termscreen.obj \ + $(OBJDIR)/state.obj \ + $(OBJDIR)/unicode.obj \ + $(OBJDIR)/vterm.obj TERM_DEFS = -DFEAT_TERMINAL TERM_DEPS = \ libvterm/include/vterm.h \ @@ -1561,31 +1561,31 @@ CCCTERM = $(CC) $(CFLAGS) -Ilibvterm/include -DINLINE="" \ -DWCWIDTH_FUNCTION=utf_uint2cells \ -D_CRT_SECURE_NO_WARNINGS -$(OUTDIR)/term_encoding.obj: $(OUTDIR) libvterm/src/encoding.c $(TERM_DEPS) +$(OUTDIR)/encoding.obj: $(OUTDIR) libvterm/src/encoding.c $(TERM_DEPS) $(CCCTERM) -Fo$@ libvterm/src/encoding.c -$(OUTDIR)/term_keyboard.obj: $(OUTDIR) libvterm/src/keyboard.c $(TERM_DEPS) +$(OUTDIR)/keyboard.obj: $(OUTDIR) libvterm/src/keyboard.c $(TERM_DEPS) $(CCCTERM) -Fo$@ libvterm/src/keyboard.c -$(OUTDIR)/term_mouse.obj: $(OUTDIR) libvterm/src/mouse.c $(TERM_DEPS) +$(OUTDIR)/mouse.obj: $(OUTDIR) libvterm/src/mouse.c $(TERM_DEPS) $(CCCTERM) -Fo$@ libvterm/src/mouse.c -$(OUTDIR)/term_parser.obj: $(OUTDIR) libvterm/src/parser.c $(TERM_DEPS) +$(OUTDIR)/parser.obj: $(OUTDIR) libvterm/src/parser.c $(TERM_DEPS) $(CCCTERM) -Fo$@ libvterm/src/parser.c -$(OUTDIR)/term_pen.obj: $(OUTDIR) libvterm/src/pen.c $(TERM_DEPS) +$(OUTDIR)/pen.obj: $(OUTDIR) libvterm/src/pen.c $(TERM_DEPS) $(CCCTERM) -Fo$@ libvterm/src/pen.c -$(OUTDIR)/term_screen.obj: $(OUTDIR) libvterm/src/screen.c $(TERM_DEPS) +$(OUTDIR)/termscreen.obj: $(OUTDIR) libvterm/src/screen.c $(TERM_DEPS) $(CCCTERM) -Fo$@ libvterm/src/screen.c -$(OUTDIR)/term_state.obj: $(OUTDIR) libvterm/src/state.c $(TERM_DEPS) +$(OUTDIR)/state.obj: $(OUTDIR) libvterm/src/state.c $(TERM_DEPS) $(CCCTERM) -Fo$@ libvterm/src/state.c -$(OUTDIR)/term_unicode.obj: $(OUTDIR) libvterm/src/unicode.c $(TERM_DEPS) +$(OUTDIR)/unicode.obj: $(OUTDIR) libvterm/src/unicode.c $(TERM_DEPS) $(CCCTERM) -Fo$@ libvterm/src/unicode.c -$(OUTDIR)/term_vterm.obj: $(OUTDIR) libvterm/src/vterm.c $(TERM_DEPS) +$(OUTDIR)/vterm.obj: $(OUTDIR) libvterm/src/vterm.c $(TERM_DEPS) $(CCCTERM) -Fo$@ libvterm/src/vterm.c diff --git a/src/Makefile b/src/Makefile index d0cf956270..df6a3b0394 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1471,6 +1471,8 @@ MKDIR_P = $(SHELL) install-sh -c -d .SUFFIXES: .SUFFIXES: .c .o .pro +VTERM_CFLAGS = -Ilibvterm/include + PRE_DEFS = -Iproto $(DEFS) $(GUI_DEFS) $(GUI_IPATH) $(CPPFLAGS) $(EXTRA_IPATHS) POST_DEFS = $(X_CFLAGS) $(MZSCHEME_CFLAGS) $(EXTRA_DEFS) @@ -1480,7 +1482,10 @@ ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(SANITIZER_CFLAGS) $(LEAK_ # with "-E". OSDEF_CFLAGS = $(PRE_DEFS) $(POST_DEFS) -LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) $(RUBY_CFLAGS) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(PYTHON3_CFLAGS) $(TCL_CFLAGS) -Dinline= -D__extension__= -Dalloca=alloca +LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) \ + $(RUBY_CFLAGS) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) \ + $(PYTHON3_CFLAGS) $(TCL_CFLAGS) $(VTERM_CFLAGS) \ + -Dinline= -D__extension__= -Dalloca=alloca LINT_EXTRA = -DHANGUL_INPUT -D"__attribute__(x)=" @@ -1671,7 +1676,8 @@ UNITTEST_TARGETS = $(JSON_TEST_TARGET) $(KWORD_TEST_TARGET) $(MEMFILE_TEST_TARGE RUN_UNITTESTS = run_json_test run_kword_test run_memfile_test run_message_test # All sources, also the ones that are not configured -ALL_SRC = $(BASIC_SRC) $(ALL_GUI_SRC) $(UNITTEST_SRC) $(EXTRA_SRC) +ALL_SRC = $(BASIC_SRC) $(ALL_GUI_SRC) $(UNITTEST_SRC) \ + $(EXTRA_SRC) $(TERM_SRC) $(XDIFF_SRC) # Which files to check with lint. Select one of these three lines. ALL_SRC # checks more, but may not work well for checking a GUI that wasn't configured. @@ -3225,36 +3231,36 @@ objects/channel.o: channel.c Makefile: @echo The name of the makefile MUST be "Makefile" (with capital M)!!!! -CCCTERM = $(CCC_NF) -Ilibvterm/include $(ALL_CFLAGS) -DINLINE="" \ +CCCTERM = $(CCC_NF) $(VTERM_CFLAGS) $(ALL_CFLAGS) -DINLINE="" \ -DVSNPRINTF=vim_vsnprintf \ -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ -DWCWIDTH_FUNCTION=utf_uint2cells -objects/term_encoding.o: libvterm/src/encoding.c $(TERM_DEPS) +objects/encoding.o: libvterm/src/encoding.c $(TERM_DEPS) $(CCCTERM) -o $@ libvterm/src/encoding.c -objects/term_keyboard.o: libvterm/src/keyboard.c $(TERM_DEPS) +objects/keyboard.o: libvterm/src/keyboard.c $(TERM_DEPS) $(CCCTERM) -o $@ libvterm/src/keyboard.c -objects/term_mouse.o: libvterm/src/mouse.c $(TERM_DEPS) +objects/mouse.o: libvterm/src/mouse.c $(TERM_DEPS) $(CCCTERM) -o $@ libvterm/src/mouse.c -objects/term_parser.o: libvterm/src/parser.c $(TERM_DEPS) +objects/parser.o: libvterm/src/parser.c $(TERM_DEPS) $(CCCTERM) -o $@ libvterm/src/parser.c -objects/term_pen.o: libvterm/src/pen.c $(TERM_DEPS) +objects/pen.o: libvterm/src/pen.c $(TERM_DEPS) $(CCCTERM) -o $@ libvterm/src/pen.c -objects/term_screen.o: libvterm/src/screen.c $(TERM_DEPS) - $(CCCTERM) -o $@ libvterm/src/screen.c +objects/termscreen.o: libvterm/src/termscreen.c $(TERM_DEPS) + $(CCCTERM) -o $@ libvterm/src/termscreen.c -objects/term_state.o: libvterm/src/state.c $(TERM_DEPS) +objects/state.o: libvterm/src/state.c $(TERM_DEPS) $(CCCTERM) -o $@ libvterm/src/state.c -objects/term_unicode.o: libvterm/src/unicode.c $(TERM_DEPS) +objects/unicode.o: libvterm/src/unicode.c $(TERM_DEPS) $(CCCTERM) -o $@ libvterm/src/unicode.c -objects/term_vterm.o: libvterm/src/vterm.c $(TERM_DEPS) +objects/vterm.o: libvterm/src/vterm.c $(TERM_DEPS) $(CCCTERM) -o $@ libvterm/src/vterm.c CCCDIFF = $(CCC_NF) $(ALL_CFLAGS) @@ -3363,266 +3369,266 @@ $(APPDIR)/Contents: ############################################################################### ### (automatically generated by 'make depend') ### Dependencies: -objects/arabic.o: arabic.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/beval.o: beval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/blowfish.o: blowfish.c vim.h auto/config.h feature.h os_unix.h \ +objects/arabic.o: arabic.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h -objects/buffer.o: buffer.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h version.h -objects/charset.o: charset.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/crypt.o: crypt.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/crypt_zip.o: crypt_zip.c vim.h auto/config.h feature.h os_unix.h \ +objects/beval.o: beval.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h -objects/dict.o: dict.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/diff.o: diff.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/digraph.o: digraph.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/edit.o: edit.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/eval.o: eval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h version.h -objects/evalfunc.o: evalfunc.c vim.h auto/config.h feature.h os_unix.h \ +objects/blowfish.o: blowfish.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/buffer.o: buffer.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h version.h -objects/ex_cmds.o: ex_cmds.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h version.h -objects/ex_cmds2.o: ex_cmds2.c vim.h auto/config.h feature.h os_unix.h \ +objects/charset.o: charset.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/crypt.o: crypt.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/crypt_zip.o: crypt_zip.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/dict.o: dict.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/diff.o: diff.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h xdiff/xdiff.h xdiff/../vim.h +objects/digraph.o: digraph.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/edit.o: edit.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/eval.o: eval.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h version.h -objects/ex_docmd.o: ex_docmd.c vim.h auto/config.h feature.h os_unix.h \ +objects/evalfunc.o: evalfunc.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h version.h +objects/ex_cmds.o: ex_cmds.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h version.h +objects/ex_cmds2.o: ex_cmds2.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h version.h +objects/ex_docmd.o: ex_docmd.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h ex_cmdidxs.h -objects/ex_eval.o: ex_eval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/ex_getln.o: ex_getln.c vim.h auto/config.h feature.h os_unix.h \ +objects/ex_eval.o: ex_eval.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h -objects/farsi.o: farsi.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/fileio.o: fileio.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/fold.o: fold.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/getchar.o: getchar.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/hardcopy.o: hardcopy.c vim.h auto/config.h feature.h os_unix.h \ +objects/ex_getln.o: ex_getln.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/farsi.o: farsi.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/fileio.o: fileio.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/fold.o: fold.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/getchar.o: getchar.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/hardcopy.o: hardcopy.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h version.h -objects/hashtab.o: hashtab.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/if_cscope.o: if_cscope.c vim.h auto/config.h feature.h os_unix.h \ +objects/hashtab.o: hashtab.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/if_cscope.o: if_cscope.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h if_cscope.h -objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h auto/config.h feature.h os_unix.h \ +objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h version.h +objects/json.o: json.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/list.o: list.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/main.o: main.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/mark.o: mark.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/memfile.o: memfile.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/memline.o: memline.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/menu.o: menu.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/message.o: message.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/misc1.o: misc1.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h version.h -objects/json.o: json.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/list.o: list.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/main.o: main.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/mark.o: mark.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/memfile.o: memfile.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/memline.o: memline.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/menu.o: menu.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/message.o: message.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/misc1.o: misc1.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h version.h -objects/misc2.o: misc2.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/move.o: move.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/mbyte.o: mbyte.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/normal.o: normal.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/ops.o: ops.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ - keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro structs.h \ - regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h farsi.h \ - arabic.h -objects/option.o: option.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h if_mzsch.h os_unixx.h -objects/pathdef.o: auto/pathdef.c vim.h auto/config.h feature.h os_unix.h \ +objects/misc2.o: misc2.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h -objects/popupmnu.o: popupmnu.c vim.h auto/config.h feature.h os_unix.h \ +objects/move.o: move.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h -objects/pty.o: pty.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ - keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro structs.h \ - regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h farsi.h \ - arabic.h -objects/quickfix.o: quickfix.c vim.h auto/config.h feature.h os_unix.h \ +objects/mbyte.o: mbyte.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h -objects/regexp.o: regexp.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h regexp_nfa.c -objects/screen.o: screen.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/search.o: search.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/sha256.o: sha256.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/spell.o: spell.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/spellfile.o: spellfile.c vim.h auto/config.h feature.h os_unix.h \ +objects/normal.o: normal.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h -objects/syntax.o: syntax.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/tag.o: tag.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ - keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro structs.h \ - regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h farsi.h \ - arabic.h -objects/term.o: term.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h libvterm/include/vterm.h \ - libvterm/include/vterm_keycodes.h -objects/terminal.o: terminal.c vim.h auto/config.h feature.h os_unix.h \ +objects/ops.o: ops.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/option.o: option.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/os_unix.o: os_unix.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h os_unixx.h +objects/pathdef.o: auto/pathdef.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/popupmnu.o: popupmnu.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/pty.o: pty.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/quickfix.o: quickfix.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/regexp.o: regexp.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h regexp_nfa.c +objects/screen.o: screen.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/search.o: search.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/sha256.o: sha256.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/spell.o: spell.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/spellfile.o: spellfile.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/syntax.o: syntax.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/tag.o: tag.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/term.o: term.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h libvterm/include/vterm.h \ libvterm/include/vterm_keycodes.h -objects/ui.o: ui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ - keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro structs.h \ - regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h farsi.h \ - arabic.h -objects/undo.o: undo.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/userfunc.o: userfunc.c vim.h auto/config.h feature.h os_unix.h \ +objects/terminal.o: terminal.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h libvterm/include/vterm.h \ + libvterm/include/vterm_keycodes.h +objects/ui.o: ui.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h -objects/version.o: version.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h version.h -objects/window.o: window.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/gui.o: gui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ - keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro structs.h \ - regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h farsi.h \ - arabic.h -objects/gui_gtk.o: gui_gtk.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h gui_gtk_f.h -objects/gui_gtk_f.o: gui_gtk_f.c vim.h auto/config.h feature.h os_unix.h \ +objects/undo.o: undo.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/userfunc.o: userfunc.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/version.o: version.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h version.h +objects/window.o: window.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/gui.o: gui.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/gui_gtk.o: gui_gtk.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h gui_gtk_f.h -objects/gui_motif.o: gui_motif.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ +objects/gui_gtk_f.o: gui_gtk_f.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h gui_gtk_f.h +objects/gui_motif.o: gui_motif.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h gui_xmebw.h ../pixmaps/alert.xpm \ ../pixmaps/error.xpm ../pixmaps/generic.xpm ../pixmaps/info.xpm \ @@ -3642,16 +3648,16 @@ objects/gui_motif.o: gui_motif.c vim.h auto/config.h feature.h os_unix.h \ ../pixmaps/tb_shell.xpm ../pixmaps/tb_replace.xpm \ ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \ ../pixmaps/tb_minwidth.xpm -objects/gui_xmdlg.o: gui_xmdlg.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ +objects/gui_xmdlg.o: gui_xmdlg.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h -objects/gui_xmebw.o: gui_xmebw.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ +objects/gui_xmebw.o: gui_xmebw.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h gui_xmebwp.h gui_xmebw.h -objects/gui_athena.o: gui_athena.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ +objects/gui_athena.o: gui_athena.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h gui_at_sb.h gui_x11_pm.h \ ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm \ @@ -3669,95 +3675,173 @@ objects/gui_athena.o: gui_athena.c vim.h auto/config.h feature.h os_unix.h \ ../pixmaps/tb_shell.xpm ../pixmaps/tb_replace.xpm \ ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \ ../pixmaps/tb_minwidth.xpm -objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ +objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h auto/gui_gtk_gresources.h gui_gtk_f.h \ ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm -objects/gui_x11.o: gui_x11.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \ - ../runtime/vim48x48.xpm -objects/gui_at_sb.o: gui_at_sb.c vim.h auto/config.h feature.h os_unix.h \ +objects/gui_x11.o: gui_x11.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h farsi.h arabic.h gui_at_sb.h -objects/gui_at_fs.o: gui_at_fs.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto.h globals.h farsi.h arabic.h ../runtime/vim32x32.xpm \ + ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm +objects/gui_at_sb.o: gui_at_sb.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h gui_at_sb.h -objects/json_test.o: json_test.c main.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ +objects/gui_at_fs.o: gui_at_fs.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h gui_at_sb.h +objects/json_test.o: json_test.c main.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h json.c -objects/kword_test.o: kword_test.c main.c vim.h auto/config.h feature.h os_unix.h \ +objects/kword_test.o: kword_test.c main.c vim.h protodef.h auto/config.h \ + feature.h os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h \ + option.h beval.h proto/gui_beval.pro structs.h regexp.h gui.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h charset.c +objects/memfile_test.o: memfile_test.c main.c vim.h protodef.h auto/config.h \ + feature.h os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h \ + option.h beval.h proto/gui_beval.pro structs.h regexp.h gui.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h memfile.c +objects/message_test.o: message_test.c main.c vim.h protodef.h auto/config.h \ + feature.h os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h \ + option.h beval.h proto/gui_beval.pro structs.h regexp.h gui.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h message.c +objects/hangulin.o: hangulin.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h farsi.h arabic.h charset.c -objects/memfile_test.o: memfile_test.c main.c vim.h auto/config.h feature.h \ + proto.h globals.h farsi.h arabic.h +objects/if_lua.o: if_lua.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/if_mzsch.o: if_mzsch.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h if_mzsch.h +objects/if_perl.o: auto/if_perl.c vim.h protodef.h auto/config.h feature.h \ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h farsi.h arabic.h memfile.c -objects/message_test.o: message_test.c main.c vim.h auto/config.h feature.h \ + proto.h globals.h farsi.h arabic.h +objects/if_perlsfio.o: if_perlsfio.c vim.h protodef.h auto/config.h feature.h \ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h farsi.h arabic.h message.c -objects/hangulin.o: hangulin.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h -objects/if_lua.o: if_lua.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/if_mzsch.o: if_mzsch.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h farsi.h arabic.h if_mzsch.h mzscheme_base.c -objects/if_perl.o: auto/if_perl.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h farsi.h arabic.h -objects/if_perlsfio.o: if_perlsfio.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h farsi.h arabic.h -objects/if_python.o: if_python.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ +objects/if_python.o: if_python.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h if_py_both.h -objects/if_python3.o: if_python3.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ +objects/if_python3.o: if_python3.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h if_py_both.h -objects/if_tcl.o: if_tcl.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h -objects/if_ruby.o: if_ruby.c auto/config.h vim.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h version.h -objects/gui_beval.o: gui_beval.c vim.h auto/config.h feature.h os_unix.h \ +objects/if_tcl.o: if_tcl.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h -objects/workshop.o: workshop.c auto/config.h integration.h vim.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h farsi.h arabic.h version.h workshop.h -objects/wsdebug.o: wsdebug.c -objects/integration.o: integration.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h farsi.h arabic.h integration.h -objects/netbeans.o: netbeans.c vim.h auto/config.h feature.h os_unix.h \ +objects/if_ruby.o: if_ruby.c protodef.h auto/config.h vim.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h version.h -objects/channel.o: channel.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ - ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h +objects/gui_beval.o: gui_beval.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +objects/workshop.o: workshop.c protodef.h auto/config.h integration.h vim.h \ + feature.h os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h \ + option.h beval.h proto/gui_beval.pro structs.h regexp.h gui.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h version.h \ + workshop.h +objects/wsdebug.o: wsdebug.c +objects/integration.o: integration.c vim.h protodef.h auto/config.h feature.h \ + os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h integration.h +objects/netbeans.o: netbeans.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h version.h +objects/channel.o: channel.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c +objects/encoding.o: libvterm/src/encoding.c libvterm/src/vterm_internal.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ + libvterm/src/encoding/DECdrawing.inc libvterm/src/encoding/uk.inc +objects/keyboard.o: libvterm/src/keyboard.c libvterm/src/vterm_internal.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ + libvterm/src/utf8.h +objects/mouse.o: libvterm/src/mouse.c libvterm/src/vterm_internal.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ + libvterm/src/utf8.h +objects/parser.o: libvterm/src/parser.c libvterm/src/vterm_internal.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h +objects/pen.o: libvterm/src/pen.c libvterm/src/vterm_internal.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h +objects/state.o: libvterm/src/state.c libvterm/src/vterm_internal.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h +objects/termscreen.o: libvterm/src/termscreen.c libvterm/src/vterm_internal.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ + libvterm/src/rect.h libvterm/src/utf8.h +objects/unicode.o: libvterm/src/unicode.c libvterm/src/vterm_internal.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h +objects/vterm.o: libvterm/src/vterm.c libvterm/src/vterm_internal.h \ + libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ + libvterm/src/utf8.h +objects/xdiffi.o: xdiff/xdiffi.c xdiff/xinclude.h xdiff/../auto/config.h \ + xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ + xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ + xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ + xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ + xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ + xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ + xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ + xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h +objects/xemit.o: xdiff/xemit.c xdiff/xinclude.h xdiff/../auto/config.h \ + xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ + xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ + xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ + xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ + xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ + xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ + xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ + xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h +objects/xprepare.o: xdiff/xprepare.c xdiff/xinclude.h xdiff/../auto/config.h \ + xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ + xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ + xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ + xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ + xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ + xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ + xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ + xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h +objects/xutils.o: xdiff/xutils.c xdiff/xinclude.h xdiff/../auto/config.h \ + xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ + xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ + xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ + xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ + xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ + xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ + xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ + xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h +objects/xhistogram.o: xdiff/xhistogram.c xdiff/xinclude.h xdiff/../auto/config.h \ + xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ + xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ + xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ + xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ + xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ + xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ + xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ + xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h +objects/xpatience.o: xdiff/xpatience.c xdiff/xinclude.h xdiff/../auto/config.h \ + xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ + xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ + xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ + xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ + xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ + xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ + xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ + xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h diff --git a/src/auto/configure b/src/auto/configure index 74d3e72197..907ec6c4d3 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -7916,9 +7916,9 @@ fi if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then $as_echo "#define FEAT_TERMINAL 1" >>confdefs.h - TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/screen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c" + TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/termscreen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c" - TERM_OBJ="objects/term_encoding.o objects/term_keyboard.o objects/term_mouse.o objects/term_parser.o objects/term_pen.o objects/term_screen.o objects/term_state.o objects/term_unicode.o objects/term_vterm.o" + TERM_OBJ="objects/encoding.o objects/keyboard.o objects/mouse.o objects/parser.o objects/pen.o objects/termscreen.o objects/state.o objects/unicode.o objects/vterm.o" fi diff --git a/src/configure.ac b/src/configure.ac index 9f17b9c700..2a31f41a43 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -2114,9 +2114,9 @@ else fi if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then AC_DEFINE(FEAT_TERMINAL) - TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/screen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c" + TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/termscreen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c" AC_SUBST(TERM_SRC) - TERM_OBJ="objects/term_encoding.o objects/term_keyboard.o objects/term_mouse.o objects/term_parser.o objects/term_pen.o objects/term_screen.o objects/term_state.o objects/term_unicode.o objects/term_vterm.o" + TERM_OBJ="objects/encoding.o objects/keyboard.o objects/mouse.o objects/parser.o objects/pen.o objects/termscreen.o objects/state.o objects/unicode.o objects/vterm.o" AC_SUBST(TERM_OBJ) fi diff --git a/src/libvterm/src/screen.c b/src/libvterm/src/termscreen.c similarity index 100% rename from src/libvterm/src/screen.c rename to src/libvterm/src/termscreen.c diff --git a/src/version.c b/src/version.c index 2e64eecbc7..4dd6b6529b 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 379, /**/ 378, /**/ From 32d19c1820305729c0d1b21536b18bae2d8378ed Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 17:26:54 +0200 Subject: [PATCH 06/14] patch 8.1.0380: "make proto" doesn't work well Problem: "make proto" doesn't work well. Solution: Define a few more types for cproto. Update proto files. Fix that workshop didn't build. --- src/if_ruby.c | 1 + src/proto/digraph.pro | 2 +- src/proto/hardcopy.pro | 2 +- src/proto/option.pro | 2 +- src/proto/window.pro | 2 +- src/protodef.h | 18 ++++++++++++++++++ src/version.c | 2 ++ src/vim.h | 5 +---- src/workshop.c | 10 ++++------ 9 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 src/protodef.h diff --git a/src/if_ruby.c b/src/if_ruby.c index fd6e552fd8..5180ed8d0e 100644 --- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -11,6 +11,7 @@ * See README.txt for an overview of the Vim source code. */ +#include "protodef.h" #ifdef HAVE_CONFIG_H # include "auto/config.h" #endif diff --git a/src/proto/digraph.pro b/src/proto/digraph.pro index dfadc9dad0..4c12f51374 100644 --- a/src/proto/digraph.pro +++ b/src/proto/digraph.pro @@ -1,6 +1,6 @@ /* digraph.c */ int do_digraph(int c); -char_u *get_digraph_for_char(int val); +char_u *get_digraph_for_char(int val_arg); int get_digraph(int cmdline); int getdigraph(int char1, int char2, int meta_char); void putdigraph(char_u *str); diff --git a/src/proto/hardcopy.pro b/src/proto/hardcopy.pro index d2c68ff8c0..4791f4a029 100644 --- a/src/proto/hardcopy.pro +++ b/src/proto/hardcopy.pro @@ -13,7 +13,7 @@ int mch_print_end_page(void); int mch_print_begin_page(char_u *str); int mch_print_blank_page(void); void mch_print_start_line(int margin, int page_line); -int mch_print_text_out(char_u *p, int len); +int mch_print_text_out(char_u *textp, int len); void mch_print_set_font(int iBold, int iItalic, int iUnderline); void mch_print_set_bg(long_u bgcol); void mch_print_set_fg(long_u fgcol); diff --git a/src/proto/option.pro b/src/proto/option.pro index 22c163d0f1..679329df39 100644 --- a/src/proto/option.pro +++ b/src/proto/option.pro @@ -64,7 +64,7 @@ int tabstop_set(char_u *var, int **array); int tabstop_padding(colnr_T col, int ts_arg, int *vts); int tabstop_at(colnr_T col, int ts, int *vts); colnr_T tabstop_start(colnr_T col, int ts, int *vts); -void tabstop_fromto(colnr_T start_col, colnr_T end_col, int ts, int *vts, int *ntabs, int *nspcs); +void tabstop_fromto(colnr_T start_col, colnr_T end_col, int ts_arg, int *vts, int *ntabs, int *nspcs); int tabstop_eq(int *ts1, int *ts2); int *tabstop_copy(int *oldts); int tabstop_count(int *ts); diff --git a/src/proto/window.pro b/src/proto/window.pro index c31e59969b..4527a37f42 100644 --- a/src/proto/window.pro +++ b/src/proto/window.pro @@ -94,5 +94,5 @@ void win_id2tabwin(typval_T *argvars, list_T *list); win_T *win_id2wp(typval_T *argvars); int win_id2win(typval_T *argvars); void win_findbuf(typval_T *argvars, list_T *list); -void get_framelayout(frame_T *fr, list_T *l, int topframe); +void get_framelayout(frame_T *fr, list_T *l, int outer); /* vim: set ft=c : */ diff --git a/src/protodef.h b/src/protodef.h new file mode 100644 index 0000000000..42a6ccec9d --- /dev/null +++ b/src/protodef.h @@ -0,0 +1,18 @@ +/* vi:set ts=8 sts=4 sw=4 noet: + * + * VIM - Vi IMproved by Bram Moolenaar + * + * Do ":help uganda" in Vim to read copying and usage conditions. + * Do ":help credits" in Vim to see a list of people who contributed. + */ + +#ifdef PROTO +// cproto runs into trouble when these types are missing +typedef double _Float16; +typedef double _Float32; +typedef double _Float64; +typedef double _Float128; +typedef double _Float32x; +typedef double _Float64x; +#endif + diff --git a/src/version.c b/src/version.c index 4dd6b6529b..76fdb492a2 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 380, /**/ 379, /**/ diff --git a/src/vim.h b/src/vim.h index 6d1c312407..c30e8db880 100644 --- a/src/vim.h +++ b/src/vim.h @@ -9,10 +9,7 @@ #ifndef VIM__H # define VIM__H -#ifdef PROTO -/* cproto runs into trouble when this type is missing */ -typedef double _Float128; -#endif +#include "protodef.h" /* use fastcall for Borland, when compiling for Win32 */ #if defined(__BORLANDC__) && defined(WIN32) && !defined(DEBUG) diff --git a/src/workshop.c b/src/workshop.c index cb6ba3e598..425174350f 100644 --- a/src/workshop.c +++ b/src/workshop.c @@ -8,6 +8,7 @@ * See README.txt for an overview of the Vim source code. */ +#include "protodef.h" #ifdef HAVE_CONFIG_H # include "auto/config.h" #endif @@ -1541,7 +1542,7 @@ workshop_beval_cb( #ifdef FEAT_VARTABS idx = computeIndex(col, text, beval->ts, beval->vts); #else - idx = computeIndex(col, text, beval->ts); + idx = computeIndex(col, text, beval->ts, 0); #endif if (idx > 0) { @@ -1577,11 +1578,8 @@ workshop_beval_cb( computeIndex( int wantedCol, char_u *line, - int ts -#ifdef FEAT_VARTABS - int *vts -#else - ) + int ts, + int *vts UNUSED) { int col = 0; int idx = 0; From 5c6f574bd1e07d6eab077fa8f28b2c0cd480b068 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 17:32:07 +0200 Subject: [PATCH 07/14] patch 8.1.0381: variable declaration not at start of block Problem: Variable declaration not at start of block. Solution: Fix line ordering. --- src/version.c | 2 ++ src/xdiff/xpatience.c | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/version.c b/src/version.c index 76fdb492a2..8addd2c36d 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 381, /**/ 380, /**/ diff --git a/src/xdiff/xpatience.c b/src/xdiff/xpatience.c index 00af0ff11c..2c65aac386 100644 --- a/src/xdiff/xpatience.c +++ b/src/xdiff/xpatience.c @@ -209,11 +209,6 @@ static struct entry *find_longest_common_sequence(struct hashmap *map) struct entry **sequence = (struct entry **)xdl_malloc(map->nr * sizeof(struct entry *)); int longest = 0, i; struct entry *entry; - - /* Added to silence Coverity. */ - if (sequence == NULL) - return map->first; - /* * If not -1, this entry in sequence must never be overridden. * Therefore, overriding entries before this has no effect, so @@ -221,6 +216,10 @@ static struct entry *find_longest_common_sequence(struct hashmap *map) */ int anchor_i = -1; + /* Added to silence Coverity. */ + if (sequence == NULL) + return map->first; + for (entry = map->first; entry; entry = entry->next) { if (!entry->line2 || entry->line2 == NON_UNIQUE) continue; From 0f7683f9739087f3c7a4678c5182ed0517523b4a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 18:01:31 +0200 Subject: [PATCH 08/14] patch 8.1.0382: some make programs can't handle "xdiff/../" Problem: Some make programs can't handle dependency on "xdiff/../". Solution: Strip it out. --- src/Makefile | 100 +++++++++++++++++++++++++------------------------- src/version.c | 2 + 2 files changed, 52 insertions(+), 50 deletions(-) diff --git a/src/Makefile b/src/Makefile index df6a3b0394..b0747c8b7b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2845,7 +2845,7 @@ depend: sed -e '/\#\#\# Dependencies/q' < Makefile > tmp_make -for i in $(ALL_SRC); do echo $$i; \ $(CPP_DEPEND) $$i | \ - sed -e 's+^\([^ ]*\.o\)+objects/\1+' >> tmp_make; done + sed -e 's+^\([^ ]*\.o\)+objects/\1+' -e 's+xdiff/\.\./++g' >> tmp_make; done mv tmp_make Makefile # Run lint. Clean up the *.ln files that are sometimes left behind. @@ -3404,7 +3404,7 @@ objects/dict.o: dict.c vim.h protodef.h auto/config.h feature.h os_unix.h \ objects/diff.o: diff.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h farsi.h arabic.h xdiff/xdiff.h xdiff/../vim.h + proto.h globals.h farsi.h arabic.h xdiff/xdiff.h vim.h objects/digraph.o: digraph.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ @@ -3791,57 +3791,57 @@ objects/unicode.o: libvterm/src/unicode.c libvterm/src/vterm_internal.h \ objects/vterm.o: libvterm/src/vterm.c libvterm/src/vterm_internal.h \ libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ libvterm/src/utf8.h -objects/xdiffi.o: xdiff/xdiffi.c xdiff/xinclude.h xdiff/../auto/config.h \ - xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ - xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ - xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ - xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ - xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ - xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ - xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ +objects/xdiffi.o: xdiff/xdiffi.c xdiff/xinclude.h auto/config.h \ + xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ + auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h \ + macros.h option.h beval.h proto/gui_beval.pro \ + structs.h regexp.h gui.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h \ + farsi.h arabic.h xdiff/xtypes.h xdiff/xutils.h \ xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h -objects/xemit.o: xdiff/xemit.c xdiff/xinclude.h xdiff/../auto/config.h \ - xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ - xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ - xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ - xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ - xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ - xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ - xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ +objects/xemit.o: xdiff/xemit.c xdiff/xinclude.h auto/config.h \ + xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ + auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h \ + macros.h option.h beval.h proto/gui_beval.pro \ + structs.h regexp.h gui.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h \ + farsi.h arabic.h xdiff/xtypes.h xdiff/xutils.h \ xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h -objects/xprepare.o: xdiff/xprepare.c xdiff/xinclude.h xdiff/../auto/config.h \ - xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ - xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ - xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ - xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ - xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ - xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ - xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ +objects/xprepare.o: xdiff/xprepare.c xdiff/xinclude.h auto/config.h \ + xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ + auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h \ + macros.h option.h beval.h proto/gui_beval.pro \ + structs.h regexp.h gui.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h \ + farsi.h arabic.h xdiff/xtypes.h xdiff/xutils.h \ xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h -objects/xutils.o: xdiff/xutils.c xdiff/xinclude.h xdiff/../auto/config.h \ - xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ - xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ - xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ - xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ - xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ - xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ - xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ +objects/xutils.o: xdiff/xutils.c xdiff/xinclude.h auto/config.h \ + xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ + auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h \ + macros.h option.h beval.h proto/gui_beval.pro \ + structs.h regexp.h gui.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h \ + farsi.h arabic.h xdiff/xtypes.h xdiff/xutils.h \ xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h -objects/xhistogram.o: xdiff/xhistogram.c xdiff/xinclude.h xdiff/../auto/config.h \ - xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ - xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ - xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ - xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ - xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ - xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ - xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ +objects/xhistogram.o: xdiff/xhistogram.c xdiff/xinclude.h auto/config.h \ + xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ + auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h \ + macros.h option.h beval.h proto/gui_beval.pro \ + structs.h regexp.h gui.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h \ + farsi.h arabic.h xdiff/xtypes.h xdiff/xutils.h \ xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h -objects/xpatience.o: xdiff/xpatience.c xdiff/xinclude.h xdiff/../auto/config.h \ - xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ - xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ - xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ - xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ - xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ - xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ - xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ +objects/xpatience.o: xdiff/xpatience.c xdiff/xinclude.h auto/config.h \ + xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ + auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h \ + macros.h option.h beval.h proto/gui_beval.pro \ + structs.h regexp.h gui.h alloc.h \ + ex_cmds.h spell.h proto.h globals.h \ + farsi.h arabic.h xdiff/xtypes.h xdiff/xutils.h \ xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h diff --git a/src/version.c b/src/version.c index 8addd2c36d..d6a8817a4c 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 382, /**/ 381, /**/ From a214079008b30567d0750ec3a27d142fd34662d9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 18:05:48 +0200 Subject: [PATCH 09/14] patch 8.1.0383: missing source file rename Problem: Missing source file rename. Solution: Update the dependency. --- src/Make_mvc.mak | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index f5588dc3b8..919f0f041b 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -1576,8 +1576,8 @@ $(OUTDIR)/parser.obj: $(OUTDIR) libvterm/src/parser.c $(TERM_DEPS) $(OUTDIR)/pen.obj: $(OUTDIR) libvterm/src/pen.c $(TERM_DEPS) $(CCCTERM) -Fo$@ libvterm/src/pen.c -$(OUTDIR)/termscreen.obj: $(OUTDIR) libvterm/src/screen.c $(TERM_DEPS) - $(CCCTERM) -Fo$@ libvterm/src/screen.c +$(OUTDIR)/termscreen.obj: $(OUTDIR) libvterm/src/termscreen.c $(TERM_DEPS) + $(CCCTERM) -Fo$@ libvterm/src/termscreen.c $(OUTDIR)/state.obj: $(OUTDIR) libvterm/src/state.c $(TERM_DEPS) $(CCCTERM) -Fo$@ libvterm/src/state.c diff --git a/src/version.c b/src/version.c index d6a8817a4c..6f75233c6a 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 383, /**/ 382, /**/ From 8aeb504fc68e3fea9da5567d2d9a31a132fbf90f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 18:33:05 +0200 Subject: [PATCH 10/14] patch 8.1.0384: sign ordering depends on +netbeans feature Problem: Sign ordering depends on +netbeans feature. Solution: Also order signs without +netbeans. (Christian Brabandt, closes #3224) --- src/buffer.c | 31 +++++++++++-------------------- src/structs.h | 2 -- src/version.c | 2 ++ 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 0bf6aa9125..b536be64bf 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5856,11 +5856,9 @@ insert_sign( newsign->lnum = lnum; newsign->typenr = typenr; newsign->next = next; -#ifdef FEAT_NETBEANS_INTG newsign->prev = prev; if (next != NULL) next->prev = newsign; -#endif if (prev == NULL) { @@ -5905,38 +5903,29 @@ buf_addsign( sign->typenr = typenr; return; } - else if ( -#ifndef FEAT_NETBEANS_INTG /* keep signs sorted by lnum */ - id < 0 && -#endif - lnum < sign->lnum) + else if (lnum < sign->lnum) { -#ifdef FEAT_NETBEANS_INTG /* insert new sign at head of list for this lnum */ - /* XXX - GRP: Is this because of sign slide problem? Or is it - * really needed? Or is it because we allow multiple signs per - * line? If so, should I add that feature to FEAT_SIGNS? - */ + // keep signs sorted by lnum: insert new sign at head of list for + // this lnum while (prev != NULL && prev->lnum == lnum) prev = prev->prev; if (prev == NULL) sign = buf->b_signlist; else sign = prev->next; -#endif insert_sign(buf, prev, sign, id, lnum, typenr); return; } prev = sign; } -#ifdef FEAT_NETBEANS_INTG /* insert new sign at head of list for this lnum */ - /* XXX - GRP: See previous comment */ + + // insert new sign at head of list for this lnum while (prev != NULL && prev->lnum == lnum) prev = prev->prev; if (prev == NULL) sign = buf->b_signlist; else sign = prev->next; -#endif insert_sign(buf, prev, sign, id, lnum, typenr); return; @@ -6008,10 +5997,8 @@ buf_delsign( if (sign->id == id) { *lastp = next; -#ifdef FEAT_NETBEANS_INTG if (next != NULL) next->prev = sign->prev; -#endif lnum = sign->lnum; vim_free(sign); break; @@ -6067,7 +6054,9 @@ buf_findsign_id( # if defined(FEAT_NETBEANS_INTG) || defined(PROTO) -/* see if a given type of sign exists on a specific line */ +/* + * See if a given type of sign exists on a specific line. + */ int buf_findsigntype_id( buf_T *buf, /* buffer whose sign we are searching for */ @@ -6085,7 +6074,9 @@ buf_findsigntype_id( # if defined(FEAT_SIGN_ICONS) || defined(PROTO) -/* return the number of icons on the given line */ +/* + * Return the number of icons on the given line. + */ int buf_signcount(buf_T *buf, linenr_T lnum) { diff --git a/src/structs.h b/src/structs.h index f978f61b79..3c2bf3f1bb 100644 --- a/src/structs.h +++ b/src/structs.h @@ -704,9 +704,7 @@ struct signlist linenr_T lnum; /* line number which has this sign */ int typenr; /* typenr of sign */ signlist_T *next; /* next signlist entry */ -# ifdef FEAT_NETBEANS_INTG signlist_T *prev; /* previous entry -- for easy reordering */ -# endif }; /* type argument for buf_getsigntype() */ diff --git a/src/version.c b/src/version.c index 6f75233c6a..6912210d4a 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 384, /**/ 383, /**/ From c91c500348f3f026a06d1c3565b380d86b8c55ee Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 19:04:48 +0200 Subject: [PATCH 11/14] patch 8.1.0385: Coveralls badge doesn't update Problem: Coveralls badge doesn't update. Solution: Update the URL --- README.md | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ea8e4c976..92257d39a5 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim) [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master) -[![Coverage Status](https://coveralls.io/repos/vim/vim/badge.svg?branch=master&service=github)](https://coveralls.io/github/vim/vim?branch=master) +[![Coverage Status](https://coveralls.io/repos/github/vim/vim/badge.svg?branch=master)](https://coveralls.io/github/vim/vim?branch=master) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim) [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim) [![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp) diff --git a/src/version.c b/src/version.c index 6912210d4a..aa6d099f13 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 385, /**/ 384, /**/ From fe8ef98dd1d0b7d296d7db29b1e2fd1b56b788de Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 20:31:54 +0200 Subject: [PATCH 12/14] patch 8.1.0386: cannot test with non-default option value Problem: Cannot test with non-default option value. Solution: Add test_option_not_set(). --- runtime/doc/eval.txt | 10 ++++++++++ src/evalfunc.c | 22 +++++++++++++++++++++- src/option.c | 6 +++++- src/proto/option.pro | 2 +- src/version.c | 2 ++ 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 2ff124b691..fdac40586b 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -2473,6 +2473,7 @@ test_null_job() Job null value for testing test_null_list() List null value for testing test_null_partial() Funcref null value for testing test_null_string() String null value for testing +test_option_not_set({name}) none reset flag indicating option was set test_override({expr}, {val}) none test with Vim internal overrides test_settime({expr}) none set current time for testing timer_info([{id}]) List information about timers @@ -8737,6 +8738,15 @@ test_null_partial() *test_null_partial()* test_null_string() *test_null_string()* Return a String that is null. Only useful for testing. +test_option_not_set({name}) *test_option_not_set()* + Reset the flag that indicates option {name} was set. Thus it + looks like it still has the default value. Use like this: > + set ambiwidth=double + call test_option_not_set('ambiwidth') +< Now the 'ambiwidth' option behaves like it was never changed, + even though the value is "double". + Only to be used for testing! + test_override({name}, {val}) *test_override()* Overrides certain parts of Vims internal processing to be able to run tests. Only to be used for testing Vim! diff --git a/src/evalfunc.c b/src/evalfunc.c index ff545893e9..69a674d2c4 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -415,6 +415,7 @@ static void f_tempname(typval_T *argvars, typval_T *rettv); static void f_test_alloc_fail(typval_T *argvars, typval_T *rettv); static void f_test_autochdir(typval_T *argvars, typval_T *rettv); static void f_test_feedinput(typval_T *argvars, typval_T *rettv); +static void f_test_option_not_set(typval_T *argvars, typval_T *rettv); static void f_test_override(typval_T *argvars, typval_T *rettv); static void f_test_garbagecollect_now(typval_T *argvars, typval_T *rettv); static void f_test_ignore_error(typval_T *argvars, typval_T *rettv); @@ -922,6 +923,7 @@ static struct fst {"test_null_list", 0, 0, f_test_null_list}, {"test_null_partial", 0, 0, f_test_null_partial}, {"test_null_string", 0, 0, f_test_null_string}, + {"test_option_not_set", 1, 1, f_test_option_not_set}, {"test_override", 2, 2, f_test_override}, {"test_settime", 1, 1, f_test_settime}, #ifdef FEAT_TIMERS @@ -13062,7 +13064,25 @@ f_test_feedinput(typval_T *argvars, typval_T *rettv UNUSED) } /* - * "test_disable({name}, {val})" function + * "test_option_not_set({name})" function + */ + static void +f_test_option_not_set(typval_T *argvars, typval_T *rettv UNUSED) +{ + char_u *name = (char_u *)""; + + if (argvars[0].v_type != VAR_STRING) + EMSG(_(e_invarg)); + else + { + name = get_tv_string_chk(&argvars[0]); + if (reset_option_was_set(name) == FAIL) + EMSG2(_(e_invarg2), name); + } +} + +/* + * "test_override({name}, {val})" function */ static void f_test_override(typval_T *argvars, typval_T *rettv UNUSED) diff --git a/src/option.c b/src/option.c index f47549d721..818e6911cd 100644 --- a/src/option.c +++ b/src/option.c @@ -12480,13 +12480,17 @@ option_was_set(char_u *name) /* * Reset the flag indicating option "name" was set. */ - void + int reset_option_was_set(char_u *name) { int idx = findoption(name); if (idx >= 0) + { options[idx].flags &= ~P_WAS_SET; + return OK; + } + return FAIL; } /* diff --git a/src/proto/option.pro b/src/proto/option.pro index 679329df39..b65cb45bf4 100644 --- a/src/proto/option.pro +++ b/src/proto/option.pro @@ -55,7 +55,7 @@ int shortmess(int x); void vimrc_found(char_u *fname, char_u *envname); void change_compatible(int on); int option_was_set(char_u *name); -void reset_option_was_set(char_u *name); +int reset_option_was_set(char_u *name); int can_bs(int what); void save_file_ff(buf_T *buf); int file_ff_differs(buf_T *buf, int ignore_empty); diff --git a/src/version.c b/src/version.c index aa6d099f13..81fc68555f 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 386, /**/ 385, /**/ From 24839edc54e985ed88d063513226922a6f5b7554 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 20:46:52 +0200 Subject: [PATCH 13/14] patch 8.1.0387: no test for 'ambiwidth' detection Problem: No test for 'ambiwidth' detection. Solution: Add a test. --- src/testdir/test_startup_utf8.vim | 22 ++++++++++++++++++++++ src/version.c | 2 ++ 2 files changed, 24 insertions(+) diff --git a/src/testdir/test_startup_utf8.vim b/src/testdir/test_startup_utf8.vim index d179a4cc79..ef1a997ea4 100644 --- a/src/testdir/test_startup_utf8.vim +++ b/src/testdir/test_startup_utf8.vim @@ -4,6 +4,7 @@ if !has('multi_byte') endif source shared.vim +source screendump.vim func Test_read_stdin_utf8() let linesin = ['テスト', '€ÀÈÌÒÙ'] @@ -62,3 +63,24 @@ func Test_read_fifo_utf8() call delete('Xtestout') call delete('Xtestin') endfunc + +func Test_detect_ambiwidth() + if !CanRunVimInTerminal() + return + endif + + " Use the title termcap entries to output the escape sequence. + call writefile([ + \ 'set enc=utf-8', + \ 'set ambiwidth=double', + \ 'call test_option_not_set("ambiwidth")', + \ 'redraw', + \ ], 'Xscript') + let buf = RunVimInTerminal('-S Xscript', {}) + call term_wait(buf) + call term_sendkeys(buf, "S\=&ambiwidth\\") + call WaitForAssert({-> assert_match('single', term_getline(buf, 1))}) + + call StopVimInTerminal(buf) + call delete('Xscript') +endfunc diff --git a/src/version.c b/src/version.c index 81fc68555f..9b2e81b125 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 387, /**/ 386, /**/ From bf1c1b85136bbbe55a50c9cd01ed064d8df75697 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 21:30:05 +0200 Subject: [PATCH 14/14] patch 8.1.0388: Coverity complains about possible NULL pointer use Problem: Coverity complains about possible NULL pointer use. Solution: Use get_tv_string() instead of get_tv_string_chk(). --- src/evalfunc.c | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/evalfunc.c b/src/evalfunc.c index 69a674d2c4..f49bcb843d 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -13075,7 +13075,7 @@ f_test_option_not_set(typval_T *argvars, typval_T *rettv UNUSED) EMSG(_(e_invarg)); else { - name = get_tv_string_chk(&argvars[0]); + name = get_tv_string(&argvars[0]); if (reset_option_was_set(name) == FAIL) EMSG2(_(e_invarg2), name); } diff --git a/src/version.c b/src/version.c index 9b2e81b125..dce4643c2f 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 388, /**/ 387, /**/