vim: src/diff.c annotate

annotate src/diff.c @ 29367:cc4b36422ecb v9.0.0026

patch 9.0.0026: accessing freed memory with diff put Commit: https://github.com/vim/vim/commit/c5274dd12224421f2430b30c53b881b9403d649e Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 2 15:10:00 2022 +0100 patch 9.0.0026: accessing freed memory with diff put Problem: Accessing freed memory with diff put. Solution: Bail out when diff pointer is no longer valid.

author	Bram Moolenaar <Bram@vim.org>
date	Sat, 02 Jul 2022 16:15:03 +0200
parents	92dd6fef5ace
children	3afe997f4415

rev	line source
10042 4aead6a9b7a9 commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47 Christian Brabandt <cb@256bit.org> parents: 10013 diff changeset	1 /* vi:set ts=8 sts=4 sw=4 noet:
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3 * VIM - Vi IMproved by Bram Moolenaar
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	4 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	5 * Do ":help uganda" in Vim to read copying and usage conditions.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	6 * Do ":help credits" in Vim to see a list of people who contributed.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	7 * See README.txt for an overview of the Vim source code.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	8 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	9
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	10 /*
1788 61d080cb268e updated for version 7.2-086 vimboss parents: 1761 diff changeset	11 * diff.c: code for diff'ing two, three or four buffers.
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	12 *
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	13 * There are three ways to diff:
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	14 * - Shell out to an external diff program, using files.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	15 * - Use the compiled-in xdiff library.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	16 * - Let 'diffexpr' do the work, using files.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	17 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	18
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	19 #include "vim.h"
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	20 #include "xdiff/xdiff.h"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	21
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	22 #if defined(FEAT_DIFF) \|\| defined(PROTO)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	23
14776 09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget Christian Brabandt <cb@256bit.org> parents: 14770 diff changeset	24 static int diff_busy = FALSE; // using diff structs, don't change them
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget Christian Brabandt <cb@256bit.org> parents: 14770 diff changeset	25 static int diff_need_update = FALSE; // ex_diffupdate needs to be called
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	26
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	27 // flags obtained from the 'diffopt' option
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	28 #define DIFF_FILLER 0x001 // display filler lines
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	29 #define DIFF_IBLANK 0x002 // ignore empty lines
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	30 #define DIFF_ICASE 0x004 // ignore case
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	31 #define DIFF_IWHITE 0x008 // ignore change in white space
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	32 #define DIFF_IWHITEALL 0x010 // ignore all white space changes
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	33 #define DIFF_IWHITEEOL 0x020 // ignore change in white space at EOL
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	34 #define DIFF_HORIZONTAL 0x040 // horizontal splits
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	35 #define DIFF_VERTICAL 0x080 // vertical splits
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	36 #define DIFF_HIDDEN_OFF 0x100 // diffoff when hidden
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	37 #define DIFF_INTERNAL 0x200 // use internal xdiff algorithm
18590 41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	38 #define DIFF_CLOSE_OFF 0x400 // diffoff when closing window
23895 e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	39 #define DIFF_FOLLOWWRAP 0x800 // follow the wrap option
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	40 #define ALL_WHITE_DIFF (DIFF_IWHITE \| DIFF_IWHITEALL \| DIFF_IWHITEEOL)
18590 41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	41 static int diff_flags = DIFF_INTERNAL \| DIFF_FILLER \| DIFF_CLOSE_OFF;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	42
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	43 static long diff_algorithm = 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	44
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	45 #define LBUFLEN 50 // length of line in diff file
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	46
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	47 static int diff_a_works = MAYBE; // TRUE when "diff -a" works, FALSE when it
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	48 // doesn't work, MAYBE when not checked yet
8212 05b88224cea1 commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce Christian Brabandt <cb@256bit.org> parents: 7817 diff changeset	49 #if defined(MSWIN)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	50 static int diff_bin_works = MAYBE; // TRUE when "diff --binary" works, FALSE
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	51 // when it doesn't work, MAYBE when not
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	52 // checked yet
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	53 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	54
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	55 // used for diff input
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	56 typedef struct {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	57 char_u *din_fname; // used for external diff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	58 mmfile_t din_mmfile; // used for internal diff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	59 } diffin_T;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	60
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	61 // used for diff result
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	62 typedef struct {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	63 char_u *dout_fname; // used for external diff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	64 garray_T dout_ga; // used for internal diff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	65 } diffout_T;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	66
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	67 // used for recording hunks from xdiff
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	68 typedef struct {
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	69 linenr_T lnum_orig;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	70 long count_orig;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	71 linenr_T lnum_new;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	72 long count_new;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	73 } diffhunk_T;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	74
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	75 // two diff inputs and one result
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	76 typedef struct {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	77 diffin_T dio_orig; // original file input
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	78 diffin_T dio_new; // new file input
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	79 diffout_T dio_diff; // diff result
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	80 int dio_internal; // using internal diff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	81 } diffio_T;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	82
7799 af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a Christian Brabandt <cb@256bit.org> parents: 7338 diff changeset	83 static int diff_buf_idx(buf_T *buf);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a Christian Brabandt <cb@256bit.org> parents: 7338 diff changeset	84 static int diff_buf_idx_tp(buf_T buf, tabpage_T tp);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a Christian Brabandt <cb@256bit.org> parents: 7338 diff changeset	85 static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a Christian Brabandt <cb@256bit.org> parents: 7338 diff changeset	86 static void diff_check_unchanged(tabpage_T tp, diff_T dp);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a Christian Brabandt <cb@256bit.org> parents: 7338 diff changeset	87 static int diff_check_sanity(tabpage_T tp, diff_T dp);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	88 static int check_external_diff(diffio_T *diffio);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	89 static int diff_file(diffio_T *diffio);
7799 af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a Christian Brabandt <cb@256bit.org> parents: 7338 diff changeset	90 static int diff_equal_entry(diff_T *dp, int idx1, int idx2);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a Christian Brabandt <cb@256bit.org> parents: 7338 diff changeset	91 static int diff_cmp(char_u s1, char_u s2);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	92 #ifdef FEAT_FOLDING
7799 af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a Christian Brabandt <cb@256bit.org> parents: 7338 diff changeset	93 static void diff_fold_update(diff_T *dp, int skip_idx);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	94 #endif
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	95 static void diff_read(int idx_orig, int idx_new, diffio_T *dio);
7799 af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a Christian Brabandt <cb@256bit.org> parents: 7338 diff changeset	96 static void diff_copy_entry(diff_T dprev, diff_T dp, int idx_orig, int idx_new);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a Christian Brabandt <cb@256bit.org> parents: 7338 diff changeset	97 static diff_T diff_alloc_new(tabpage_T tp, diff_T dprev, diff_T dp);
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	98 static int parse_diff_ed(char_u line, diffhunk_T hunk);
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	99 static int parse_diff_unified(char_u line, diffhunk_T hunk);
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	100 static int xdiff_out(long start_a, long count_a, long start_b, long count_b, void *priv);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	101
19888 435726a03481 patch 8.2.0500: using the same loop in many places Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	102 #define FOR_ALL_DIFFBLOCKS_IN_TAB(tp, dp) \
435726a03481 patch 8.2.0500: using the same loop in many places Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	103 for ((dp) = (tp)->tp_first_diff; (dp) != NULL; (dp) = (dp)->df_next)
435726a03481 patch 8.2.0500: using the same loop in many places Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	104
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	105 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	106 * Called when deleting or unloading a buffer: No longer make a diff with it.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	107 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	108 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	109 diff_buf_delete(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	110 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	111 int i;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	112 tabpage_T *tp;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	113
9649 fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07 Christian Brabandt <cb@256bit.org> parents: 9487 diff changeset	114 FOR_ALL_TABPAGES(tp)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	115 {
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	116 i = diff_buf_idx_tp(buf, tp);
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	117 if (i != DB_COUNT)
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	118 {
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	119 tp->tp_diffbuf[i] = NULL;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	120 tp->tp_diff_invalid = TRUE;
1761 0836531167ab updated for version 7.2-059 vimboss parents: 1757 diff changeset	121 if (tp == curtab)
29293 bf4d7898cf93 patch 8.2.5163: crash when deleting buffers in diff mode Bram Moolenaar <Bram@vim.org> parents: 28457 diff changeset	122 {
bf4d7898cf93 patch 8.2.5163: crash when deleting buffers in diff mode Bram Moolenaar <Bram@vim.org> parents: 28457 diff changeset	123 // don't redraw right away, more might change or buffer state
bf4d7898cf93 patch 8.2.5163: crash when deleting buffers in diff mode Bram Moolenaar <Bram@vim.org> parents: 28457 diff changeset	124 // is invalid right now
bf4d7898cf93 patch 8.2.5163: crash when deleting buffers in diff mode Bram Moolenaar <Bram@vim.org> parents: 28457 diff changeset	125 need_diff_redraw = TRUE;
bf4d7898cf93 patch 8.2.5163: crash when deleting buffers in diff mode Bram Moolenaar <Bram@vim.org> parents: 28457 diff changeset	126 redraw_later(VALID);
bf4d7898cf93 patch 8.2.5163: crash when deleting buffers in diff mode Bram Moolenaar <Bram@vim.org> parents: 28457 diff changeset	127 }
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	128 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	129 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	130 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	131
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	132 /*
16 3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	133 * Check if the current buffer should be added to or removed from the list of
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	134 * diff buffers.
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	135 */
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	136 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	137 diff_buf_adjust(win_T *win)
16 3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	138 {
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	139 win_T *wp;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	140 int i;
16 3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	141
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	142 if (!win->w_p_diff)
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	143 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	144 // When there is no window showing a diff for this buffer, remove
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	145 // it from the diffs.
9649 fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07 Christian Brabandt <cb@256bit.org> parents: 9487 diff changeset	146 FOR_ALL_WINDOWS(wp)
16 3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	147 if (wp->w_buffer == win->w_buffer && wp->w_p_diff)
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	148 break;
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	149 if (wp == NULL)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	150 {
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	151 i = diff_buf_idx(win->w_buffer);
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	152 if (i != DB_COUNT)
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	153 {
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	154 curtab->tp_diffbuf[i] = NULL;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	155 curtab->tp_diff_invalid = TRUE;
1761 0836531167ab updated for version 7.2-059 vimboss parents: 1757 diff changeset	156 diff_redraw(TRUE);
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	157 }
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	158 }
16 3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	159 }
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	160 else
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	161 diff_buf_add(win->w_buffer);
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	162 }
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	163
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	164 /*
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	165 * Add a buffer to make diffs for.
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	166 * Call this when a new buffer is being edited in the current window where
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	167 * 'diff' is set.
1788 61d080cb268e updated for version 7.2-086 vimboss parents: 1761 diff changeset	168 * Marks the current buffer as being part of the diff and requiring updating.
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	169 * This must be done before any autocmd, because a command may use info
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	170 * about the screen contents.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	171 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	172 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	173 diff_buf_add(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	174 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	175 int i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	176
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	177 if (diff_buf_idx(buf) != DB_COUNT)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	178 return; // It's already there.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	179
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	180 for (i = 0; i < DB_COUNT; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	181 if (curtab->tp_diffbuf[i] == NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	182 {
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	183 curtab->tp_diffbuf[i] = buf;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	184 curtab->tp_diff_invalid = TRUE;
1761 0836531167ab updated for version 7.2-059 vimboss parents: 1757 diff changeset	185 diff_redraw(TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	186 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	187 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	188
26602 fac6673086df patch 8.2.3830: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26044 diff changeset	189 semsg(_(e_cannot_diff_more_than_nr_buffers), DB_COUNT);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	190 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	191
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	192 /*
10821 d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	193 * Remove all buffers to make diffs for.
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	194 */
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	195 static void
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	196 diff_buf_clear(void)
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	197 {
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	198 int i;
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	199
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	200 for (i = 0; i < DB_COUNT; ++i)
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	201 if (curtab->tp_diffbuf[i] != NULL)
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	202 {
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	203 curtab->tp_diffbuf[i] = NULL;
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	204 curtab->tp_diff_invalid = TRUE;
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	205 diff_redraw(TRUE);
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	206 }
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	207 }
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	208
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	209 /*
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	210 * Find buffer "buf" in the list of diff buffers for the current tab page.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	211 * Return its index or DB_COUNT if not found.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	212 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	213 static int
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	214 diff_buf_idx(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	215 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	216 int idx;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	217
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	218 for (idx = 0; idx < DB_COUNT; ++idx)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	219 if (curtab->tp_diffbuf[idx] == buf)
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	220 break;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	221 return idx;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	222 }
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	223
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	224 /*
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	225 * Find buffer "buf" in the list of diff buffers for tab page "tp".
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	226 * Return its index or DB_COUNT if not found.
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	227 */
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	228 static int
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	229 diff_buf_idx_tp(buf_T buf, tabpage_T tp)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	230 {
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	231 int idx;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	232
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	233 for (idx = 0; idx < DB_COUNT; ++idx)
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	234 if (tp->tp_diffbuf[idx] == buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	235 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	236 return idx;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	237 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	238
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	239 /*
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	240 * Mark the diff info involving buffer "buf" as invalid, it will be updated
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	241 * when info is requested.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	242 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	243 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	244 diff_invalidate(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	245 {
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	246 tabpage_T *tp;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	247 int i;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	248
9649 fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07 Christian Brabandt <cb@256bit.org> parents: 9487 diff changeset	249 FOR_ALL_TABPAGES(tp)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	250 {
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	251 i = diff_buf_idx_tp(buf, tp);
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	252 if (i != DB_COUNT)
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	253 {
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	254 tp->tp_diff_invalid = TRUE;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	255 if (tp == curtab)
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	256 diff_redraw(TRUE);
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	257 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	258 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	259 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	260
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	261 /*
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	262 * Called by mark_adjust(): update line numbers in "curbuf".
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	263 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	264 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	265 diff_mark_adjust(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	266 linenr_T line1,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	267 linenr_T line2,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	268 long amount,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	269 long amount_after)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	270 {
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	271 int idx;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	272 tabpage_T *tp;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	273
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	274 // Handle all tab pages that use the current buffer in a diff.
9649 fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07 Christian Brabandt <cb@256bit.org> parents: 9487 diff changeset	275 FOR_ALL_TABPAGES(tp)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	276 {
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	277 idx = diff_buf_idx_tp(curbuf, tp);
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	278 if (idx != DB_COUNT)
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	279 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after);
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	280 }
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	281 }
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	282
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	283 /*
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	284 * Update line numbers in tab page "tp" for "curbuf" with index "idx".
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	285 * This attempts to update the changes as much as possible:
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	286 * When inserting/deleting lines outside of existing change blocks, create a
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	287 * new change block and update the line numbers in following blocks.
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	288 * When inserting/deleting lines in existing change blocks, update them.
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	289 */
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	290 static void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	291 diff_mark_adjust_tp(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	292 tabpage_T *tp,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	293 int idx,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	294 linenr_T line1,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	295 linenr_T line2,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	296 long amount,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	297 long amount_after)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	298 {
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	299 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	300 diff_T *dprev;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	301 diff_T *dnext;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	302 int i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	303 int inserted, deleted;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	304 int n, off;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	305 linenr_T last;
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	306 linenr_T lnum_deleted = line1; // lnum of remaining deletion
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	307 int check_unchanged;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	308
14764 f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly Christian Brabandt <cb@256bit.org> parents: 14762 diff changeset	309 if (diff_internal())
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly Christian Brabandt <cb@256bit.org> parents: 14762 diff changeset	310 {
14780 552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	311 // Will update diffs before redrawing. Set _invalid to update the
14764 f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly Christian Brabandt <cb@256bit.org> parents: 14762 diff changeset	312 // diffs themselves, set _update to also update folds properly just
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly Christian Brabandt <cb@256bit.org> parents: 14762 diff changeset	313 // before redrawing.
14972 5d52b21b2e7f patch 8.1.0497: :%diffput changes order of lines Bram Moolenaar <Bram@vim.org> parents: 14893 diff changeset	314 // Do update marks here, it is needed for :%diffput.
14764 f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly Christian Brabandt <cb@256bit.org> parents: 14762 diff changeset	315 tp->tp_diff_invalid = TRUE;
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly Christian Brabandt <cb@256bit.org> parents: 14762 diff changeset	316 tp->tp_diff_update = TRUE;
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly Christian Brabandt <cb@256bit.org> parents: 14762 diff changeset	317 }
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly Christian Brabandt <cb@256bit.org> parents: 14762 diff changeset	318
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	319 if (line2 == MAXLNUM)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	320 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	321 // mark_adjust(99, MAXLNUM, 9, 0): insert lines
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	322 inserted = amount;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	323 deleted = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	324 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	325 else if (amount_after > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	326 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	327 // mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	328 inserted = amount_after;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	329 deleted = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	330 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	331 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	332 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	333 // mark_adjust(98, 99, MAXLNUM, -2): delete lines
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	334 inserted = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	335 deleted = -amount_after;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	336 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	337
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	338 dprev = NULL;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	339 dp = tp->tp_first_diff;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	340 for (;;)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	341 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	342 // If the change is after the previous diff block and before the next
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	343 // diff block, thus not touching an existing change, create a new diff
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	344 // block. Don't do this when ex_diffgetput() is busy.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	345 if ((dp == NULL \|\| dp->df_lnum[idx] - 1 > line2
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	346 \|\| (line2 == MAXLNUM && dp->df_lnum[idx] > line1))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	347 && (dprev == NULL
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	348 \|\| dprev->df_lnum[idx] + dprev->df_count[idx] < line1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	349 && !diff_busy)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	350 {
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	351 dnext = diff_alloc_new(tp, dprev, dp);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	352 if (dnext == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	353 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	354
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	355 dnext->df_lnum[idx] = line1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	356 dnext->df_count[idx] = inserted;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	357 for (i = 0; i < DB_COUNT; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	358 if (tp->tp_diffbuf[i] != NULL && i != idx)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	359 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	360 if (dprev == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	361 dnext->df_lnum[i] = line1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	362 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	363 dnext->df_lnum[i] = line1
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	364 + (dprev->df_lnum[i] + dprev->df_count[i])
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	365 - (dprev->df_lnum[idx] + dprev->df_count[idx]);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	366 dnext->df_count[i] = deleted;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	367 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	368 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	369
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	370 // if at end of the list, quit
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	371 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	372 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	373
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	374 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	375 * Check for these situations:
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	376 * 1 2 3
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	377 * 1 2 3
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	378 * line1 2 3 4 5
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	379 * 2 3 4 5
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	380 * 2 3 4 5
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	381 * line2 2 3 4 5
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	382 * 3 5 6
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	383 * 3 5 6
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	384 */
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	385 // compute last line of this change
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	386 last = dp->df_lnum[idx] + dp->df_count[idx] - 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	387
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	388 // 1. change completely above line1: nothing to do
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	389 if (last >= line1 - 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	390 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	391 // 6. change below line2: only adjust for amount_after; also when
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	392 // "deleted" became zero when deleted all lines between two diffs
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	393 if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	394 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	395 if (amount_after == 0)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	396 break; // nothing left to change
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	397 dp->df_lnum[idx] += amount_after;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	398 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	399 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	400 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	401 check_unchanged = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	402
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	403 // 2. 3. 4. 5.: inserted/deleted lines touching this diff.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	404 if (deleted > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	405 {
29295 92dd6fef5ace patch 8.2.5164: invalid memory access after diff buffer manipulations Bram Moolenaar <Bram@vim.org> parents: 29293 diff changeset	406 off = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	407 if (dp->df_lnum[idx] >= line1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	408 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	409 if (last <= line2)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	410 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	411 // 4. delete all lines of diff
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	412 if (dp->df_next != NULL
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	413 && dp->df_next->df_lnum[idx] - 1 <= line2)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	414 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	415 // delete continues in next diff, only do
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	416 // lines until that one
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	417 n = dp->df_next->df_lnum[idx] - lnum_deleted;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	418 deleted -= n;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	419 n -= dp->df_count[idx];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	420 lnum_deleted = dp->df_next->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	421 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	422 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	423 n = deleted - dp->df_count[idx];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	424 dp->df_count[idx] = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	425 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	426 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	427 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	428 // 5. delete lines at or just before top of diff
29295 92dd6fef5ace patch 8.2.5164: invalid memory access after diff buffer manipulations Bram Moolenaar <Bram@vim.org> parents: 29293 diff changeset	429 off = dp->df_lnum[idx] - lnum_deleted;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	430 n = off;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	431 dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	432 check_unchanged = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	433 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	434 dp->df_lnum[idx] = line1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	435 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	436 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	437 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	438 if (last < line2)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	439 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	440 // 2. delete at end of diff
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	441 dp->df_count[idx] -= last - lnum_deleted + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	442 if (dp->df_next != NULL
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	443 && dp->df_next->df_lnum[idx] - 1 <= line2)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	444 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	445 // delete continues in next diff, only do
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	446 // lines until that one
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	447 n = dp->df_next->df_lnum[idx] - 1 - last;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	448 deleted -= dp->df_next->df_lnum[idx]
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	449 - lnum_deleted;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	450 lnum_deleted = dp->df_next->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	451 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	452 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	453 n = line2 - last;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	454 check_unchanged = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	455 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	456 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	457 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	458 // 3. delete lines inside the diff
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	459 n = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	460 dp->df_count[idx] -= deleted;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	461 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	462 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	463
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	464 for (i = 0; i < DB_COUNT; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	465 if (tp->tp_diffbuf[i] != NULL && i != idx)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	466 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	467 dp->df_lnum[i] -= off;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	468 dp->df_count[i] += n;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	469 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	470 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	471 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	472 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	473 if (dp->df_lnum[idx] <= line1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	474 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	475 // inserted lines somewhere in this diff
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	476 dp->df_count[idx] += inserted;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	477 check_unchanged = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	478 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	479 else
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	480 // inserted lines somewhere above this diff
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	481 dp->df_lnum[idx] += inserted;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	482 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	483
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	484 if (check_unchanged)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	485 // Check if inserted lines are equal, may reduce the
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	486 // size of the diff. TODO: also check for equal lines
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	487 // in the middle and perhaps split the block.
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	488 diff_check_unchanged(tp, dp);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	489 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	490 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	491
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	492 // check if this block touches the previous one, may merge them.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	493 if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx]
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	494 == dp->df_lnum[idx])
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	495 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	496 for (i = 0; i < DB_COUNT; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	497 if (tp->tp_diffbuf[i] != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	498 dprev->df_count[i] += dp->df_count[i];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	499 dprev->df_next = dp->df_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	500 vim_free(dp);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	501 dp = dprev->df_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	502 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	503 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	504 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	505 // Advance to next entry.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	506 dprev = dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	507 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	508 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	509 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	510
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	511 dprev = NULL;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	512 dp = tp->tp_first_diff;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	513 while (dp != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	514 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	515 // All counts are zero, remove this entry.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	516 for (i = 0; i < DB_COUNT; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	517 if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	518 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	519 if (i == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	520 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	521 dnext = dp->df_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	522 vim_free(dp);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	523 dp = dnext;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	524 if (dprev == NULL)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	525 tp->tp_first_diff = dnext;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	526 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	527 dprev->df_next = dnext;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	528 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	529 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	530 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	531 // Advance to next entry.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	532 dprev = dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	533 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	534 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	535
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	536 }
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	537
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	538 if (tp == curtab)
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	539 {
17851 ba63a184e6b6 patch 8.1.1922: in diff mode global operations can be very slow Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	540 // Don't redraw right away, this updates the diffs, which can be slow.
ba63a184e6b6 patch 8.1.1922: in diff mode global operations can be very slow Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	541 need_diff_redraw = TRUE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	542
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	543 // Need to recompute the scroll binding, may remove or add filler
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	544 // lines (e.g., when adding lines above w_topline). But it's slow when
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	545 // making many changes, postpone until redrawing.
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	546 diff_need_scrollbind = TRUE;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	547 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	548 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	549
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	550 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	551 * Allocate a new diff block and link it between "dprev" and "dp".
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	552 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	553 static diff_T *
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	554 diff_alloc_new(tabpage_T tp, diff_T dprev, diff_T *dp)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	555 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	556 diff_T *dnew;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	557
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16806 diff changeset	558 dnew = ALLOC_ONE(diff_T);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	559 if (dnew != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	560 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	561 dnew->df_next = dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	562 if (dprev == NULL)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	563 tp->tp_first_diff = dnew;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	564 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	565 dprev->df_next = dnew;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	566 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	567 return dnew;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	568 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	569
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	570 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	571 * Check if the diff block "dp" can be made smaller for lines at the start and
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	572 * end that are equal. Called after inserting lines.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	573 * This may result in a change where all buffers have zero lines, the caller
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	574 * must take care of removing it.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	575 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	576 static void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	577 diff_check_unchanged(tabpage_T tp, diff_T dp)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	578 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	579 int i_org;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	580 int i_new;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	581 int off_org, off_new;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	582 char_u *line_org;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	583 int dir = FORWARD;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	584
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	585 // Find the first buffers, use it as the original, compare the other
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	586 // buffer lines against this one.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	587 for (i_org = 0; i_org < DB_COUNT; ++i_org)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	588 if (tp->tp_diffbuf[i_org] != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	589 break;
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	590 if (i_org == DB_COUNT) // safety check
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	591 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	592
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	593 if (diff_check_sanity(tp, dp) == FAIL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	594 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	595
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	596 // First check lines at the top, then at the bottom.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	597 off_org = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	598 off_new = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	599 for (;;)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	600 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	601 // Repeat until a line is found which is different or the number of
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	602 // lines has become zero.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	603 while (dp->df_count[i_org] > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	604 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	605 // Copy the line, the next ml_get() will invalidate it.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	606 if (dir == BACKWARD)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	607 off_org = dp->df_count[i_org] - 1;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	608 line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org],
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	609 dp->df_lnum[i_org] + off_org, FALSE));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	610 if (line_org == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	611 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	612 for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	613 {
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	614 if (tp->tp_diffbuf[i_new] == NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	615 continue;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	616 if (dir == BACKWARD)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	617 off_new = dp->df_count[i_new] - 1;
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	618 // if other buffer doesn't have this line, it was inserted
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	619 if (off_new < 0 \|\| off_new >= dp->df_count[i_new])
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	620 break;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	621 if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new],
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	622 dp->df_lnum[i_new] + off_new, FALSE)) != 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	623 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	624 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	625 vim_free(line_org);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	626
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	627 // Stop when a line isn't equal in all diff buffers.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	628 if (i_new != DB_COUNT)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	629 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	630
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	631 // Line matched in all buffers, remove it from the diff.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	632 for (i_new = i_org; i_new < DB_COUNT; ++i_new)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	633 if (tp->tp_diffbuf[i_new] != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	634 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	635 if (dir == FORWARD)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	636 ++dp->df_lnum[i_new];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	637 --dp->df_count[i_new];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	638 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	639 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	640 if (dir == BACKWARD)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	641 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	642 dir = BACKWARD;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	643 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	644 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	645
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	646 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	647 * Check if a diff block doesn't contain invalid line numbers.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	648 * This can happen when the diff program returns invalid results.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	649 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	650 static int
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	651 diff_check_sanity(tabpage_T tp, diff_T dp)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	652 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	653 int i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	654
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	655 for (i = 0; i < DB_COUNT; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	656 if (tp->tp_diffbuf[i] != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	657 if (dp->df_lnum[i] + dp->df_count[i] - 1
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	658 > tp->tp_diffbuf[i]->b_ml.ml_line_count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	659 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	660 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	661 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	662
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	663 /*
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	664 * Mark all diff buffers in the current tab page for redraw.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	665 */
17851 ba63a184e6b6 patch 8.1.1922: in diff mode global operations can be very slow Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	666 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	667 diff_redraw(
14764 f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly Christian Brabandt <cb@256bit.org> parents: 14762 diff changeset	668 int dofold) // also recompute the folds
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	669 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	670 win_T *wp;
25717 d3f992bc6ef8 patch 8.2.3394: filler lines are wrong when changing text in diff mode Bram Moolenaar <Bram@vim.org> parents: 25709 diff changeset	671 win_T *wp_other = NULL;
26044 2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	672 int used_max_fill_other = FALSE;
2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	673 int used_max_fill_curwin = FALSE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	674 int n;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	675
17851 ba63a184e6b6 patch 8.1.1922: in diff mode global operations can be very slow Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	676 need_diff_redraw = FALSE;
9649 fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07 Christian Brabandt <cb@256bit.org> parents: 9487 diff changeset	677 FOR_ALL_WINDOWS(wp)
29293 bf4d7898cf93 patch 8.2.5163: crash when deleting buffers in diff mode Bram Moolenaar <Bram@vim.org> parents: 28457 diff changeset	678 // when closing windows or wiping buffers skip invalid window
bf4d7898cf93 patch 8.2.5163: crash when deleting buffers in diff mode Bram Moolenaar <Bram@vim.org> parents: 28457 diff changeset	679 if (wp->w_p_diff && buf_valid(wp->w_buffer))
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	680 {
738 5c9e7c6e6e2e updated for version 7.0222 vimboss parents: 694 diff changeset	681 redraw_win_later(wp, SOME_VALID);
25717 d3f992bc6ef8 patch 8.2.3394: filler lines are wrong when changing text in diff mode Bram Moolenaar <Bram@vim.org> parents: 25709 diff changeset	682 if (wp != curwin)
d3f992bc6ef8 patch 8.2.3394: filler lines are wrong when changing text in diff mode Bram Moolenaar <Bram@vim.org> parents: 25709 diff changeset	683 wp_other = wp;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	684 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	685 if (dofold && foldmethodIsDiff(wp))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	686 foldUpdateAll(wp);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	687 #endif
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	688 // A change may have made filler lines invalid, need to take care
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	689 // of that for other windows.
3904 64427849c158 updated for version 7.3.708 Bram Moolenaar <bram@vim.org> parents: 3524 diff changeset	690 n = diff_check(wp, wp->w_topline);
64427849c158 updated for version 7.3.708 Bram Moolenaar <bram@vim.org> parents: 3524 diff changeset	691 if ((wp != curwin && wp->w_topfill > 0) \|\| n > 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	692 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	693 if (wp->w_topfill > n)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	694 wp->w_topfill = (n < 0 ? 0 : n);
3904 64427849c158 updated for version 7.3.708 Bram Moolenaar <bram@vim.org> parents: 3524 diff changeset	695 else if (n > 0 && n > wp->w_topfill)
25717 d3f992bc6ef8 patch 8.2.3394: filler lines are wrong when changing text in diff mode Bram Moolenaar <Bram@vim.org> parents: 25709 diff changeset	696 {
3904 64427849c158 updated for version 7.3.708 Bram Moolenaar <bram@vim.org> parents: 3524 diff changeset	697 wp->w_topfill = n;
25717 d3f992bc6ef8 patch 8.2.3394: filler lines are wrong when changing text in diff mode Bram Moolenaar <Bram@vim.org> parents: 25709 diff changeset	698 if (wp == curwin)
26044 2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	699 used_max_fill_curwin = TRUE;
2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	700 else if (wp_other != NULL)
2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	701 used_max_fill_other = TRUE;
25717 d3f992bc6ef8 patch 8.2.3394: filler lines are wrong when changing text in diff mode Bram Moolenaar <Bram@vim.org> parents: 25709 diff changeset	702 }
5934 e3d2b8d83bb3 updated for version 7.4.308 Bram Moolenaar <bram@vim.org> parents: 5358 diff changeset	703 check_topfill(wp, FALSE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	704 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	705 }
25717 d3f992bc6ef8 patch 8.2.3394: filler lines are wrong when changing text in diff mode Bram Moolenaar <Bram@vim.org> parents: 25709 diff changeset	706
26044 2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	707 if (wp_other != NULL && curwin->w_p_scb)
2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	708 {
2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	709 if (used_max_fill_curwin)
26771 fc859aea8cec patch 8.2.3914: various spelling mistakes in comments Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	710 // The current window was set to use the maximum number of filler
26044 2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	711 // lines, may need to reduce them.
2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	712 diff_set_topline(wp_other, curwin);
2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	713 else if (used_max_fill_other)
26771 fc859aea8cec patch 8.2.3914: various spelling mistakes in comments Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	714 // The other window was set to use the maximum number of filler
26044 2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	715 // lines, may need to reduce them.
2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	716 diff_set_topline(curwin, wp_other);
2e8226c03007 patch 8.2.3556: filler lines are incorrect for other window in diff mode Bram Moolenaar <Bram@vim.org> parents: 25717 diff changeset	717 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	718 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	719
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	720 static void
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	721 clear_diffin(diffin_T *din)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	722 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	723 if (din->din_fname == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	724 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	725 vim_free(din->din_mmfile.ptr);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	726 din->din_mmfile.ptr = NULL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	727 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	728 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	729 mch_remove(din->din_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	730 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	731
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	732 static void
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	733 clear_diffout(diffout_T *dout)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	734 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	735 if (dout->dout_fname == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	736 ga_clear_strings(&dout->dout_ga);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	737 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	738 mch_remove(dout->dout_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	739 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	740
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	741 /*
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	742 * Write buffer "buf" to a memory buffer.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	743 * Return FAIL for failure.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	744 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	745 static int
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	746 diff_write_buffer(buf_T buf, diffin_T din)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	747 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	748 linenr_T lnum;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	749 char_u *s;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	750 long len = 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	751 char_u *ptr;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	752
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	753 // xdiff requires one big block of memory with all the text.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	754 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
14766 7a11facdf74b patch 8.1.0395: compiler warning on 64-bit MS-Windows Christian Brabandt <cb@256bit.org> parents: 14764 diff changeset	755 len += (long)STRLEN(ml_get_buf(buf, lnum, FALSE)) + 1;
16768 695d9ef00b03 patch 8.1.1386: unessesary type casts for lalloc() Bram Moolenaar <Bram@vim.org> parents: 16764 diff changeset	756 ptr = alloc(len);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	757 if (ptr == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	758 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	759 // Allocating memory failed. This can happen, because we try to read
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	760 // the whole buffer text into memory. Set the failed flag, the diff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	761 // will be retried with external diff. The flag is never reset.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	762 buf->b_diff_failed = TRUE;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	763 if (p_verbose > 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	764 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	765 verbose_enter();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15103 diff changeset	766 smsg(_("Not enough memory to use internal diff for buffer \"%s\""),
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	767 buf->b_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	768 verbose_leave();
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	769 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	770 return FAIL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	771 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	772 din->din_mmfile.ptr = (char *)ptr;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	773 din->din_mmfile.size = len;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	774
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	775 len = 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	776 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	777 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	778 for (s = ml_get_buf(buf, lnum, FALSE); *s != NUL; )
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	779 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	780 if (diff_flags & DIFF_ICASE)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	781 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	782 int c;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	783 int orig_len;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	784 char_u cbuf[MB_MAXBYTES + 1];
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	785
26794 83a99f08d1e8 patch 8.2.3925: diff mode confused by NUL bytes Bram Moolenaar <Bram@vim.org> parents: 26786 diff changeset	786 if (*s == NL)
83a99f08d1e8 patch 8.2.3925: diff mode confused by NUL bytes Bram Moolenaar <Bram@vim.org> parents: 26786 diff changeset	787 c = NUL;
83a99f08d1e8 patch 8.2.3925: diff mode confused by NUL bytes Bram Moolenaar <Bram@vim.org> parents: 26786 diff changeset	788 else
83a99f08d1e8 patch 8.2.3925: diff mode confused by NUL bytes Bram Moolenaar <Bram@vim.org> parents: 26786 diff changeset	789 {
83a99f08d1e8 patch 8.2.3925: diff mode confused by NUL bytes Bram Moolenaar <Bram@vim.org> parents: 26786 diff changeset	790 // xdiff doesn't support ignoring case, fold-case the text.
83a99f08d1e8 patch 8.2.3925: diff mode confused by NUL bytes Bram Moolenaar <Bram@vim.org> parents: 26786 diff changeset	791 c = PTR2CHAR(s);
83a99f08d1e8 patch 8.2.3925: diff mode confused by NUL bytes Bram Moolenaar <Bram@vim.org> parents: 26786 diff changeset	792 c = MB_CASEFOLD(c);
83a99f08d1e8 patch 8.2.3925: diff mode confused by NUL bytes Bram Moolenaar <Bram@vim.org> parents: 26786 diff changeset	793 }
18251 c8a53c0daeed patch 8.1.2120: some MB_ macros are more complicated than necessary Bram Moolenaar <Bram@vim.org> parents: 17986 diff changeset	794 orig_len = mb_ptr2len(s);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	795 if (mb_char2bytes(c, cbuf) != orig_len)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	796 // TODO: handle byte length difference
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	797 mch_memmove(ptr + len, s, orig_len);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	798 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	799 mch_memmove(ptr + len, cbuf, orig_len);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	800
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	801 s += orig_len;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	802 len += orig_len;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	803 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	804 else
26794 83a99f08d1e8 patch 8.2.3925: diff mode confused by NUL bytes Bram Moolenaar <Bram@vim.org> parents: 26786 diff changeset	805 {
83a99f08d1e8 patch 8.2.3925: diff mode confused by NUL bytes Bram Moolenaar <Bram@vim.org> parents: 26786 diff changeset	806 ptr[len++] = s == NL ? NUL : s;
83a99f08d1e8 patch 8.2.3925: diff mode confused by NUL bytes Bram Moolenaar <Bram@vim.org> parents: 26786 diff changeset	807 s++;
83a99f08d1e8 patch 8.2.3925: diff mode confused by NUL bytes Bram Moolenaar <Bram@vim.org> parents: 26786 diff changeset	808 }
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	809 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	810 ptr[len++] = NL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	811 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	812 return OK;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	813 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	814
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	815 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	816 * Write buffer "buf" to file or memory buffer.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	817 * Return FAIL for failure.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	818 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	819 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	820 diff_write(buf_T buf, diffin_T din)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	821 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	822 int r;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	823 char_u *save_ff;
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 20772 diff changeset	824 int save_cmod_flags;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	825
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	826 if (din->din_fname == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	827 return diff_write_buffer(buf, din);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	828
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	829 // Always use 'fileformat' set to "unix".
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	830 save_ff = buf->b_p_ff;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	831 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 20772 diff changeset	832 save_cmod_flags = cmdmod.cmod_flags;
18619 788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18590 diff changeset	833 // Writing the buffer is an implementation detail of performing the diff,
788d76db02ac patch 8.1.2302: :lockmarks does not work for '[ and '] Bram Moolenaar <Bram@vim.org> parents: 18590 diff changeset	834 // so it shouldn't update the '[ and '] marks.
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 20772 diff changeset	835 cmdmod.cmod_flags \|= CMOD_LOCKMARKS;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	836 r = buf_write(buf, din->din_fname, NULL,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	837 (linenr_T)1, buf->b_ml.ml_line_count,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	838 NULL, FALSE, FALSE, FALSE, TRUE);
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 20772 diff changeset	839 cmdmod.cmod_flags = save_cmod_flags;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	840 free_string_option(buf->b_p_ff);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	841 buf->b_p_ff = save_ff;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	842 return r;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	843 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	844
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	845 /*
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	846 * Update the diffs for all buffers involved.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	847 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	848 static void
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	849 diff_try_update(
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	850 diffio_T *dio,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	851 int idx_orig,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	852 exarg_T *eap) // "eap" can be NULL
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	853 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	854 buf_T *buf;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	855 int idx_new;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	856
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	857 if (dio->dio_internal)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	858 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	859 ga_init2(&dio->dio_diff.dout_ga, sizeof(char *), 1000);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	860 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	861 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	862 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	863 // We need three temp file names.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	864 dio->dio_orig.din_fname = vim_tempname('o', TRUE);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	865 dio->dio_new.din_fname = vim_tempname('n', TRUE);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	866 dio->dio_diff.dout_fname = vim_tempname('d', TRUE);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	867 if (dio->dio_orig.din_fname == NULL
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	868 \|\| dio->dio_new.din_fname == NULL
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	869 \|\| dio->dio_diff.dout_fname == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	870 goto theend;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	871 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	872
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	873 // Check external diff is actually working.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	874 if (!dio->dio_internal && check_external_diff(dio) == FAIL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	875 goto theend;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	876
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	877 // :diffupdate!
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	878 if (eap != NULL && eap->forceit)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	879 for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	880 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	881 buf = curtab->tp_diffbuf[idx_new];
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	882 if (buf_valid(buf))
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	883 buf_check_timestamp(buf, FALSE);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	884 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	885
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	886 // Write the first buffer to a tempfile or mmfile_t.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	887 buf = curtab->tp_diffbuf[idx_orig];
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	888 if (diff_write(buf, &dio->dio_orig) == FAIL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	889 goto theend;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	890
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	891 // Make a difference between the first buffer and every other.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	892 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	893 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	894 buf = curtab->tp_diffbuf[idx_new];
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	895 if (buf == NULL \|\| buf->b_ml.ml_mfp == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	896 continue; // skip buffer that isn't loaded
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	897
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	898 // Write the other buffer and diff with the first one.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	899 if (diff_write(buf, &dio->dio_new) == FAIL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	900 continue;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	901 if (diff_file(dio) == FAIL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	902 continue;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	903
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	904 // Read the diff output and add each entry to the diff list.
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	905 diff_read(idx_orig, idx_new, dio);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	906
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	907 clear_diffin(&dio->dio_new);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	908 clear_diffout(&dio->dio_diff);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	909 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	910 clear_diffin(&dio->dio_orig);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	911
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	912 theend:
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	913 vim_free(dio->dio_orig.din_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	914 vim_free(dio->dio_new.din_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	915 vim_free(dio->dio_diff.dout_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	916 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	917
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	918 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	919 * Return TRUE if the options are set to use the internal diff library.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	920 * Note that if the internal diff failed for one of the buffers, the external
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	921 * diff will be used anyway.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	922 */
14764 f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly Christian Brabandt <cb@256bit.org> parents: 14762 diff changeset	923 int
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	924 diff_internal(void)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	925 {
15971 ced614446eaa patch 8.1.0991: cannot build with a mix of features Bram Moolenaar <Bram@vim.org> parents: 15900 diff changeset	926 return (diff_flags & DIFF_INTERNAL) != 0
ced614446eaa patch 8.1.0991: cannot build with a mix of features Bram Moolenaar <Bram@vim.org> parents: 15900 diff changeset	927 #ifdef FEAT_EVAL
ced614446eaa patch 8.1.0991: cannot build with a mix of features Bram Moolenaar <Bram@vim.org> parents: 15900 diff changeset	928 && *p_dex == NUL
ced614446eaa patch 8.1.0991: cannot build with a mix of features Bram Moolenaar <Bram@vim.org> parents: 15900 diff changeset	929 #endif
ced614446eaa patch 8.1.0991: cannot build with a mix of features Bram Moolenaar <Bram@vim.org> parents: 15900 diff changeset	930 ;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	931 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	932
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	933 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	934 * Return TRUE if the internal diff failed for one of the diff buffers.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	935 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	936 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	937 diff_internal_failed(void)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	938 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	939 int idx;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	940
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	941 // Only need to do something when there is another buffer.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	942 for (idx = 0; idx < DB_COUNT; ++idx)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	943 if (curtab->tp_diffbuf[idx] != NULL
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	944 && curtab->tp_diffbuf[idx]->b_diff_failed)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	945 return TRUE;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	946 return FALSE;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	947 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	948
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	949 /*
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	950 * Completely update the diffs for the buffers involved.
14764 f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly Christian Brabandt <cb@256bit.org> parents: 14762 diff changeset	951 * When using the external "diff" command the buffers are written to a file,
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly Christian Brabandt <cb@256bit.org> parents: 14762 diff changeset	952 * also for unmodified buffers (the file could have been produced by
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly Christian Brabandt <cb@256bit.org> parents: 14762 diff changeset	953 * autocommands, e.g. the netrw plugin).
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	954 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	955 void
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	956 ex_diffupdate(exarg_T *eap) // "eap" can be NULL
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	957 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	958 int idx_orig;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	959 int idx_new;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	960 diffio_T diffio;
14780 552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	961 int had_diffs = curtab->tp_first_diff != NULL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	962
14776 09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget Christian Brabandt <cb@256bit.org> parents: 14770 diff changeset	963 if (diff_busy)
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget Christian Brabandt <cb@256bit.org> parents: 14770 diff changeset	964 {
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget Christian Brabandt <cb@256bit.org> parents: 14770 diff changeset	965 diff_need_update = TRUE;
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget Christian Brabandt <cb@256bit.org> parents: 14770 diff changeset	966 return;
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget Christian Brabandt <cb@256bit.org> parents: 14770 diff changeset	967 }
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget Christian Brabandt <cb@256bit.org> parents: 14770 diff changeset	968
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	969 // Delete all diffblocks.
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	970 diff_clear(curtab);
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	971 curtab->tp_diff_invalid = FALSE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	972
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	973 // Use the first buffer as the original text.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	974 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	975 if (curtab->tp_diffbuf[idx_orig] != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	976 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	977 if (idx_orig == DB_COUNT)
14780 552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	978 goto theend;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	979
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	980 // Only need to do something when there is another buffer.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	981 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	982 if (curtab->tp_diffbuf[idx_new] != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	983 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	984 if (idx_new == DB_COUNT)
14780 552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	985 goto theend;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	986
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	987 // Only use the internal method if it did not fail for one of the buffers.
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19888 diff changeset	988 CLEAR_FIELD(diffio);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	989 diffio.dio_internal = diff_internal() && !diff_internal_failed();
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	990
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	991 diff_try_update(&diffio, idx_orig, eap);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	992 if (diffio.dio_internal && diff_internal_failed())
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	993 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	994 // Internal diff failed, use external diff instead.
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19888 diff changeset	995 CLEAR_FIELD(diffio);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	996 diff_try_update(&diffio, idx_orig, eap);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	997 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	998
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	999 // force updating cursor position on screen
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1000 curwin->w_valid_cursor.lnum = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1001
14780 552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	1002 theend:
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	1003 // A redraw is needed if there were diffs and they were cleared, or there
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	1004 // are diffs now, which means they got updated.
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	1005 if (had_diffs \|\| curtab->tp_first_diff != NULL)
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	1006 {
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	1007 diff_redraw(TRUE);
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	1008 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	1009 }
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1010 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1011
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1012 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1013 * Do a quick test if "diff" really works. Otherwise it looks like there
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1014 * are no differences. Can't use the return value, it's non-zero when
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1015 * there are differences.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1016 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1017 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1018 check_external_diff(diffio_T *diffio)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1019 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1020 FILE *fd;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1021 int ok;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1022 int io_error = FALSE;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1023
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1024 // May try twice, first with "-a" and then without.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1025 for (;;)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1026 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1027 ok = FALSE;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1028 fd = mch_fopen((char *)diffio->dio_orig.din_fname, "w");
1757 f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1029 if (fd == NULL)
f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1030 io_error = TRUE;
f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1031 else
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1032 {
1757 f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1033 if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1034 io_error = TRUE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1035 fclose(fd);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1036 fd = mch_fopen((char *)diffio->dio_new.din_fname, "w");
1757 f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1037 if (fd == NULL)
f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1038 io_error = TRUE;
f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1039 else
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1040 {
1757 f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1041 if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1042 io_error = TRUE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1043 fclose(fd);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1044 fd = NULL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1045 if (diff_file(diffio) == OK)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1046 fd = mch_fopen((char *)diffio->dio_diff.dout_fname, "r");
1757 f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1047 if (fd == NULL)
f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1048 io_error = TRUE;
f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1049 else
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1050 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1051 char_u linebuf[LBUFLEN];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1052
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1053 for (;;)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1054 {
24683 05c199ea8295 patch 8.2.2880: unified diff fails if actually used Bram Moolenaar <Bram@vim.org> parents: 23895 diff changeset	1055 // For normal diff there must be a line that contains
05c199ea8295 patch 8.2.2880: unified diff fails if actually used Bram Moolenaar <Bram@vim.org> parents: 23895 diff changeset	1056 // "1c1". For unified diff "@@ -1 +1 @@".
15840 734b1928a5aa patch 8.1.0927: USE_CR is never defined Bram Moolenaar <Bram@vim.org> parents: 15595 diff changeset	1057 if (vim_fgets(linebuf, LBUFLEN, fd))
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1058 break;
24683 05c199ea8295 patch 8.2.2880: unified diff fails if actually used Bram Moolenaar <Bram@vim.org> parents: 23895 diff changeset	1059 if (STRNCMP(linebuf, "1c1", 3) == 0
05c199ea8295 patch 8.2.2880: unified diff fails if actually used Bram Moolenaar <Bram@vim.org> parents: 23895 diff changeset	1060 \|\| STRNCMP(linebuf, "@@ -1 +1 @@", 11) == 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1061 ok = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1062 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1063 fclose(fd);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1064 }
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1065 mch_remove(diffio->dio_diff.dout_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1066 mch_remove(diffio->dio_new.din_fname);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1067 }
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1068 mch_remove(diffio->dio_orig.din_fname);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1069 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1070
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1071 #ifdef FEAT_EVAL
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1072 // When using 'diffexpr' break here.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1073 if (*p_dex != NUL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1074 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1075 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1076
8212 05b88224cea1 commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce Christian Brabandt <cb@256bit.org> parents: 7817 diff changeset	1077 #if defined(MSWIN)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1078 // If the "-a" argument works, also check if "--binary" works.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1079 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1080 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1081 diff_a_works = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1082 diff_bin_works = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1083 continue;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1084 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1085 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1086 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1087 // Tried --binary, but it failed. "-a" works though.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1088 diff_bin_works = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1089 ok = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1090 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1091 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1092
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1093 // If we checked if "-a" works already, break here.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1094 if (diff_a_works != MAYBE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1095 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1096 diff_a_works = ok;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1097
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1098 // If "-a" works break here, otherwise retry without "-a".
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1099 if (ok)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1100 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1101 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1102 if (!ok)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1103 {
1757 f10fe14748e2 updated for version 7.2-055 vimboss parents: 1519 diff changeset	1104 if (io_error)
26962 85866e069c24 patch 8.2.4010: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	1105 emsg(_(e_cannot_read_or_write_temp_files));
26602 fac6673086df patch 8.2.3830: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26044 diff changeset	1106 emsg(_(e_cannot_create_diffs));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1107 diff_a_works = MAYBE;
8212 05b88224cea1 commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce Christian Brabandt <cb@256bit.org> parents: 7817 diff changeset	1108 #if defined(MSWIN)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1109 diff_bin_works = MAYBE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1110 #endif
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1111 return FAIL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1112 }
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1113 return OK;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1114 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1115
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1116 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1117 * Invoke the xdiff function.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1118 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1119 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1120 diff_file_internal(diffio_T *diffio)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1121 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1122 xpparam_t param;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1123 xdemitconf_t emit_cfg;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1124 xdemitcb_t emit_cb;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1125
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19888 diff changeset	1126 CLEAR_FIELD(param);
aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19888 diff changeset	1127 CLEAR_FIELD(emit_cfg);
aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19888 diff changeset	1128 CLEAR_FIELD(emit_cb);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1129
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1130 param.flags = diff_algorithm;
3524 d8ce4a2eb44e updated for version 7.3.523 Bram Moolenaar <bram@vim.org> parents: 2583 diff changeset	1131
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1132 if (diff_flags & DIFF_IWHITE)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1133 param.flags \|= XDF_IGNORE_WHITESPACE_CHANGE;
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	1134 if (diff_flags & DIFF_IWHITEALL)
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	1135 param.flags \|= XDF_IGNORE_WHITESPACE;
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	1136 if (diff_flags & DIFF_IWHITEEOL)
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	1137 param.flags \|= XDF_IGNORE_WHITESPACE_AT_EOL;
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	1138 if (diff_flags & DIFF_IBLANK)
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	1139 param.flags \|= XDF_IGNORE_BLANK_LINES;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1140
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1141 emit_cfg.ctxlen = 0; // don't need any diff_context here
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1142 emit_cb.priv = &diffio->dio_diff;
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1143 emit_cfg.hunk_func = xdiff_out;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1144 if (xdl_diff(&diffio->dio_orig.din_mmfile,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1145 &diffio->dio_new.din_mmfile,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1146 &param, &emit_cfg, &emit_cb) < 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1147 {
26966 ac75c145f0a9 patch 8.2.4012: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26962 diff changeset	1148 emsg(_(e_problem_creating_internal_diff));
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1149 return FAIL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1150 }
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1151 return OK;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1152 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1153
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1154 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1155 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1156 * return OK or FAIL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1157 */
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1158 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1159 diff_file(diffio_T *dio)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1160 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1161 char_u *cmd;
1872 f13849167330 updated for version 7.2-169 vimboss parents: 1835 diff changeset	1162 size_t len;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1163 char_u *tmp_orig = dio->dio_orig.din_fname;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1164 char_u *tmp_new = dio->dio_new.din_fname;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1165 char_u *tmp_diff = dio->dio_diff.dout_fname;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1166
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1167 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1168 if (*p_dex != NUL)
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1169 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1170 // Use 'diffexpr' to generate the diff file.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1171 eval_diff(tmp_orig, tmp_new, tmp_diff);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1172 return OK;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1173 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1174 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1175 #endif
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1176 // Use xdiff for generating the diff.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1177 if (dio->dio_internal)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1178 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1179 return diff_file_internal(dio);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1180 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1181 else
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1182 {
1872 f13849167330 updated for version 7.2-169 vimboss parents: 1835 diff changeset	1183 len = STRLEN(tmp_orig) + STRLEN(tmp_new)
f13849167330 updated for version 7.2-169 vimboss parents: 1835 diff changeset	1184 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27;
16764 ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 15971 diff changeset	1185 cmd = alloc(len);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1186 if (cmd == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1187 return FAIL;
193 eee3fa1b0197 updated for version 7.0058 vimboss parents: 28 diff changeset	1188
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1189 // We don't want $DIFF_OPTIONS to get in the way.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1190 if (getenv("DIFF_OPTIONS"))
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1191 vim_setenv((char_u )"DIFF_OPTIONS", (char_u )"");
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1192
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1193 // Build the diff command and execute it. Always use -a, binary
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1194 // differences are of no use. Ignore errors, diff returns
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1195 // non-zero when differences have been found.
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	1196 vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s%s%s%s %s",
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1197 diff_a_works == FALSE ? "" : "-a ",
8212 05b88224cea1 commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce Christian Brabandt <cb@256bit.org> parents: 7817 diff changeset	1198 #if defined(MSWIN)
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1199 diff_bin_works == TRUE ? "--binary " : "",
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1200 #else
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1201 "",
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1202 #endif
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1203 (diff_flags & DIFF_IWHITE) ? "-b " : "",
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	1204 (diff_flags & DIFF_IWHITEALL) ? "-w " : "",
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	1205 (diff_flags & DIFF_IWHITEEOL) ? "-Z " : "",
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	1206 (diff_flags & DIFF_IBLANK) ? "-B " : "",
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1207 (diff_flags & DIFF_ICASE) ? "-i " : "",
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1208 tmp_orig, tmp_new);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1209 append_redir(cmd, (int)len, p_srr, tmp_diff);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1210 block_autocmds(); // avoid ShellCmdPost stuff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1211 (void)call_shell(cmd, SHELL_FILTER\|SHELL_SILENT\|SHELL_DOOUT);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1212 unblock_autocmds();
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1213 vim_free(cmd);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1214 return OK;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1215 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1216 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1217
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1218 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1219 * Create a new version of a file from the current buffer and a diff file.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1220 * The buffer is written to a file, also for unmodified buffers (the file
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1221 * could have been produced by autocommands, e.g. the netrw plugin).
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1222 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1223 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1224 ex_diffpatch(exarg_T *eap)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1225 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1226 char_u *tmp_orig; // name of original temp file
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1227 char_u *tmp_new; // name of patched temp file
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1228 char_u *buf = NULL;
1872 f13849167330 updated for version 7.2-169 vimboss parents: 1835 diff changeset	1229 size_t buflen;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1230 win_T *old_curwin = curwin;
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1231 char_u *newname = NULL; // name of patched file buffer
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1232 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1233 char_u dirbuf[MAXPATHL];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1234 char_u *fullname = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1235 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1236 #ifdef FEAT_BROWSE
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1237 char_u *browseFile = NULL;
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 20772 diff changeset	1238 int save_cmod_flags = cmdmod.cmod_flags;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1239 #endif
9387 f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8368 diff changeset	1240 stat_T st;
11113 081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote Christian Brabandt <cb@256bit.org> parents: 11109 diff changeset	1241 char_u *esc_name = NULL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1242
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1243 #ifdef FEAT_BROWSE
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 20772 diff changeset	1244 if (cmdmod.cmod_flags & CMOD_BROWSE)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1245 {
28 726bdc53fa49 updated for version 7.0018 vimboss parents: 16 diff changeset	1246 browseFile = do_browse(0, (char_u *)_("Patch file"),
13802 378f9f8e6d8f patch 8.0.1773: dialog messages are not translated Christian Brabandt <cb@256bit.org> parents: 13384 diff changeset	1247 eap->arg, NULL, NULL,
378f9f8e6d8f patch 8.0.1773: dialog messages are not translated Christian Brabandt <cb@256bit.org> parents: 13384 diff changeset	1248 (char_u *)_(BROWSE_FILTER_ALL_FILES), NULL);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1249 if (browseFile == NULL)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1250 return; // operation cancelled
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1251 eap->arg = browseFile;
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 20772 diff changeset	1252 cmdmod.cmod_flags &= ~CMOD_BROWSE; // don't let do_ecmd() browse again
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1253 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1254 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1255
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1256 // We need two temp file names.
6721 7347229a646a updated for version 7.4.684 Bram Moolenaar <bram@vim.org> parents: 6314 diff changeset	1257 tmp_orig = vim_tempname('o', FALSE);
7347229a646a updated for version 7.4.684 Bram Moolenaar <bram@vim.org> parents: 6314 diff changeset	1258 tmp_new = vim_tempname('n', FALSE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1259 if (tmp_orig == NULL \|\| tmp_new == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1260 goto theend;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1261
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1262 // Write the current buffer to "tmp_orig".
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1263 if (buf_write(curbuf, tmp_orig, NULL,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1264 (linenr_T)1, curbuf->b_ml.ml_line_count,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1265 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1266 goto theend;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1267
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1268 #ifdef UNIX
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1269 // Get the absolute path of the patchfile, changing directory below.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1270 fullname = FullName_save(eap->arg, FALSE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1271 #endif
11113 081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote Christian Brabandt <cb@256bit.org> parents: 11109 diff changeset	1272 esc_name = vim_strsave_shellescape(
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1273 # ifdef UNIX
11113 081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote Christian Brabandt <cb@256bit.org> parents: 11109 diff changeset	1274 fullname != NULL ? fullname :
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1275 # endif
11113 081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote Christian Brabandt <cb@256bit.org> parents: 11109 diff changeset	1276 eap->arg, TRUE, TRUE);
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote Christian Brabandt <cb@256bit.org> parents: 11109 diff changeset	1277 if (esc_name == NULL)
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote Christian Brabandt <cb@256bit.org> parents: 11109 diff changeset	1278 goto theend;
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote Christian Brabandt <cb@256bit.org> parents: 11109 diff changeset	1279 buflen = STRLEN(tmp_orig) + STRLEN(esc_name) + STRLEN(tmp_new) + 16;
16764 ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 15971 diff changeset	1280 buf = alloc(buflen);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1281 if (buf == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1282 goto theend;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1283
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1284 #ifdef UNIX
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1285 // Temporarily chdir to /tmp, to avoid patching files in the current
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1286 // directory when the patch file contains more than one patch. When we
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1287 // have our own temp dir use that instead, it will be cleaned up when we
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1288 // exit (any .rej files created). Don't change directory if we can't
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1289 // return to the current.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1290 if (mch_dirname(dirbuf, MAXPATHL) != OK \|\| mch_chdir((char *)dirbuf) != 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1291 dirbuf[0] = NUL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1292 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1293 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1294 # ifdef TEMPDIRNAMES
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1295 if (vim_tempdir != NULL)
14730 193471015e1a patch 8.1.0377: xdiff doesn't use the Vim memory allocation functions Christian Brabandt <cb@256bit.org> parents: 14726 diff changeset	1296 vim_ignored = mch_chdir((char *)vim_tempdir);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1297 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1298 # endif
14730 193471015e1a patch 8.1.0377: xdiff doesn't use the Vim memory allocation functions Christian Brabandt <cb@256bit.org> parents: 14726 diff changeset	1299 vim_ignored = mch_chdir("/tmp");
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1300 shorten_fnames(TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1301 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1302 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1303
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1304 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1305 if (*p_pex != NUL)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1306 // Use 'patchexpr' to generate the new file.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1307 eval_patch(tmp_orig,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1308 # ifdef UNIX
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1309 fullname != NULL ? fullname :
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1310 # endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1311 eap->arg, tmp_new);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1312 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1313 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1314 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1315 // Build the patch command and execute it. Ignore errors. Switch to
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1316 // cooked mode to allow the user to respond to prompts.
11113 081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote Christian Brabandt <cb@256bit.org> parents: 11109 diff changeset	1317 vim_snprintf((char *)buf, buflen, "patch -o %s %s < %s",
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote Christian Brabandt <cb@256bit.org> parents: 11109 diff changeset	1318 tmp_new, tmp_orig, esc_name);
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1319 block_autocmds(); // Avoid ShellCmdPost stuff
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1320 (void)call_shell(buf, SHELL_FILTER \| SHELL_COOKED);
1410 cdd82acd75b4 updated for version 7.1-125 vimboss parents: 1075 diff changeset	1321 unblock_autocmds();
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1322 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1323
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1324 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1325 if (dirbuf[0] != NUL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1326 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1327 if (mch_chdir((char *)dirbuf) != 0)
26877 06a137af96f8 patch 8.2.3967: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26829 diff changeset	1328 emsg(_(e_cannot_go_back_to_previous_directory));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1329 shorten_fnames(TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1330 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1331 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1332
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1333 // patch probably has written over the screen
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1334 redraw_later(CLEAR);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1335
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1336 // Delete any .orig or .rej file created.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1337 STRCPY(buf, tmp_new);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1338 STRCAT(buf, ".orig");
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1339 mch_remove(buf);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1340 STRCPY(buf, tmp_new);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1341 STRCAT(buf, ".rej");
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1342 mch_remove(buf);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1343
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1344 // Only continue if the output file was created.
1942 fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1345 if (mch_stat((char *)tmp_new, &st) < 0 \|\| st.st_size == 0)
26962 85866e069c24 patch 8.2.4010: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	1346 emsg(_(e_cannot_read_patch_output));
1942 fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1347 else
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1348 {
1942 fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1349 if (curbuf->b_fname != NULL)
fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1350 {
fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1351 newname = vim_strnsave(curbuf->b_fname,
20751 d9a2e5dcfd9f patch 8.2.0928: many type casts are used for vim_strnsave() Bram Moolenaar <Bram@vim.org> parents: 20599 diff changeset	1352 STRLEN(curbuf->b_fname) + 4);
1942 fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1353 if (newname != NULL)
fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1354 STRCAT(newname, ".new");
fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1355 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1356
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1357 #ifdef FEAT_GUI
1942 fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1358 need_mouse_correct = TRUE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1359 #endif
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1360 // don't use a new tab page, each tab page has its own diffs
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 20772 diff changeset	1361 cmdmod.cmod_tab = 0;
682 f1b013312711 updated for version 7.0205 vimboss parents: 681 diff changeset	1362
1942 fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1363 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1364 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1365 // Pretend it was a ":split fname" command
1942 fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1366 eap->cmdidx = CMD_split;
fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1367 eap->arg = tmp_new;
fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1368 do_exedit(eap, old_curwin);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1369
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1370 // check that split worked and editing tmp_new
1942 fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1371 if (curwin != old_curwin && win_valid(old_curwin))
fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1372 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1373 // Set 'diff', 'scrollbind' on and 'wrap' off.
1942 fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1374 diff_win_options(curwin, TRUE);
fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1375 diff_win_options(old_curwin, TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1376
1942 fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1377 if (newname != NULL)
fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1378 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1379 // do a ":file filename.new" on the patched buffer
1942 fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1380 eap->arg = newname;
fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1381 ex_file(eap);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1382
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1383 // Do filetype detection with the new name.
1942 fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1384 if (au_has_group((char_u *)"filetypedetect"))
fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1385 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
fe26299d6f70 updated for version 7.2-239 vimboss parents: 1876 diff changeset	1386 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1387 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1388 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1389 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1390
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1391 theend:
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1392 if (tmp_orig != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1393 mch_remove(tmp_orig);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1394 vim_free(tmp_orig);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1395 if (tmp_new != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1396 mch_remove(tmp_new);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1397 vim_free(tmp_new);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1398 vim_free(newname);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1399 vim_free(buf);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1400 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1401 vim_free(fullname);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1402 #endif
11113 081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote Christian Brabandt <cb@256bit.org> parents: 11109 diff changeset	1403 vim_free(esc_name);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1404 #ifdef FEAT_BROWSE
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1405 vim_free(browseFile);
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 20772 diff changeset	1406 cmdmod.cmod_flags = save_cmod_flags;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1407 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1408 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1409
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1410 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1411 * Split the window and edit another file, setting options to show the diffs.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1412 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1413 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1414 ex_diffsplit(exarg_T *eap)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1415 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1416 win_T *old_curwin = curwin;
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9387 diff changeset	1417 bufref_T old_curbuf;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1418
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9387 diff changeset	1419 set_bufref(&old_curbuf, curbuf);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1420 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1421 need_mouse_correct = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1422 #endif
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1423 // Need to compute w_fraction when no redraw happened yet.
10013 942d40a92be6 commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028 Christian Brabandt <cb@256bit.org> parents: 10005 diff changeset	1424 validate_cursor();
942d40a92be6 commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028 Christian Brabandt <cb@256bit.org> parents: 10005 diff changeset	1425 set_fraction(curwin);
942d40a92be6 commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028 Christian Brabandt <cb@256bit.org> parents: 10005 diff changeset	1426
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1427 // don't use a new tab page, each tab page has its own diffs
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 20772 diff changeset	1428 cmdmod.cmod_tab = 0;
682 f1b013312711 updated for version 7.0205 vimboss parents: 681 diff changeset	1429
764 986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	1430 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1431 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1432 // Pretend it was a ":split fname" command
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1433 eap->cmdidx = CMD_split;
449 3709cf52b9b5 updated for version 7.0119 vimboss parents: 358 diff changeset	1434 curwin->w_p_diff = TRUE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1435 do_exedit(eap, old_curwin);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1436
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1437 if (curwin != old_curwin) // split must have worked
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1438 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1439 // Set 'diff', 'scrollbind' on and 'wrap' off.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1440 diff_win_options(curwin, TRUE);
7338 96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b Christian Brabandt <cb@256bit.org> parents: 6985 diff changeset	1441 if (win_valid(old_curwin))
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b Christian Brabandt <cb@256bit.org> parents: 6985 diff changeset	1442 {
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b Christian Brabandt <cb@256bit.org> parents: 6985 diff changeset	1443 diff_win_options(old_curwin, TRUE);
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b Christian Brabandt <cb@256bit.org> parents: 6985 diff changeset	1444
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9387 diff changeset	1445 if (bufref_valid(&old_curbuf))
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1446 // Move the cursor position to that of the old window.
7338 96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b Christian Brabandt <cb@256bit.org> parents: 6985 diff changeset	1447 curwin->w_cursor.lnum = diff_get_corresponding_line(
10295 d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	1448 old_curbuf.br_buf, old_curwin->w_cursor.lnum);
7338 96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b Christian Brabandt <cb@256bit.org> parents: 6985 diff changeset	1449 }
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1450 // Now that lines are folded scroll to show the cursor at the same
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1451 // relative position.
10013 942d40a92be6 commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028 Christian Brabandt <cb@256bit.org> parents: 10005 diff changeset	1452 scroll_to_fraction(curwin, curwin->w_height);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1453 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1454 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1455 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1456
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1457 /*
4352 04736b4030ec updated for version 7.3.925 Bram Moolenaar <bram@vim.org> parents: 4236 diff changeset	1458 * Set options to show diffs for the current window.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1459 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1460 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1461 ex_diffthis(exarg_T *eap UNUSED)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1462 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1463 // Set 'diff', 'scrollbind' on and 'wrap' off.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1464 diff_win_options(curwin, TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1465 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1466
11707 1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1467 static void
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1468 set_diff_option(win_T *wp, int value)
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1469 {
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1470 win_T *old_curwin = curwin;
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1471
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1472 curwin = wp;
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1473 curbuf = curwin->w_buffer;
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1474 ++curbuf_lock;
28457 4dcccb2673fe patch 8.2.4753: error from setting an option is silently ignored Bram Moolenaar <Bram@vim.org> parents: 28197 diff changeset	1475 set_option_value_give_err((char_u *)"diff", (long)value, NULL, OPT_LOCAL);
11707 1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1476 --curbuf_lock;
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1477 curwin = old_curwin;
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1478 curbuf = curwin->w_buffer;
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1479 }
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1480
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1481 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1482 * Set options in window "wp" for diff mode.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1483 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1484 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1485 diff_win_options(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1486 win_T *wp,
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1487 int addbuf) // Add buffer to diff.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1488 {
2086 c11845a465ae updated for version 7.2.370 Bram Moolenaar <bram@zimbu.org> parents: 1942 diff changeset	1489 # ifdef FEAT_FOLDING
c11845a465ae updated for version 7.2.370 Bram Moolenaar <bram@zimbu.org> parents: 1942 diff changeset	1490 win_T *old_curwin = curwin;
c11845a465ae updated for version 7.2.370 Bram Moolenaar <bram@zimbu.org> parents: 1942 diff changeset	1491
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1492 // close the manually opened folds
2086 c11845a465ae updated for version 7.2.370 Bram Moolenaar <bram@zimbu.org> parents: 1942 diff changeset	1493 curwin = wp;
c11845a465ae updated for version 7.2.370 Bram Moolenaar <bram@zimbu.org> parents: 1942 diff changeset	1494 newFoldLevel();
c11845a465ae updated for version 7.2.370 Bram Moolenaar <bram@zimbu.org> parents: 1942 diff changeset	1495 curwin = old_curwin;
c11845a465ae updated for version 7.2.370 Bram Moolenaar <bram@zimbu.org> parents: 1942 diff changeset	1496 # endif
c11845a465ae updated for version 7.2.370 Bram Moolenaar <bram@zimbu.org> parents: 1942 diff changeset	1497
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1498 // Use 'scrollbind' and 'cursorbind' when available
6897 d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1499 if (!wp->w_p_diff)
5102 11d0c6df1d7b updated for version 7.3.1294 Bram Moolenaar <bram@vim.org> parents: 4352 diff changeset	1500 wp->w_p_scb_save = wp->w_p_scb;
2583 7c2e6ba1d702 updated for version 7.3.008 Bram Moolenaar <bram@vim.org> parents: 2445 diff changeset	1501 wp->w_p_scb = TRUE;
6897 d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1502 if (!wp->w_p_diff)
5102 11d0c6df1d7b updated for version 7.3.1294 Bram Moolenaar <bram@vim.org> parents: 4352 diff changeset	1503 wp->w_p_crb_save = wp->w_p_crb;
2250 1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	1504 wp->w_p_crb = TRUE;
23895 e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	1505 if (!(diff_flags & DIFF_FOLLOWWRAP))
e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	1506 {
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1507 if (!wp->w_p_diff)
23895 e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	1508 wp->w_p_wrap_save = wp->w_p_wrap;
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1509 wp->w_p_wrap = FALSE;
23895 e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	1510 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1511 # ifdef FEAT_FOLDING
6897 d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1512 if (!wp->w_p_diff)
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1513 {
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1514 if (wp->w_p_diff_saved)
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1515 free_string_option(wp->w_p_fdm_save);
5102 11d0c6df1d7b updated for version 7.3.1294 Bram Moolenaar <bram@vim.org> parents: 4352 diff changeset	1516 wp->w_p_fdm_save = vim_strsave(wp->w_p_fdm);
6897 d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1517 }
16806 306766ed0f70 patch 8.1.1405: "highlight" option of popup windows not supported Bram Moolenaar <Bram@vim.org> parents: 16768 diff changeset	1518 set_string_option_direct_in_win(wp, (char_u )"fdm", -1, (char_u )"diff",
694 07d199fe02ed updated for version 7.0209 vimboss parents: 682 diff changeset	1519 OPT_LOCAL\|OPT_FREE, 0);
6897 d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1520 if (!wp->w_p_diff)
5102 11d0c6df1d7b updated for version 7.3.1294 Bram Moolenaar <bram@vim.org> parents: 4352 diff changeset	1521 {
11d0c6df1d7b updated for version 7.3.1294 Bram Moolenaar <bram@vim.org> parents: 4352 diff changeset	1522 wp->w_p_fdc_save = wp->w_p_fdc;
11d0c6df1d7b updated for version 7.3.1294 Bram Moolenaar <bram@vim.org> parents: 4352 diff changeset	1523 wp->w_p_fen_save = wp->w_p_fen;
11d0c6df1d7b updated for version 7.3.1294 Bram Moolenaar <bram@vim.org> parents: 4352 diff changeset	1524 wp->w_p_fdl_save = wp->w_p_fdl;
11d0c6df1d7b updated for version 7.3.1294 Bram Moolenaar <bram@vim.org> parents: 4352 diff changeset	1525 }
2086 c11845a465ae updated for version 7.2.370 Bram Moolenaar <bram@zimbu.org> parents: 1942 diff changeset	1526 wp->w_p_fdc = diff_foldcolumn;
c11845a465ae updated for version 7.2.370 Bram Moolenaar <bram@zimbu.org> parents: 1942 diff changeset	1527 wp->w_p_fen = TRUE;
c11845a465ae updated for version 7.2.370 Bram Moolenaar <bram@zimbu.org> parents: 1942 diff changeset	1528 wp->w_p_fdl = 0;
c11845a465ae updated for version 7.2.370 Bram Moolenaar <bram@zimbu.org> parents: 1942 diff changeset	1529 foldUpdateAll(wp);
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1530 // make sure topline is not halfway a fold
2086 c11845a465ae updated for version 7.2.370 Bram Moolenaar <bram@zimbu.org> parents: 1942 diff changeset	1531 changed_window_setting_win(wp);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1532 # endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1533 if (vim_strchr(p_sbo, 'h') == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1534 do_cmdline_cmd((char_u *)"set sbo+=hor");
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1535 // Save the current values, to be restored in ex_diffoff().
5102 11d0c6df1d7b updated for version 7.3.1294 Bram Moolenaar <bram@vim.org> parents: 4352 diff changeset	1536 wp->w_p_diff_saved = TRUE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1537
11707 1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1538 set_diff_option(wp, TRUE);
6897 d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1539
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1540 if (addbuf)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1541 diff_buf_add(wp->w_buffer);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1542 redraw_win_later(wp, NOT_VALID);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1543 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1544
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1545 /*
16 3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1546 * Set options not to show diffs. For the current window or all windows.
671 83a006f81bac updated for version 7.0199 vimboss parents: 648 diff changeset	1547 * Only in the current tab page.
16 3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1548 */
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1549 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1550 ex_diffoff(exarg_T *eap)
16 3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1551 {
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1552 win_T *wp;
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1553 int diffwin = FALSE;
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1554
9649 fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07 Christian Brabandt <cb@256bit.org> parents: 9487 diff changeset	1555 FOR_ALL_WINDOWS(wp)
16 3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1556 {
5358 b21b5dcdca21 updated for version 7.4.031 Bram Moolenaar <bram@vim.org> parents: 5200 diff changeset	1557 if (eap->forceit ? wp->w_p_diff : wp == curwin)
16 3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1558 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1559 // Set 'diff' off. If option values were saved in
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1560 // diff_win_options(), restore the ones whose settings seem to have
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1561 // been left over from diff mode.
11707 1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode Christian Brabandt <cb@256bit.org> parents: 11430 diff changeset	1562 set_diff_option(wp, FALSE);
5102 11d0c6df1d7b updated for version 7.3.1294 Bram Moolenaar <bram@vim.org> parents: 4352 diff changeset	1563
11d0c6df1d7b updated for version 7.3.1294 Bram Moolenaar <bram@vim.org> parents: 4352 diff changeset	1564 if (wp->w_p_diff_saved)
11d0c6df1d7b updated for version 7.3.1294 Bram Moolenaar <bram@vim.org> parents: 4352 diff changeset	1565 {
6897 d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1566
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1567 if (wp->w_p_scb)
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1568 wp->w_p_scb = wp->w_p_scb_save;
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1569 if (wp->w_p_crb)
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1570 wp->w_p_crb = wp->w_p_crb_save;
23895 e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	1571 if (!(diff_flags & DIFF_FOLLOWWRAP))
e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	1572 {
e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	1573 if (!wp->w_p_wrap)
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1574 wp->w_p_wrap = wp->w_p_wrap_save;
23895 e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	1575 }
6897 d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1576 #ifdef FEAT_FOLDING
5102 11d0c6df1d7b updated for version 7.3.1294 Bram Moolenaar <bram@vim.org> parents: 4352 diff changeset	1577 free_string_option(wp->w_p_fdm);
11430 eba1a8c6e21d patch 8.0.0599: diff mode is insufficiently tested Christian Brabandt <cb@256bit.org> parents: 11129 diff changeset	1578 wp->w_p_fdm = vim_strsave(
eba1a8c6e21d patch 8.0.0599: diff mode is insufficiently tested Christian Brabandt <cb@256bit.org> parents: 11129 diff changeset	1579 wp->w_p_fdm_save ? wp->w_p_fdm_save : (char_u)"manual");
5200 b3ff17862b4c updated for version 7.4a.026 Bram Moolenaar <bram@vim.org> parents: 5102 diff changeset	1580
6897 d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1581 if (wp->w_p_fdc == diff_foldcolumn)
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1582 wp->w_p_fdc = wp->w_p_fdc_save;
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1583 if (wp->w_p_fdl == 0)
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1584 wp->w_p_fdl = wp->w_p_fdl_save;
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1585
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1586 // Only restore 'foldenable' when 'foldmethod' is not
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1587 // "manual", otherwise we continue to show the diff folds.
6897 d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1588 if (wp->w_p_fen)
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1589 wp->w_p_fen = foldmethodIsManual(wp) ? FALSE
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1590 : wp->w_p_fen_save;
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1591
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1592 foldUpdateAll(wp);
d3a23af4bba1 patch 7.4.768 Bram Moolenaar <bram@vim.org> parents: 6721 diff changeset	1593 #endif
5200 b3ff17862b4c updated for version 7.4a.026 Bram Moolenaar <bram@vim.org> parents: 5102 diff changeset	1594 }
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1595 // remove filler lines
10005 4b4ba6589a98 commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14 Christian Brabandt <cb@256bit.org> parents: 9719 diff changeset	1596 wp->w_topfill = 0;
4b4ba6589a98 commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14 Christian Brabandt <cb@256bit.org> parents: 9719 diff changeset	1597
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1598 // make sure topline is not halfway a fold and cursor is
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1599 // invalidated
10005 4b4ba6589a98 commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14 Christian Brabandt <cb@256bit.org> parents: 9719 diff changeset	1600 changed_window_setting_win(wp);
5200 b3ff17862b4c updated for version 7.4a.026 Bram Moolenaar <bram@vim.org> parents: 5102 diff changeset	1601
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1602 // Note: 'sbo' is not restored, it's a global option.
16 3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1603 diff_buf_adjust(wp);
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1604 }
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1605 diffwin \|= wp->w_p_diff;
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1606 }
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1607
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1608 // Also remove hidden buffers from the list.
10821 d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	1609 if (eap->forceit)
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	1610 diff_buf_clear();
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers Christian Brabandt <cb@256bit.org> parents: 10295 diff changeset	1611
18590 41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1612 if (!diffwin)
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1613 {
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1614 diff_need_update = FALSE;
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1615 curtab->tp_diff_invalid = FALSE;
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1616 curtab->tp_diff_update = FALSE;
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1617 diff_clear(curtab);
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1618 }
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1619
26771 fc859aea8cec patch 8.2.3914: various spelling mistakes in comments Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1620 // Remove "hor" from 'scrollopt' if there are no diff windows left.
16 3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1621 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1622 do_cmdline_cmd((char_u *)"set sbo-=hor");
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1623 }
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1624
3ba373b54370 updated for version 7.0008 vimboss parents: 7 diff changeset	1625 /*
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1626 * Read the diff output and add each entry to the diff list.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1627 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1628 static void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1629 diff_read(
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1630 int idx_orig, // idx of original file
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1631 int idx_new, // idx of new file
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1632 diffio_T *dio) // diff output
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1633 {
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1634 FILE *fd = NULL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1635 int line_idx = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1636 diff_T *dprev = NULL;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	1637 diff_T *dp = curtab->tp_first_diff;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1638 diff_T dn, dpl;
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1639 diffout_T *dout = &dio->dio_diff;
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1640 char_u linebuf[LBUFLEN]; // only need to hold the diff line
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1641 char_u *line;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1642 long off;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1643 int i;
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1644 int notset = TRUE; // block "*dp" not set yet
26829 88a33cf5aeb6 patch 8.2.3943: compiler warning from gcc for uninitialized variable Bram Moolenaar <Bram@vim.org> parents: 26805 diff changeset	1645 diffhunk_T *hunk = NULL; // init to avoid gcc warning
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1646
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1647 enum {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1648 DIFF_ED,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1649 DIFF_UNIFIED,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1650 DIFF_NONE
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1651 } diffstyle = DIFF_NONE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1652
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1653 if (dout->dout_fname == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1654 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1655 diffstyle = DIFF_UNIFIED;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1656 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1657 else
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1658 {
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1659 fd = mch_fopen((char *)dout->dout_fname, "r");
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1660 if (fd == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1661 {
26602 fac6673086df patch 8.2.3830: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26044 diff changeset	1662 emsg(_(e_cannot_read_diff_output));
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1663 return;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1664 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1665 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1666
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1667 if (!dio->dio_internal)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1668 {
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1669 hunk = ALLOC_ONE(diffhunk_T);
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1670 if (hunk == NULL)
28197 e4d25cbc2bd7 patch 8.2.4624: old Coverity warning for resource leak Bram Moolenaar <Bram@vim.org> parents: 26966 diff changeset	1671 {
e4d25cbc2bd7 patch 8.2.4624: old Coverity warning for resource leak Bram Moolenaar <Bram@vim.org> parents: 26966 diff changeset	1672 if (fd != NULL)
e4d25cbc2bd7 patch 8.2.4624: old Coverity warning for resource leak Bram Moolenaar <Bram@vim.org> parents: 26966 diff changeset	1673 fclose(fd);
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1674 return;
28197 e4d25cbc2bd7 patch 8.2.4624: old Coverity warning for resource leak Bram Moolenaar <Bram@vim.org> parents: 26966 diff changeset	1675 }
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1676 }
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1677
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1678 for (;;)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1679 {
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1680 if (dio->dio_internal)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1681 {
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1682 if (line_idx >= dout->dout_ga.ga_len) {
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1683 break; // did last line
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1684 }
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1685 hunk = ((diffhunk_T **)dout->dout_ga.ga_data)[line_idx++];
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1686 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1687 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1688 {
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1689 if (fd == NULL)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1690 {
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1691 if (line_idx >= dout->dout_ga.ga_len)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1692 break; // did last line
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1693 line = ((char_u **)dout->dout_ga.ga_data)[line_idx++];
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1694 }
14726 655f00c29c58 patch 8.1.0375: cannot use diff mode with Cygwin diff.exe Christian Brabandt <cb@256bit.org> parents: 14716 diff changeset	1695 else
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1696 {
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1697 if (vim_fgets(linebuf, LBUFLEN, fd))
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1698 break; // end of file
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1699 line = linebuf;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1700 }
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1701
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1702 if (diffstyle == DIFF_NONE)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1703 {
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1704 // Determine diff style.
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1705 // ed like diff looks like this:
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1706 // {first}[,{last}]c{first}[,{last}]
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1707 // {first}a{first}[,{last}]
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1708 // {first}[,{last}]d{first}
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1709 //
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1710 // unified diff looks like this:
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1711 // --- file1 2018-03-20 13:23:35.783153140 +0100
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1712 // +++ file2 2018-03-20 13:23:41.183156066 +0100
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1713 // @@ -1,3 +1,5 @@
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1714 if (isdigit(*line))
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1715 diffstyle = DIFF_ED;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1716 else if ((STRNCMP(line, "@@ ", 3) == 0))
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1717 diffstyle = DIFF_UNIFIED;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1718 else if ((STRNCMP(line, "--- ", 4) == 0)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1719 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1720 && (STRNCMP(line, "+++ ", 4) == 0)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1721 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1722 && (STRNCMP(line, "@@ ", 3) == 0))
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1723 diffstyle = DIFF_UNIFIED;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1724 else
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1725 // Format not recognized yet, skip over this line. Cygwin
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1726 // diff may put a warning at the start of the file.
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1727 continue;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1728 }
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1729
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1730 if (diffstyle == DIFF_ED)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1731 {
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1732 if (!isdigit(*line))
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1733 continue; // not the start of a diff block
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1734 if (parse_diff_ed(line, hunk) == FAIL)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1735 continue;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1736 }
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1737 else if (diffstyle == DIFF_UNIFIED)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1738 {
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1739 if (STRNCMP(line, "@@ ", 3) != 0)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1740 continue; // not the start of a diff block
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1741 if (parse_diff_unified(line, hunk) == FAIL)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1742 continue;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1743 }
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1744 else
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1745 {
26966 ac75c145f0a9 patch 8.2.4012: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26962 diff changeset	1746 emsg(_(e_invalid_diff_format));
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1747 break;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1748 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1749 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1750
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1751 // Go over blocks before the change, for which orig and new are equal.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1752 // Copy blocks from orig to new.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1753 while (dp != NULL
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1754 && hunk->lnum_orig > dp->df_lnum[idx_orig]
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1755 + dp->df_count[idx_orig])
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1756 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1757 if (notset)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1758 diff_copy_entry(dprev, dp, idx_orig, idx_new);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1759 dprev = dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1760 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1761 notset = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1762 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1763
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1764 if (dp != NULL
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1765 && hunk->lnum_orig <= dp->df_lnum[idx_orig]
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1766 + dp->df_count[idx_orig]
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1767 && hunk->lnum_orig + hunk->count_orig >= dp->df_lnum[idx_orig])
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1768 {
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1769 // New block overlaps with existing block(s).
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1770 // First find last block that overlaps.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1771 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next)
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1772 if (hunk->lnum_orig + hunk->count_orig
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1773 < dpl->df_next->df_lnum[idx_orig])
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1774 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1775
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1776 // If the newly found block starts before the old one, set the
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1777 // start back a number of lines.
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1778 off = dp->df_lnum[idx_orig] - hunk->lnum_orig;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1779 if (off > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1780 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1781 for (i = idx_orig; i < idx_new; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	1782 if (curtab->tp_diffbuf[i] != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1783 dp->df_lnum[i] -= off;
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1784 dp->df_lnum[idx_new] = hunk->lnum_new;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1785 dp->df_count[idx_new] = hunk->count_new;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1786 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1787 else if (notset)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1788 {
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1789 // new block inside existing one, adjust new block
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1790 dp->df_lnum[idx_new] = hunk->lnum_new + off;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1791 dp->df_count[idx_new] = hunk->count_new - off;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1792 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1793 else
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1794 // second overlap of new block with existing block
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1795 dp->df_count[idx_new] += hunk->count_new - hunk->count_orig
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	1796 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	1797 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1798
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1799 // Adjust the size of the block to include all the lines to the
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1800 // end of the existing block or the new diff, whatever ends last.
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1801 off = (hunk->lnum_orig + hunk->count_orig)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1802 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1803 if (off < 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1804 {
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1805 // new change ends in existing block, adjust the end if not
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1806 // done already
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1807 if (notset)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1808 dp->df_count[idx_new] += -off;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1809 off = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1810 }
1428 912b18745def updated for version 7.1-143 vimboss parents: 1410 diff changeset	1811 for (i = idx_orig; i < idx_new; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	1812 if (curtab->tp_diffbuf[i] != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1813 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1814 - dp->df_lnum[i] + off;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1815
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1816 // Delete the diff blocks that have been merged into one.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1817 dn = dp->df_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1818 dp->df_next = dpl->df_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1819 while (dn != dp->df_next)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1820 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1821 dpl = dn->df_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1822 vim_free(dn);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1823 dn = dpl;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1824 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1825 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1826 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1827 {
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1828 // Allocate a new diffblock.
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	1829 dp = diff_alloc_new(curtab, dprev, dp);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1830 if (dp == NULL)
840 2c885fab04e3 updated for version 7.0e06 vimboss parents: 835 diff changeset	1831 goto done;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1832
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1833 dp->df_lnum[idx_orig] = hunk->lnum_orig;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1834 dp->df_count[idx_orig] = hunk->count_orig;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1835 dp->df_lnum[idx_new] = hunk->lnum_new;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1836 dp->df_count[idx_new] = hunk->count_new;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1837
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1838 // Set values for other buffers, these must be equal to the
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1839 // original buffer, otherwise there would have been a change
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1840 // already.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1841 for (i = idx_orig + 1; i < idx_new; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	1842 if (curtab->tp_diffbuf[i] != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1843 diff_copy_entry(dprev, dp, idx_orig, i);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1844 }
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1845 notset = FALSE; // "*dp" has been set
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1846 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1847
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1848 // for remaining diff blocks orig and new are equal
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1849 while (dp != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1850 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1851 if (notset)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1852 diff_copy_entry(dprev, dp, idx_orig, idx_new);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1853 dprev = dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1854 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1855 notset = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1856 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1857
840 2c885fab04e3 updated for version 7.0e06 vimboss parents: 835 diff changeset	1858 done:
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1859 if (!dio->dio_internal)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1860 vim_free(hunk);
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	1861
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1862 if (fd != NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	1863 fclose(fd);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1864 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1865
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1866 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1867 * Copy an entry at "dp" from "idx_orig" to "idx_new".
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1868 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1869 static void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1870 diff_copy_entry(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1871 diff_T *dprev,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1872 diff_T *dp,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1873 int idx_orig,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1874 int idx_new)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1875 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1876 long off;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1877
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1878 if (dprev == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1879 off = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1880 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1881 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig])
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1882 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1883 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1884 dp->df_count[idx_new] = dp->df_count[idx_orig];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1885 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1886
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1887 /*
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	1888 * Clear the list of diffblocks for tab page "tp".
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1889 */
358 e111db373ca4 updated for version 7.0093 vimboss parents: 193 diff changeset	1890 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1891 diff_clear(tabpage_T *tp)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1892 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1893 diff_T p, next_p;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1894
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	1895 for (p = tp->tp_first_diff; p != NULL; p = next_p)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1896 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1897 next_p = p->df_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1898 vim_free(p);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1899 }
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	1900 tp->tp_first_diff = NULL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1901 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1902
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1903 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1904 * Check diff status for line "lnum" in buffer "buf":
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1905 * Returns 0 for nothing special
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1906 * Returns -1 for a line that should be highlighted as changed.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1907 * Returns -2 for a line that should be highlighted as added/deleted.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1908 * Returns > 0 for inserting that many filler lines above it (never happens
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1909 * when 'diffopt' doesn't contain "filler").
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1910 * This should only be used for windows where 'diff' is set.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1911 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1912 int
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	1913 diff_check(win_T *wp, linenr_T lnum)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1914 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1915 int idx; // index in tp_diffbuf[] for this buffer
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1916 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1917 int maxcount;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1918 int i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1919 buf_T *buf = wp->w_buffer;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1920 int cmp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1921
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	1922 if (curtab->tp_diff_invalid)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1923 ex_diffupdate(NULL); // update after a big change
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1924
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1925 if (curtab->tp_first_diff == NULL \|\| !wp->w_p_diff) // no diffs at all
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1926 return 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1927
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1928 // safety check: "lnum" must be a buffer line
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1929 if (lnum < 1 \|\| lnum > buf->b_ml.ml_line_count + 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1930 return 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1931
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1932 idx = diff_buf_idx(buf);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1933 if (idx == DB_COUNT)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1934 return 0; // no diffs for buffer "buf"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1935
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1936 #ifdef FEAT_FOLDING
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1937 // A closed fold never has filler lines.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1938 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1939 return 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1940 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1941
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1942 // search for a change that includes "lnum" in the list of diffblocks.
19888 435726a03481 patch 8.2.0500: using the same loop in many places Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	1943 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1944 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1945 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1946 if (dp == NULL \|\| lnum < dp->df_lnum[idx])
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1947 return 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1948
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1949 if (lnum < dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1950 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1951 int zero = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1952
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1953 // Changed or inserted line. If the other buffers have a count of
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1954 // zero, the lines were inserted. If the other buffers have the same
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1955 // count, check if the lines are identical.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1956 cmp = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1957 for (i = 0; i < DB_COUNT; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	1958 if (i != idx && curtab->tp_diffbuf[i] != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1959 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1960 if (dp->df_count[i] == 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1961 zero = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1962 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1963 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1964 if (dp->df_count[i] != dp->df_count[idx])
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1965 return -1; // nr of lines changed.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1966 cmp = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1967 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1968 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1969 if (cmp)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1970 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1971 // Compare all lines. If they are equal the lines were inserted
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1972 // in some buffers, deleted in others, but not changed.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1973 for (i = 0; i < DB_COUNT; ++i)
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9387 diff changeset	1974 if (i != idx && curtab->tp_diffbuf[i] != NULL
69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9387 diff changeset	1975 && dp->df_count[i] != 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1976 if (!diff_equal_entry(dp, idx, i))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1977 return -1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1978 }
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1979 // If there is no buffer with zero lines then there is no difference
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1980 // any longer. Happens when making a change (or undo) that removes
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1981 // the difference. Can't remove the entry here, we might be halfway
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1982 // updating the window. Just report the text as unchanged. Other
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1983 // windows might still show the change though.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1984 if (zero == FALSE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1985 return 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1986 return -2;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1987 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1988
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1989 // If 'diffopt' doesn't contain "filler", return 0.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1990 if (!(diff_flags & DIFF_FILLER))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1991 return 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1992
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1993 // Insert filler lines above the line just below the change. Will return
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	1994 // 0 when this buf had the max count.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1995 maxcount = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1996 for (i = 0; i < DB_COUNT; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	1997 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1998 maxcount = dp->df_count[i];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	1999 return maxcount - dp->df_count[idx];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2000 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2001
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2002 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2003 * Compare two entries in diff "*dp" and return TRUE if they are equal.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2004 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2005 static int
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	2006 diff_equal_entry(diff_T *dp, int idx1, int idx2)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2007 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2008 int i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2009 char_u *line;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2010 int cmp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2011
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2012 if (dp->df_count[idx1] != dp->df_count[idx2])
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2013 return FALSE;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2014 if (diff_check_sanity(curtab, dp) == FAIL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2015 return FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2016 for (i = 0; i < dp->df_count[idx1]; ++i)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2017 {
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2018 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1],
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2019 dp->df_lnum[idx1] + i, FALSE));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2020 if (line == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2021 return FALSE;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2022 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2],
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2023 dp->df_lnum[idx2] + i, FALSE));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2024 vim_free(line);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2025 if (cmp != 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2026 return FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2027 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2028 return TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2029 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2030
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2031 /*
12333 dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2032 * Compare the characters at "p1" and "p2". If they are equal (possibly
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2033 * ignoring case) return TRUE and set "len" to the number of bytes.
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2034 */
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2035 static int
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2036 diff_equal_char(char_u p1, char_u p2, int *len)
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2037 {
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2038 int l = (*mb_ptr2len)(p1);
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2039
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2040 if (l != (*mb_ptr2len)(p2))
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2041 return FALSE;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2042 if (l > 1)
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2043 {
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2044 if (STRNCMP(p1, p2, l) != 0
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2045 && (!enc_utf8
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2046 \|\| !(diff_flags & DIFF_ICASE)
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2047 \|\| utf_fold(utf_ptr2char(p1))
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2048 != utf_fold(utf_ptr2char(p2))))
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2049 return FALSE;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2050 *len = l;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2051 }
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2052 else
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2053 {
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2054 if ((p1 != p2)
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2055 && (!(diff_flags & DIFF_ICASE)
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2056 \|\| TOLOWER_LOC(p1) != TOLOWER_LOC(p2)))
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2057 return FALSE;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2058 *len = 1;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2059 }
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2060 return TRUE;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2061 }
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2062
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2063 /*
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2064 * Compare strings "s1" and "s2" according to 'diffopt'.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2065 * Return non-zero when they are different.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2066 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2067 static int
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	2068 diff_cmp(char_u s1, char_u s2)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2069 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2070 char_u p1, p2;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2071 int l;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2072
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2073 if ((diff_flags & DIFF_IBLANK)
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2074 && (skipwhite(s1) == NUL \|\| skipwhite(s2) == NUL))
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2075 return 0;
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2076
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2077 if ((diff_flags & (DIFF_ICASE \| ALL_WHITE_DIFF)) == 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2078 return STRCMP(s1, s2);
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2079 if ((diff_flags & DIFF_ICASE) && !(diff_flags & ALL_WHITE_DIFF))
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2080 return MB_STRICMP(s1, s2);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2081
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2082 p1 = s1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2083 p2 = s2;
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2084
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2085 // Ignore white space changes and possibly ignore case.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2086 while (p1 != NUL && p2 != NUL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2087 {
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2088 if (((diff_flags & DIFF_IWHITE)
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2089 && VIM_ISWHITE(p1) && VIM_ISWHITE(p2))
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2090 \|\| ((diff_flags & DIFF_IWHITEALL)
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2091 && (VIM_ISWHITE(p1) \|\| VIM_ISWHITE(p2))))
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2092 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2093 p1 = skipwhite(p1);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2094 p2 = skipwhite(p2);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2095 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2096 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2097 {
12333 dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2098 if (!diff_equal_char(p1, p2, &l))
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2099 break;
12333 dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2100 p1 += l;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode Christian Brabandt <cb@256bit.org> parents: 12315 diff changeset	2101 p2 += l;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2102 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2103 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2104
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2105 // Ignore trailing white space.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2106 p1 = skipwhite(p1);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2107 p2 = skipwhite(p2);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2108 if (p1 != NUL \|\| p2 != NUL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2109 return 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2110 return 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2111 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2112
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2113 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2114 * Return the number of filler lines above "lnum".
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2115 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2116 int
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	2117 diff_check_fill(win_T *wp, linenr_T lnum)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2118 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2119 int n;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2120
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2121 // be quick when there are no filler lines
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2122 if (!(diff_flags & DIFF_FILLER))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2123 return 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2124 n = diff_check(wp, lnum);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2125 if (n <= 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2126 return 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2127 return n;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2128 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2129
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2130 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2131 * Set the topline of "towin" to match the position in "fromwin", so that they
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2132 * show the same diff'ed lines.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2133 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2134 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	2135 diff_set_topline(win_T fromwin, win_T towin)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2136 {
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2137 buf_T *frombuf = fromwin->w_buffer;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2138 linenr_T lnum = fromwin->w_topline;
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2139 int fromidx;
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2140 int toidx;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2141 diff_T *dp;
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2142 int max_count;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2143 int i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2144
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2145 fromidx = diff_buf_idx(frombuf);
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2146 if (fromidx == DB_COUNT)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2147 return; // safety check
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2148
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2149 if (curtab->tp_diff_invalid)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2150 ex_diffupdate(NULL); // update after a big change
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2151
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2152 towin->w_topfill = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2153
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2154 // search for a change that includes "lnum" in the list of diffblocks.
19888 435726a03481 patch 8.2.0500: using the same loop in many places Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	2155 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2156 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx])
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2157 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2158 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2159 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2160 // After last change, compute topline relative to end of file; no
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2161 // filler lines.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2162 towin->w_topline = towin->w_buffer->b_ml.ml_line_count
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2163 - (frombuf->b_ml.ml_line_count - lnum);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2164 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2165 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2166 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2167 // Find index for "towin".
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2168 toidx = diff_buf_idx(towin->w_buffer);
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2169 if (toidx == DB_COUNT)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2170 return; // safety check
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2171
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2172 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]);
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2173 if (lnum >= dp->df_lnum[fromidx])
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2174 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2175 // Inside a change: compute filler lines. With three or more
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2176 // buffers we need to know the largest count.
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2177 max_count = 0;
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2178 for (i = 0; i < DB_COUNT; ++i)
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2179 if (curtab->tp_diffbuf[i] != NULL
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2180 && max_count < dp->df_count[i])
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2181 max_count = dp->df_count[i];
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2182
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2183 if (dp->df_count[toidx] == dp->df_count[fromidx])
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2184 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2185 // same number of lines: use same filler count
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2186 towin->w_topfill = fromwin->w_topfill;
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2187 }
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2188 else if (dp->df_count[toidx] > dp->df_count[fromidx])
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2189 {
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2190 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2191 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2192 // more lines in towin and fromwin doesn't show diff
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2193 // lines, only filler lines
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2194 if (max_count - fromwin->w_topfill >= dp->df_count[toidx])
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2195 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2196 // towin also only shows filler lines
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2197 towin->w_topline = dp->df_lnum[toidx]
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2198 + dp->df_count[toidx];
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2199 towin->w_topfill = fromwin->w_topfill;
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2200 }
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2201 else
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2202 // towin still has some diff lines to show
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2203 towin->w_topline = dp->df_lnum[toidx]
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2204 + max_count - fromwin->w_topfill;
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2205 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2206 }
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2207 else if (towin->w_topline >= dp->df_lnum[toidx]
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2208 + dp->df_count[toidx])
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2209 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2210 // less lines in towin and no diff lines to show: compute
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2211 // filler lines
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2212 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx];
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2213 if (diff_flags & DIFF_FILLER)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2214 {
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2215 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2216 // fromwin is also out of diff lines
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2217 towin->w_topfill = fromwin->w_topfill;
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2218 else
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2219 // fromwin has some diff lines
1519 17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2220 towin->w_topfill = dp->df_lnum[fromidx]
17c88d44ace9 updated for version 7.1-234 vimboss parents: 1429 diff changeset	2221 + max_count - lnum;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2222 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2223 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2224 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2225 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2226
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2227 // safety check (if diff info gets outdated strange things may happen)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2228 towin->w_botfill = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2229 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2230 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2231 towin->w_topline = towin->w_buffer->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2232 towin->w_botfill = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2233 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2234 if (towin->w_topline < 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2235 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2236 towin->w_topline = 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2237 towin->w_topfill = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2238 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2239
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2240 // When w_topline changes need to recompute w_botline and cursor position
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2241 invalidate_botline_win(towin);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2242 changed_line_abv_curs_win(towin);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2243
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2244 check_topfill(towin, FALSE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2245 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2246 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2247 NULL, TRUE, NULL);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2248 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2249 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2250
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2251 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2252 * This is called when 'diffopt' is changed.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2253 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2254 int
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	2255 diffopt_changed(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2256 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2257 char_u *p;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2258 int diff_context_new = 6;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2259 int diff_flags_new = 0;
764 986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2260 int diff_foldcolumn_new = 2;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2261 long diff_algorithm_new = 0;
15103 9339601e7a31 patch 8.1.0562: parsing of 'diffopt' is slightly wrong Bram Moolenaar <Bram@vim.org> parents: 15004 diff changeset	2262 long diff_indent_heuristic = 0;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2263 tabpage_T *tp;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2264
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2265 p = p_dip;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2266 while (*p != NUL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2267 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2268 if (STRNCMP(p, "filler", 6) == 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2269 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2270 p += 6;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2271 diff_flags_new \|= DIFF_FILLER;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2272 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2273 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8]))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2274 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2275 p += 8;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2276 diff_context_new = getdigits(&p);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2277 }
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2278 else if (STRNCMP(p, "iblank", 6) == 0)
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2279 {
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2280 p += 6;
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2281 diff_flags_new \|= DIFF_IBLANK;
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2282 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2283 else if (STRNCMP(p, "icase", 5) == 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2284 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2285 p += 5;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2286 diff_flags_new \|= DIFF_ICASE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2287 }
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2288 else if (STRNCMP(p, "iwhiteall", 9) == 0)
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2289 {
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2290 p += 9;
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2291 diff_flags_new \|= DIFF_IWHITEALL;
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2292 }
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2293 else if (STRNCMP(p, "iwhiteeol", 9) == 0)
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2294 {
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2295 p += 9;
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2296 diff_flags_new \|= DIFF_IWHITEEOL;
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2297 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2298 else if (STRNCMP(p, "iwhite", 6) == 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2299 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2300 p += 6;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2301 diff_flags_new \|= DIFF_IWHITE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2302 }
764 986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2303 else if (STRNCMP(p, "horizontal", 10) == 0)
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2304 {
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2305 p += 10;
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2306 diff_flags_new \|= DIFF_HORIZONTAL;
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2307 }
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2308 else if (STRNCMP(p, "vertical", 8) == 0)
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2309 {
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2310 p += 8;
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2311 diff_flags_new \|= DIFF_VERTICAL;
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2312 }
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2313 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11]))
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2314 {
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2315 p += 11;
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2316 diff_foldcolumn_new = getdigits(&p);
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2317 }
12971 ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2318 else if (STRNCMP(p, "hiddenoff", 9) == 0)
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2319 {
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2320 p += 9;
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2321 diff_flags_new \|= DIFF_HIDDEN_OFF;
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2322 }
18590 41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2323 else if (STRNCMP(p, "closeoff", 8) == 0)
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2324 {
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2325 p += 8;
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2326 diff_flags_new \|= DIFF_CLOSE_OFF;
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2327 }
23895 e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	2328 else if (STRNCMP(p, "followwrap", 10) == 0)
e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	2329 {
e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	2330 p += 10;
e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	2331 diff_flags_new \|= DIFF_FOLLOWWRAP;
e313b6ee2d9c patch 8.2.2490: 'wrap' option is always reset when starting diff mode Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	2332 }
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2333 else if (STRNCMP(p, "indent-heuristic", 16) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2334 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2335 p += 16;
15103 9339601e7a31 patch 8.1.0562: parsing of 'diffopt' is slightly wrong Bram Moolenaar <Bram@vim.org> parents: 15004 diff changeset	2336 diff_indent_heuristic = XDF_INDENT_HEURISTIC;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2337 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2338 else if (STRNCMP(p, "internal", 8) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2339 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2340 p += 8;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2341 diff_flags_new \|= DIFF_INTERNAL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2342 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2343 else if (STRNCMP(p, "algorithm:", 10) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2344 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2345 p += 10;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2346 if (STRNCMP(p, "myers", 5) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2347 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2348 p += 5;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2349 diff_algorithm_new = 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2350 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2351 else if (STRNCMP(p, "minimal", 7) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2352 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2353 p += 7;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2354 diff_algorithm_new = XDF_NEED_MINIMAL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2355 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2356 else if (STRNCMP(p, "patience", 8) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2357 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2358 p += 8;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2359 diff_algorithm_new = XDF_PATIENCE_DIFF;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2360 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2361 else if (STRNCMP(p, "histogram", 9) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2362 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2363 p += 9;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2364 diff_algorithm_new = XDF_HISTOGRAM_DIFF;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2365 }
15004 9c2352253376 patch 8.1.0513: no error for set diffopt+=algorithm: Bram Moolenaar <Bram@vim.org> parents: 14982 diff changeset	2366 else
9c2352253376 patch 8.1.0513: no error for set diffopt+=algorithm: Bram Moolenaar <Bram@vim.org> parents: 14982 diff changeset	2367 return FAIL;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2368 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2369
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2370 if (p != ',' && p != NUL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2371 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2372 if (*p == ',')
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2373 ++p;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2374 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2375
15103 9339601e7a31 patch 8.1.0562: parsing of 'diffopt' is slightly wrong Bram Moolenaar <Bram@vim.org> parents: 15004 diff changeset	2376 diff_algorithm_new \|= diff_indent_heuristic;
9339601e7a31 patch 8.1.0562: parsing of 'diffopt' is slightly wrong Bram Moolenaar <Bram@vim.org> parents: 15004 diff changeset	2377
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2378 // Can't have both "horizontal" and "vertical".
764 986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2379 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL))
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2380 return FAIL;
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2381
14780 552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	2382 // If flags were added or removed, or the algorithm was changed, need to
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	2383 // update the diff.
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2384 if (diff_flags != diff_flags_new \|\| diff_algorithm != diff_algorithm_new)
9649 fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07 Christian Brabandt <cb@256bit.org> parents: 9487 diff changeset	2385 FOR_ALL_TABPAGES(tp)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2386 tp->tp_diff_invalid = TRUE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2387
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2388 diff_flags = diff_flags_new;
15900 360c93a884d0 patch 8.1.0956: using context:0 in 'diffopt' does not work well Bram Moolenaar <Bram@vim.org> parents: 15840 diff changeset	2389 diff_context = diff_context_new == 0 ? 1 : diff_context_new;
764 986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2390 diff_foldcolumn = diff_foldcolumn_new;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	2391 diff_algorithm = diff_algorithm_new;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2392
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2393 diff_redraw(TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2394
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2395 // recompute the scroll binding with the new option value, may
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2396 // remove or add filler lines
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2397 check_scrollbind((linenr_T)0, 0L);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2398
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2399 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2400 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2401
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2402 /*
764 986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2403 * Return TRUE if 'diffopt' contains "horizontal".
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2404 */
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2405 int
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	2406 diffopt_horizontal(void)
764 986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2407 {
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2408 return (diff_flags & DIFF_HORIZONTAL) != 0;
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2409 }
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2410
986753bbc441 updated for version 7.0225 vimboss parents: 738 diff changeset	2411 /*
12971 ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2412 * Return TRUE if 'diffopt' contains "hiddenoff".
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2413 */
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2414 int
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2415 diffopt_hiddenoff(void)
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2416 {
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2417 return (diff_flags & DIFF_HIDDEN_OFF) != 0;
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2418 }
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2419
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers Christian Brabandt <cb@256bit.org> parents: 12353 diff changeset	2420 /*
18590 41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2421 * Return TRUE if 'diffopt' contains "closeoff".
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2422 */
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2423 int
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2424 diffopt_closeoff(void)
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2425 {
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2426 return (diff_flags & DIFF_CLOSE_OFF) != 0;
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2427 }
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2428
41484f342f80 patch 8.1.2289: after :diffsplit closing the window does not disable diff Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2429 /*
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2430 * Find the difference within a changed line.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2431 * Returns TRUE if the line was added, no other buffer has it.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2432 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2433 int
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	2434 diff_find_change(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	2435 win_T *wp,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	2436 linenr_T lnum,
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2437 int *startp, // first char of the change
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2438 int *endp) // last char of the change
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2439 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2440 char_u *line_org;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2441 char_u *line_new;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2442 int i;
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2443 int si_org, si_new;
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2444 int ei_org, ei_new;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2445 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2446 int idx;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2447 int off;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2448 int added = TRUE;
12315 40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting Christian Brabandt <cb@256bit.org> parents: 11707 diff changeset	2449 char_u p1, p2;
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting Christian Brabandt <cb@256bit.org> parents: 11707 diff changeset	2450 int l;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2451
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2452 // Make a copy of the line, the next ml_get() will invalidate it.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2453 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2454 if (line_org == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2455 return FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2456
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2457 idx = diff_buf_idx(wp->w_buffer);
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2458 if (idx == DB_COUNT) // cannot happen
1074 a112fdce9ebd updated for version 7.0-200 vimboss parents: 840 diff changeset	2459 {
a112fdce9ebd updated for version 7.0-200 vimboss parents: 840 diff changeset	2460 vim_free(line_org);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2461 return FALSE;
1074 a112fdce9ebd updated for version 7.0-200 vimboss parents: 840 diff changeset	2462 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2463
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2464 // search for a change that includes "lnum" in the list of diffblocks.
19888 435726a03481 patch 8.2.0500: using the same loop in many places Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	2465 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2466 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2467 break;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2468 if (dp == NULL \|\| diff_check_sanity(curtab, dp) == FAIL)
1074 a112fdce9ebd updated for version 7.0-200 vimboss parents: 840 diff changeset	2469 {
a112fdce9ebd updated for version 7.0-200 vimboss parents: 840 diff changeset	2470 vim_free(line_org);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2471 return FALSE;
1074 a112fdce9ebd updated for version 7.0-200 vimboss parents: 840 diff changeset	2472 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2473
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2474 off = lnum - dp->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2475
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2476 for (i = 0; i < DB_COUNT; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2477 if (curtab->tp_diffbuf[i] != NULL && i != idx)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2478 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2479 // Skip lines that are not in the other change (filler lines).
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2480 if (off >= dp->df_count[i])
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2481 continue;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2482 added = FALSE;
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2483 line_new = ml_get_buf(curtab->tp_diffbuf[i],
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2484 dp->df_lnum[i] + off, FALSE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2485
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2486 // Search for start of difference
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2487 si_org = si_new = 0;
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2488 while (line_org[si_org] != NUL)
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2489 {
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2490 if (((diff_flags & DIFF_IWHITE)
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2491 && VIM_ISWHITE(line_org[si_org])
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2492 && VIM_ISWHITE(line_new[si_new]))
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2493 \|\| ((diff_flags & DIFF_IWHITEALL)
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2494 && (VIM_ISWHITE(line_org[si_org])
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2495 \|\| VIM_ISWHITE(line_new[si_new]))))
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2496 {
835 8bebcabccc2c updated for version 7.0e01 vimboss parents: 829 diff changeset	2497 si_org = (int)(skipwhite(line_org + si_org) - line_org);
8bebcabccc2c updated for version 7.0e01 vimboss parents: 829 diff changeset	2498 si_new = (int)(skipwhite(line_new + si_new) - line_new);
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2499 }
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2500 else
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2501 {
12315 40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting Christian Brabandt <cb@256bit.org> parents: 11707 diff changeset	2502 if (!diff_equal_char(line_org + si_org, line_new + si_new,
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting Christian Brabandt <cb@256bit.org> parents: 11707 diff changeset	2503 &l))
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2504 break;
12315 40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting Christian Brabandt <cb@256bit.org> parents: 11707 diff changeset	2505 si_org += l;
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting Christian Brabandt <cb@256bit.org> parents: 11707 diff changeset	2506 si_new += l;
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2507 }
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2508 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2509 if (has_mbyte)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2510 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2511 // Move back to first byte of character in both lines (may
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2512 // have "nn^" in line_org and "n^ in line_new).
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2513 si_org -= (*mb_head_off)(line_org, line_org + si_org);
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2514 si_new -= (*mb_head_off)(line_new, line_new + si_new);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2515 }
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2516 if (*startp > si_org)
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2517 *startp = si_org;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2518
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2519 // Search for end of difference, if any.
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2520 if (line_org[si_org] != NUL \|\| line_new[si_new] != NUL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2521 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2522 ei_org = (int)STRLEN(line_org);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2523 ei_new = (int)STRLEN(line_new);
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2524 while (ei_org >= *startp && ei_new >= si_new
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2525 && ei_org >= 0 && ei_new >= 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2526 {
14762 b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2527 if (((diff_flags & DIFF_IWHITE)
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2528 && VIM_ISWHITE(line_org[ei_org])
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2529 && VIM_ISWHITE(line_new[ei_new]))
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2530 \|\| ((diff_flags & DIFF_IWHITEALL)
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2531 && (VIM_ISWHITE(line_org[ei_org])
b43ea03bb522 patch 8.1.0393: not all white space difference options available Christian Brabandt <cb@256bit.org> parents: 14730 diff changeset	2532 \|\| VIM_ISWHITE(line_new[ei_new]))))
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2533 {
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2534 while (ei_org >= *startp
11129 f4ea50924c6d patch 8.0.0452: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11121 diff changeset	2535 && VIM_ISWHITE(line_org[ei_org]))
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2536 --ei_org;
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2537 while (ei_new >= si_new
11129 f4ea50924c6d patch 8.0.0452: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11121 diff changeset	2538 && VIM_ISWHITE(line_new[ei_new]))
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2539 --ei_new;
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2540 }
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2541 else
dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2542 {
12315 40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting Christian Brabandt <cb@256bit.org> parents: 11707 diff changeset	2543 p1 = line_org + ei_org;
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting Christian Brabandt <cb@256bit.org> parents: 11707 diff changeset	2544 p2 = line_new + ei_new;
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting Christian Brabandt <cb@256bit.org> parents: 11707 diff changeset	2545 p1 -= (*mb_head_off)(line_org, p1);
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting Christian Brabandt <cb@256bit.org> parents: 11707 diff changeset	2546 p2 -= (*mb_head_off)(line_new, p2);
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting Christian Brabandt <cb@256bit.org> parents: 11707 diff changeset	2547 if (!diff_equal_char(p1, p2, &l))
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2548 break;
12315 40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting Christian Brabandt <cb@256bit.org> parents: 11707 diff changeset	2549 ei_org -= l;
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting Christian Brabandt <cb@256bit.org> parents: 11707 diff changeset	2550 ei_new -= l;
829 dc8197342755 updated for version 7.0d04 vimboss parents: 828 diff changeset	2551 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2552 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2553 if (*endp < ei_org)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2554 *endp = ei_org;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2555 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2556 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2557
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2558 vim_free(line_org);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2559 return added;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2560 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2561
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2562 #if defined(FEAT_FOLDING) \|\| defined(PROTO)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2563 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2564 * Return TRUE if line "lnum" is not close to a diff block, this line should
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2565 * be in a fold.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2566 * Return FALSE if there are no diff blocks at all in this window.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2567 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2568 int
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	2569 diff_infold(win_T *wp, linenr_T lnum)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2570 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2571 int i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2572 int idx = -1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2573 int other = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2574 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2575
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2576 // Return if 'diff' isn't set.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2577 if (!wp->w_p_diff)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2578 return FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2579
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2580 for (i = 0; i < DB_COUNT; ++i)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2581 {
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2582 if (curtab->tp_diffbuf[i] == wp->w_buffer)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2583 idx = i;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2584 else if (curtab->tp_diffbuf[i] != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2585 other = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2586 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2587
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2588 // return here if there are no diffs in the window
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2589 if (idx == -1 \|\| !other)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2590 return FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2591
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2592 if (curtab->tp_diff_invalid)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2593 ex_diffupdate(NULL); // update after a big change
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2594
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2595 // Return if there are no diff blocks. All lines will be folded.
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2596 if (curtab->tp_first_diff == NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2597 return TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2598
19888 435726a03481 patch 8.2.0500: using the same loop in many places Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	2599 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2600 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2601 // If this change is below the line there can't be any further match.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2602 if (dp->df_lnum[idx] - diff_context > lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2603 break;
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2604 // If this change ends before the line we have a match.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2605 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2606 return FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2607 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2608 return TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2609 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2610 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2611
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2612 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2613 * "dp" and "do" commands.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2614 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2615 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	2616 nv_diffgetput(int put, long count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2617 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2618 exarg_T ea;
6314 df92c2b2a179 updated for version 7.4.490 Bram Moolenaar <bram@vim.org> parents: 6286 diff changeset	2619 char_u buf[30];
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2620
14019 dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job Christian Brabandt <cb@256bit.org> parents: 13802 diff changeset	2621 #ifdef FEAT_JOB_CHANNEL
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job Christian Brabandt <cb@256bit.org> parents: 13802 diff changeset	2622 if (bt_prompt(curbuf))
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job Christian Brabandt <cb@256bit.org> parents: 13802 diff changeset	2623 {
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job Christian Brabandt <cb@256bit.org> parents: 13802 diff changeset	2624 vim_beep(BO_OPER);
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job Christian Brabandt <cb@256bit.org> parents: 13802 diff changeset	2625 return;
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job Christian Brabandt <cb@256bit.org> parents: 13802 diff changeset	2626 }
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job Christian Brabandt <cb@256bit.org> parents: 13802 diff changeset	2627 #endif
6314 df92c2b2a179 updated for version 7.4.490 Bram Moolenaar <bram@vim.org> parents: 6286 diff changeset	2628 if (count == 0)
df92c2b2a179 updated for version 7.4.490 Bram Moolenaar <bram@vim.org> parents: 6286 diff changeset	2629 ea.arg = (char_u *)"";
df92c2b2a179 updated for version 7.4.490 Bram Moolenaar <bram@vim.org> parents: 6286 diff changeset	2630 else
df92c2b2a179 updated for version 7.4.490 Bram Moolenaar <bram@vim.org> parents: 6286 diff changeset	2631 {
df92c2b2a179 updated for version 7.4.490 Bram Moolenaar <bram@vim.org> parents: 6286 diff changeset	2632 vim_snprintf((char *)buf, 30, "%ld", count);
df92c2b2a179 updated for version 7.4.490 Bram Moolenaar <bram@vim.org> parents: 6286 diff changeset	2633 ea.arg = buf;
df92c2b2a179 updated for version 7.4.490 Bram Moolenaar <bram@vim.org> parents: 6286 diff changeset	2634 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2635 if (put)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2636 ea.cmdidx = CMD_diffput;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2637 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2638 ea.cmdidx = CMD_diffget;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2639 ea.addr_count = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2640 ea.line1 = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2641 ea.line2 = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2642 ex_diffgetput(&ea);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2643 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2644
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2645 /*
29367 cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2646 * Return TRUE if "diff" appears in the list of diff blocks of the current tab.
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2647 */
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2648 static int
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2649 valid_diff(diff_T *diff)
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2650 {
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2651 diff_T *dp;
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2652
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2653 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2654 if (dp == diff)
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2655 return TRUE;
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2656 return FALSE;
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2657 }
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2658
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2659 /*
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2660 * ":diffget"
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2661 * ":diffput"
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2662 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2663 void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	2664 ex_diffgetput(exarg_T *eap)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2665 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2666 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2667 int count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2668 linenr_T off = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2669 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2670 diff_T *dprev;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2671 diff_T *dfree;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2672 int idx_cur;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2673 int idx_other;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2674 int idx_from;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2675 int idx_to;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2676 int i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2677 int added;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2678 char_u *p;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2679 aco_save_T aco;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2680 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2681 int start_skip, end_skip;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2682 int new_count;
648 9032e4668296 updated for version 7.0189 vimboss parents: 638 diff changeset	2683 int buf_empty;
1075 21ce954cbdca updated for version 7.0-201 vimboss parents: 1074 diff changeset	2684 int found_not_ma = FALSE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2685
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2686 // Find the current buffer in the list of diff buffers.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2687 idx_cur = diff_buf_idx(curbuf);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2688 if (idx_cur == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2689 {
26602 fac6673086df patch 8.2.3830: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26044 diff changeset	2690 emsg(_(e_current_buffer_is_not_in_diff_mode));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2691 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2692 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2693
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2694 if (*eap->arg == NUL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2695 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2696 // No argument: Find the other buffer in the list of diff buffers.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2697 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2698 if (curtab->tp_diffbuf[idx_other] != curbuf
1075 21ce954cbdca updated for version 7.0-201 vimboss parents: 1074 diff changeset	2699 && curtab->tp_diffbuf[idx_other] != NULL)
21ce954cbdca updated for version 7.0-201 vimboss parents: 1074 diff changeset	2700 {
21ce954cbdca updated for version 7.0-201 vimboss parents: 1074 diff changeset	2701 if (eap->cmdidx != CMD_diffput
21ce954cbdca updated for version 7.0-201 vimboss parents: 1074 diff changeset	2702 \|\| curtab->tp_diffbuf[idx_other]->b_p_ma)
21ce954cbdca updated for version 7.0-201 vimboss parents: 1074 diff changeset	2703 break;
21ce954cbdca updated for version 7.0-201 vimboss parents: 1074 diff changeset	2704 found_not_ma = TRUE;
21ce954cbdca updated for version 7.0-201 vimboss parents: 1074 diff changeset	2705 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2706 if (idx_other == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2707 {
1075 21ce954cbdca updated for version 7.0-201 vimboss parents: 1074 diff changeset	2708 if (found_not_ma)
26958 d92e0d85923f patch 8.2.4008: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26877 diff changeset	2709 emsg(_(e_no_other_buffer_in_diff_mode_is_modifiable));
1075 21ce954cbdca updated for version 7.0-201 vimboss parents: 1074 diff changeset	2710 else
26602 fac6673086df patch 8.2.3830: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26044 diff changeset	2711 emsg(_(e_no_other_buffer_in_diff_mode));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2712 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2713 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2714
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2715 // Check that there isn't a third buffer in the list
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2716 for (i = idx_other + 1; i < DB_COUNT; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2717 if (curtab->tp_diffbuf[i] != curbuf
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2718 && curtab->tp_diffbuf[i] != NULL
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2719 && (eap->cmdidx != CMD_diffput \|\| curtab->tp_diffbuf[i]->b_p_ma))
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2720 {
26602 fac6673086df patch 8.2.3830: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26044 diff changeset	2721 emsg(_(e_more_than_two_buffers_in_diff_mode_dont_know_which_one_to_use));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2722 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2723 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2724 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2725 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2726 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2727 // Buffer number or pattern given. Ignore trailing white space.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2728 p = eap->arg + STRLEN(eap->arg);
11129 f4ea50924c6d patch 8.0.0452: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11121 diff changeset	2729 while (p > eap->arg && VIM_ISWHITE(p[-1]))
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2730 --p;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2731 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2732 ;
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2733 if (eap->arg + i == p) // digits only
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2734 i = atol((char *)eap->arg);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2735 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2736 {
4236 23ce9a61bdc2 updated for version 7.3.869 Bram Moolenaar <bram@vim.org> parents: 3904 diff changeset	2737 i = buflist_findpat(eap->arg, p, FALSE, TRUE, FALSE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2738 if (i < 0)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2739 return; // error message already given
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2740 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2741 buf = buflist_findnr(i);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2742 if (buf == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2743 {
26602 fac6673086df patch 8.2.3830: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26044 diff changeset	2744 semsg(_(e_cant_find_buffer_str), eap->arg);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2745 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2746 }
1788 61d080cb268e updated for version 7.2-086 vimboss parents: 1761 diff changeset	2747 if (buf == curbuf)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2748 return; // nothing to do
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2749 idx_other = diff_buf_idx(buf);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2750 if (idx_other == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2751 {
26602 fac6673086df patch 8.2.3830: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26044 diff changeset	2752 semsg(_(e_buffer_str_is_not_in_diff_mode), eap->arg);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2753 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2754 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2755 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2756
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2757 diff_busy = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2758
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2759 // When no range given include the line above or below the cursor.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2760 if (eap->addr_count == 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2761 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2762 // Make it possible that ":diffget" on the last line gets line below
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2763 // the cursor line when there is no difference above the cursor.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2764 if (eap->cmdidx == CMD_diffget
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2765 && eap->line1 == curbuf->b_ml.ml_line_count
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2766 && diff_check(curwin, eap->line1) == 0
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2767 && (eap->line1 == 1 \|\| diff_check(curwin, eap->line1 - 1) == 0))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2768 ++eap->line2;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2769 else if (eap->line1 > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2770 --eap->line1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2771 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2772
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2773 if (eap->cmdidx == CMD_diffget)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2774 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2775 idx_from = idx_other;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2776 idx_to = idx_cur;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2777 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2778 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2779 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2780 idx_from = idx_cur;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2781 idx_to = idx_other;
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2782 // Need to make the other buffer the current buffer to be able to make
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2783 // changes in it.
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2784 // set curwin/curbuf to buf and save a few things
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2785 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2786 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2787
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2788 // May give the warning for a changed buffer here, which can trigger the
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2789 // FileChangedRO autocommand, which may do nasty things and mess
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2790 // everything up.
819 23f82b5d2814 updated for version 7.0c10 vimboss parents: 764 diff changeset	2791 if (!curbuf->b_changed)
23f82b5d2814 updated for version 7.0c10 vimboss parents: 764 diff changeset	2792 {
23f82b5d2814 updated for version 7.0c10 vimboss parents: 764 diff changeset	2793 change_warning(0);
23f82b5d2814 updated for version 7.0c10 vimboss parents: 764 diff changeset	2794 if (diff_buf_idx(curbuf) != idx_to)
23f82b5d2814 updated for version 7.0c10 vimboss parents: 764 diff changeset	2795 {
26958 d92e0d85923f patch 8.2.4008: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26877 diff changeset	2796 emsg(_(e_buffer_changed_unexpectedly));
14776 09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget Christian Brabandt <cb@256bit.org> parents: 14770 diff changeset	2797 goto theend;
819 23f82b5d2814 updated for version 7.0c10 vimboss parents: 764 diff changeset	2798 }
23f82b5d2814 updated for version 7.0c10 vimboss parents: 764 diff changeset	2799 }
23f82b5d2814 updated for version 7.0c10 vimboss parents: 764 diff changeset	2800
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2801 dprev = NULL;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2802 for (dp = curtab->tp_first_diff; dp != NULL; )
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2803 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2804 if (dp->df_lnum[idx_cur] > eap->line2 + off)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2805 break; // past the range that was specified
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2806
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2807 dfree = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2808 lnum = dp->df_lnum[idx_to];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2809 count = dp->df_count[idx_to];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2810 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2811 && u_save(lnum - 1, lnum + count) != FAIL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2812 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2813 // Inside the specified range and saving for undo worked.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2814 start_skip = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2815 end_skip = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2816 if (eap->addr_count > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2817 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2818 // A range was specified: check if lines need to be skipped.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2819 start_skip = eap->line1 + off - dp->df_lnum[idx_cur];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2820 if (start_skip > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2821 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2822 // range starts below start of current diff block
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2823 if (start_skip > count)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2824 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2825 lnum += count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2826 count = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2827 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2828 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2829 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2830 count -= start_skip;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2831 lnum += start_skip;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2832 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2833 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2834 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2835 start_skip = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2836
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2837 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2838 - (eap->line2 + off);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2839 if (end_skip > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2840 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2841 // range ends above end of current/from diff block
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2842 if (idx_cur == idx_from) // :diffput
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2843 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2844 i = dp->df_count[idx_cur] - start_skip - end_skip;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2845 if (count > i)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2846 count = i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2847 }
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2848 else // :diffget
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2849 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2850 count -= end_skip;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2851 end_skip = dp->df_count[idx_from] - start_skip - count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2852 if (end_skip < 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2853 end_skip = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2854 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2855 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2856 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2857 end_skip = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2858 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2859
11121 778c10516955 patch 8.0.0448: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11113 diff changeset	2860 buf_empty = BUFEMPTY();
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2861 added = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2862 for (i = 0; i < count; ++i)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2863 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2864 // remember deleting the last line of the buffer
648 9032e4668296 updated for version 7.0189 vimboss parents: 638 diff changeset	2865 buf_empty = curbuf->b_ml.ml_line_count == 1;
20599 d571231175b4 patch 8.2.0853: ml_delete() often called with FALSE argument Bram Moolenaar <Bram@vim.org> parents: 20007 diff changeset	2866 ml_delete(lnum);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2867 --added;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2868 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2869 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2870 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2871 linenr_T nr;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2872
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2873 nr = dp->df_lnum[idx_from] + start_skip + i;
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2874 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2875 break;
819 23f82b5d2814 updated for version 7.0c10 vimboss parents: 764 diff changeset	2876 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from],
23f82b5d2814 updated for version 7.0c10 vimboss parents: 764 diff changeset	2877 nr, FALSE));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2878 if (p != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2879 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2880 ml_append(lnum + i - 1, p, 0, FALSE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2881 vim_free(p);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2882 ++added;
648 9032e4668296 updated for version 7.0189 vimboss parents: 638 diff changeset	2883 if (buf_empty && curbuf->b_ml.ml_line_count == 2)
9032e4668296 updated for version 7.0189 vimboss parents: 638 diff changeset	2884 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2885 // Added the first line into an empty buffer, need to
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2886 // delete the dummy empty line.
648 9032e4668296 updated for version 7.0189 vimboss parents: 638 diff changeset	2887 buf_empty = FALSE;
20599 d571231175b4 patch 8.2.0853: ml_delete() often called with FALSE argument Bram Moolenaar <Bram@vim.org> parents: 20007 diff changeset	2888 ml_delete((linenr_T)2);
648 9032e4668296 updated for version 7.0189 vimboss parents: 638 diff changeset	2889 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2890 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2891 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2892 new_count = dp->df_count[idx_to] + added;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2893 dp->df_count[idx_to] = new_count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2894
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2895 if (start_skip == 0 && end_skip == 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2896 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2897 // Check if there are any other buffers and if the diff is
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2898 // equal in them.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2899 for (i = 0; i < DB_COUNT; ++i)
819 23f82b5d2814 updated for version 7.0c10 vimboss parents: 764 diff changeset	2900 if (curtab->tp_diffbuf[i] != NULL && i != idx_from
23f82b5d2814 updated for version 7.0c10 vimboss parents: 764 diff changeset	2901 && i != idx_to
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2902 && !diff_equal_entry(dp, idx_from, i))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2903 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2904 if (i == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2905 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2906 // delete the diff entry, the buffers are now equal here
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2907 dfree = dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2908 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2909 if (dprev == NULL)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	2910 curtab->tp_first_diff = dp;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2911 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2912 dprev->df_next = dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2913 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2914 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2915
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2916 if (added != 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2917 {
29367 cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2918 // Adjust marks. This will change the following entries!
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2919 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2920 if (curwin->w_cursor.lnum >= lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2921 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2922 // Adjust the cursor position if it's in/after the changed
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2923 // lines.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2924 if (curwin->w_cursor.lnum >= lnum + count)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2925 curwin->w_cursor.lnum += added;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2926 else if (added < 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2927 curwin->w_cursor.lnum = lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2928 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2929 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2930 changed_lines(lnum, 0, lnum + count, (long)added);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2931
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2932 if (dfree != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2933 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2934 // Diff is deleted, update folds in other windows.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2935 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2936 diff_fold_update(dfree, idx_to);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2937 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2938 vim_free(dfree);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2939 }
29367 cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2940
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2941 // mark_adjust() may have made "dp" invalid. We don't know where
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2942 // to continue then, bail out.
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2943 if (added != 0 && !valid_diff(dp))
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2944 break;
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2945
cc4b36422ecb patch 9.0.0026: accessing freed memory with diff put Bram Moolenaar <Bram@vim.org> parents: 29295 diff changeset	2946 if (dfree == NULL)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2947 // mark_adjust() may have changed the count in a wrong way
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2948 dp->df_count[idx_to] = new_count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2949
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2950 // When changing the current buffer, keep track of line numbers
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2951 if (idx_cur == idx_to)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2952 off += added;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2953 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2954
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2955 // If before the range or not deleted, go to next diff.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2956 if (dfree == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2957 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2958 dprev = dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2959 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2960 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2961 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2962
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2963 // restore curwin/curbuf and a few other things
2445 04dae202d316 Fixes for coverity warnings. Bram Moolenaar <bram@vim.org> parents: 2250 diff changeset	2964 if (eap->cmdidx != CMD_diffget)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2965 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2966 // Syncing undo only works for the current buffer, but we change
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2967 // another buffer. Sync undo if the command was typed. This isn't
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	2968 // 100% right when ":diffput" is used in a function or mapping.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2969 if (KeyTyped)
825 6675076019ae updated for version 7.0d vimboss parents: 819 diff changeset	2970 u_sync(FALSE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2971 aucmd_restbuf(&aco);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2972 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2973
14776 09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget Christian Brabandt <cb@256bit.org> parents: 14770 diff changeset	2974 theend:
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2975 diff_busy = FALSE;
14776 09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget Christian Brabandt <cb@256bit.org> parents: 14770 diff changeset	2976 if (diff_need_update)
14893 291656f731c9 patch 8.1.0458: ml_get error and crash when using "do" Bram Moolenaar <Bram@vim.org> parents: 14780 diff changeset	2977 ex_diffupdate(NULL);
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do" Bram Moolenaar <Bram@vim.org> parents: 14780 diff changeset	2978
14972 5d52b21b2e7f patch 8.1.0497: :%diffput changes order of lines Bram Moolenaar <Bram@vim.org> parents: 14893 diff changeset	2979 // Check that the cursor is on a valid character and update its
14893 291656f731c9 patch 8.1.0458: ml_get error and crash when using "do" Bram Moolenaar <Bram@vim.org> parents: 14780 diff changeset	2980 // position. When there were filler lines the topline has become
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do" Bram Moolenaar <Bram@vim.org> parents: 14780 diff changeset	2981 // invalid.
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do" Bram Moolenaar <Bram@vim.org> parents: 14780 diff changeset	2982 check_cursor();
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do" Bram Moolenaar <Bram@vim.org> parents: 14780 diff changeset	2983 changed_line_abv_curs();
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do" Bram Moolenaar <Bram@vim.org> parents: 14780 diff changeset	2984
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do" Bram Moolenaar <Bram@vim.org> parents: 14780 diff changeset	2985 if (diff_need_update)
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do" Bram Moolenaar <Bram@vim.org> parents: 14780 diff changeset	2986 // redraw already done by ex_diffupdate()
14776 09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget Christian Brabandt <cb@256bit.org> parents: 14770 diff changeset	2987 diff_need_update = FALSE;
14780 552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	2988 else
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	2989 {
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	2990 // Also need to redraw the other buffers.
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	2991 diff_redraw(FALSE);
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	2992 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput Christian Brabandt <cb@256bit.org> parents: 14776 diff changeset	2993 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2994 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2995
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2996 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2997 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2998 * Update folds for all diff buffers for entry "dp".
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2999 * Skip buffer with index "skip_idx".
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3000 * When there are no diffs, all folds are removed.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3001 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3002 static void
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	3003 diff_fold_update(diff_T *dp, int skip_idx)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3004 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3005 int i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3006 win_T *wp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3007
9649 fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07 Christian Brabandt <cb@256bit.org> parents: 9487 diff changeset	3008 FOR_ALL_WINDOWS(wp)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3009 for (i = 0; i < DB_COUNT; ++i)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	3010 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3011 foldUpdate(wp, dp->df_lnum[i],
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3012 dp->df_lnum[i] + dp->df_count[i]);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3013 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3014 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3015
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3016 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3017 * Return TRUE if buffer "buf" is in diff-mode.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3018 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3019 int
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	3020 diff_mode_buf(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3021 {
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	3022 tabpage_T *tp;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	3023
9649 fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07 Christian Brabandt <cb@256bit.org> parents: 9487 diff changeset	3024 FOR_ALL_TABPAGES(tp)
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	3025 if (diff_buf_idx_tp(buf, tp) != DB_COUNT)
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	3026 return TRUE;
db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	3027 return FALSE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3028 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3029
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3030 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3031 * Move "count" times in direction "dir" to the next diff block.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3032 * Return FAIL if there isn't such a diff block.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3033 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3034 int
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	3035 diff_move_to(int dir, long count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3036 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3037 int idx;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3038 linenr_T lnum = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3039 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3040
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3041 idx = diff_buf_idx(curbuf);
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	3042 if (idx == DB_COUNT \|\| curtab->tp_first_diff == NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3043 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3044
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	3045 if (curtab->tp_diff_invalid)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3046 ex_diffupdate(NULL); // update after a big change
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3047
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3048 if (curtab->tp_first_diff == NULL) // no diffs today
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3049 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3050
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3051 while (--count >= 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3052 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3053 // Check if already before first diff.
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	3054 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx])
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3055 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3056
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	3057 for (dp = curtab->tp_first_diff; ; dp = dp->df_next)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3058 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3059 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3060 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3061 if ((dir == FORWARD && lnum < dp->df_lnum[idx])
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3062 \|\| (dir == BACKWARD
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3063 && (dp->df_next == NULL
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3064 \|\| lnum <= dp->df_next->df_lnum[idx])))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3065 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3066 lnum = dp->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3067 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3068 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3069 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3070 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3071
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3072 // don't end up past the end of the file
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3073 if (lnum > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3074 lnum = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3075
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3076 // When the cursor didn't move at all we fail.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3077 if (lnum == curwin->w_cursor.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3078 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3079
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3080 setpcmark();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3081 curwin->w_cursor.lnum = lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3082 curwin->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3083
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3084 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3085 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3086
10295 d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3087 /*
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3088 * Return the line number in the current window that is closest to "lnum1" in
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3089 * "buf1" in diff mode.
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3090 */
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3091 static linenr_T
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3092 diff_get_corresponding_line_int(
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	3093 buf_T *buf1,
10295 d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3094 linenr_T lnum1)
2250 1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3095 {
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3096 int idx1;
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3097 int idx2;
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3098 diff_T *dp;
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3099 int baseline = 0;
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3100
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3101 idx1 = diff_buf_idx(buf1);
10295 d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3102 idx2 = diff_buf_idx(curbuf);
2250 1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3103 if (idx1 == DB_COUNT \|\| idx2 == DB_COUNT \|\| curtab->tp_first_diff == NULL)
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3104 return lnum1;
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3105
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3106 if (curtab->tp_diff_invalid)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3107 ex_diffupdate(NULL); // update after a big change
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3108
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3109 if (curtab->tp_first_diff == NULL) // no diffs today
2250 1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3110 return lnum1;
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3111
19888 435726a03481 patch 8.2.0500: using the same loop in many places Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	3112 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
2250 1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3113 {
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3114 if (dp->df_lnum[idx1] > lnum1)
10295 d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3115 return lnum1 - baseline;
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3116 if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1)
2250 1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3117 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3118 // Inside the diffblock
2250 1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3119 baseline = lnum1 - dp->df_lnum[idx1];
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3120 if (baseline > dp->df_count[idx2])
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3121 baseline = dp->df_count[idx2];
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3122
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3123 return dp->df_lnum[idx2] + baseline;
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3124 }
10295 d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3125 if ( (dp->df_lnum[idx1] == lnum1)
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3126 && (dp->df_count[idx1] == 0)
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3127 && (dp->df_lnum[idx2] <= curwin->w_cursor.lnum)
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3128 && ((dp->df_lnum[idx2] + dp->df_count[idx2])
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3129 > curwin->w_cursor.lnum))
2250 1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3130 /*
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3131 * Special case: if the cursor is just after a zero-count
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3132 * block (i.e. all filler) and the target cursor is already
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3133 * inside the corresponding block, leave the target cursor
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3134 * unmoved. This makes repeated CTRL-W W operations work
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3135 * as expected.
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3136 */
10295 d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3137 return curwin->w_cursor.lnum;
2250 1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3138 baseline = (dp->df_lnum[idx1] + dp->df_count[idx1])
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3139 - (dp->df_lnum[idx2] + dp->df_count[idx2]);
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3140 }
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3141
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3142 // If we get here then the cursor is after the last diff
10295 d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3143 return lnum1 - baseline;
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3144 }
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3145
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3146 /*
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3147 * Return the line number in the current window that is closest to "lnum1" in
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3148 * "buf1" in diff mode. Checks the line number to be valid.
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3149 */
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3150 linenr_T
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3151 diff_get_corresponding_line(buf_T *buf1, linenr_T lnum1)
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3152 {
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3153 linenr_T lnum = diff_get_corresponding_line_int(buf1, lnum1);
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3154
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3155 // don't end up past the end of the file
10295 d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3156 if (lnum > curbuf->b_ml.ml_line_count)
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3157 return curbuf->b_ml.ml_line_count;
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	3158 return lnum;
2250 1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3159 }
1bac28a53fae Add the conceal patch from Vince Negri. Bram Moolenaar <bram@vim.org> parents: 2086 diff changeset	3160
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3161 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3162 * For line "lnum" in the current window find the equivalent lnum in window
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3163 * "wp", compensating for inserted/deleted lines.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3164 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3165 linenr_T
7817 83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff Christian Brabandt <cb@256bit.org> parents: 7799 diff changeset	3166 diff_lnum_win(linenr_T lnum, win_T *wp)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3167 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3168 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3169 int idx;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3170 int i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3171 linenr_T n;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3172
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3173 idx = diff_buf_idx(curbuf);
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3174 if (idx == DB_COUNT) // safety check
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3175 return (linenr_T)0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3176
672 db58b9066b21 updated for version 7.0200 vimboss parents: 671 diff changeset	3177 if (curtab->tp_diff_invalid)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3178 ex_diffupdate(NULL); // update after a big change
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3179
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3180 // search for a change that includes "lnum" in the list of diffblocks.
19888 435726a03481 patch 8.2.0500: using the same loop in many places Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	3181 FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3182 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3183 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3184
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3185 // When after the last change, compute relative to the last line number.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3186 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3187 return wp->w_buffer->b_ml.ml_line_count
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3188 - (curbuf->b_ml.ml_line_count - lnum);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3189
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3190 // Find index for "wp".
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3191 i = diff_buf_idx(wp->w_buffer);
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3192 if (i == DB_COUNT) // safety check
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3193 return (linenr_T)0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3194
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3195 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3196 if (n > dp->df_lnum[i] + dp->df_count[i])
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3197 n = dp->df_lnum[i] + dp->df_count[i];
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3198 return n;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3199 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3200
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3201 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3202 * Handle an ED style diff line.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3203 * Return FAIL if the line does not contain diff info.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3204 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3205 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3206 parse_diff_ed(
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3207 char_u *line,
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3208 diffhunk_T *hunk)
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3209 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3210 char_u *p;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3211 long f1, l1, f2, l2;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3212 int difftype;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3213
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3214 // The line must be one of three formats:
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3215 // change: {first}[,{last}]c{first}[,{last}]
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3216 // append: {first}a{first}[,{last}]
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3217 // delete: {first}[,{last}]d{first}
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3218 p = line;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3219 f1 = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3220 if (*p == ',')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3221 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3222 ++p;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3223 l1 = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3224 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3225 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3226 l1 = f1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3227 if (p != 'a' && p != 'c' && *p != 'd')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3228 return FAIL; // invalid diff format
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3229 difftype = *p++;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3230 f2 = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3231 if (*p == ',')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3232 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3233 ++p;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3234 l2 = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3235 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3236 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3237 l2 = f2;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3238 if (l1 < f1 \|\| l2 < f2)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3239 return FAIL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3240
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3241 if (difftype == 'a')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3242 {
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3243 hunk->lnum_orig = f1 + 1;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3244 hunk->count_orig = 0;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3245 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3246 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3247 {
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3248 hunk->lnum_orig = f1;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3249 hunk->count_orig = l1 - f1 + 1;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3250 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3251 if (difftype == 'd')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3252 {
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3253 hunk->lnum_new = f2 + 1;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3254 hunk->count_new = 0;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3255 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3256 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3257 {
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3258 hunk->lnum_new = f2;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3259 hunk->count_new = l2 - f2 + 1;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3260 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3261 return OK;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3262 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3263
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3264 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3265 * Parses unified diff with zero(!) context lines.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3266 * Return FAIL if there is no diff information in "line".
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3267 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3268 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3269 parse_diff_unified(
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3270 char_u *line,
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3271 diffhunk_T *hunk)
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3272 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3273 char_u *p;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3274 long oldline, oldcount, newline, newcount;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3275
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3276 // Parse unified diff hunk header:
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3277 // @@ -oldline,oldcount +newline,newcount @@
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3278 p = line;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3279 if (p++ == '@' && p++ == '@' && p++ == ' ' && p++ == '-')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3280 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3281 oldline = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3282 if (*p == ',')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3283 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3284 ++p;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3285 oldcount = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3286 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3287 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3288 oldcount = 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3289 if (p++ == ' ' && p++ == '+')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3290 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3291 newline = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3292 if (*p == ',')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3293 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3294 ++p;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3295 newcount = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3296 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3297 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3298 newcount = 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3299 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3300 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3301 return FAIL; // invalid diff format
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3302
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3303 if (oldcount == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3304 oldline += 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3305 if (newcount == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3306 newline += 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3307 if (newline == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3308 newline = 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3309
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3310 hunk->lnum_orig = oldline;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3311 hunk->count_orig = oldcount;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3312 hunk->lnum_new = newline;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3313 hunk->count_new = newcount;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3314
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3315 return OK;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3316 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3317
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3318 return FAIL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3319 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3320
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3321 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3322 * Callback function for the xdl_diff() function.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3323 * Stores the diff output in a grow array.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3324 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3325 static int
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3326 xdiff_out(
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3327 long start_a,
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3328 long count_a,
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3329 long start_b,
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3330 long count_b,
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3331 void *priv)
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3332 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3333 diffout_T dout = (diffout_T )priv;
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3334 diffhunk_T *p = ALLOC_ONE(diffhunk_T);
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3335
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3336 if (p == NULL)
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3337 return -1;
14982 d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff Bram Moolenaar <Bram@vim.org> parents: 14972 diff changeset	3338
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff Bram Moolenaar <Bram@vim.org> parents: 14972 diff changeset	3339 if (ga_grow(&dout->dout_ga, 1) == FAIL)
26805 77ff030699d2 patch 8.2.3931: Coverity reports a memory leak Bram Moolenaar <Bram@vim.org> parents: 26794 diff changeset	3340 {
77ff030699d2 patch 8.2.3931: Coverity reports a memory leak Bram Moolenaar <Bram@vim.org> parents: 26794 diff changeset	3341 vim_free(p);
14982 d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff Bram Moolenaar <Bram@vim.org> parents: 14972 diff changeset	3342 return -1;
26805 77ff030699d2 patch 8.2.3931: Coverity reports a memory leak Bram Moolenaar <Bram@vim.org> parents: 26794 diff changeset	3343 }
26786 b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3344
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3345 p->lnum_orig = start_a + 1;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3346 p->count_orig = count_a;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3347 p->lnum_new = start_b + 1;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3348 p->count_new = count_b;
b802798e4a26 patch 8.2.3921: the way xdiff is used is inefficient Bram Moolenaar <Bram@vim.org> parents: 26771 diff changeset	3349 ((diffhunk_T **)dout->dout_ga.ga_data)[dout->dout_ga.ga_len++] = p;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3350 return 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3351 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: 14019 diff changeset	3352
17986 5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3353 #endif // FEAT_DIFF
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3354
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3355 #if defined(FEAT_EVAL) \|\| defined(PROTO)
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3356
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3357 /*
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3358 * "diff_filler()" function
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3359 */
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3360 void
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3361 f_diff_filler(typval_T argvars UNUSED, typval_T rettv UNUSED)
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3362 {
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3363 #ifdef FEAT_DIFF
25384 e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25314 diff changeset	3364 if (in_vim9script() && check_for_lnum_arg(argvars, 0) == FAIL)
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25314 diff changeset	3365 return;
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25314 diff changeset	3366
17986 5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3367 rettv->vval.v_number = diff_check_fill(curwin, tv_get_lnum(argvars));
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3368 #endif
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3369 }
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3370
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3371 /*
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3372 * "diff_hlID()" function
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3373 */
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3374 void
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3375 f_diff_hlID(typval_T argvars UNUSED, typval_T rettv UNUSED)
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3376 {
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3377 #ifdef FEAT_DIFF
25272 712e867f9721 patch 8.2.3173: Vim9: argument types are not checked at compile time Bram Moolenaar <Bram@vim.org> parents: 24683 diff changeset	3378 linenr_T lnum;
17986 5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3379 static linenr_T prev_lnum = 0;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3380 static varnumber_T changedtick = 0;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3381 static int fnum = 0;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3382 static int change_start = 0;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3383 static int change_end = 0;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3384 static hlf_T hlID = (hlf_T)0;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3385 int filler_lines;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3386 int col;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3387
25272 712e867f9721 patch 8.2.3173: Vim9: argument types are not checked at compile time Bram Moolenaar <Bram@vim.org> parents: 24683 diff changeset	3388 if (in_vim9script()
25314 7e620652bd13 patch 8.2.3194: Vim9: argument types are not checked at compile time Bram Moolenaar <Bram@vim.org> parents: 25302 diff changeset	3389 && (check_for_lnum_arg(argvars,0) == FAIL
25272 712e867f9721 patch 8.2.3173: Vim9: argument types are not checked at compile time Bram Moolenaar <Bram@vim.org> parents: 24683 diff changeset	3390 \|\| check_for_number_arg(argvars, 1) == FAIL))
712e867f9721 patch 8.2.3173: Vim9: argument types are not checked at compile time Bram Moolenaar <Bram@vim.org> parents: 24683 diff changeset	3391 return;
712e867f9721 patch 8.2.3173: Vim9: argument types are not checked at compile time Bram Moolenaar <Bram@vim.org> parents: 24683 diff changeset	3392
712e867f9721 patch 8.2.3173: Vim9: argument types are not checked at compile time Bram Moolenaar <Bram@vim.org> parents: 24683 diff changeset	3393 lnum = tv_get_lnum(argvars);
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3394 if (lnum < 0) // ignore type error in {lnum} arg
17986 5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3395 lnum = 0;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3396 if (lnum != prev_lnum
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3397 \|\| changedtick != CHANGEDTICK(curbuf)
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3398 \|\| fnum != curbuf->b_fnum)
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3399 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3400 // New line, buffer, change: need to get the values.
17986 5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3401 filler_lines = diff_check(curwin, lnum);
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3402 if (filler_lines < 0)
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3403 {
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3404 if (filler_lines == -1)
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3405 {
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3406 change_start = MAXCOL;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3407 change_end = -1;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3408 if (diff_find_change(curwin, lnum, &change_start, &change_end))
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3409 hlID = HLF_ADD; // added line
17986 5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3410 else
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3411 hlID = HLF_CHD; // changed line
17986 5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3412 }
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3413 else
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3414 hlID = HLF_ADD; // added line
17986 5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3415 }
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3416 else
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3417 hlID = (hlf_T)0;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3418 prev_lnum = lnum;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3419 changedtick = CHANGEDTICK(curbuf);
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3420 fnum = curbuf->b_fnum;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3421 }
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3422
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3423 if (hlID == HLF_CHD \|\| hlID == HLF_TXD)
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3424 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3425 col = tv_get_number(&argvars[1]) - 1; // ignore type error in {col}
17986 5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3426 if (col >= change_start && col <= change_end)
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3427 hlID = HLF_TXD; // changed text
17986 5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3428 else
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18619 diff changeset	3429 hlID = HLF_CHD; // changed line
17986 5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3430 }
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3431 rettv->vval.v_number = hlID == (hlf_T)0 ? 0 : (int)hlID;
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3432 #endif
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3433 }
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3434
5c8906f653f5 patch 8.1.1989: the evalfunc.c file is still too big Bram Moolenaar <Bram@vim.org> parents: 17851 diff changeset	3435 #endif

Mercurial > vim

annotate src/diff.c @ 29367:cc4b36422ecb v9.0.0026