vim: src/diff.c annotate

annotate src/diff.c @ 34264:cce6b834635c v9.1.0071

patch 9.1.0071: Need a diff() Vim script function Commit: https://github.com/vim/vim/commit/fa37835b8c0ed0f83952978fca4c332335ca7c46 Author: Yegappan Lakshmanan <yegappan@yahoo.com> Date: Thu Feb 1 22:05:27 2024 +0100 patch 9.1.0071: Need a diff() Vim script function Problem: Need a diff() Vim script function Solution: Add the diff() Vim script function using the xdiff internal diff library, add support for "unified" and "indices" mode. (Yegappan Lakshmanan) fixes: #4241 closes: #12321 Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com> Signed-off-by: Christian Brabandt <cb@256bit.org>

author	Christian Brabandt <cb@256bit.org>
date	Thu, 01 Feb 2024 22:30:03 +0100
parents	1629cc65d78d
children	3a5750596c3d

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

Mercurial > vim

annotate src/diff.c @ 34264:cce6b834635c v9.1.0071