vim: src/undo.c annotate

annotate src/undo.c @ 27884:6061cd922df1

Added tag v8.2.4467 for changeset 9c04fbcaacbcf5679574a653bfe2de4626d25ce2

author	Bram Moolenaar <Bram@vim.org>
date	Fri, 25 Feb 2022 19:00:04 +0100
parents	17cd22b7151b
children	4dcccb2673fe

rev	line source
10042 4aead6a9b7a9 commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47 Christian Brabandt <cb@256bit.org> parents: 9674 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 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	11 * undo.c: multi level undo facility
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	12 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	13 * The saved lines are stored in a list of lists (one for each buffer):
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	14 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	15 * b_u_oldhead------------------------------------------------+
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	16 * \|
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	17 * V
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	18 * +--------------+ +--------------+ +--------------+
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	19 * b_u_newhead--->\| u_header \| \| u_header \| \| u_header \|
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	20 * \| uh_next------>\| uh_next------>\| uh_next---->NULL
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	21 * NULL<--------uh_prev \|<---------uh_prev \|<---------uh_prev \|
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	22 * \| uh_entry \| \| uh_entry \| \| uh_entry \|
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	23 * +--------\|-----+ +--------\|-----+ +--------\|-----+
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	24 * \| \| \|
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	25 * V V V
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	26 * +--------------+ +--------------+ +--------------+
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	27 * \| u_entry \| \| u_entry \| \| u_entry \|
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	28 * \| ue_next \| \| ue_next \| \| ue_next \|
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	29 * +--------\|-----+ +--------\|-----+ +--------\|-----+
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	30 * \| \| \|
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	31 * V V V
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	32 * +--------------+ NULL NULL
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	33 * \| u_entry \|
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	34 * \| ue_next \|
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	35 * +--------\|-----+
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	36 * \|
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	37 * V
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	38 * etc.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	39 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	40 * Each u_entry list contains the information for one undo or redo.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	41 * curbuf->b_u_curhead points to the header of the last undo (the next redo),
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	42 * or is NULL if nothing has been undone (end of the branch).
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	43 *
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	44 * For keeping alternate undo/redo branches the uh_alt field is used. Thus at
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	45 * each point in the list a branch may appear for an alternate to redo. The
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	46 * uh_seq field is numbered sequentially to be able to find a newer or older
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	47 * branch.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	48 *
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	49 * +---------------+ +---------------+
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	50 * b_u_oldhead --->\| u_header \| \| u_header \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	51 * \| uh_alt_next ---->\| uh_alt_next ----> NULL
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	52 * NULL <----- uh_alt_prev \|<------ uh_alt_prev \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	53 * \| uh_prev \| \| uh_prev \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	54 * +-----\|---------+ +-----\|---------+
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	55 * \| \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	56 * V V
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	57 * +---------------+ +---------------+
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	58 * \| u_header \| \| u_header \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	59 * \| uh_alt_next \| \| uh_alt_next \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	60 * b_u_newhead --->\| uh_alt_prev \| \| uh_alt_prev \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	61 * \| uh_prev \| \| uh_prev \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	62 * +-----\|---------+ +-----\|---------+
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	63 * \| \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	64 * V V
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	65 * NULL +---------------+ +---------------+
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	66 * \| u_header \| \| u_header \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	67 * \| uh_alt_next ---->\| uh_alt_next \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	68 * \| uh_alt_prev \|<------ uh_alt_prev \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	69 * \| uh_prev \| \| uh_prev \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	70 * +-----\|---------+ +-----\|---------+
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	71 * \| \|
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	72 * etc. etc.
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	73 *
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	74 *
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	75 * All data is allocated and will all be freed when the buffer is unloaded.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	76 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	77
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	78 // Uncomment the next line for including the u_check() function. This warns
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	79 // for errors in the debug information.
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	80 // #define U_DEBUG 1
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	81 #define UH_MAGIC 0x18dade // value for uh_magic when in use
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	82 #define UE_MAGIC 0xabc123 // value for ue_magic when in use
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	83
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	84 // Size of buffer used for encryption.
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	85 #define CRYPT_BUF_SIZE 8192
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	86
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	87 #include "vim.h"
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	88
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	89 // Structure passed around between functions.
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	90 // Avoids passing cryptstate_T when encryption not available.
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	91 typedef struct {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	92 buf_T *bi_buf;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	93 FILE *bi_fp;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	94 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	95 cryptstate_T *bi_state;
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	96 char_u *bi_buffer; // CRYPT_BUF_SIZE, NULL when not buffering
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	97 size_t bi_used; // bytes written to/read from bi_buffer
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	98 size_t bi_avail; // bytes available in bi_buffer
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	99 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	100 } bufinfo_T;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	101
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	102
7805 0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	103 static void u_unch_branch(u_header_T *uhp);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	104 static u_entry_T *u_get_headentry(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	105 static void u_getbot(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	106 static void u_doit(int count);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	107 static void u_undoredo(int undo);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	108 static void u_undo_end(int did_undo, int absolute);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	109 static void u_freeheader(buf_T buf, u_header_T uhp, u_header_T **uhpp);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	110 static void u_freebranch(buf_T buf, u_header_T uhp, u_header_T **uhpp);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	111 static void u_freeentries(buf_T buf, u_header_T uhp, u_header_T **uhpp);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	112 static void u_freeentry(u_entry_T *, long);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	113 #ifdef FEAT_PERSISTENT_UNDO
8128 985cd5917560 commit https://github.com/vim/vim/commit/1d6fbe654066845ff2a182ed258e6e9d3408fa90 Christian Brabandt <cb@256bit.org> parents: 7835 diff changeset	114 # ifdef FEAT_CRYPT
7805 0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	115 static int undo_flush(bufinfo_T *bi);
8128 985cd5917560 commit https://github.com/vim/vim/commit/1d6fbe654066845ff2a182ed258e6e9d3408fa90 Christian Brabandt <cb@256bit.org> parents: 7835 diff changeset	116 # endif
7805 0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	117 static int undo_read(bufinfo_T bi, char_u buffer, size_t size);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	118 static int serialize_uep(bufinfo_T bi, u_entry_T uep);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	119 static u_entry_T unserialize_uep(bufinfo_T bi, int error, char_u file_name);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	120 static void serialize_pos(bufinfo_T *bi, pos_T pos);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	121 static void unserialize_pos(bufinfo_T bi, pos_T pos);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	122 static void serialize_visualinfo(bufinfo_T bi, visualinfo_T info);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	123 static void unserialize_visualinfo(bufinfo_T bi, visualinfo_T info);
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	124 #endif
17789 0f7ae8010787 patch 8.1.1891: functions used in one file are global Bram Moolenaar <Bram@vim.org> parents: 17630 diff changeset	125 static void u_saveline(linenr_T lnum);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	126
16768 695d9ef00b03 patch 8.1.1386: unessesary type casts for lalloc() Bram Moolenaar <Bram@vim.org> parents: 16764 diff changeset	127 #define U_ALLOC_LINE(size) lalloc(size, FALSE)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	128
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	129 // used in undo_end() to report number of added and deleted lines
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	130 static long u_newcount, u_oldcount;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	131
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	132 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	133 * When 'u' flag included in 'cpoptions', we behave like vi. Need to remember
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	134 * the action that "u" should do.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	135 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	136 static int undo_undoes = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	137
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	138 static int lastmark = 0;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	139
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	140 #if defined(U_DEBUG) \|\| defined(PROTO)
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	141 /*
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	142 * Check the undo structures for being valid. Print a warning when something
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	143 * looks wrong.
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	144 */
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	145 static int seen_b_u_curhead;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	146 static int seen_b_u_newhead;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	147 static int header_count;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	148
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	149 static void
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	150 u_check_tree(u_header_T *uhp,
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	151 u_header_T *exp_uh_next,
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	152 u_header_T *exp_uh_alt_prev)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	153 {
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	154 u_entry_T *uep;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	155
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	156 if (uhp == NULL)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	157 return;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	158 ++header_count;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	159 if (uhp == curbuf->b_u_curhead && ++seen_b_u_curhead > 1)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	160 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	161 emsg("b_u_curhead found twice (looping?)");
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	162 return;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	163 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	164 if (uhp == curbuf->b_u_newhead && ++seen_b_u_newhead > 1)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	165 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	166 emsg("b_u_newhead found twice (looping?)");
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	167 return;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	168 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	169
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	170 if (uhp->uh_magic != UH_MAGIC)
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	171 emsg("uh_magic wrong (may be using freed memory)");
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	172 else
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	173 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	174 // Check pointers back are correct.
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	175 if (uhp->uh_next.ptr != exp_uh_next)
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	176 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	177 emsg("uh_next wrong");
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	178 smsg("expected: 0x%x, actual: 0x%x",
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	179 exp_uh_next, uhp->uh_next.ptr);
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	180 }
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	181 if (uhp->uh_alt_prev.ptr != exp_uh_alt_prev)
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	182 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	183 emsg("uh_alt_prev wrong");
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	184 smsg("expected: 0x%x, actual: 0x%x",
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	185 exp_uh_alt_prev, uhp->uh_alt_prev.ptr);
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	186 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	187
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	188 // Check the undo tree at this header.
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	189 for (uep = uhp->uh_entry; uep != NULL; uep = uep->ue_next)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	190 {
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	191 if (uep->ue_magic != UE_MAGIC)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	192 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	193 emsg("ue_magic wrong (may be using freed memory)");
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	194 break;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	195 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	196 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	197
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	198 // Check the next alt tree.
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	199 u_check_tree(uhp->uh_alt_next.ptr, uhp->uh_next.ptr, uhp);
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	200
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	201 // Check the next header in this branch.
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	202 u_check_tree(uhp->uh_prev.ptr, uhp, NULL);
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	203 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	204 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	205
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	206 static void
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	207 u_check(int newhead_may_be_NULL)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	208 {
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	209 seen_b_u_newhead = 0;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	210 seen_b_u_curhead = 0;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	211 header_count = 0;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	212
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	213 u_check_tree(curbuf->b_u_oldhead, NULL, NULL);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	214
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	215 if (seen_b_u_newhead == 0 && curbuf->b_u_oldhead != NULL
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	216 && !(newhead_may_be_NULL && curbuf->b_u_newhead == NULL))
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	217 semsg("b_u_newhead invalid: 0x%x", curbuf->b_u_newhead);
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	218 if (curbuf->b_u_curhead != NULL && seen_b_u_curhead == 0)
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	219 semsg("b_u_curhead invalid: 0x%x", curbuf->b_u_curhead);
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	220 if (header_count != curbuf->b_u_numhead)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	221 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	222 emsg("b_u_numhead invalid");
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	223 smsg("expected: %ld, actual: %ld",
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	224 (long)header_count, (long)curbuf->b_u_numhead);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	225 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	226 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	227 #endif
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	228
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	229 /*
344 7033303ea0c0 updated for version 7.0089 vimboss parents: 179 diff changeset	230 * Save the current line for both the "u" and "U" command.
4303 790238e5a46c updated for version 7.3.901 Bram Moolenaar <bram@vim.org> parents: 3751 diff changeset	231 * Careful: may trigger autocommands that reload the buffer.
344 7033303ea0c0 updated for version 7.0089 vimboss parents: 179 diff changeset	232 * Returns OK or FAIL.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	233 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	234 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	235 u_save_cursor(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	236 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	237 return (u_save((linenr_T)(curwin->w_cursor.lnum - 1),
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	238 (linenr_T)(curwin->w_cursor.lnum + 1)));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	239 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	240
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	241 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	242 * Save the lines between "top" and "bot" for both the "u" and "U" command.
26532 255bc9a08e58 patch 8.2.3795: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 25951 diff changeset	243 * "top" may be 0 and "bot" may be curbuf->b_ml.ml_line_count + 1.
2289 3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2288 diff changeset	244 * Careful: may trigger autocommands that reload the buffer.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	245 * Returns FAIL when lines could not be saved, OK otherwise.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	246 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	247 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	248 u_save(linenr_T top, linenr_T bot)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	249 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	250 if (undo_off)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	251 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	252
14327 b8f1167aa8ad patch 8.1.0179: redundant condition for boundary check Christian Brabandt <cb@256bit.org> parents: 14301 diff changeset	253 if (top >= bot \|\| bot > curbuf->b_ml.ml_line_count + 1)
b8f1167aa8ad patch 8.1.0179: redundant condition for boundary check Christian Brabandt <cb@256bit.org> parents: 14301 diff changeset	254 return FAIL; // rely on caller to give an error message
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	255
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	256 if (top + 2 == bot)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	257 u_saveline((linenr_T)(top + 1));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	258
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	259 return (u_savecommon(top, bot, (linenr_T)0, FALSE));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	260 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	261
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	262 /*
2181 f838615313cd updated for version 7.2.441 Bram Moolenaar <bram@vim.org> parents: 2165 diff changeset	263 * Save the line "lnum" (used by ":s" and "~" command).
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	264 * The line is replaced, so the new bottom line is lnum + 1.
2289 3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2288 diff changeset	265 * Careful: may trigger autocommands that reload the buffer.
3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2288 diff changeset	266 * Returns FAIL when lines could not be saved, OK otherwise.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	267 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	268 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	269 u_savesub(linenr_T lnum)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	270 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	271 if (undo_off)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	272 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	273
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	274 return (u_savecommon(lnum - 1, lnum + 1, lnum + 1, FALSE));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	275 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	276
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	277 /*
2181 f838615313cd updated for version 7.2.441 Bram Moolenaar <bram@vim.org> parents: 2165 diff changeset	278 * A new line is inserted before line "lnum" (used by :s command).
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	279 * The line is inserted, so the new bottom line is lnum + 1.
2289 3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2288 diff changeset	280 * Careful: may trigger autocommands that reload the buffer.
3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2288 diff changeset	281 * Returns FAIL when lines could not be saved, OK otherwise.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	282 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	283 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	284 u_inssub(linenr_T lnum)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	285 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	286 if (undo_off)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	287 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	288
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	289 return (u_savecommon(lnum - 1, lnum, lnum + 1, FALSE));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	290 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	291
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	292 /*
2181 f838615313cd updated for version 7.2.441 Bram Moolenaar <bram@vim.org> parents: 2165 diff changeset	293 * Save the lines "lnum" - "lnum" + nlines (used by delete command).
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	294 * The lines are deleted, so the new bottom line is lnum, unless the buffer
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	295 * becomes empty.
2289 3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2288 diff changeset	296 * Careful: may trigger autocommands that reload the buffer.
3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2288 diff changeset	297 * Returns FAIL when lines could not be saved, OK otherwise.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	298 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	299 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	300 u_savedel(linenr_T lnum, long nlines)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	301 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	302 if (undo_off)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	303 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	304
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	305 return (u_savecommon(lnum - 1, lnum + nlines,
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	306 nlines == curbuf->b_ml.ml_line_count ? 2 : lnum, FALSE));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	307 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	308
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	309 /*
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	310 * Return TRUE when undo is allowed. Otherwise give an error message and
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	311 * return FALSE.
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	312 */
912 adf6a9dcaded updated for version 7.0-038 vimboss parents: 839 diff changeset	313 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	314 undo_allowed(void)
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	315 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	316 // Don't allow changes when 'modifiable' is off.
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	317 if (!curbuf->b_p_ma)
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	318 {
25064 8f2262c72178 patch 8.2.3069: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 24970 diff changeset	319 emsg(_(e_cannot_make_changes_modifiable_is_off));
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	320 return FALSE;
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	321 }
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	322
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	323 #ifdef HAVE_SANDBOX
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	324 // In the sandbox it's not allowed to change the text.
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	325 if (sandbox != 0)
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	326 {
25320 1e6da8364a02 patch 8.2.3197: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 25064 diff changeset	327 emsg(_(e_not_allowed_in_sandbox));
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	328 return FALSE;
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	329 }
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	330 #endif
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	331
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	332 // Don't allow changes in the buffer while editing the cmdline. The
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	333 // caller of getcmdline() may get confused.
20229 06a1dd50463e patch 8.2.0670: cannot change window when evaluating 'completefunc' Bram Moolenaar <Bram@vim.org> parents: 20118 diff changeset	334 if (textwinlock != 0 \|\| textlock != 0)
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	335 {
26883 7f150a4936f2 patch 8.2.3970: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26532 diff changeset	336 emsg(_(e_not_allowed_to_change_text_here));
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	337 return FALSE;
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	338 }
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	339
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	340 return TRUE;
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	341 }
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	342
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	343 /*
18498 9e6d5a4abb1c patch 8.1.2243: typos in comments Bram Moolenaar <Bram@vim.org> parents: 18463 diff changeset	344 * Get the undolevel value for the current buffer.
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	345 */
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	346 static long
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	347 get_undolevel(void)
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	348 {
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	349 if (curbuf->b_p_ul == NO_LOCAL_UNDOLEVEL)
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	350 return p_ul;
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	351 return curbuf->b_p_ul;
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	352 }
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	353
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	354 /*
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	355 * u_save_line(): save an allocated copy of line "lnum" into "ul".
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	356 * Returns FAIL when out of memory.
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	357 */
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	358 static int
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	359 u_save_line(undoline_T *ul, linenr_T lnum)
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	360 {
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	361 char_u *line = ml_get(lnum);
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	362
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	363 if (curbuf->b_ml.ml_line_len == 0)
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	364 {
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	365 ul->ul_len = 1;
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	366 ul->ul_line = vim_strsave((char_u *)"");
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	367 }
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	368 else
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	369 {
16764 ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 16627 diff changeset	370 // This uses the length in the memline, thus text properties are
ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 16627 diff changeset	371 // included.
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	372 ul->ul_len = curbuf->b_ml.ml_line_len;
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	373 ul->ul_line = vim_memsave(line, ul->ul_len);
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	374 }
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	375 return ul->ul_line == NULL ? FAIL : OK;
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	376 }
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	377
20585 0b55c9a14ea1 patch 8.2.0846: build failure with small features Bram Moolenaar <Bram@vim.org> parents: 20581 diff changeset	378 #ifdef FEAT_PROP_POPUP
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	379 /*
20581 e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	380 * return TRUE if line "lnum" has text property "flags".
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	381 */
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	382 static int
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	383 has_prop_w_flags(linenr_T lnum, int flags)
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	384 {
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	385 char_u *props;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	386 int i;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	387 int proplen = get_text_props(curbuf, lnum, &props, FALSE);
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	388
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	389 for (i = 0; i < proplen; ++i)
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	390 {
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	391 textprop_T prop;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	392
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	393 mch_memmove(&prop, props + i * sizeof prop, sizeof prop);
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	394 if (prop.tp_flags & flags)
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	395 return TRUE;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	396 }
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	397 return FALSE;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	398 }
20585 0b55c9a14ea1 patch 8.2.0846: build failure with small features Bram Moolenaar <Bram@vim.org> parents: 20581 diff changeset	399 #endif
20581 e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	400
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	401 /*
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	402 * Common code for various ways to save text before a change.
2289 3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2288 diff changeset	403 * "top" is the line above the first changed line.
3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2288 diff changeset	404 * "bot" is the line below the last changed line.
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	405 * "newbot" is the new bottom line. Use zero when not known.
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	406 * "reload" is TRUE when saving for a buffer reload.
2289 3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2288 diff changeset	407 * Careful: may trigger autocommands that reload the buffer.
3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2288 diff changeset	408 * Returns FAIL when lines could not be saved, OK otherwise.
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	409 */
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	410 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	411 u_savecommon(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	412 linenr_T top,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	413 linenr_T bot,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	414 linenr_T newbot,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	415 int reload)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	416 {
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	417 linenr_T lnum;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	418 long i;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	419 u_header_T *uhp;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	420 u_header_T *old_curhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	421 u_entry_T *uep;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	422 u_entry_T *prev_uep;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	423 long size;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	424
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	425 if (!reload)
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	426 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	427 // When making changes is not allowed return FAIL. It's a crude way
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	428 // to make all change commands fail.
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	429 if (!undo_allowed())
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	430 return FAIL;
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	431
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	432 #ifdef FEAT_NETBEANS_INTG
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	433 /*
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	434 * Netbeans defines areas that cannot be modified. Bail out here when
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	435 * trying to change text in a guarded area.
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	436 */
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	437 if (netbeans_active())
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	438 {
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	439 if (netbeans_is_guarded(top, bot))
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	440 {
26883 7f150a4936f2 patch 8.2.3970: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26532 diff changeset	441 emsg(_(e_region_is_guarded_cannot_modify));
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	442 return FAIL;
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	443 }
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	444 if (curbuf->b_p_ro)
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	445 {
26883 7f150a4936f2 patch 8.2.3970: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26532 diff changeset	446 emsg(_(e_netbeans_does_not_allow_changes_in_read_only_files));
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	447 return FAIL;
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	448 }
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	449 }
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	450 #endif
11836 f080b225a2a4 patch 8.0.0798: no highlighting in a terminal window with a finished job Christian Brabandt <cb@256bit.org> parents: 11506 diff changeset	451 #ifdef FEAT_TERMINAL
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	452 // A change in a terminal buffer removes the highlighting.
11836 f080b225a2a4 patch 8.0.0798: no highlighting in a terminal window with a finished job Christian Brabandt <cb@256bit.org> parents: 11506 diff changeset	453 term_change_in_curbuf();
f080b225a2a4 patch 8.0.0798: no highlighting in a terminal window with a finished job Christian Brabandt <cb@256bit.org> parents: 11506 diff changeset	454 #endif
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	455
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	456 /*
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	457 * Saving text for undo means we are going to make a change. Give a
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	458 * warning for a read-only file before making the change, so that the
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	459 * FileChangedRO event can replace the buffer with a read-write version
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	460 * (e.g., obtained from a source control system).
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	461 */
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	462 change_warning(0);
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	463 if (bot > curbuf->b_ml.ml_line_count + 1)
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	464 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	465 // This happens when the FileChangedRO autocommand changes the
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	466 // file in a way it becomes shorter.
26966 ac75c145f0a9 patch 8.2.4012: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26962 diff changeset	467 emsg(_(e_line_count_changed_unexpectedly));
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	468 return FAIL;
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	469 }
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	470 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	471
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	472 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	473 u_check(FALSE);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	474 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	475
20581 e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	476 #ifdef FEAT_PROP_POPUP
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	477 // Include the line above if a text property continues from it.
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	478 // Include the line below if a text property continues to it.
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	479 if (bot - top > 1)
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	480 {
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	481 if (top > 0 && has_prop_w_flags(top + 1, TP_FLAG_CONT_PREV))
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	482 --top;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	483 if (bot <= curbuf->b_ml.ml_line_count
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	484 && has_prop_w_flags(bot - 1, TP_FLAG_CONT_NEXT))
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	485 {
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	486 ++bot;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	487 if (newbot != 0)
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	488 ++newbot;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	489 }
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	490 }
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	491 #endif
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	492
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	493 size = bot - top - 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	494
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	495 /*
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	496 * If curbuf->b_u_synced == TRUE make a new header.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	497 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	498 if (curbuf->b_u_synced)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	499 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	500 // Need to create new entry in b_changelist.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	501 curbuf->b_new_change = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	502
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	503 if (get_undolevel() >= 0)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	504 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	505 /*
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	506 * Make a new header entry. Do this first so that we don't mess
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	507 * up the undo info when out of memory.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	508 */
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16768 diff changeset	509 uhp = U_ALLOC_LINE(sizeof(u_header_T));
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	510 if (uhp == NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	511 goto nomem;
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	512 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	513 uhp->uh_magic = UH_MAGIC;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	514 #endif
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	515 }
766 f0d0d3d3a1e2 updated for version 7.0225 vimboss parents: 758 diff changeset	516 else
f0d0d3d3a1e2 updated for version 7.0225 vimboss parents: 758 diff changeset	517 uhp = NULL;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	518
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	519 /*
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	520 * If we undid more than we redid, move the entry lists before and
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	521 * including curbuf->b_u_curhead to an alternate branch.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	522 */
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	523 old_curhead = curbuf->b_u_curhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	524 if (old_curhead != NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	525 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	526 curbuf->b_u_newhead = old_curhead->uh_next.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	527 curbuf->b_u_curhead = NULL;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	528 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	529
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	530 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	531 * free headers to keep the size right
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	532 */
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	533 while (curbuf->b_u_numhead > get_undolevel()
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	534 && curbuf->b_u_oldhead != NULL)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	535 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	536 u_header_T *uhfree = curbuf->b_u_oldhead;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	537
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	538 if (uhfree == old_curhead)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	539 // Can't reconnect the branch, delete all of it.
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	540 u_freebranch(curbuf, uhfree, &old_curhead);
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	541 else if (uhfree->uh_alt_next.ptr == NULL)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	542 // There is no branch, only free one header.
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	543 u_freeheader(curbuf, uhfree, &old_curhead);
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	544 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	545 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	546 // Free the oldest alternate branch as a whole.
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	547 while (uhfree->uh_alt_next.ptr != NULL)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	548 uhfree = uhfree->uh_alt_next.ptr;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	549 u_freebranch(curbuf, uhfree, &old_curhead);
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	550 }
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	551 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	552 u_check(TRUE);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	553 #endif
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	554 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	555
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	556 if (uhp == NULL) // no undo at all
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	557 {
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	558 if (old_curhead != NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	559 u_freebranch(curbuf, old_curhead, NULL);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	560 curbuf->b_u_synced = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	561 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	562 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	563
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	564 uhp->uh_prev.ptr = NULL;
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	565 uhp->uh_next.ptr = curbuf->b_u_newhead;
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	566 uhp->uh_alt_next.ptr = old_curhead;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	567 if (old_curhead != NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	568 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	569 uhp->uh_alt_prev.ptr = old_curhead->uh_alt_prev.ptr;
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	570 if (uhp->uh_alt_prev.ptr != NULL)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	571 uhp->uh_alt_prev.ptr->uh_alt_next.ptr = uhp;
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	572 old_curhead->uh_alt_prev.ptr = uhp;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	573 if (curbuf->b_u_oldhead == old_curhead)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	574 curbuf->b_u_oldhead = uhp;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	575 }
1056 e6d25347de2c updated for version 7.0-182 vimboss parents: 944 diff changeset	576 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	577 uhp->uh_alt_prev.ptr = NULL;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	578 if (curbuf->b_u_newhead != NULL)
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	579 curbuf->b_u_newhead->uh_prev.ptr = uhp;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	580
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	581 uhp->uh_seq = ++curbuf->b_u_seq_last;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	582 curbuf->b_u_seq_cur = uhp->uh_seq;
9674 adc7212951ee commit https://github.com/vim/vim/commit/170b10b421f0c9fda08b7cfd3bb043c064f3659a Christian Brabandt <cb@256bit.org> parents: 9536 diff changeset	583 uhp->uh_time = vim_time();
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	584 uhp->uh_save_nr = 0;
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	585 curbuf->b_u_time_cur = uhp->uh_time + 1;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	586
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	587 uhp->uh_walk = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	588 uhp->uh_entry = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	589 uhp->uh_getbot_entry = NULL;
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	590 uhp->uh_cursor = curwin->w_cursor; // save cursor pos. for undo
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	591 if (virtual_active() && curwin->w_cursor.coladd > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	592 uhp->uh_cursor_vcol = getviscol();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	593 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	594 uhp->uh_cursor_vcol = -1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	595
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	596 // save changed and buffer empty flag for undo
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	597 uhp->uh_flags = (curbuf->b_changed ? UH_CHANGED : 0) +
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	598 ((curbuf->b_ml.ml_flags & ML_EMPTY) ? UH_EMPTYBUF : 0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	599
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	600 // save named marks and Visual marks for undo
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	601 mch_memmove(uhp->uh_namedm, curbuf->b_namedm, sizeof(pos_T) * NMARKS);
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	602 uhp->uh_visual = curbuf->b_visual;
a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	603
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	604 curbuf->b_u_newhead = uhp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	605 if (curbuf->b_u_oldhead == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	606 curbuf->b_u_oldhead = uhp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	607 ++curbuf->b_u_numhead;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	608 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	609 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	610 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	611 if (get_undolevel() < 0) // no undo at all
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	612 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	613
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	614 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	615 * When saving a single line, and it has been saved just before, it
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	616 * doesn't make sense saving it again. Saves a lot of memory when
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	617 * making lots of changes inside the same line.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	618 * This is only possible if the previous change didn't increase or
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	619 * decrease the number of lines.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	620 * Check the ten last changes. More doesn't make sense and takes too
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	621 * long.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	622 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	623 if (size == 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	624 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	625 uep = u_get_headentry();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	626 prev_uep = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	627 for (i = 0; i < 10; ++i)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	628 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	629 if (uep == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	630 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	631
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	632 // If lines have been inserted/deleted we give up.
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	633 // Also when the line was included in a multi-line save.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	634 if ((curbuf->b_u_newhead->uh_getbot_entry != uep
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	635 ? (uep->ue_top + uep->ue_size + 1
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	636 != (uep->ue_bot == 0
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	637 ? curbuf->b_ml.ml_line_count + 1
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	638 : uep->ue_bot))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	639 : uep->ue_lcount != curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	640 \|\| (uep->ue_size > 1
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	641 && top >= uep->ue_top
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	642 && top + 2 <= uep->ue_top + uep->ue_size + 1))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	643 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	644
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	645 // If it's the same line we can skip saving it again.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	646 if (uep->ue_size == 1 && uep->ue_top == top)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	647 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	648 if (i > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	649 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	650 // It's not the last entry: get ue_bot for the last
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	651 // entry now. Following deleted/inserted lines go to
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	652 // the re-used entry.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	653 u_getbot();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	654 curbuf->b_u_synced = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	655
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	656 // Move the found entry to become the last entry. The
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	657 // order of undo/redo doesn't matter for the entries
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	658 // we move it over, since they don't change the line
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	659 // count and don't include this line. It does matter
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	660 // for the found entry if the line count is changed by
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	661 // the executed command.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	662 prev_uep->ue_next = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	663 uep->ue_next = curbuf->b_u_newhead->uh_entry;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	664 curbuf->b_u_newhead->uh_entry = uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	665 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	666
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	667 // The executed command may change the line count.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	668 if (newbot != 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	669 uep->ue_bot = newbot;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	670 else if (bot > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	671 uep->ue_bot = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	672 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	673 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	674 uep->ue_lcount = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	675 curbuf->b_u_newhead->uh_getbot_entry = uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	676 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	677 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	678 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	679 prev_uep = uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	680 uep = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	681 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	682 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	683
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	684 // find line number for ue_bot for previous u_save()
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	685 u_getbot();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	686 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	687
15868 7fad90423bd2 patch 8.1.0941: macros for MS-Windows are inconsistent Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	688 #if !defined(UNIX) && !defined(MSWIN)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	689 /*
8212 05b88224cea1 commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce Christian Brabandt <cb@256bit.org> parents: 8128 diff changeset	690 * With Amiga we can't handle big undo's, because
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	691 * then u_alloc_line would have to allocate a block larger than 32K
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	692 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	693 if (size >= 8000)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	694 goto nomem;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	695 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	696
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	697 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	698 * add lines in front of entry list
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	699 */
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16768 diff changeset	700 uep = U_ALLOC_LINE(sizeof(u_entry_T));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	701 if (uep == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	702 goto nomem;
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 18816 diff changeset	703 CLEAR_POINTER(uep);
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	704 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	705 uep->ue_magic = UE_MAGIC;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	706 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	707
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	708 uep->ue_size = size;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	709 uep->ue_top = top;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	710 if (newbot != 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	711 uep->ue_bot = newbot;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	712 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	713 * Use 0 for ue_bot if bot is below last line.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	714 * Otherwise we have to compute ue_bot later.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	715 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	716 else if (bot > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	717 uep->ue_bot = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	718 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	719 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	720 uep->ue_lcount = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	721 curbuf->b_u_newhead->uh_getbot_entry = uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	722 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	723
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	724 if (size > 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	725 {
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16768 diff changeset	726 if ((uep->ue_array = U_ALLOC_LINE(sizeof(undoline_T) * size)) == NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	727 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	728 u_freeentry(uep, 0L);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	729 goto nomem;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	730 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	731 for (i = 0, lnum = top + 1; i < size; ++i)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	732 {
481 66080ac5dab7 updated for version 7.0130 vimboss parents: 414 diff changeset	733 fast_breakcheck();
66080ac5dab7 updated for version 7.0130 vimboss parents: 414 diff changeset	734 if (got_int)
66080ac5dab7 updated for version 7.0130 vimboss parents: 414 diff changeset	735 {
66080ac5dab7 updated for version 7.0130 vimboss parents: 414 diff changeset	736 u_freeentry(uep, i);
66080ac5dab7 updated for version 7.0130 vimboss parents: 414 diff changeset	737 return FAIL;
66080ac5dab7 updated for version 7.0130 vimboss parents: 414 diff changeset	738 }
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	739 if (u_save_line(&uep->ue_array[i], lnum++) == FAIL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	740 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	741 u_freeentry(uep, i);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	742 goto nomem;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	743 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	744 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	745 }
359 6c62b9b939bd updated for version 7.0093 vimboss parents: 356 diff changeset	746 else
6c62b9b939bd updated for version 7.0093 vimboss parents: 356 diff changeset	747 uep->ue_array = NULL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	748 uep->ue_next = curbuf->b_u_newhead->uh_entry;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	749 curbuf->b_u_newhead->uh_entry = uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	750 curbuf->b_u_synced = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	751 undo_undoes = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	752
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	753 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	754 u_check(FALSE);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	755 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	756 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	757
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	758 nomem:
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	759 msg_silent = 0; // must display the prompt
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	760 if (ask_yesno((char_u *)_("No undo possible; continue anyway"), TRUE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	761 == 'y')
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	762 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	763 undo_off = TRUE; // will be reset when character typed
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	764 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	765 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	766 do_outofmem_msg((long_u)0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	767 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	768 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	769
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	770 #if defined(FEAT_PERSISTENT_UNDO) \|\| defined(PROTO)
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	771
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	772 # define UF_START_MAGIC "Vim\237UnDo\345" // magic at start of undofile
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	773 # define UF_START_MAGIC_LEN 9
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	774 # define UF_HEADER_MAGIC 0x5fd0 // magic at start of header
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	775 # define UF_HEADER_END_MAGIC 0xe7aa // magic after last header
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	776 # define UF_ENTRY_MAGIC 0xf518 // magic at start of entry
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	777 # define UF_ENTRY_END_MAGIC 0x3581 // magic after last entry
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	778 # define UF_VERSION 2 // 2-byte undofile version number
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	779 # define UF_VERSION_CRYPT 0x8002 // idem, encrypted
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	780
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	781 // extra fields for header
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	782 # define UF_LAST_SAVE_NR 1
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	783
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	784 // extra fields for uhp
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	785 # define UHP_SAVE_NR 1
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	786
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	787 /*
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	788 * Compute the hash for the current buffer text into hash[UNDO_HASH_SIZE].
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	789 */
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	790 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	791 u_compute_hash(char_u *hash)
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	792 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	793 context_sha256_T ctx;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	794 linenr_T lnum;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	795 char_u *p;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	796
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	797 sha256_start(&ctx);
3194 972bd3fca556 updated for version 7.3.367 Bram Moolenaar <bram@vim.org> parents: 2689 diff changeset	798 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum)
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	799 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	800 p = ml_get(lnum);
2217 120502692d82 Improve the MS-Windows installer. Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	801 sha256_update(&ctx, p, (UINT32_T)(STRLEN(p) + 1));
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	802 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	803 sha256_finish(&ctx, hash);
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	804 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	805
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	806 /*
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	807 * Return an allocated string of the full path of the target undofile.
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	808 * When "reading" is TRUE find the file to read, go over all directories in
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	809 * 'undodir'.
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	810 * When "reading" is FALSE use the first name where the directory exists.
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	811 * Returns NULL when there is no place to write or no file to read.
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	812 */
18051 d1e77015f60b patch 8.1.2021: some global functions can be local to the file Bram Moolenaar <Bram@vim.org> parents: 18025 diff changeset	813 static char_u *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	814 u_get_undo_file_name(char_u *buf_ffname, int reading)
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	815 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	816 char_u *dirp;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	817 char_u dir_name[IOSIZE + 1];
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	818 char_u *munged_name = NULL;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	819 char_u *undo_file_name = NULL;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	820 int dir_len;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	821 char_u *p;
9387 f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	822 stat_T st;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	823 char_u *ffname = buf_ffname;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	824 #ifdef HAVE_READLINK
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	825 char_u fname_buf[MAXPATHL];
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	826 #endif
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	827
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	828 if (ffname == NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	829 return NULL;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	830
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	831 #ifdef HAVE_READLINK
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	832 // Expand symlink in the file name, so that we put the undo file with the
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	833 // actual file instead of with the symlink.
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	834 if (resolve_symlink(ffname, fname_buf) == OK)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	835 ffname = fname_buf;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	836 #endif
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	837
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	838 // Loop over 'undodir'. When reading find the first file that exists.
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	839 // When not reading use the first directory that exists or ".".
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	840 dirp = p_udir;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	841 while (*dirp != NUL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	842 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	843 dir_len = copy_option_part(&dirp, dir_name, IOSIZE, ",");
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	844 if (dir_len == 1 && dir_name[0] == '.')
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	845 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	846 // Use same directory as the ffname,
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	847 // "dir/name" -> "dir/.name.un~"
20830 9064044fd4f6 patch 8.2.0967: unnecessary type casts for vim_strnsave() Bram Moolenaar <Bram@vim.org> parents: 20585 diff changeset	848 undo_file_name = vim_strnsave(ffname, STRLEN(ffname) + 5);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	849 if (undo_file_name == NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	850 break;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	851 p = gettail(undo_file_name);
5704 47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	852 #ifdef VMS
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	853 // VMS can not handle more than one dot in the filenames
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	854 // use "dir/name" -> "dir/_un_name" - add _un_
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	855 // at the beginning to keep the extension
5704 47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	856 mch_memmove(p + 4, p, STRLEN(p) + 1);
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	857 mch_memmove(p, "_un_", 4);
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	858
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	859 #else
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	860 // Use same directory as the ffname,
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	861 // "dir/name" -> "dir/.name.un~"
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	862 mch_memmove(p + 1, p, STRLEN(p) + 1);
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	863 *p = '.';
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	864 STRCAT(p, ".un~");
5704 47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	865 #endif
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	866 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	867 else
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	868 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	869 dir_name[dir_len] = NUL;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	870 if (mch_isdir(dir_name))
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	871 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	872 if (munged_name == NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	873 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	874 munged_name = vim_strsave(ffname);
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	875 if (munged_name == NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	876 return NULL;
11127 506f5d8b7d8b patch 8.0.0451: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11121 diff changeset	877 for (p = munged_name; *p != NUL; MB_PTR_ADV(p))
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	878 if (vim_ispathsep(*p))
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	879 *p = '%';
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	880 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	881 undo_file_name = concat_fnames(dir_name, munged_name, TRUE);
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	882 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	883 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	884
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	885 // When reading check if the file exists.
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	886 if (undo_file_name != NULL && (!reading
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	887 \|\| mch_stat((char *)undo_file_name, &st) >= 0))
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	888 break;
13244 ac42c4b11dbc patch 8.0.1496: clearing a pointer takes two lines Christian Brabandt <cb@256bit.org> parents: 13138 diff changeset	889 VIM_CLEAR(undo_file_name);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	890 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	891
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	892 vim_free(munged_name);
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	893 return undo_file_name;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	894 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	895
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	896 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	897 corruption_error(char mesg, char_u file_name)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	898 {
26962 85866e069c24 patch 8.2.4010: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	899 semsg(_(e_corrupted_undo_file_str_str), mesg, file_name);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	900 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	901
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	902 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	903 u_free_uhp(u_header_T *uhp)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	904 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	905 u_entry_T *nuep;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	906 u_entry_T *uep;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	907
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	908 uep = uhp->uh_entry;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	909 while (uep != NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	910 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	911 nuep = uep->ue_next;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	912 u_freeentry(uep, uep->ue_size);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	913 uep = nuep;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	914 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	915 vim_free(uhp);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	916 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	917
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	918 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	919 * Write a sequence of bytes to the undo file.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	920 * Buffers and encrypts as needed.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	921 * Returns OK or FAIL.
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	922 */
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	923 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	924 undo_write(bufinfo_T bi, char_u ptr, size_t len)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	925 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	926 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	927 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	928 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	929 size_t len_todo = len;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	930 char_u *p = ptr;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	931
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	932 while (bi->bi_used + len_todo >= CRYPT_BUF_SIZE)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	933 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	934 size_t n = CRYPT_BUF_SIZE - bi->bi_used;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	935
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	936 mch_memmove(bi->bi_buffer + bi->bi_used, p, n);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	937 len_todo -= n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	938 p += n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	939 bi->bi_used = CRYPT_BUF_SIZE;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	940 if (undo_flush(bi) == FAIL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	941 return FAIL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	942 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	943 if (len_todo > 0)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	944 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	945 mch_memmove(bi->bi_buffer + bi->bi_used, p, len_todo);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	946 bi->bi_used += len_todo;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	947 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	948 return OK;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	949 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	950 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	951 if (fwrite(ptr, len, (size_t)1, bi->bi_fp) != 1)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	952 return FAIL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	953 return OK;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	954 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	955
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	956 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	957 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	958 undo_flush(bufinfo_T *bi)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	959 {
12216 e971ef6c0dee patch 8.0.0988: warning from Covscan about using NULL pointer Christian Brabandt <cb@256bit.org> parents: 11957 diff changeset	960 if (bi->bi_buffer != NULL && bi->bi_state != NULL && bi->bi_used > 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	961 {
24970 7e9e53a0368f patch 8.2.3022: available encryption methods are not strong enough Bram Moolenaar <Bram@vim.org> parents: 21996 diff changeset	962 // Last parameter is only used for sodium encryption and that
7e9e53a0368f patch 8.2.3022: available encryption methods are not strong enough Bram Moolenaar <Bram@vim.org> parents: 21996 diff changeset	963 // explicitly disables encryption of undofiles.
7e9e53a0368f patch 8.2.3022: available encryption methods are not strong enough Bram Moolenaar <Bram@vim.org> parents: 21996 diff changeset	964 crypt_encode_inplace(bi->bi_state, bi->bi_buffer, bi->bi_used, FALSE);
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	965 if (fwrite(bi->bi_buffer, bi->bi_used, (size_t)1, bi->bi_fp) != 1)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	966 return FAIL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	967 bi->bi_used = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	968 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	969 return OK;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	970 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	971 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	972
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	973 /*
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	974 * Write "ptr[len]" and crypt the bytes when needed.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	975 * Returns OK or FAIL.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	976 */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	977 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	978 fwrite_crypt(bufinfo_T bi, char_u ptr, size_t len)
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	979 {
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	980 #ifdef FEAT_CRYPT
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	981 char_u *copy;
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	982 char_u small_buf[100];
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	983 size_t i;
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	984
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	985 if (bi->bi_state != NULL && bi->bi_buffer == NULL)
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	986 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	987 // crypting every piece of text separately
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	988 if (len < 100)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	989 copy = small_buf; // no malloc()/free() for short strings
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	990 else
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	991 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	992 copy = lalloc(len, FALSE);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	993 if (copy == NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	994 return 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	995 }
24970 7e9e53a0368f patch 8.2.3022: available encryption methods are not strong enough Bram Moolenaar <Bram@vim.org> parents: 21996 diff changeset	996 // Last parameter is only used for sodium encryption and that
7e9e53a0368f patch 8.2.3022: available encryption methods are not strong enough Bram Moolenaar <Bram@vim.org> parents: 21996 diff changeset	997 // explicitly disables encryption of undofiles.
7e9e53a0368f patch 8.2.3022: available encryption methods are not strong enough Bram Moolenaar <Bram@vim.org> parents: 21996 diff changeset	998 crypt_encode(bi->bi_state, ptr, len, copy, TRUE);
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	999 i = fwrite(copy, len, (size_t)1, bi->bi_fp);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1000 if (copy != small_buf)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1001 vim_free(copy);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1002 return i == 1 ? OK : FAIL;
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1003 }
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1004 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1005 return undo_write(bi, ptr, len);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1006 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1007
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1008 /*
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1009 * Write a number, MSB first, in "len" bytes.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1010 * Must match with undo_read_?c() functions.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1011 * Returns OK or FAIL.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1012 */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1013 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1014 undo_write_bytes(bufinfo_T *bi, long_u nr, int len)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1015 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1016 char_u buf[8];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1017 int i;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1018 int bufi = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1019
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1020 for (i = len - 1; i >= 0; --i)
6132 0242c27e40e1 updated for version 7.4.404 Bram Moolenaar <bram@vim.org> parents: 6128 diff changeset	1021 buf[bufi++] = (char_u)(nr >> (i * 8));
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1022 return undo_write(bi, buf, (size_t)len);
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1023 }
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1024
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1025 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1026 * Write the pointer to an undo header. Instead of writing the pointer itself
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1027 * we use the sequence number of the header. This is converted back to
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1028 * pointers when reading. */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1029 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1030 put_header_ptr(bufinfo_T bi, u_header_T uhp)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1031 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1032 undo_write_bytes(bi, (long_u)(uhp != NULL ? uhp->uh_seq : 0), 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1033 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1034
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1035 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1036 undo_read_4c(bufinfo_T *bi)
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1037 {
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1038 #ifdef FEAT_CRYPT
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1039 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1040 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1041 char_u buf[4];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1042 int n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1043
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1044 undo_read(bi, buf, (size_t)4);
6216 f1ba154c3a12 updated for version 7.4.443 Bram Moolenaar <bram@vim.org> parents: 6132 diff changeset	1045 n = ((unsigned)buf[0] << 24) + (buf[1] << 16) + (buf[2] << 8) + buf[3];
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1046 return n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1047 }
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1048 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1049 return get4c(bi->bi_fp);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1050 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1051
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1052 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1053 undo_read_2c(bufinfo_T *bi)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1054 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1055 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1056 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1057 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1058 char_u buf[2];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1059 int n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1060
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1061 undo_read(bi, buf, (size_t)2);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1062 n = (buf[0] << 8) + buf[1];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1063 return n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1064 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1065 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1066 return get2c(bi->bi_fp);
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1067 }
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1068
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1069 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1070 undo_read_byte(bufinfo_T *bi)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1071 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1072 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1073 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1074 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1075 char_u buf[1];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1076
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1077 undo_read(bi, buf, (size_t)1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1078 return buf[0];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1079 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1080 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1081 return getc(bi->bi_fp);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1082 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1083
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1084 static time_t
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1085 undo_read_time(bufinfo_T *bi)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1086 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1087 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1088 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1089 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1090 char_u buf[8];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1091 time_t n = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1092 int i;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1093
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1094 undo_read(bi, buf, (size_t)8);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1095 for (i = 0; i < 8; ++i)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1096 n = (n << 8) + buf[i];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1097 return n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1098 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1099 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1100 return get8ctime(bi->bi_fp);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1101 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1102
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1103 /*
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1104 * Read "buffer[size]" from the undo file.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1105 * Return OK or FAIL.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1106 */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1107 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1108 undo_read(bufinfo_T bi, char_u buffer, size_t size)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1109 {
11506 7140ff4857eb patch 8.0.0636: when reading the undo file fails may use uninitialized data Christian Brabandt <cb@256bit.org> parents: 11158 diff changeset	1110 int retval = OK;
7140ff4857eb patch 8.0.0636: when reading the undo file fails may use uninitialized data Christian Brabandt <cb@256bit.org> parents: 11158 diff changeset	1111
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1112 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1113 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1114 {
6132 0242c27e40e1 updated for version 7.4.404 Bram Moolenaar <bram@vim.org> parents: 6128 diff changeset	1115 int size_todo = (int)size;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1116 char_u *p = buffer;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1117
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1118 while (size_todo > 0)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1119 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1120 size_t n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1121
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1122 if (bi->bi_used >= bi->bi_avail)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1123 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1124 n = fread(bi->bi_buffer, 1, (size_t)CRYPT_BUF_SIZE, bi->bi_fp);
10336 9d282593ba24 commit https://github.com/vim/vim/commit/55952d4dd490bb2f63bda5d7f6d8fb69f58c333c Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	1125 if (n == 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1126 {
11506 7140ff4857eb patch 8.0.0636: when reading the undo file fails may use uninitialized data Christian Brabandt <cb@256bit.org> parents: 11158 diff changeset	1127 retval = FAIL;
7140ff4857eb patch 8.0.0636: when reading the undo file fails may use uninitialized data Christian Brabandt <cb@256bit.org> parents: 11158 diff changeset	1128 break;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1129 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1130 bi->bi_avail = n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1131 bi->bi_used = 0;
24970 7e9e53a0368f patch 8.2.3022: available encryption methods are not strong enough Bram Moolenaar <Bram@vim.org> parents: 21996 diff changeset	1132 crypt_decode_inplace(bi->bi_state, bi->bi_buffer, bi->bi_avail, FALSE);
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1133 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1134 n = size_todo;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1135 if (n > bi->bi_avail - bi->bi_used)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1136 n = bi->bi_avail - bi->bi_used;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1137 mch_memmove(p, bi->bi_buffer + bi->bi_used, n);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1138 bi->bi_used += n;
6132 0242c27e40e1 updated for version 7.4.404 Bram Moolenaar <bram@vim.org> parents: 6128 diff changeset	1139 size_todo -= (int)n;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1140 p += n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1141 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1142 }
11506 7140ff4857eb patch 8.0.0636: when reading the undo file fails may use uninitialized data Christian Brabandt <cb@256bit.org> parents: 11158 diff changeset	1143 else
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1144 #endif
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27378 diff changeset	1145 if (fread(buffer, size, 1, bi->bi_fp) != 1)
11506 7140ff4857eb patch 8.0.0636: when reading the undo file fails may use uninitialized data Christian Brabandt <cb@256bit.org> parents: 11158 diff changeset	1146 retval = FAIL;
7140ff4857eb patch 8.0.0636: when reading the undo file fails may use uninitialized data Christian Brabandt <cb@256bit.org> parents: 11158 diff changeset	1147
7140ff4857eb patch 8.0.0636: when reading the undo file fails may use uninitialized data Christian Brabandt <cb@256bit.org> parents: 11158 diff changeset	1148 if (retval == FAIL)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1149 // Error may be checked for only later. Fill with zeros,
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1150 // so that the reader won't use garbage.
11506 7140ff4857eb patch 8.0.0636: when reading the undo file fails may use uninitialized data Christian Brabandt <cb@256bit.org> parents: 11158 diff changeset	1151 vim_memset(buffer, 0, size);
7140ff4857eb patch 8.0.0636: when reading the undo file fails may use uninitialized data Christian Brabandt <cb@256bit.org> parents: 11158 diff changeset	1152 return retval;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1153 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1154
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1155 /*
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1156 * Read a string of length "len" from "bi->bi_fd".
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1157 * "len" can be zero to allocate an empty line.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1158 * Decrypt the bytes if needed.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1159 * Append a NUL.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1160 * Returns a pointer to allocated memory or NULL for failure.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1161 */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1162 static char_u *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1163 read_string_decrypt(bufinfo_T *bi, int len)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1164 {
16764 ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 16627 diff changeset	1165 char_u *ptr = alloc(len + 1);
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1166
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1167 if (ptr != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1168 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1169 if (len > 0 && undo_read(bi, ptr, len) == FAIL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1170 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1171 vim_free(ptr);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1172 return NULL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1173 }
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1174 // In case there are text properties there already is a NUL, but
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1175 // checking for that is more expensive than just adding a dummy byte.
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1176 ptr[len] = NUL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1177 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1178 if (bi->bi_state != NULL && bi->bi_buffer == NULL)
24970 7e9e53a0368f patch 8.2.3022: available encryption methods are not strong enough Bram Moolenaar <Bram@vim.org> parents: 21996 diff changeset	1179 crypt_decode_inplace(bi->bi_state, ptr, len, FALSE);
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1180 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1181 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1182 return ptr;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1183 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1184
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1185 /*
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1186 * Writes the (not encrypted) header and initializes encryption if needed.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1187 */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1188 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1189 serialize_header(bufinfo_T bi, char_u hash)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1190 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1191 long len;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1192 buf_T *buf = bi->bi_buf;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1193 FILE *fp = bi->bi_fp;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1194 char_u time_buf[8];
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1195
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1196 // Start writing, first the magic marker and undo info version.
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1197 if (fwrite(UF_START_MAGIC, (size_t)UF_START_MAGIC_LEN, (size_t)1, fp) != 1)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1198 return FAIL;
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1199
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1200 // If the buffer is encrypted then all text bytes following will be
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1201 // encrypted. Numbers and other info is not crypted.
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1202 #ifdef FEAT_CRYPT
2410 8f6106dd3d12 Fix: editing a not encrypted file after a crypted file messed up reading the Bram Moolenaar <bram@vim.org> parents: 2394 diff changeset	1203 if (*buf->b_p_key != NUL)
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1204 {
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1205 char_u *header;
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1206 int header_len;
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1207
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1208 undo_write_bytes(bi, (long_u)UF_VERSION_CRYPT, 2);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1209 bi->bi_state = crypt_create_for_writing(crypt_get_method_nr(buf),
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1210 buf->b_p_key, &header, &header_len);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1211 if (bi->bi_state == NULL)
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1212 return FAIL;
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1213 len = (long)fwrite(header, (size_t)header_len, (size_t)1, fp);
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1214 vim_free(header);
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1215 if (len != 1)
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	1216 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1217 crypt_free_state(bi->bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1218 bi->bi_state = NULL;
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1219 return FAIL;
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	1220 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1221
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1222 if (crypt_whole_undofile(crypt_get_method_nr(buf)))
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1223 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1224 bi->bi_buffer = alloc(CRYPT_BUF_SIZE);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1225 if (bi->bi_buffer == NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1226 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1227 crypt_free_state(bi->bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1228 bi->bi_state = NULL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1229 return FAIL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1230 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1231 bi->bi_used = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1232 }
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1233 }
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1234 else
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1235 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1236 undo_write_bytes(bi, (long_u)UF_VERSION, 2);
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1237
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1238
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1239 // Write a hash of the buffer text, so that we can verify it is still the
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1240 // same when reading the buffer text.
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1241 if (undo_write(bi, hash, (size_t)UNDO_HASH_SIZE) == FAIL)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1242 return FAIL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1243
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1244 // buffer-specific data
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1245 undo_write_bytes(bi, (long_u)buf->b_ml.ml_line_count, 4);
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1246 len = buf->b_u_line_ptr.ul_line == NULL
15390 00aa76a735e7 patch 8.1.0703: compiler warnings with 64-bit compiler Bram Moolenaar <Bram@vim.org> parents: 15361 diff changeset	1247 ? 0L : (long)STRLEN(buf->b_u_line_ptr.ul_line);
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1248 undo_write_bytes(bi, (long_u)len, 4);
15390 00aa76a735e7 patch 8.1.0703: compiler warnings with 64-bit compiler Bram Moolenaar <Bram@vim.org> parents: 15361 diff changeset	1249 if (len > 0 && fwrite_crypt(bi, buf->b_u_line_ptr.ul_line, (size_t)len)
00aa76a735e7 patch 8.1.0703: compiler warnings with 64-bit compiler Bram Moolenaar <Bram@vim.org> parents: 15361 diff changeset	1250 == FAIL)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1251 return FAIL;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1252 undo_write_bytes(bi, (long_u)buf->b_u_line_lnum, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1253 undo_write_bytes(bi, (long_u)buf->b_u_line_colnr, 4);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1254
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1255 // Undo structures header data
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1256 put_header_ptr(bi, buf->b_u_oldhead);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1257 put_header_ptr(bi, buf->b_u_newhead);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1258 put_header_ptr(bi, buf->b_u_curhead);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1259
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1260 undo_write_bytes(bi, (long_u)buf->b_u_numhead, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1261 undo_write_bytes(bi, (long_u)buf->b_u_seq_last, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1262 undo_write_bytes(bi, (long_u)buf->b_u_seq_cur, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1263 time_to_bytes(buf->b_u_time_cur, time_buf);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1264 undo_write(bi, time_buf, 8);
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1265
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1266 // Optional fields.
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1267 undo_write_bytes(bi, 4, 1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1268 undo_write_bytes(bi, UF_LAST_SAVE_NR, 1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1269 undo_write_bytes(bi, (long_u)buf->b_u_save_nr_last, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1270
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1271 undo_write_bytes(bi, 0, 1); // end marker
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1272
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1273 return OK;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1274 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1275
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1276 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1277 serialize_uhp(bufinfo_T bi, u_header_T uhp)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1278 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1279 int i;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1280 u_entry_T *uep;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1281 char_u time_buf[8];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1282
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1283 if (undo_write_bytes(bi, (long_u)UF_HEADER_MAGIC, 2) == FAIL)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1284 return FAIL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1285
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1286 put_header_ptr(bi, uhp->uh_next.ptr);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1287 put_header_ptr(bi, uhp->uh_prev.ptr);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1288 put_header_ptr(bi, uhp->uh_alt_next.ptr);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1289 put_header_ptr(bi, uhp->uh_alt_prev.ptr);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1290 undo_write_bytes(bi, uhp->uh_seq, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1291 serialize_pos(bi, uhp->uh_cursor);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1292 undo_write_bytes(bi, (long_u)uhp->uh_cursor_vcol, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1293 undo_write_bytes(bi, (long_u)uhp->uh_flags, 2);
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1294 // Assume NMARKS will stay the same.
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1295 for (i = 0; i < NMARKS; ++i)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1296 serialize_pos(bi, uhp->uh_namedm[i]);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1297 serialize_visualinfo(bi, &uhp->uh_visual);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1298 time_to_bytes(uhp->uh_time, time_buf);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1299 undo_write(bi, time_buf, 8);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1300
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1301 // Optional fields.
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1302 undo_write_bytes(bi, 4, 1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1303 undo_write_bytes(bi, UHP_SAVE_NR, 1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1304 undo_write_bytes(bi, (long_u)uhp->uh_save_nr, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1305
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1306 undo_write_bytes(bi, 0, 1); // end marker
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1307
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1308 // Write all the entries.
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1309 for (uep = uhp->uh_entry; uep != NULL; uep = uep->ue_next)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1310 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1311 undo_write_bytes(bi, (long_u)UF_ENTRY_MAGIC, 2);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1312 if (serialize_uep(bi, uep) == FAIL)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1313 return FAIL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1314 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1315 undo_write_bytes(bi, (long_u)UF_ENTRY_END_MAGIC, 2);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1316 return OK;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1317 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1318
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1319 static u_header_T *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1320 unserialize_uhp(bufinfo_T bi, char_u file_name)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1321 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1322 u_header_T *uhp;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1323 int i;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1324 u_entry_T uep, last_uep;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1325 int c;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1326 int error;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1327
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16768 diff changeset	1328 uhp = U_ALLOC_LINE(sizeof(u_header_T));
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1329 if (uhp == NULL)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1330 return NULL;
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 18816 diff changeset	1331 CLEAR_POINTER(uhp);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1332 #ifdef U_DEBUG
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1333 uhp->uh_magic = UH_MAGIC;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1334 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1335 uhp->uh_next.seq = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1336 uhp->uh_prev.seq = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1337 uhp->uh_alt_next.seq = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1338 uhp->uh_alt_prev.seq = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1339 uhp->uh_seq = undo_read_4c(bi);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1340 if (uhp->uh_seq <= 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1341 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1342 corruption_error("uh_seq", file_name);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1343 vim_free(uhp);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1344 return NULL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1345 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1346 unserialize_pos(bi, &uhp->uh_cursor);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1347 uhp->uh_cursor_vcol = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1348 uhp->uh_flags = undo_read_2c(bi);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1349 for (i = 0; i < NMARKS; ++i)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1350 unserialize_pos(bi, &uhp->uh_namedm[i]);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1351 unserialize_visualinfo(bi, &uhp->uh_visual);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1352 uhp->uh_time = undo_read_time(bi);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1353
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1354 // Optional fields.
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1355 for (;;)
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1356 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1357 int len = undo_read_byte(bi);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1358 int what;
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1359
17630 380adf86bf66 patch 8.1.1812: reading a truncted undo file hangs Vim Bram Moolenaar <Bram@vim.org> parents: 17135 diff changeset	1360 if (len == EOF)
380adf86bf66 patch 8.1.1812: reading a truncted undo file hangs Vim Bram Moolenaar <Bram@vim.org> parents: 17135 diff changeset	1361 {
380adf86bf66 patch 8.1.1812: reading a truncted undo file hangs Vim Bram Moolenaar <Bram@vim.org> parents: 17135 diff changeset	1362 corruption_error("truncated", file_name);
380adf86bf66 patch 8.1.1812: reading a truncted undo file hangs Vim Bram Moolenaar <Bram@vim.org> parents: 17135 diff changeset	1363 u_free_uhp(uhp);
380adf86bf66 patch 8.1.1812: reading a truncted undo file hangs Vim Bram Moolenaar <Bram@vim.org> parents: 17135 diff changeset	1364 return NULL;
380adf86bf66 patch 8.1.1812: reading a truncted undo file hangs Vim Bram Moolenaar <Bram@vim.org> parents: 17135 diff changeset	1365 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1366 if (len == 0)
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1367 break;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1368 what = undo_read_byte(bi);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1369 switch (what)
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1370 {
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1371 case UHP_SAVE_NR:
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1372 uhp->uh_save_nr = undo_read_4c(bi);
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1373 break;
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1374 default:
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1375 // field not supported, skip
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1376 while (--len >= 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1377 (void)undo_read_byte(bi);
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1378 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1379 }
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1380
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1381 // Unserialize the uep list.
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1382 last_uep = NULL;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1383 while ((c = undo_read_2c(bi)) == UF_ENTRY_MAGIC)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1384 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1385 error = FALSE;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1386 uep = unserialize_uep(bi, &error, file_name);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1387 if (last_uep == NULL)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1388 uhp->uh_entry = uep;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1389 else
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1390 last_uep->ue_next = uep;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1391 last_uep = uep;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1392 if (uep == NULL \|\| error)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1393 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1394 u_free_uhp(uhp);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1395 return NULL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1396 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1397 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1398 if (c != UF_ENTRY_END_MAGIC)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1399 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1400 corruption_error("entry end", file_name);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1401 u_free_uhp(uhp);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1402 return NULL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1403 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1404
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1405 return uhp;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1406 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1407
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1408 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1409 * Serialize "uep".
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1410 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1411 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1412 serialize_uep(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1413 bufinfo_T *bi,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1414 u_entry_T *uep)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1415 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1416 int i;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1417 size_t len;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1418
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1419 undo_write_bytes(bi, (long_u)uep->ue_top, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1420 undo_write_bytes(bi, (long_u)uep->ue_bot, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1421 undo_write_bytes(bi, (long_u)uep->ue_lcount, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1422 undo_write_bytes(bi, (long_u)uep->ue_size, 4);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1423 for (i = 0; i < uep->ue_size; ++i)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1424 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1425 // Text is written without the text properties, since we cannot restore
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1426 // the text property types.
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1427 len = STRLEN(uep->ue_array[i].ul_line);
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1428 if (undo_write_bytes(bi, (long_u)len, 4) == FAIL)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1429 return FAIL;
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1430 if (len > 0 && fwrite_crypt(bi, uep->ue_array[i].ul_line, len) == FAIL)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1431 return FAIL;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1432 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1433 return OK;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1434 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1435
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1436 static u_entry_T *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1437 unserialize_uep(bufinfo_T bi, int error, char_u *file_name)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1438 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1439 int i;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1440 u_entry_T *uep;
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1441 undoline_T *array = NULL;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1442 char_u *line;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1443 int line_len;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1444
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16768 diff changeset	1445 uep = U_ALLOC_LINE(sizeof(u_entry_T));
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1446 if (uep == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1447 return NULL;
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 18816 diff changeset	1448 CLEAR_POINTER(uep);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1449 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1450 uep->ue_magic = UE_MAGIC;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1451 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1452 uep->ue_top = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1453 uep->ue_bot = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1454 uep->ue_lcount = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1455 uep->ue_size = undo_read_4c(bi);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1456 if (uep->ue_size > 0)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1457 {
10978 f3d64d9e5d76 patch 8.0.0378: possible overflow when reading corrupted undo file Christian Brabandt <cb@256bit.org> parents: 10976 diff changeset	1458 if (uep->ue_size < LONG_MAX / (int)sizeof(char_u *))
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16768 diff changeset	1459 array = U_ALLOC_LINE(sizeof(undoline_T) * uep->ue_size);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1460 if (array == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1461 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1462 *error = TRUE;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1463 return uep;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1464 }
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1465 vim_memset(array, 0, sizeof(undoline_T) * uep->ue_size);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1466 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1467 uep->ue_array = array;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1468
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1469 for (i = 0; i < uep->ue_size; ++i)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1470 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1471 line_len = undo_read_4c(bi);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1472 if (line_len >= 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1473 line = read_string_decrypt(bi, line_len);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1474 else
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1475 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1476 line = NULL;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1477 corruption_error("line length", file_name);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1478 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1479 if (line == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1480 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1481 *error = TRUE;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1482 return uep;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1483 }
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1484 array[i].ul_line = line;
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1485 array[i].ul_len = line_len + 1;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1486 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1487 return uep;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1488 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1489
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1490 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1491 * Serialize "pos".
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1492 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1493 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1494 serialize_pos(bufinfo_T *bi, pos_T pos)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1495 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1496 undo_write_bytes(bi, (long_u)pos.lnum, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1497 undo_write_bytes(bi, (long_u)pos.col, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1498 undo_write_bytes(bi, (long_u)pos.coladd, 4);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1499 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1500
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1501 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1502 * Unserialize the pos_T at the current position.
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1503 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1504 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1505 unserialize_pos(bufinfo_T bi, pos_T pos)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1506 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1507 pos->lnum = undo_read_4c(bi);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1508 if (pos->lnum < 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1509 pos->lnum = 0;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1510 pos->col = undo_read_4c(bi);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1511 if (pos->col < 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1512 pos->col = 0;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1513 pos->coladd = undo_read_4c(bi);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1514 if (pos->coladd < 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1515 pos->coladd = 0;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1516 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1517
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1518 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1519 * Serialize "info".
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1520 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1521 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1522 serialize_visualinfo(bufinfo_T bi, visualinfo_T info)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1523 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1524 serialize_pos(bi, info->vi_start);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1525 serialize_pos(bi, info->vi_end);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1526 undo_write_bytes(bi, (long_u)info->vi_mode, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1527 undo_write_bytes(bi, (long_u)info->vi_curswant, 4);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1528 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1529
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1530 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1531 * Unserialize the visualinfo_T at the current position.
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1532 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1533 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1534 unserialize_visualinfo(bufinfo_T bi, visualinfo_T info)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1535 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1536 unserialize_pos(bi, &info->vi_start);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1537 unserialize_pos(bi, &info->vi_end);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1538 info->vi_mode = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1539 info->vi_curswant = undo_read_4c(bi);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1540 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1541
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1542 /*
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1543 * Write the undo tree in an undo file.
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1544 * When "name" is not NULL, use it as the name of the undo file.
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1545 * Otherwise use buf->b_ffname to generate the undo file name.
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1546 * "buf" must never be null, buf->b_ffname is used to obtain the original file
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1547 * permissions.
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1548 * "forceit" is TRUE for ":wundo!", FALSE otherwise.
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1549 * "hash[UNDO_HASH_SIZE]" must be the hash value of the buffer text.
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1550 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1551 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1552 u_write_undo(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1553 char_u *name,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1554 int forceit,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1555 buf_T *buf,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1556 char_u *hash)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1557 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1558 u_header_T *uhp;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1559 char_u *file_name;
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1560 int mark;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1561 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1562 int headers_written = 0;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1563 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1564 int fd;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1565 FILE *fp = NULL;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1566 int perm;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1567 int write_ok = FALSE;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1568 #ifdef UNIX
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1569 int st_old_valid = FALSE;
9387 f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	1570 stat_T st_old;
f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	1571 stat_T st_new;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1572 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1573 bufinfo_T bi;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1574
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 18816 diff changeset	1575 CLEAR_FIELD(bi);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1576
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1577 if (name == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1578 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1579 file_name = u_get_undo_file_name(buf->b_ffname, FALSE);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1580 if (file_name == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1581 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1582 if (p_verbose > 0)
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1583 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1584 verbose_enter();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1585 smsg(
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1586 _("Cannot write undo file in any directory in 'undodir'"));
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1587 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1588 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1589 return;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1590 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1591 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1592 else
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1593 file_name = name;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1594
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1595 /*
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1596 * Decide about the permission to use for the undo file. If the buffer
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1597 * has a name use the permission of the original file. Otherwise only
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1598 * allow the user to access the undo file.
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1599 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1600 perm = 0600;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1601 if (buf->b_ffname != NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1602 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1603 #ifdef UNIX
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1604 if (mch_stat((char *)buf->b_ffname, &st_old) >= 0)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1605 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1606 perm = st_old.st_mode;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1607 st_old_valid = TRUE;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1608 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1609 #else
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1610 perm = mch_getperm(buf->b_ffname);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1611 if (perm < 0)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1612 perm = 0600;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1613 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1614 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1615
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1616 // strip any s-bit and executable bit
6771 63b2bc619d5a patch 7.4.707 Bram Moolenaar <bram@vim.org> parents: 6616 diff changeset	1617 perm = perm & 0666;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1618
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1619 // If the undo file already exists, verify that it actually is an undo
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1620 // file, and delete it.
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1621 if (mch_getperm(file_name) >= 0)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1622 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1623 if (name == NULL \|\| !forceit)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1624 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1625 // Check we can read it and it's an undo file.
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1626 fd = mch_open((char *)file_name, O_RDONLY\|O_EXTRA, 0);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1627 if (fd < 0)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1628 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1629 if (name != NULL \|\| p_verbose > 0)
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1630 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1631 if (name == NULL)
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1632 verbose_enter();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1633 smsg(
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1634 _("Will not overwrite with undo file, cannot read: %s"),
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1635 file_name);
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1636 if (name == NULL)
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1637 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1638 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1639 goto theend;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1640 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1641 else
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1642 {
2271 2b33a7678e7b Fix compiler warnings for shadowed variables. Make 'conceal' a long instead Bram Moolenaar <bram@vim.org> parents: 2267 diff changeset	1643 char_u mbuf[UF_START_MAGIC_LEN];
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1644 int len;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1645
2664 033e7b49356c updated for version 7.3.083 Bram Moolenaar <bram@vim.org> parents: 2627 diff changeset	1646 len = read_eintr(fd, mbuf, UF_START_MAGIC_LEN);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1647 close(fd);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1648 if (len < UF_START_MAGIC_LEN
2271 2b33a7678e7b Fix compiler warnings for shadowed variables. Make 'conceal' a long instead Bram Moolenaar <bram@vim.org> parents: 2267 diff changeset	1649 \|\| memcmp(mbuf, UF_START_MAGIC, UF_START_MAGIC_LEN) != 0)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1650 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1651 if (name != NULL \|\| p_verbose > 0)
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1652 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1653 if (name == NULL)
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1654 verbose_enter();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1655 smsg(
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1656 _("Will not overwrite, this is not an undo file: %s"),
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1657 file_name);
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1658 if (name == NULL)
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1659 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1660 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1661 goto theend;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1662 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1663 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1664 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1665 mch_remove(file_name);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1666 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1667
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1668 // If there is no undo information at all, quit here after deleting any
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1669 // existing undo file.
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1670 if (buf->b_u_numhead == 0 && buf->b_u_line_ptr.ul_line == NULL)
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1671 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1672 if (p_verbose > 0)
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	1673 verb_msg(_("Skipping undo file write, nothing to undo"));
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1674 goto theend;
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1675 }
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1676
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1677 fd = mch_open((char *)file_name,
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1678 O_CREAT\|O_EXTRA\|O_WRONLY\|O_EXCL\|O_NOFOLLOW, perm);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1679 if (fd < 0)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1680 {
26962 85866e069c24 patch 8.2.4010: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	1681 semsg(_(e_cannot_open_undo_file_for_writing_str), file_name);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1682 goto theend;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1683 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1684 (void)mch_setperm(file_name, perm);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1685 if (p_verbose > 0)
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1686 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1687 verbose_enter();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1688 smsg(_("Writing undo file: %s"), file_name);
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1689 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1690 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1691
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1692 #ifdef U_DEBUG
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1693 // Check there is no problem in undo info before writing.
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1694 u_check(FALSE);
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1695 #endif
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1696
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1697 #ifdef UNIX
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1698 /*
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1699 * Try to set the group of the undo file same as the original file. If
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1700 * this fails, set the protection bits for the group same as the
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1701 * protection bits for others.
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1702 */
2367 76b7ba68a098 Fix build problem when fchown() not available. (Gary Johnson) Bram Moolenaar <bram@vim.org> parents: 2348 diff changeset	1703 if (st_old_valid
76b7ba68a098 Fix build problem when fchown() not available. (Gary Johnson) Bram Moolenaar <bram@vim.org> parents: 2348 diff changeset	1704 && mch_stat((char *)file_name, &st_new) >= 0
76b7ba68a098 Fix build problem when fchown() not available. (Gary Johnson) Bram Moolenaar <bram@vim.org> parents: 2348 diff changeset	1705 && st_new.st_gid != st_old.st_gid
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1706 # ifdef HAVE_FCHOWN // sequent-ptx lacks fchown()
2367 76b7ba68a098 Fix build problem when fchown() not available. (Gary Johnson) Bram Moolenaar <bram@vim.org> parents: 2348 diff changeset	1707 && fchown(fd, (uid_t)-1, st_old.st_gid) != 0
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1708 # endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1709 )
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1710 mch_setperm(file_name, (perm & 0707) \| ((perm & 07) << 3));
5788 410ef4f1a3d2 updated for version 7.4.238 Bram Moolenaar <bram@vim.org> parents: 5735 diff changeset	1711 # if defined(HAVE_SELINUX) \|\| defined(HAVE_SMACK)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1712 if (buf->b_ffname != NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1713 mch_copy_sec(buf->b_ffname, file_name);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1714 # endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1715 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1716
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1717 fp = fdopen(fd, "w");
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1718 if (fp == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1719 {
26962 85866e069c24 patch 8.2.4010: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	1720 semsg(_(e_cannot_open_undo_file_for_writing_str), file_name);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1721 close(fd);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1722 mch_remove(file_name);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1723 goto theend;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1724 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1725
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1726 // Undo must be synced.
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1727 u_sync(TRUE);
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1728
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1729 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1730 * Write the header. Initializes encryption, if enabled.
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1731 */
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1732 bi.bi_buf = buf;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1733 bi.bi_fp = fp;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1734 if (serialize_header(&bi, hash) == FAIL)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1735 goto write_error;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1736
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1737 /*
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1738 * Iteratively serialize UHPs and their UEPs from the top down.
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1739 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1740 mark = ++lastmark;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1741 uhp = buf->b_u_oldhead;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1742 while (uhp != NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1743 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1744 // Serialize current UHP if we haven't seen it
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1745 if (uhp->uh_walk != mark)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1746 {
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1747 uhp->uh_walk = mark;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1748 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1749 ++headers_written;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1750 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1751 if (serialize_uhp(&bi, uhp) == FAIL)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1752 goto write_error;
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1753 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1754
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1755 // Now walk through the tree - algorithm from undo_time().
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1756 if (uhp->uh_prev.ptr != NULL && uhp->uh_prev.ptr->uh_walk != mark)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1757 uhp = uhp->uh_prev.ptr;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1758 else if (uhp->uh_alt_next.ptr != NULL
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	1759 && uhp->uh_alt_next.ptr->uh_walk != mark)
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1760 uhp = uhp->uh_alt_next.ptr;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1761 else if (uhp->uh_next.ptr != NULL && uhp->uh_alt_prev.ptr == NULL
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	1762 && uhp->uh_next.ptr->uh_walk != mark)
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1763 uhp = uhp->uh_next.ptr;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1764 else if (uhp->uh_alt_prev.ptr != NULL)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1765 uhp = uhp->uh_alt_prev.ptr;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1766 else
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1767 uhp = uhp->uh_next.ptr;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1768 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1769
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1770 if (undo_write_bytes(&bi, (long_u)UF_HEADER_END_MAGIC, 2) == OK)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1771 write_ok = TRUE;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1772 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1773 if (headers_written != buf->b_u_numhead)
4827 60301d4d1682 updated for version 7.3.1160 Bram Moolenaar <bram@vim.org> parents: 4303 diff changeset	1774 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1775 semsg("Written %ld headers, ...", headers_written);
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1776 semsg("... but numhead is %ld", buf->b_u_numhead);
4827 60301d4d1682 updated for version 7.3.1160 Bram Moolenaar <bram@vim.org> parents: 4303 diff changeset	1777 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1778 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1779
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1780 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1781 if (bi.bi_state != NULL && undo_flush(&bi) == FAIL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1782 write_ok = FALSE;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1783 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1784
25951 560132056b97 patch 8.2.3509: undo file is not synced Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	1785 #if defined(UNIX) && defined(HAVE_FSYNC)
560132056b97 patch 8.2.3509: undo file is not synced Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	1786 if (p_fs && fflush(fp) == 0 && vim_fsync(fd) != 0)
560132056b97 patch 8.2.3509: undo file is not synced Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	1787 write_ok = FALSE;
560132056b97 patch 8.2.3509: undo file is not synced Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	1788 #endif
560132056b97 patch 8.2.3509: undo file is not synced Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	1789
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1790 write_error:
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1791 fclose(fp);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1792 if (!write_ok)
26962 85866e069c24 patch 8.2.4010: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	1793 semsg(_(e_write_error_in_undo_file_str), file_name);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1794
15868 7fad90423bd2 patch 8.1.0941: macros for MS-Windows are inconsistent Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	1795 #if defined(MSWIN)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1796 // Copy file attributes; for systems where this can only be done after
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1797 // closing the file.
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1798 if (buf->b_ffname != NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1799 (void)mch_copy_file_attribute(buf->b_ffname, file_name);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1800 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1801 #ifdef HAVE_ACL
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1802 if (buf->b_ffname != NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1803 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1804 vim_acl_T acl;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1805
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1806 // For systems that support ACL: get the ACL from the original file.
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1807 acl = mch_get_acl(buf->b_ffname);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1808 mch_set_acl(file_name, acl);
3545 74d51b51f3e6 updated for version 7.3.533 Bram Moolenaar <bram@vim.org> parents: 3194 diff changeset	1809 mch_free_acl(acl);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1810 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1811 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1812
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1813 theend:
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	1814 #ifdef FEAT_CRYPT
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1815 if (bi.bi_state != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1816 crypt_free_state(bi.bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1817 vim_free(bi.bi_buffer);
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	1818 #endif
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1819 if (file_name != name)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1820 vim_free(file_name);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1821 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1822
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1823 /*
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1824 * Load the undo tree from an undo file.
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1825 * If "name" is not NULL use it as the undo file name. This also means being
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1826 * a bit more verbose.
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1827 * Otherwise use curbuf->b_ffname to generate the undo file name.
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1828 * "hash[UNDO_HASH_SIZE]" must be the hash value of the buffer text.
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1829 */
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1830 void
18139 59bc3cd42cf5 patch 8.1.2064: MS-Windows: compiler warnings for unused arguments Bram Moolenaar <Bram@vim.org> parents: 18051 diff changeset	1831 u_read_undo(char_u name, char_u hash, char_u *orig_name UNUSED)
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1832 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1833 char_u *file_name;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1834 FILE *fp;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1835 long version, str_len;
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1836 undoline_T line_ptr;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1837 linenr_T line_lnum;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1838 colnr_T line_colnr;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1839 linenr_T line_count;
10976 f97a72ad8ffa patch 8.0.0377: possible overflow when reading corrupted undo file Christian Brabandt <cb@256bit.org> parents: 10631 diff changeset	1840 long num_head = 0;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1841 long old_header_seq, new_header_seq, cur_header_seq;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1842 long seq_last, seq_cur;
2282 a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	1843 long last_save_nr = 0;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1844 short old_idx = -1, new_idx = -1, cur_idx = -1;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1845 long num_read_uhps = 0;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1846 time_t seq_time;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1847 int i, j;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1848 int c;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1849 u_header_T *uhp;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1850 u_header_T **uhp_table = NULL;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1851 char_u read_hash[UNDO_HASH_SIZE];
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1852 char_u magic_buf[UF_START_MAGIC_LEN];
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1853 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1854 int *uhp_table_used;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1855 #endif
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1856 #ifdef UNIX
9387 f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	1857 stat_T st_orig;
f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	1858 stat_T st_undo;
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1859 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1860 bufinfo_T bi;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1861
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 18816 diff changeset	1862 CLEAR_FIELD(bi);
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1863 line_ptr.ul_len = 0;
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1864 line_ptr.ul_line = NULL;
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1865
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1866 if (name == NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1867 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1868 file_name = u_get_undo_file_name(curbuf->b_ffname, TRUE);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1869 if (file_name == NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1870 return;
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1871
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1872 #ifdef UNIX
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1873 // For safety we only read an undo file if the owner is equal to the
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1874 // owner of the text file or equal to the current user.
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1875 if (mch_stat((char *)orig_name, &st_orig) >= 0
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1876 && mch_stat((char *)file_name, &st_undo) >= 0
5343 00d61a47df66 updated for version 7.4.024 Bram Moolenaar <bram@vim.org> parents: 4827 diff changeset	1877 && st_orig.st_uid != st_undo.st_uid
00d61a47df66 updated for version 7.4.024 Bram Moolenaar <bram@vim.org> parents: 4827 diff changeset	1878 && st_undo.st_uid != getuid())
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1879 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1880 if (p_verbose > 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1881 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1882 verbose_enter();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1883 smsg(_("Not reading undo file, owner differs: %s"),
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1884 file_name);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1885 verbose_leave();
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1886 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1887 return;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1888 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1889 #endif
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1890 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1891 else
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1892 file_name = name;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1893
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1894 if (p_verbose > 0)
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1895 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1896 verbose_enter();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1897 smsg(_("Reading undo file: %s"), file_name);
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1898 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1899 }
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1900
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1901 fp = mch_fopen((char *)file_name, "r");
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1902 if (fp == NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1903 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1904 if (name != NULL \|\| p_verbose > 0)
26962 85866e069c24 patch 8.2.4010: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	1905 semsg(_(e_cannot_open_undo_file_for_reading_str), file_name);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1906 goto error;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1907 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1908 bi.bi_buf = curbuf;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1909 bi.bi_fp = fp;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1910
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1911 /*
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1912 * Read the undo file header.
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1913 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1914 if (fread(magic_buf, UF_START_MAGIC_LEN, 1, fp) != 1
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1915 \|\| memcmp(magic_buf, UF_START_MAGIC, UF_START_MAGIC_LEN) != 0)
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1916 {
26962 85866e069c24 patch 8.2.4010: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	1917 semsg(_(e_not_an_undo_file_str), file_name);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1918 goto error;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1919 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1920 version = get2c(fp);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1921 if (version == UF_VERSION_CRYPT)
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1922 {
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1923 #ifdef FEAT_CRYPT
2251 646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file. Bram Moolenaar <bram@vim.org> parents: 2245 diff changeset	1924 if (*curbuf->b_p_key == NUL)
646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file. Bram Moolenaar <bram@vim.org> parents: 2245 diff changeset	1925 {
26962 85866e069c24 patch 8.2.4010: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	1926 semsg(_(e_non_encrypted_file_has_encrypted_undo_file), file_name);
2251 646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file. Bram Moolenaar <bram@vim.org> parents: 2245 diff changeset	1927 goto error;
646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file. Bram Moolenaar <bram@vim.org> parents: 2245 diff changeset	1928 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1929 bi.bi_state = crypt_create_from_file(fp, curbuf->b_p_key);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1930 if (bi.bi_state == NULL)
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1931 {
26962 85866e069c24 patch 8.2.4010: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	1932 semsg(_(e_undo_file_decryption_failed), file_name);
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1933 goto error;
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1934 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1935 if (crypt_whole_undofile(bi.bi_state->method_nr))
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1936 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1937 bi.bi_buffer = alloc(CRYPT_BUF_SIZE);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1938 if (bi.bi_buffer == NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1939 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1940 crypt_free_state(bi.bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1941 bi.bi_state = NULL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1942 goto error;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1943 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1944 bi.bi_avail = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1945 bi.bi_used = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1946 }
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1947 #else
26962 85866e069c24 patch 8.2.4010: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	1948 semsg(_(e_undo_file_is_encrypted_str), file_name);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1949 goto error;
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1950 #endif
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1951 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1952 else if (version != UF_VERSION)
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1953 {
26962 85866e069c24 patch 8.2.4010: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	1954 semsg(_(e_incompatible_undo_file_str), file_name);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1955 goto error;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1956 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1957
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1958 if (undo_read(&bi, read_hash, (size_t)UNDO_HASH_SIZE) == FAIL)
2229 d45902a5c61c Fix a few more things for persistent undo. Bram Moolenaar <bram@vim.org> parents: 2223 diff changeset	1959 {
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1960 corruption_error("hash", file_name);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1961 goto error;
2229 d45902a5c61c Fix a few more things for persistent undo. Bram Moolenaar <bram@vim.org> parents: 2223 diff changeset	1962 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1963 line_count = (linenr_T)undo_read_4c(&bi);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1964 if (memcmp(hash, read_hash, UNDO_HASH_SIZE) != 0
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1965 \|\| line_count != curbuf->b_ml.ml_line_count)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1966 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1967 if (p_verbose > 0 \|\| name != NULL)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1968 {
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1969 if (name == NULL)
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1970 verbose_enter();
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1971 give_warning((char_u *)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1972 _("File contents changed, cannot use undo info"), TRUE);
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1973 if (name == NULL)
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1974 verbose_leave();
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1975 }
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1976 goto error;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1977 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1978
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1979 // Read undo data for "U" command.
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1980 str_len = undo_read_4c(&bi);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1981 if (str_len < 0)
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1982 goto error;
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1983 if (str_len > 0)
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1984 {
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1985 line_ptr.ul_line = read_string_decrypt(&bi, str_len);
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1986 line_ptr.ul_len = str_len + 1;
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1987 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1988 line_lnum = (linenr_T)undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1989 line_colnr = (colnr_T)undo_read_4c(&bi);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1990 if (line_lnum < 0 \|\| line_colnr < 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1991 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1992 corruption_error("line lnum/col", file_name);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1993 goto error;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1994 }
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1995
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1996 // Begin general undo data
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1997 old_header_seq = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1998 new_header_seq = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1999 cur_header_seq = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2000 num_head = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2001 seq_last = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2002 seq_cur = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2003 seq_time = undo_read_time(&bi);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2004
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2005 // Optional header fields.
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2006 for (;;)
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2007 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2008 int len = undo_read_byte(&bi);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2009 int what;
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2010
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2011 if (len == 0 \|\| len == EOF)
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2012 break;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2013 what = undo_read_byte(&bi);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2014 switch (what)
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	2015 {
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2016 case UF_LAST_SAVE_NR:
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2017 last_save_nr = undo_read_4c(&bi);
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	2018 break;
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2019 default:
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2020 // field not supported, skip
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2021 while (--len >= 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2022 (void)undo_read_byte(&bi);
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	2023 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2024 }
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	2025
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2026 // uhp_table will store the freshly created undo headers we allocate
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2027 // until we insert them into curbuf. The table remains sorted by the
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2028 // sequence numbers of the headers.
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2029 // When there are no headers uhp_table is NULL.
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2030 if (num_head > 0)
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2031 {
10976 f97a72ad8ffa patch 8.0.0377: possible overflow when reading corrupted undo file Christian Brabandt <cb@256bit.org> parents: 10631 diff changeset	2032 if (num_head < LONG_MAX / (long)sizeof(u_header_T *))
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16768 diff changeset	2033 uhp_table = U_ALLOC_LINE(num_head * sizeof(u_header_T *));
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2034 if (uhp_table == NULL)
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2035 goto error;
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2036 }
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2037
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2038 while ((c = undo_read_2c(&bi)) == UF_HEADER_MAGIC)
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2039 {
2223 81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	2040 if (num_read_uhps >= num_head)
81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	2041 {
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	2042 corruption_error("num_head too small", file_name);
2223 81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	2043 goto error;
81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	2044 }
81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	2045
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2046 uhp = unserialize_uhp(&bi, file_name);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	2047 if (uhp == NULL)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	2048 goto error;
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2049 uhp_table[num_read_uhps++] = uhp;
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2050 }
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2051
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2052 if (num_read_uhps != num_head)
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2053 {
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2054 corruption_error("num_head", file_name);
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2055 goto error;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2056 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2057 if (c != UF_HEADER_END_MAGIC)
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2058 {
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2059 corruption_error("end marker", file_name);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2060 goto error;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2061 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2062
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2063 #ifdef U_DEBUG
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16768 diff changeset	2064 uhp_table_used = alloc_clear(sizeof(int) * num_head + 1);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2065 # define SET_FLAG(j) ++uhp_table_used[j]
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2066 #else
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2067 # define SET_FLAG(j)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2068 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2069
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2070 // We have put all of the headers into a table. Now we iterate through the
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2071 // table and swizzle each sequence number we have stored in uh_*_seq into
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2072 // a pointer corresponding to the header with that sequence number.
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2073 for (i = 0; i < num_head; i++)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2074 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2075 uhp = uhp_table[i];
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2076 if (uhp == NULL)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2077 continue;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2078 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2079 if (uhp_table[j] != NULL && i != j
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2080 && uhp_table[i]->uh_seq == uhp_table[j]->uh_seq)
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2081 {
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2082 corruption_error("duplicate uh_seq", file_name);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2083 goto error;
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2084 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2085 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2086 if (uhp_table[j] != NULL
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2087 && uhp_table[j]->uh_seq == uhp->uh_next.seq)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2088 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2089 uhp->uh_next.ptr = uhp_table[j];
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2090 SET_FLAG(j);
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2091 break;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2092 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2093 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2094 if (uhp_table[j] != NULL
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2095 && uhp_table[j]->uh_seq == uhp->uh_prev.seq)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2096 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2097 uhp->uh_prev.ptr = uhp_table[j];
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2098 SET_FLAG(j);
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2099 break;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2100 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2101 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2102 if (uhp_table[j] != NULL
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2103 && uhp_table[j]->uh_seq == uhp->uh_alt_next.seq)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2104 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2105 uhp->uh_alt_next.ptr = uhp_table[j];
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2106 SET_FLAG(j);
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2107 break;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2108 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2109 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2110 if (uhp_table[j] != NULL
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2111 && uhp_table[j]->uh_seq == uhp->uh_alt_prev.seq)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2112 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2113 uhp->uh_alt_prev.ptr = uhp_table[j];
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2114 SET_FLAG(j);
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2115 break;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2116 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2117 if (old_header_seq > 0 && old_idx < 0 && uhp->uh_seq == old_header_seq)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2118 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2119 old_idx = i;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2120 SET_FLAG(i);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2121 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2122 if (new_header_seq > 0 && new_idx < 0 && uhp->uh_seq == new_header_seq)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2123 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2124 new_idx = i;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2125 SET_FLAG(i);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2126 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2127 if (cur_header_seq > 0 && cur_idx < 0 && uhp->uh_seq == cur_header_seq)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2128 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2129 cur_idx = i;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2130 SET_FLAG(i);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2131 }
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2132 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2133
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2134 // Now that we have read the undo info successfully, free the current undo
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2135 // info and use the info from the file.
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2136 u_blockfree(curbuf);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2137 curbuf->b_u_oldhead = old_idx < 0 ? NULL : uhp_table[old_idx];
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2138 curbuf->b_u_newhead = new_idx < 0 ? NULL : uhp_table[new_idx];
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2139 curbuf->b_u_curhead = cur_idx < 0 ? NULL : uhp_table[cur_idx];
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2140 curbuf->b_u_line_ptr = line_ptr;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2141 curbuf->b_u_line_lnum = line_lnum;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2142 curbuf->b_u_line_colnr = line_colnr;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2143 curbuf->b_u_numhead = num_head;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2144 curbuf->b_u_seq_last = seq_last;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2145 curbuf->b_u_seq_cur = seq_cur;
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	2146 curbuf->b_u_time_cur = seq_time;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2147 curbuf->b_u_save_nr_last = last_save_nr;
2627 fae6fb779a6b updated for version 7.3.048 Bram Moolenaar <bram@vim.org> parents: 2577 diff changeset	2148 curbuf->b_u_save_nr_cur = last_save_nr;
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2149
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2150 curbuf->b_u_synced = TRUE;
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2151 vim_free(uhp_table);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2152
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2153 #ifdef U_DEBUG
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2154 for (i = 0; i < num_head; ++i)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2155 if (uhp_table_used[i] == 0)
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	2156 semsg("uhp_table entry %ld not used, leaking memory", i);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2157 vim_free(uhp_table_used);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2158 u_check(TRUE);
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2159 #endif
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2160
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2161 if (name != NULL)
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	2162 smsg(_("Finished reading undo file %s"), file_name);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2163 goto theend;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2164
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2165 error:
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2166 vim_free(line_ptr.ul_line);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2167 if (uhp_table != NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2168 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2169 for (i = 0; i < num_read_uhps; i++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2170 if (uhp_table[i] != NULL)
2223 81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	2171 u_free_uhp(uhp_table[i]);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2172 vim_free(uhp_table);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2173 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2174
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2175 theend:
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	2176 #ifdef FEAT_CRYPT
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2177 if (bi.bi_state != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2178 crypt_free_state(bi.bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2179 vim_free(bi.bi_buffer);
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	2180 #endif
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2181 if (fp != NULL)
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2182 fclose(fp);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2183 if (file_name != name)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2184 vim_free(file_name);
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2185 return;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2186 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2187
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2188 #endif // FEAT_PERSISTENT_UNDO
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2189
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2190
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2191 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2192 * If 'cpoptions' contains 'u': Undo the previous undo or redo (vi compatible).
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2193 * If 'cpoptions' does not contain 'u': Always undo.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2194 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2195 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2196 u_undo(int count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2197 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2198 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2199 * If we get an undo command while executing a macro, we behave like the
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2200 * original vi. If this happens twice in one macro the result will not
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2201 * be compatible.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2202 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2203 if (curbuf->b_u_synced == FALSE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2204 {
825 6675076019ae updated for version 7.0d vimboss parents: 810 diff changeset	2205 u_sync(TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2206 count = 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2207 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2208
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2209 if (vim_strchr(p_cpo, CPO_UNDO) == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2210 undo_undoes = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2211 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2212 undo_undoes = !undo_undoes;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2213 u_doit(count);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2214 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2215
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2216 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2217 * If 'cpoptions' contains 'u': Repeat the previous undo or redo.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2218 * If 'cpoptions' does not contain 'u': Always redo.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2219 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2220 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2221 u_redo(int count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2222 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2223 if (vim_strchr(p_cpo, CPO_UNDO) == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2224 undo_undoes = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2225 u_doit(count);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2226 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2227
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2228 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2229 * Undo or redo, depending on 'undo_undoes', 'count' times.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2230 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2231 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2232 u_doit(int startcount)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2233 {
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2234 int count = startcount;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2235
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	2236 if (!undo_allowed())
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2237 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2238
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2239 u_newcount = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2240 u_oldcount = 0;
179 7fd70926e2e1 updated for version 7.0055 vimboss parents: 168 diff changeset	2241 if (curbuf->b_ml.ml_flags & ML_EMPTY)
7fd70926e2e1 updated for version 7.0055 vimboss parents: 168 diff changeset	2242 u_oldcount = -1;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2243 while (count--)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2244 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2245 // Do the change warning now, so that it triggers FileChangedRO when
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2246 // needed. This may cause the file to be reloaded, that must happen
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2247 // before we do anything, because it may change curbuf->b_u_curhead
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2248 // and more.
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2249 change_warning(0);
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2250
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2251 if (undo_undoes)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2252 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2253 if (curbuf->b_u_curhead == NULL) // first undo
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2254 curbuf->b_u_curhead = curbuf->b_u_newhead;
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2255 else if (get_undolevel() > 0) // multi level undo
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2256 // get next undo
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2257 curbuf->b_u_curhead = curbuf->b_u_curhead->uh_next.ptr;
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2258 // nothing to undo
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2259 if (curbuf->b_u_numhead == 0 \|\| curbuf->b_u_curhead == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2260 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2261 // stick curbuf->b_u_curhead at end
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2262 curbuf->b_u_curhead = curbuf->b_u_oldhead;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2263 beep_flush();
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2264 if (count == startcount - 1)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2265 {
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	2266 msg(_("Already at oldest change"));
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2267 return;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2268 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2269 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2270 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2271
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2272 u_undoredo(TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2273 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2274 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2275 {
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	2276 if (curbuf->b_u_curhead == NULL \|\| get_undolevel() <= 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2277 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2278 beep_flush(); // nothing to redo
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2279 if (count == startcount - 1)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2280 {
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	2281 msg(_("Already at newest change"));
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2282 return;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2283 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2284 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2285 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2286
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2287 u_undoredo(FALSE);
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2288
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2289 // Advance for next redo. Set "newhead" when at the end of the
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2290 // redoable changes.
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2291 if (curbuf->b_u_curhead->uh_prev.ptr == NULL)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2292 curbuf->b_u_newhead = curbuf->b_u_curhead;
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2293 curbuf->b_u_curhead = curbuf->b_u_curhead->uh_prev.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2294 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2295 }
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2296 u_undo_end(undo_undoes, FALSE);
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2297 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2298
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2299 /*
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2300 * Undo or redo over the timeline.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2301 * When "step" is negative go back in time, otherwise goes forward in time.
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2302 * When "sec" is FALSE make "step" steps, when "sec" is TRUE use "step" as
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2303 * seconds.
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2304 * When "file" is TRUE use "step" as a number of file writes.
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2305 * When "absolute" is TRUE use "step" as the sequence number to jump to.
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2306 * "sec" must be FALSE then.
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2307 */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2308 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2309 undo_time(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2310 long step,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2311 int sec,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2312 int file,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2313 int absolute)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2314 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2315 long target;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2316 long closest;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2317 long closest_start;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2318 long closest_seq = 0;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2319 long val;
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2320 u_header_T *uhp = NULL;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2321 u_header_T *last;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2322 int mark;
16405 840fa633ad64 patch 8.1.1207: some compilers give warning messages Bram Moolenaar <Bram@vim.org> parents: 16097 diff changeset	2323 int nomark = 0; // shut up compiler
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2324 int round;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2325 int dosec = sec;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2326 int dofile = file;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2327 int above = FALSE;
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	2328 int did_undo = TRUE;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2329
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2330 // First make sure the current undoable change is synced.
766 f0d0d3d3a1e2 updated for version 7.0225 vimboss parents: 758 diff changeset	2331 if (curbuf->b_u_synced == FALSE)
825 6675076019ae updated for version 7.0d vimboss parents: 810 diff changeset	2332 u_sync(TRUE);
766 f0d0d3d3a1e2 updated for version 7.0225 vimboss parents: 758 diff changeset	2333
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2334 u_newcount = 0;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2335 u_oldcount = 0;
179 7fd70926e2e1 updated for version 7.0055 vimboss parents: 168 diff changeset	2336 if (curbuf->b_ml.ml_flags & ML_EMPTY)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2337 u_oldcount = -1;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2338
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2339 // "target" is the node below which we want to be.
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2340 // Init "closest" to a value we can't reach.
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2341 if (absolute)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2342 {
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2343 target = step;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2344 closest = -1;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2345 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2346 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2347 {
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2348 if (dosec)
10518 de77fa909414 commit https://github.com/vim/vim/commit/cbd4de44e8d08fba3c09eb40ad6e36e83faf020a Christian Brabandt <cb@256bit.org> parents: 10359 diff changeset	2349 target = (long)(curbuf->b_u_time_cur) + step;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2350 else if (dofile)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2351 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2352 if (step < 0)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2353 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2354 // Going back to a previous write. If there were changes after
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2355 // the last write, count that as moving one file-write, so
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2356 // that ":earlier 1f" undoes all changes since the last save.
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2357 uhp = curbuf->b_u_curhead;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2358 if (uhp != NULL)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2359 uhp = uhp->uh_next.ptr;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2360 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2361 uhp = curbuf->b_u_newhead;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2362 if (uhp != NULL && uhp->uh_save_nr != 0)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2363 // "uh_save_nr" was set in the last block, that means
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2364 // there were no changes since the last write
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2365 target = curbuf->b_u_save_nr_cur + step;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2366 else
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2367 // count the changes since the last write as one step
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2368 target = curbuf->b_u_save_nr_cur + step + 1;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2369 if (target <= 0)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2370 // Go to before first write: before the oldest change. Use
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2371 // the sequence number for that.
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2372 dofile = FALSE;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2373 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2374 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2375 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2376 // Moving forward to a newer write.
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2377 target = curbuf->b_u_save_nr_cur + step;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2378 if (target > curbuf->b_u_save_nr_last)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2379 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2380 // Go to after last write: after the latest change. Use
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2381 // the sequence number for that.
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2382 target = curbuf->b_u_seq_last + 1;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2383 dofile = FALSE;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2384 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2385 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2386 }
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2387 else
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2388 target = curbuf->b_u_seq_cur + step;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2389 if (step < 0)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2390 {
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2391 if (target < 0)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2392 target = 0;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2393 closest = -1;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2394 }
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2395 else
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2396 {
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2397 if (dosec)
10518 de77fa909414 commit https://github.com/vim/vim/commit/cbd4de44e8d08fba3c09eb40ad6e36e83faf020a Christian Brabandt <cb@256bit.org> parents: 10359 diff changeset	2398 closest = (long)(vim_time() + 1);
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2399 else if (dofile)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2400 closest = curbuf->b_u_save_nr_last + 2;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2401 else
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2402 closest = curbuf->b_u_seq_last + 2;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2403 if (target >= closest)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2404 target = closest - 1;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2405 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2406 }
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2407 closest_start = closest;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2408 closest_seq = curbuf->b_u_seq_cur;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2409
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2410 // When "target" is 0; Back to origin.
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2411 if (target == 0)
13138 0f906f414c69 patch 8.0.1443: compiler complains about uninitialized variable Christian Brabandt <cb@256bit.org> parents: 13134 diff changeset	2412 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2413 mark = lastmark; // avoid that GCC complains
13138 0f906f414c69 patch 8.0.1443: compiler complains about uninitialized variable Christian Brabandt <cb@256bit.org> parents: 13134 diff changeset	2414 goto target_zero;
0f906f414c69 patch 8.0.1443: compiler complains about uninitialized variable Christian Brabandt <cb@256bit.org> parents: 13134 diff changeset	2415 }
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2416
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2417 /*
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2418 * May do this twice:
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2419 * 1. Search for "target", update "closest" to the best match found.
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2420 * 2. If "target" not found search for "closest".
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2421 *
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2422 * When using the closest time we use the sequence number in the second
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2423 * round, because there may be several entries with the same time.
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2424 */
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2425 for (round = 1; round <= 2; ++round)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2426 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2427 // Find the path from the current state to where we want to go. The
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2428 // desired state can be anywhere in the undo tree, need to go all over
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2429 // it. We put "nomark" in uh_walk where we have been without success,
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2430 // "mark" where it could possibly be.
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2431 mark = ++lastmark;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2432 nomark = ++lastmark;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2433
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2434 if (curbuf->b_u_curhead == NULL) // at leaf of the tree
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2435 uhp = curbuf->b_u_newhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2436 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2437 uhp = curbuf->b_u_curhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2438
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2439 while (uhp != NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2440 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2441 uhp->uh_walk = mark;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2442 if (dosec)
10518 de77fa909414 commit https://github.com/vim/vim/commit/cbd4de44e8d08fba3c09eb40ad6e36e83faf020a Christian Brabandt <cb@256bit.org> parents: 10359 diff changeset	2443 val = (long)(uhp->uh_time);
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2444 else if (dofile)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2445 val = uhp->uh_save_nr;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2446 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2447 val = uhp->uh_seq;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2448
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2449 if (round == 1 && !(dofile && val == 0))
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2450 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2451 // Remember the header that is closest to the target.
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2452 // It must be at least in the right direction (checked with
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2453 // "b_u_seq_cur"). When the timestamp is equal find the
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2454 // highest/lowest sequence number.
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2455 if ((step < 0 ? uhp->uh_seq <= curbuf->b_u_seq_cur
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2456 : uhp->uh_seq > curbuf->b_u_seq_cur)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2457 && ((dosec && val == closest)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2458 ? (step < 0
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2459 ? uhp->uh_seq < closest_seq
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2460 : uhp->uh_seq > closest_seq)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2461 : closest == closest_start
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2462 \|\| (val > target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2463 ? (closest > target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2464 ? val - target <= closest - target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2465 : val - target <= target - closest)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2466 : (closest > target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2467 ? target - val <= closest - target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2468 : target - val <= target - closest))))
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2469 {
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2470 closest = val;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2471 closest_seq = uhp->uh_seq;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2472 }
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2473 }
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2474
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2475 // Quit searching when we found a match. But when searching for a
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2476 // time we need to continue looking for the best uh_seq.
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2477 if (target == val && !dosec)
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2478 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2479 target = uhp->uh_seq;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2480 break;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2481 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2482
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2483 // go down in the tree if we haven't been there
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2484 if (uhp->uh_prev.ptr != NULL && uhp->uh_prev.ptr->uh_walk != nomark
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2485 && uhp->uh_prev.ptr->uh_walk != mark)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2486 uhp = uhp->uh_prev.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2487
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2488 // go to alternate branch if we haven't been there
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2489 else if (uhp->uh_alt_next.ptr != NULL
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2490 && uhp->uh_alt_next.ptr->uh_walk != nomark
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2491 && uhp->uh_alt_next.ptr->uh_walk != mark)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2492 uhp = uhp->uh_alt_next.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2493
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2494 // go up in the tree if we haven't been there and we are at the
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2495 // start of alternate branches
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2496 else if (uhp->uh_next.ptr != NULL && uhp->uh_alt_prev.ptr == NULL
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2497 && uhp->uh_next.ptr->uh_walk != nomark
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2498 && uhp->uh_next.ptr->uh_walk != mark)
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2499 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2500 // If still at the start we don't go through this change.
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2501 if (uhp == curbuf->b_u_curhead)
95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2502 uhp->uh_walk = nomark;
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2503 uhp = uhp->uh_next.ptr;
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2504 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2505
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2506 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2507 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2508 // need to backtrack; mark this node as useless
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2509 uhp->uh_walk = nomark;
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2510 if (uhp->uh_alt_prev.ptr != NULL)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2511 uhp = uhp->uh_alt_prev.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2512 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2513 uhp = uhp->uh_next.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2514 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2515 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2516
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2517 if (uhp != NULL) // found it
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2518 break;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2519
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2520 if (absolute)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2521 {
26962 85866e069c24 patch 8.2.4010: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26958 diff changeset	2522 semsg(_(e_undo_number_nr_not_found), step);
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2523 return;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2524 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2525
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2526 if (closest == closest_start)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2527 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2528 if (step < 0)
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	2529 msg(_("Already at oldest change"));
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2530 else
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	2531 msg(_("Already at newest change"));
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2532 return;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2533 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2534
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2535 target = closest_seq;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2536 dosec = FALSE;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2537 dofile = FALSE;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2538 if (step < 0)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2539 above = TRUE; // stop above the header
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2540 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2541
13138 0f906f414c69 patch 8.0.1443: compiler complains about uninitialized variable Christian Brabandt <cb@256bit.org> parents: 13134 diff changeset	2542 target_zero:
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2543 // If we found it: Follow the path to go to where we want to be.
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2544 if (uhp != NULL \|\| target == 0)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2545 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2546 /*
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2547 * First go up the tree as much as needed.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2548 */
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2549 while (!got_int)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2550 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2551 // Do the change warning now, for the same reason as above.
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2552 change_warning(0);
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2553
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2554 uhp = curbuf->b_u_curhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2555 if (uhp == NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2556 uhp = curbuf->b_u_newhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2557 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2558 uhp = uhp->uh_next.ptr;
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2559 if (uhp == NULL \|\| (target > 0 && uhp->uh_walk != mark)
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2560 \|\| (uhp->uh_seq == target && !above))
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2561 break;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2562 curbuf->b_u_curhead = uhp;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2563 u_undoredo(TRUE);
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2564 if (target > 0)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2565 uhp->uh_walk = nomark; // don't go back down here
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2566 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2567
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2568 // When back to origin, redo is not needed.
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2569 if (target > 0)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2570 {
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2571 /*
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2572 * And now go down the tree (redo), branching off where needed.
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2573 */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2574 while (!got_int)
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2575 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2576 // Do the change warning now, for the same reason as above.
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2577 change_warning(0);
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2578
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2579 uhp = curbuf->b_u_curhead;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2580 if (uhp == NULL)
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2581 break;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2582
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2583 // Go back to the first branch with a mark.
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2584 while (uhp->uh_alt_prev.ptr != NULL
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2585 && uhp->uh_alt_prev.ptr->uh_walk == mark)
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2586 uhp = uhp->uh_alt_prev.ptr;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2587
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2588 // Find the last branch with a mark, that's the one.
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2589 last = uhp;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2590 while (last->uh_alt_next.ptr != NULL
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2591 && last->uh_alt_next.ptr->uh_walk == mark)
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2592 last = last->uh_alt_next.ptr;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2593 if (last != uhp)
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2594 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2595 // Make the used branch the first entry in the list of
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2596 // alternatives to make "u" and CTRL-R take this branch.
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2597 while (uhp->uh_alt_prev.ptr != NULL)
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2598 uhp = uhp->uh_alt_prev.ptr;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2599 if (last->uh_alt_next.ptr != NULL)
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2600 last->uh_alt_next.ptr->uh_alt_prev.ptr =
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2601 last->uh_alt_prev.ptr;
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2602 last->uh_alt_prev.ptr->uh_alt_next.ptr =
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2603 last->uh_alt_next.ptr;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2604 last->uh_alt_prev.ptr = NULL;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2605 last->uh_alt_next.ptr = uhp;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2606 uhp->uh_alt_prev.ptr = last;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2607
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2608 if (curbuf->b_u_oldhead == uhp)
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2609 curbuf->b_u_oldhead = last;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2610 uhp = last;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2611 if (uhp->uh_next.ptr != NULL)
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2612 uhp->uh_next.ptr->uh_prev.ptr = uhp;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2613 }
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2614 curbuf->b_u_curhead = uhp;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2615
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2616 if (uhp->uh_walk != mark)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2617 break; // must have reached the target
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2618
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2619 // Stop when going backwards in time and didn't find the exact
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2620 // header we were looking for.
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2621 if (uhp->uh_seq == target && above)
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2622 {
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2623 curbuf->b_u_seq_cur = target - 1;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2624 break;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2625 }
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2626
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2627 u_undoredo(FALSE);
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2628
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2629 // Advance "curhead" to below the header we last used. If it
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2630 // becomes NULL then we need to set "newhead" to this leaf.
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2631 if (uhp->uh_prev.ptr == NULL)
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2632 curbuf->b_u_newhead = uhp;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2633 curbuf->b_u_curhead = uhp->uh_prev.ptr;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2634 did_undo = FALSE;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2635
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2636 if (uhp->uh_seq == target) // found it!
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2637 break;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2638
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2639 uhp = uhp->uh_prev.ptr;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2640 if (uhp == NULL \|\| uhp->uh_walk != mark)
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2641 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2642 // Need to redo more but can't find it...
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2643 internal_error("undo_time()");
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2644 break;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2645 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2646 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2647 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2648 }
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2649 u_undo_end(did_undo, absolute);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2650 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2651
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2652 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2653 * u_undoredo: common code for undo and redo
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2654 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2655 * The lines in the file are replaced by the lines in the entry list at
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2656 * curbuf->b_u_curhead. The replaced lines in the file are saved in the entry
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2657 * list for the next undo/redo.
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2658 *
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2659 * When "undo" is TRUE we go up in the tree, when FALSE we go down.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2660 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2661 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2662 u_undoredo(int undo)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2663 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2664 undoline_T *newarray = NULL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2665 linenr_T oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2666 linenr_T newsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2667 linenr_T top, bot;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2668 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2669 linenr_T newlnum = MAXLNUM;
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2670 pos_T new_curpos = curwin->w_cursor;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2671 long i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2672 u_entry_T uep, nuep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2673 u_entry_T *newlist = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2674 int old_flags;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2675 int new_flags;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2676 pos_T namedm[NMARKS];
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	2677 visualinfo_T visualinfo;
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2678 int empty_buffer; // buffer became empty
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2679 u_header_T *curhead = curbuf->b_u_curhead;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2680
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2681 // Don't want autocommands using the undo structures here, they are
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2682 // invalid till the end.
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2683 block_autocmds();
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2684
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2685 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2686 u_check(FALSE);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2687 #endif
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2688 old_flags = curhead->uh_flags;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2689 new_flags = (curbuf->b_changed ? UH_CHANGED : 0) +
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2690 ((curbuf->b_ml.ml_flags & ML_EMPTY) ? UH_EMPTYBUF : 0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2691 setpcmark();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2692
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2693 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2694 * save marks before undo/redo
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2695 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2696 mch_memmove(namedm, curbuf->b_namedm, sizeof(pos_T) * NMARKS);
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	2697 visualinfo = curbuf->b_visual;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2698 curbuf->b_op_start.lnum = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2699 curbuf->b_op_start.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2700 curbuf->b_op_end.lnum = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2701 curbuf->b_op_end.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2702
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2703 for (uep = curhead->uh_entry; uep != NULL; uep = nuep)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2704 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2705 top = uep->ue_top;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2706 bot = uep->ue_bot;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2707 if (bot == 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2708 bot = curbuf->b_ml.ml_line_count + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2709 if (top > curbuf->b_ml.ml_line_count \|\| top >= bot
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2710 \|\| bot > curbuf->b_ml.ml_line_count + 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2711 {
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2712 unblock_autocmds();
26913 d4e61d61afd9 patch 8.2.3985: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26883 diff changeset	2713 iemsg(_(e_u_undo_line_numbers_wrong));
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2714 changed(); // don't want UNCHANGED now
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2715 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2716 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2717
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2718 oldsize = bot - top - 1; // number of lines before undo
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2719 newsize = uep->ue_size; // number of lines after undo
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2720
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2721 // Decide about the cursor position, depending on what text changed.
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2722 // Don't set it yet, it may be invalid if lines are going to be added.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2723 if (top < newlnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2724 {
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2725 // If the saved cursor is somewhere in this undo block, move it to
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2726 // the remembered position. Makes "gwap" put the cursor back
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2727 // where it was.
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2728 lnum = curhead->uh_cursor.lnum;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2729 if (lnum >= top && lnum <= top + newsize + 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2730 {
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2731 new_curpos = curhead->uh_cursor;
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2732 newlnum = new_curpos.lnum - 1;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2733 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2734 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2735 {
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2736 // Use the first line that actually changed. Avoids that
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2737 // undoing auto-formatting puts the cursor in the previous
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2738 // line.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2739 for (i = 0; i < newsize && i < oldsize; ++i)
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2740 {
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2741 char_u *p = ml_get(top + 1 + i);
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2742
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2743 if (curbuf->b_ml.ml_line_len != uep->ue_array[i].ul_len
16764 ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 16627 diff changeset	2744 \|\| memcmp(uep->ue_array[i].ul_line, p,
ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 16627 diff changeset	2745 curbuf->b_ml.ml_line_len) != 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2746 break;
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2747 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2748 if (i == newsize && newlnum == MAXLNUM && uep->ue_next == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2749 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2750 newlnum = top;
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2751 new_curpos.lnum = newlnum + 1;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2752 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2753 else if (i < newsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2754 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2755 newlnum = top + i;
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2756 new_curpos.lnum = newlnum + 1;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2757 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2758 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2759 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2760
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2761 empty_buffer = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2762
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2763 /*
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2764 * Delete the lines between top and bot and save them in newarray.
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2765 */
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	2766 if (oldsize > 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2767 {
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16768 diff changeset	2768 if ((newarray = U_ALLOC_LINE(sizeof(undoline_T) * oldsize)) == NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2769 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2770 do_outofmem_msg((long_u)(sizeof(undoline_T) * oldsize));
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2771
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2772 // We have messed up the entry list, repair is impossible.
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2773 // we have to free the rest of the list.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2774 while (uep != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2775 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2776 nuep = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2777 u_freeentry(uep, uep->ue_size);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2778 uep = nuep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2779 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2780 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2781 }
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2782 // delete backwards, it goes faster in most cases
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2783 for (lnum = bot - 1, i = oldsize; --i >= 0; --lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2784 {
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2785 // what can we do when we run out of memory?
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2786 if (u_save_line(&newarray[i], lnum) == FAIL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2787 do_outofmem_msg((long_u)0);
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2788 // remember we deleted the last line in the buffer, and a
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2789 // dummy empty line will be inserted
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2790 if (curbuf->b_ml.ml_line_count == 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2791 empty_buffer = TRUE;
20581 e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	2792 ml_delete_flags(lnum, ML_DEL_UNDO);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2793 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2794 }
414 8ab9c77240d4 updated for version 7.0108 vimboss parents: 407 diff changeset	2795 else
8ab9c77240d4 updated for version 7.0108 vimboss parents: 407 diff changeset	2796 newarray = NULL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2797
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2798 // make sure the cursor is on a valid line after the deletions
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2799 check_cursor_lnum();
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2800
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2801 /*
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2802 * Insert the lines in u_array between top and bot.
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2803 */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2804 if (newsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2805 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2806 for (lnum = top, i = 0; i < newsize; ++i, ++lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2807 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2808 // If the file is empty, there is an empty line 1 that we
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2809 // should get rid of, by replacing it with the new line.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2810 if (empty_buffer && lnum == 0)
16764 ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 16627 diff changeset	2811 ml_replace_len((linenr_T)1, uep->ue_array[i].ul_line,
ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 16627 diff changeset	2812 uep->ue_array[i].ul_len, TRUE, TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2813 else
20581 e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	2814 ml_append_flags(lnum, uep->ue_array[i].ul_line,
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	2815 (colnr_T)uep->ue_array[i].ul_len, ML_APPEND_UNDO);
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2816 vim_free(uep->ue_array[i].ul_line);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2817 }
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2818 vim_free((char_u *)uep->ue_array);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2819 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2820
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2821 // adjust marks
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2822 if (oldsize != newsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2823 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2824 mark_adjust(top + 1, top + oldsize, (long)MAXLNUM,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2825 (long)newsize - (long)oldsize);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2826 if (curbuf->b_op_start.lnum > top + oldsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2827 curbuf->b_op_start.lnum += newsize - oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2828 if (curbuf->b_op_end.lnum > top + oldsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2829 curbuf->b_op_end.lnum += newsize - oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2830 }
27706 17cd22b7151b patch 8.2.4379: an empty change is reported to a listener Bram Moolenaar <Bram@vim.org> parents: 27426 diff changeset	2831 if (oldsize > 0 \|\| newsize > 0)
17cd22b7151b patch 8.2.4379: an empty change is reported to a listener Bram Moolenaar <Bram@vim.org> parents: 27426 diff changeset	2832 changed_lines(top + 1, 0, bot, newsize - oldsize);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2833
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2834 // set '[ and '] mark
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2835 if (top + 1 < curbuf->b_op_start.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2836 curbuf->b_op_start.lnum = top + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2837 if (newsize == 0 && top + 1 > curbuf->b_op_end.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2838 curbuf->b_op_end.lnum = top + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2839 else if (top + newsize > curbuf->b_op_end.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2840 curbuf->b_op_end.lnum = top + newsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2841
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2842 u_newcount += newsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2843 u_oldcount += oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2844 uep->ue_size = oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2845 uep->ue_array = newarray;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2846 uep->ue_bot = top + newsize + 1;
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 * insert this entry in front of the new entry list
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2850 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2851 nuep = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2852 uep->ue_next = newlist;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2853 newlist = uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2854 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2855
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2856 // Set the cursor to the desired position. Check that the line is valid.
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2857 curwin->w_cursor = new_curpos;
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2858 check_cursor_lnum();
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2859
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2860 curhead->uh_entry = newlist;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2861 curhead->uh_flags = new_flags;
11121 778c10516955 patch 8.0.0448: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 10978 diff changeset	2862 if ((old_flags & UH_EMPTYBUF) && BUFEMPTY())
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2863 curbuf->b_ml.ml_flags \|= ML_EMPTY;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2864 if (old_flags & UH_CHANGED)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2865 changed();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2866 else
33 f6033dcbaf31 updated for version 7.0020 vimboss parents: 7 diff changeset	2867 #ifdef FEAT_NETBEANS_INTG
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2868 // per netbeans undo rules, keep it as modified
33 f6033dcbaf31 updated for version 7.0020 vimboss parents: 7 diff changeset	2869 if (!isNetbeansModified(curbuf))
f6033dcbaf31 updated for version 7.0020 vimboss parents: 7 diff changeset	2870 #endif
16996 d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	2871 unchanged(curbuf, FALSE, TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2872
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2873 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2874 * restore marks from before undo/redo
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2875 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2876 for (i = 0; i < NMARKS; ++i)
6616 290631797b76 updated for version 7.4.634 Bram Moolenaar <bram@vim.org> parents: 6216 diff changeset	2877 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2878 if (curhead->uh_namedm[i].lnum != 0)
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2879 curbuf->b_namedm[i] = curhead->uh_namedm[i];
6616 290631797b76 updated for version 7.4.634 Bram Moolenaar <bram@vim.org> parents: 6216 diff changeset	2880 if (namedm[i].lnum != 0)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2881 curhead->uh_namedm[i] = namedm[i];
6616 290631797b76 updated for version 7.4.634 Bram Moolenaar <bram@vim.org> parents: 6216 diff changeset	2882 else
290631797b76 updated for version 7.4.634 Bram Moolenaar <bram@vim.org> parents: 6216 diff changeset	2883 curhead->uh_namedm[i].lnum = 0;
290631797b76 updated for version 7.4.634 Bram Moolenaar <bram@vim.org> parents: 6216 diff changeset	2884 }
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2885 if (curhead->uh_visual.vi_start.lnum != 0)
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	2886 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2887 curbuf->b_visual = curhead->uh_visual;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2888 curhead->uh_visual = visualinfo;
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	2889 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2890
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2891 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2892 * If the cursor is only off by one line, put it at the same position as
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2893 * before starting the change (for the "o" command).
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2894 * Otherwise the cursor should go to the first undone line.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2895 */
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2896 if (curhead->uh_cursor.lnum + 1 == curwin->w_cursor.lnum
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2897 && curwin->w_cursor.lnum > 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2898 --curwin->w_cursor.lnum;
2501 c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2899 if (curwin->w_cursor.lnum <= curbuf->b_ml.ml_line_count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2900 {
2501 c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2901 if (curhead->uh_cursor.lnum == curwin->w_cursor.lnum)
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2902 {
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2903 curwin->w_cursor.col = curhead->uh_cursor.col;
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2904 if (virtual_active() && curhead->uh_cursor_vcol >= 0)
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2905 coladvance((colnr_T)curhead->uh_cursor_vcol);
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2906 else
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2907 curwin->w_cursor.coladd = 0;
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2908 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2909 else
2501 c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2910 beginline(BL_SOL \| BL_FIX);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2911 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2912 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2913 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2914 // We get here with the current cursor line being past the end (eg
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2915 // after adding lines at the end of the file, and then undoing it).
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2916 // check_cursor() will move the cursor to the last line. Move it to
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2917 // the first column here.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2918 curwin->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2919 curwin->w_cursor.coladd = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2920 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2921
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2922 // Make sure the cursor is on an existing line and column.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2923 check_cursor();
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2924
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2925 // Remember where we are for "g-" and ":earlier 10s".
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2926 curbuf->b_u_seq_cur = curhead->uh_seq;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2927 if (undo)
12827 ff494a964ab7 patch 8.0.1290: seq_cur of undotree() wrong after undo Christian Brabandt <cb@256bit.org> parents: 12716 diff changeset	2928 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2929 // We are below the previous undo. However, to make ":earlier 1s"
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2930 // work we compute this as being just above the just undone change.
12827 ff494a964ab7 patch 8.0.1290: seq_cur of undotree() wrong after undo Christian Brabandt <cb@256bit.org> parents: 12716 diff changeset	2931 if (curhead->uh_next.ptr != NULL)
ff494a964ab7 patch 8.0.1290: seq_cur of undotree() wrong after undo Christian Brabandt <cb@256bit.org> parents: 12716 diff changeset	2932 curbuf->b_u_seq_cur = curhead->uh_next.ptr->uh_seq;
ff494a964ab7 patch 8.0.1290: seq_cur of undotree() wrong after undo Christian Brabandt <cb@256bit.org> parents: 12716 diff changeset	2933 else
ff494a964ab7 patch 8.0.1290: seq_cur of undotree() wrong after undo Christian Brabandt <cb@256bit.org> parents: 12716 diff changeset	2934 curbuf->b_u_seq_cur = 0;
ff494a964ab7 patch 8.0.1290: seq_cur of undotree() wrong after undo Christian Brabandt <cb@256bit.org> parents: 12716 diff changeset	2935 }
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2936
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2937 // Remember where we are for ":earlier 1f" and ":later 1f".
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2938 if (curhead->uh_save_nr != 0)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2939 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2940 if (undo)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2941 curbuf->b_u_save_nr_cur = curhead->uh_save_nr - 1;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2942 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2943 curbuf->b_u_save_nr_cur = curhead->uh_save_nr;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2944 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2945
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2946 // The timestamp can be the same for multiple changes, just use the one of
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2947 // the undone/redone change.
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	2948 curbuf->b_u_time_cur = curhead->uh_time;
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2949
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2950 unblock_autocmds();
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2951 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2952 u_check(FALSE);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2953 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2954 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2955
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2956 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2957 * If we deleted or added lines, report the number of less/more lines.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2958 * Otherwise, report the number of changes (this may be incorrect
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2959 * in some cases, but it's better than nothing).
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2960 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2961 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2962 u_undo_end(
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2963 int did_undo, // just did an undo
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2964 int absolute) // used ":undo N"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2965 {
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2966 char *msgstr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2967 u_header_T *uhp;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2968 char_u msgbuf[80];
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2969
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2970 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2971 if ((fdo_flags & FDO_UNDO) && KeyTyped)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2972 foldOpenCursor();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2973 #endif
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2974
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2975 if (global_busy // no messages now, wait until global is finished
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2976 \|\| !messaging()) // 'lazyredraw' set, don't do messages now
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2977 return;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2978
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2979 if (curbuf->b_ml.ml_flags & ML_EMPTY)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2980 --u_newcount;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2981
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2982 u_oldcount -= u_newcount;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2983 if (u_oldcount == -1)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2984 msgstr = N_("more line");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2985 else if (u_oldcount < 0)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2986 msgstr = N_("more lines");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2987 else if (u_oldcount == 1)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2988 msgstr = N_("line less");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2989 else if (u_oldcount > 1)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2990 msgstr = N_("fewer lines");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2991 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2992 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2993 u_oldcount = u_newcount;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2994 if (u_newcount == 1)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2995 msgstr = N_("change");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2996 else
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2997 msgstr = N_("changes");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2998 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2999
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3000 if (curbuf->b_u_curhead != NULL)
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	3001 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3002 // For ":undo N" we prefer a "after #N" message.
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3003 if (absolute && curbuf->b_u_curhead->uh_next.ptr != NULL)
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	3004 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3005 uhp = curbuf->b_u_curhead->uh_next.ptr;
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	3006 did_undo = FALSE;
95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	3007 }
95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	3008 else if (did_undo)
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	3009 uhp = curbuf->b_u_curhead;
f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	3010 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3011 uhp = curbuf->b_u_curhead->uh_next.ptr;
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	3012 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3013 else
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3014 uhp = curbuf->b_u_newhead;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3015
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3016 if (uhp == NULL)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3017 *msgbuf = NUL;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3018 else
18463 18d7337b6837 patch 8.1.2225: the "last used" info of a buffer is under used Bram Moolenaar <Bram@vim.org> parents: 18139 diff changeset	3019 add_time(msgbuf, sizeof(msgbuf), uhp->uh_time);
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3020
2282 a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3021 #ifdef FEAT_CONCEAL
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3022 {
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3023 win_T *wp;
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3024
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3025 FOR_ALL_WINDOWS(wp)
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3026 {
2378 85b7dc8da5eb Add the 'concealcursor' option to decide when the cursor line is to be Bram Moolenaar <bram@vim.org> parents: 2367 diff changeset	3027 if (wp->w_buffer == curbuf && wp->w_p_cole > 0)
2282 a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3028 redraw_win_later(wp, NOT_VALID);
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3029 }
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3030 }
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3031 #endif
27378 a4746d1a3cf3 patch 8.2.4217: illegal memory access when undo makes Visual area invalid Bram Moolenaar <Bram@vim.org> parents: 27028 diff changeset	3032 if (VIsual_active)
a4746d1a3cf3 patch 8.2.4217: illegal memory access when undo makes Visual area invalid Bram Moolenaar <Bram@vim.org> parents: 27028 diff changeset	3033 check_pos(curbuf, &VIsual);
2282 a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3034
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	3035 smsg_attr_keep(0, _("%ld %s; %s #%ld %s"),
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	3036 u_oldcount < 0 ? -u_oldcount : u_oldcount,
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	3037 _(msgstr),
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	3038 did_undo ? _("before") : _("after"),
f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	3039 uhp == NULL ? 0L : uhp->uh_seq,
f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	3040 msgbuf);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3041 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3042
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3043 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3044 * u_sync: stop adding to the current entry list
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3045 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3046 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3047 u_sync(
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3048 int force) // Also sync when no_u_sync is set.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3049 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3050 // Skip it when already synced or syncing is disabled.
825 6675076019ae updated for version 7.0d vimboss parents: 810 diff changeset	3051 if (curbuf->b_u_synced \|\| (!force && no_u_sync > 0))
6675076019ae updated for version 7.0d vimboss parents: 810 diff changeset	3052 return;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3053 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
12293 1ff5e5dfa9b0 patch 8.0.1026: GTK on-the-spot input has problems Christian Brabandt <cb@256bit.org> parents: 12216 diff changeset	3054 if (p_imst == IM_ON_THE_SPOT && im_is_preediting())
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3055 return; // XIM is busy, don't break an undo sequence
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3056 #endif
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	3057 if (get_undolevel() < 0)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3058 curbuf->b_u_synced = TRUE; // no entries, nothing to do
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3059 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3060 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3061 u_getbot(); // compute ue_bot of previous u_save
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3062 curbuf->b_u_curhead = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3063 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3064 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3065
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3066 /*
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3067 * ":undolist": List the leafs of the undo tree
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3068 */
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3069 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3070 ex_undolist(exarg_T *eap UNUSED)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3071 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3072 garray_T ga;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3073 u_header_T *uhp;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3074 int mark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3075 int nomark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3076 int changes = 1;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3077 int i;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3078
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3079 /*
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3080 * 1: walk the tree to find all leafs, put the info in "ga".
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3081 * 2: sort the lines
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3082 * 3: display the list
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3083 */
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3084 mark = ++lastmark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3085 nomark = ++lastmark;
27028 c9474ae175f4 patch 8.2.4043: using int for second argument of ga_init2() Bram Moolenaar <Bram@vim.org> parents: 26966 diff changeset	3086 ga_init2(&ga, sizeof(char *), 20);
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3087
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3088 uhp = curbuf->b_u_oldhead;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3089 while (uhp != NULL)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3090 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3091 if (uhp->uh_prev.ptr == NULL && uhp->uh_walk != nomark
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	3092 && uhp->uh_walk != mark)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3093 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3094 if (ga_grow(&ga, 1) == FAIL)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3095 break;
13610 e76499e85744 patch 8.0.1677: no compiler warning for wrong format in vim_snprintf() Christian Brabandt <cb@256bit.org> parents: 13380 diff changeset	3096 vim_snprintf((char *)IObuff, IOSIZE, "%6ld %7d ",
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3097 uhp->uh_seq, changes);
18463 18d7337b6837 patch 8.1.2225: the "last used" info of a buffer is under used Bram Moolenaar <Bram@vim.org> parents: 18139 diff changeset	3098 add_time(IObuff + STRLEN(IObuff), IOSIZE - STRLEN(IObuff),
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3099 uhp->uh_time);
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3100 if (uhp->uh_save_nr > 0)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3101 {
2627 fae6fb779a6b updated for version 7.3.048 Bram Moolenaar <bram@vim.org> parents: 2577 diff changeset	3102 while (STRLEN(IObuff) < 33)
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3103 STRCAT(IObuff, " ");
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3104 vim_snprintf_add((char *)IObuff, IOSIZE,
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3105 " %3ld", uhp->uh_save_nr);
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3106 }
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3107 ((char_u **)(ga.ga_data))[ga.ga_len++] = vim_strsave(IObuff);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3108 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3109
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3110 uhp->uh_walk = mark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3111
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3112 // go down in the tree if we haven't been there
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3113 if (uhp->uh_prev.ptr != NULL && uhp->uh_prev.ptr->uh_walk != nomark
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3114 && uhp->uh_prev.ptr->uh_walk != mark)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3115 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3116 uhp = uhp->uh_prev.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3117 ++changes;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3118 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3119
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3120 // go to alternate branch if we haven't been there
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3121 else if (uhp->uh_alt_next.ptr != NULL
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3122 && uhp->uh_alt_next.ptr->uh_walk != nomark
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3123 && uhp->uh_alt_next.ptr->uh_walk != mark)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3124 uhp = uhp->uh_alt_next.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3125
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3126 // go up in the tree if we haven't been there and we are at the
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3127 // start of alternate branches
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3128 else if (uhp->uh_next.ptr != NULL && uhp->uh_alt_prev.ptr == NULL
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3129 && uhp->uh_next.ptr->uh_walk != nomark
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3130 && uhp->uh_next.ptr->uh_walk != mark)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3131 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3132 uhp = uhp->uh_next.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3133 --changes;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3134 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3135
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3136 else
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3137 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3138 // need to backtrack; mark this node as done
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3139 uhp->uh_walk = nomark;
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3140 if (uhp->uh_alt_prev.ptr != NULL)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3141 uhp = uhp->uh_alt_prev.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3142 else
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3143 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3144 uhp = uhp->uh_next.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3145 --changes;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3146 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3147 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3148 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3149
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3150 if (ga.ga_len == 0)
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	3151 msg(_("Nothing to undo"));
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3152 else
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3153 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3154 sort_strings((char_u **)ga.ga_data, ga.ga_len);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3155
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3156 msg_start();
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	3157 msg_puts_attr(_("number changes when saved"),
11158 501f46f7644c patch 8.0.0466: still macros that should be all-caps Christian Brabandt <cb@256bit.org> parents: 11127 diff changeset	3158 HL_ATTR(HLF_T));
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3159 for (i = 0; i < ga.ga_len && !got_int; ++i)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3160 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3161 msg_putchar('\n');
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3162 if (got_int)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3163 break;
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	3164 msg_puts(((char **)ga.ga_data)[i]);
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3165 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3166 msg_end();
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3167
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3168 ga_clear_strings(&ga);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3169 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3170 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3171
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3172 /*
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3173 * ":undojoin": continue adding to the last entry list
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3174 */
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3175 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3176 ex_undojoin(exarg_T *eap UNUSED)
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3177 {
839 1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3178 if (curbuf->b_u_newhead == NULL)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3179 return; // nothing changed before
839 1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3180 if (curbuf->b_u_curhead != NULL)
1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3181 {
26958 d92e0d85923f patch 8.2.4008: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26913 diff changeset	3182 emsg(_(e_undojoin_is_not_allowed_after_undo));
839 1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3183 return;
1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3184 }
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3185 if (!curbuf->b_u_synced)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3186 return; // already unsynced
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	3187 if (get_undolevel() < 0)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3188 return; // no entries, nothing to do
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3189 else
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3190 // Append next change to the last entry
10631 cbf17371627c patch 8.0.0205: wrong behavior after :undojoin Christian Brabandt <cb@256bit.org> parents: 10518 diff changeset	3191 curbuf->b_u_synced = FALSE;
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3192 }
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3193
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3194 /*
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	3195 * Called after writing or reloading the file and setting b_changed to FALSE.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3196 * Now an undo means that the buffer is modified.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3197 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3198 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3199 u_unchanged(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3200 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3201 u_unch_branch(buf->b_u_oldhead);
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3202 buf->b_did_warn = FALSE;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3203 }
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3204
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3205 /*
2482 88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3206 * After reloading a buffer which was saved for 'undoreload': Find the first
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3207 * line that was changed and set the cursor there.
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3208 */
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3209 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3210 u_find_first_changed(void)
2482 88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3211 {
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3212 u_header_T *uhp = curbuf->b_u_newhead;
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3213 u_entry_T *uep;
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3214 linenr_T lnum;
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3215
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3216 if (curbuf->b_u_curhead != NULL \|\| uhp == NULL)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3217 return; // undid something in an autocmd?
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3218
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3219 // Check that the last undo block was for the whole file.
2482 88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3220 uep = uhp->uh_entry;
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3221 if (uep->ue_top != 0 \|\| uep->ue_bot != 0)
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3222 return;
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3223
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3224 for (lnum = 1; lnum < curbuf->b_ml.ml_line_count
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3225 && lnum <= uep->ue_size; ++lnum)
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3226 {
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3227 char_u *p = ml_get_buf(curbuf, lnum, FALSE);
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3228
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3229 if (uep->ue_array[lnum - 1].ul_len != curbuf->b_ml.ml_line_len
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3230 \|\| memcmp(p, uep->ue_array[lnum - 1].ul_line, uep->ue_array[lnum - 1].ul_len) != 0)
2482 88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3231 {
11121 778c10516955 patch 8.0.0448: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 10978 diff changeset	3232 CLEAR_POS(&(uhp->uh_cursor));
2482 88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3233 uhp->uh_cursor.lnum = lnum;
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3234 return;
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3235 }
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3236 }
2482 88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3237 if (curbuf->b_ml.ml_line_count != uep->ue_size)
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3238 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3239 // lines added or deleted at the end, put the cursor there
11121 778c10516955 patch 8.0.0448: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 10978 diff changeset	3240 CLEAR_POS(&(uhp->uh_cursor));
2482 88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3241 uhp->uh_cursor.lnum = lnum;
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3242 }
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3243 }
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3244
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3245 /*
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3246 * Increase the write count, store it in the last undo header, what would be
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3247 * used for "u".
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3248 */
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3249 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3250 u_update_save_nr(buf_T *buf)
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3251 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3252 u_header_T *uhp;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3253
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3254 ++buf->b_u_save_nr_last;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3255 buf->b_u_save_nr_cur = buf->b_u_save_nr_last;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3256 uhp = buf->b_u_curhead;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3257 if (uhp != NULL)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3258 uhp = uhp->uh_next.ptr;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3259 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3260 uhp = buf->b_u_newhead;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3261 if (uhp != NULL)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3262 uhp->uh_save_nr = buf->b_u_save_nr_last;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3263 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3264
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3265 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3266 u_unch_branch(u_header_T *uhp)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3267 {
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3268 u_header_T *uh;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3269
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3270 for (uh = uhp; uh != NULL; uh = uh->uh_prev.ptr)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3271 {
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3272 uh->uh_flags \|= UH_CHANGED;
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3273 if (uh->uh_alt_next.ptr != NULL)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3274 u_unch_branch(uh->uh_alt_next.ptr); // recursive
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3275 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3276 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3277
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3278 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3279 * Get pointer to last added entry.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3280 * If it's not valid, give an error message and return NULL.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3281 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3282 static u_entry_T *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3283 u_get_headentry(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3284 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3285 if (curbuf->b_u_newhead == NULL \|\| curbuf->b_u_newhead->uh_entry == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3286 {
26913 d4e61d61afd9 patch 8.2.3985: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26883 diff changeset	3287 iemsg(_(e_undo_list_corrupt));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3288 return NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3289 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3290 return curbuf->b_u_newhead->uh_entry;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3291 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3292
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3293 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3294 * u_getbot(): compute the line number of the previous u_save
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3295 * It is called only when b_u_synced is FALSE.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3296 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3297 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3298 u_getbot(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3299 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3300 u_entry_T *uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3301 linenr_T extra;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3302
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3303 uep = u_get_headentry(); // check for corrupt undo list
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3304 if (uep == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3305 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3306
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3307 uep = curbuf->b_u_newhead->uh_getbot_entry;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3308 if (uep != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3309 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3310 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3311 * the new ue_bot is computed from the number of lines that has been
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3312 * inserted (0 - deleted) since calling u_save. This is equal to the
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3313 * old line count subtracted from the current line count.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3314 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3315 extra = curbuf->b_ml.ml_line_count - uep->ue_lcount;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3316 uep->ue_bot = uep->ue_top + uep->ue_size + 1 + extra;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3317 if (uep->ue_bot < 1 \|\| uep->ue_bot > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3318 {
26913 d4e61d61afd9 patch 8.2.3985: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26883 diff changeset	3319 iemsg(_(e_undo_line_missing));
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3320 uep->ue_bot = uep->ue_top + 1; // assume all lines deleted, will
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3321 // get all the old lines back
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3322 // without deleting the current
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3323 // ones
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3324 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3325
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3326 curbuf->b_u_newhead->uh_getbot_entry = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3327 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3328
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3329 curbuf->b_u_synced = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3330 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3331
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3332 /*
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3333 * Free one header "uhp" and its entry list and adjust the pointers.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3334 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3335 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3336 u_freeheader(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3337 buf_T *buf,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3338 u_header_T *uhp,
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3339 u_header_T **uhpp) // if not NULL reset when freeing this header
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3340 {
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3341 u_header_T *uhap;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3342
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3343 // When there is an alternate redo list free that branch completely,
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3344 // because we can never go there.
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3345 if (uhp->uh_alt_next.ptr != NULL)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3346 u_freebranch(buf, uhp->uh_alt_next.ptr, uhpp);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3347
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3348 if (uhp->uh_alt_prev.ptr != NULL)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3349 uhp->uh_alt_prev.ptr->uh_alt_next.ptr = NULL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3350
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3351 // Update the links in the list to remove the header.
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3352 if (uhp->uh_next.ptr == NULL)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3353 buf->b_u_oldhead = uhp->uh_prev.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3354 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3355 uhp->uh_next.ptr->uh_prev.ptr = uhp->uh_prev.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3356
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3357 if (uhp->uh_prev.ptr == NULL)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3358 buf->b_u_newhead = uhp->uh_next.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3359 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3360 for (uhap = uhp->uh_prev.ptr; uhap != NULL;
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3361 uhap = uhap->uh_alt_next.ptr)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3362 uhap->uh_next.ptr = uhp->uh_next.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3363
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3364 u_freeentries(buf, uhp, uhpp);
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3365 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3366
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3367 /*
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3368 * Free an alternate branch and any following alternate branches.
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3369 */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3370 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3371 u_freebranch(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3372 buf_T *buf,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3373 u_header_T *uhp,
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3374 u_header_T **uhpp) // if not NULL reset when freeing this header
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3375 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3376 u_header_T tofree, next;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3377
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3378 // If this is the top branch we may need to use u_freeheader() to update
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3379 // all the pointers.
1440 93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3380 if (uhp == buf->b_u_oldhead)
93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3381 {
5448 9818311eeca0 updated for version 7.4.074 Bram Moolenaar <bram@vim.org> parents: 5446 diff changeset	3382 while (buf->b_u_oldhead != NULL)
9818311eeca0 updated for version 7.4.074 Bram Moolenaar <bram@vim.org> parents: 5446 diff changeset	3383 u_freeheader(buf, buf->b_u_oldhead, uhpp);
1440 93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3384 return;
93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3385 }
93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3386
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3387 if (uhp->uh_alt_prev.ptr != NULL)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3388 uhp->uh_alt_prev.ptr->uh_alt_next.ptr = NULL;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3389
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3390 next = uhp;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3391 while (next != NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3392 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3393 tofree = next;
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3394 if (tofree->uh_alt_next.ptr != NULL)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3395 u_freebranch(buf, tofree->uh_alt_next.ptr, uhpp); // recursive
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3396 next = tofree->uh_prev.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3397 u_freeentries(buf, tofree, uhpp);
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3398 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3399 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3400
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3401 /*
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3402 * Free all the undo entries for one header and the header itself.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3403 * This means that "uhp" is invalid when returning.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3404 */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3405 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3406 u_freeentries(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3407 buf_T *buf,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3408 u_header_T *uhp,
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3409 u_header_T **uhpp) // if not NULL reset when freeing this header
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3410 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3411 u_entry_T uep, nuep;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3412
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3413 // Check for pointers to the header that become invalid now.
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3414 if (buf->b_u_curhead == uhp)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3415 buf->b_u_curhead = NULL;
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3416 if (buf->b_u_newhead == uhp)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3417 buf->b_u_newhead = NULL; // freeing the newest entry
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3418 if (uhpp != NULL && uhp == *uhpp)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3419 *uhpp = NULL;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3420
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3421 for (uep = uhp->uh_entry; uep != NULL; uep = nuep)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3422 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3423 nuep = uep->ue_next;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3424 u_freeentry(uep, uep->ue_size);
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3425 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3426
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3427 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3428 uhp->uh_magic = 0;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3429 #endif
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3430 vim_free((char_u *)uhp);
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3431 --buf->b_u_numhead;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3432 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3433
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3434 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3435 * free entry 'uep' and 'n' lines in uep->ue_array[]
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3436 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3437 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3438 u_freeentry(u_entry_T *uep, long n)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3439 {
414 8ab9c77240d4 updated for version 7.0108 vimboss parents: 407 diff changeset	3440 while (n > 0)
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3441 vim_free(uep->ue_array[--n].ul_line);
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3442 vim_free((char_u *)uep->ue_array);
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3443 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3444 uep->ue_magic = 0;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3445 #endif
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3446 vim_free((char_u *)uep);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3447 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3448
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3449 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3450 * invalidate the undo buffer; called when storage has already been released
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3451 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3452 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3453 u_clearall(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3454 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3455 buf->b_u_newhead = buf->b_u_oldhead = buf->b_u_curhead = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3456 buf->b_u_synced = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3457 buf->b_u_numhead = 0;
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3458 buf->b_u_line_ptr.ul_line = NULL;
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3459 buf->b_u_line_ptr.ul_len = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3460 buf->b_u_line_lnum = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3461 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3462
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3463 /*
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3464 * Save the line "lnum" for the "U" command.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3465 */
17789 0f7ae8010787 patch 8.1.1891: functions used in one file are global Bram Moolenaar <Bram@vim.org> parents: 17630 diff changeset	3466 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3467 u_saveline(linenr_T lnum)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3468 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3469 if (lnum == curbuf->b_u_line_lnum) // line is already saved
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3470 return;
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3471 if (lnum < 1 \|\| lnum > curbuf->b_ml.ml_line_count) // should never happen
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3472 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3473 u_clearline();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3474 curbuf->b_u_line_lnum = lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3475 if (curwin->w_cursor.lnum == lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3476 curbuf->b_u_line_colnr = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3477 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3478 curbuf->b_u_line_colnr = 0;
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3479 if (u_save_line(&curbuf->b_u_line_ptr, lnum) == FAIL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3480 do_outofmem_msg((long_u)0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3481 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3482
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3483 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3484 * clear the line saved for the "U" command
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3485 * (this is used externally for crossing a line while in insert mode)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3486 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3487 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3488 u_clearline(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3489 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3490 if (curbuf->b_u_line_ptr.ul_line != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3491 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3492 VIM_CLEAR(curbuf->b_u_line_ptr.ul_line);
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3493 curbuf->b_u_line_ptr.ul_len = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3494 curbuf->b_u_line_lnum = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3495 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3496 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3497
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3498 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3499 * Implementation of the "U" command.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3500 * Differentiation from vi: "U" can be undone with the next "U".
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3501 * We also allow the cursor to be in another line.
2289 3331756e4232 Make synstack() work on the character just after the end of the line. Bram Moolenaar <bram@vim.org> parents: 2288 diff changeset	3502 * Careful: may trigger autocommands that reload the buffer.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3503 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3504 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3505 u_undoline(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3506 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3507 colnr_T t;
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3508 undoline_T oldp;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3509
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3510 if (undo_off)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3511 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3512
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3513 if (curbuf->b_u_line_ptr.ul_line == NULL
1534 bdfbf8ef447a updated for version 7.1-249 vimboss parents: 1440 diff changeset	3514 \|\| curbuf->b_u_line_lnum > curbuf->b_ml.ml_line_count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3515 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3516 beep_flush();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3517 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3518 }
1534 bdfbf8ef447a updated for version 7.1-249 vimboss parents: 1440 diff changeset	3519
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3520 // first save the line for the 'u' command
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3521 if (u_savecommon(curbuf->b_u_line_lnum - 1,
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	3522 curbuf->b_u_line_lnum + 1, (linenr_T)0, FALSE) == FAIL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3523 return;
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3524 if (u_save_line(&oldp, curbuf->b_u_line_lnum) == FAIL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3525 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3526 do_outofmem_msg((long_u)0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3527 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3528 }
21996 808edde1e97d patch 8.2.1547: various comment problems Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	3529 ml_replace_len(curbuf->b_u_line_lnum, curbuf->b_u_line_ptr.ul_line,
808edde1e97d patch 8.2.1547: various comment problems Bram Moolenaar <Bram@vim.org> parents: 20830 diff changeset	3530 curbuf->b_u_line_ptr.ul_len, TRUE, FALSE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3531 changed_bytes(curbuf->b_u_line_lnum, 0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3532 curbuf->b_u_line_ptr = oldp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3533
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3534 t = curbuf->b_u_line_colnr;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3535 if (curwin->w_cursor.lnum == curbuf->b_u_line_lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3536 curbuf->b_u_line_colnr = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3537 curwin->w_cursor.col = t;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3538 curwin->w_cursor.lnum = curbuf->b_u_line_lnum;
1534 bdfbf8ef447a updated for version 7.1-249 vimboss parents: 1440 diff changeset	3539 check_cursor_col();
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3540 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3541
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3542 /*
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3543 * Free all allocated memory blocks for the buffer 'buf'.
4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3544 */
4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3545 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3546 u_blockfree(buf_T *buf)
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3547 {
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3548 while (buf->b_u_oldhead != NULL)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3549 u_freeheader(buf, buf->b_u_oldhead, NULL);
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3550 vim_free(buf->b_u_line_ptr.ul_line);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3551 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3552
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3553 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3554 * Check if the 'modified' flag is set, or 'ff' has changed (only need to
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3555 * check the first character, because it can only be "dos", "unix" or "mac").
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3556 * "nofile" and "scratch" type buffers are considered to always be unchanged.
13012 8d5b451d7bab patch 8.0.1382: get "no write since last change" message if terminal is open Christian Brabandt <cb@256bit.org> parents: 12827 diff changeset	3557 * Also considers a buffer changed when a terminal window contains a running
8d5b451d7bab patch 8.0.1382: get "no write since last change" message if terminal is open Christian Brabandt <cb@256bit.org> parents: 12827 diff changeset	3558 * job.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3559 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3560 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3561 bufIsChanged(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3562 {
11957 bc0fee081e1e patch 8.0.0858: can exit while a terminal is still running a job Christian Brabandt <cb@256bit.org> parents: 11836 diff changeset	3563 #ifdef FEAT_TERMINAL
bc0fee081e1e patch 8.0.0858: can exit while a terminal is still running a job Christian Brabandt <cb@256bit.org> parents: 11836 diff changeset	3564 if (term_job_running(buf->b_term))
bc0fee081e1e patch 8.0.0858: can exit while a terminal is still running a job Christian Brabandt <cb@256bit.org> parents: 11836 diff changeset	3565 return TRUE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3566 #endif
13012 8d5b451d7bab patch 8.0.1382: get "no write since last change" message if terminal is open Christian Brabandt <cb@256bit.org> parents: 12827 diff changeset	3567 return bufIsChangedNotTerm(buf);
8d5b451d7bab patch 8.0.1382: get "no write since last change" message if terminal is open Christian Brabandt <cb@256bit.org> parents: 12827 diff changeset	3568 }
8d5b451d7bab patch 8.0.1382: get "no write since last change" message if terminal is open Christian Brabandt <cb@256bit.org> parents: 12827 diff changeset	3569
8d5b451d7bab patch 8.0.1382: get "no write since last change" message if terminal is open Christian Brabandt <cb@256bit.org> parents: 12827 diff changeset	3570 /*
16089 4411c38f3d16 patch 8.1.1049: when user tries to exit with CTRL-C message is confusing Bram Moolenaar <Bram@vim.org> parents: 15868 diff changeset	3571 * Return TRUE if any buffer has changes. Also buffers that are not written.
4411c38f3d16 patch 8.1.1049: when user tries to exit with CTRL-C message is confusing Bram Moolenaar <Bram@vim.org> parents: 15868 diff changeset	3572 */
4411c38f3d16 patch 8.1.1049: when user tries to exit with CTRL-C message is confusing Bram Moolenaar <Bram@vim.org> parents: 15868 diff changeset	3573 int
4411c38f3d16 patch 8.1.1049: when user tries to exit with CTRL-C message is confusing Bram Moolenaar <Bram@vim.org> parents: 15868 diff changeset	3574 anyBufIsChanged(void)
4411c38f3d16 patch 8.1.1049: when user tries to exit with CTRL-C message is confusing Bram Moolenaar <Bram@vim.org> parents: 15868 diff changeset	3575 {
4411c38f3d16 patch 8.1.1049: when user tries to exit with CTRL-C message is confusing Bram Moolenaar <Bram@vim.org> parents: 15868 diff changeset	3576 buf_T *buf;
4411c38f3d16 patch 8.1.1049: when user tries to exit with CTRL-C message is confusing Bram Moolenaar <Bram@vim.org> parents: 15868 diff changeset	3577
4411c38f3d16 patch 8.1.1049: when user tries to exit with CTRL-C message is confusing Bram Moolenaar <Bram@vim.org> parents: 15868 diff changeset	3578 FOR_ALL_BUFFERS(buf)
4411c38f3d16 patch 8.1.1049: when user tries to exit with CTRL-C message is confusing Bram Moolenaar <Bram@vim.org> parents: 15868 diff changeset	3579 if (bufIsChanged(buf))
4411c38f3d16 patch 8.1.1049: when user tries to exit with CTRL-C message is confusing Bram Moolenaar <Bram@vim.org> parents: 15868 diff changeset	3580 return TRUE;
16097 d45e42b45470 patch 8.1.1053: warning for missing return statement Bram Moolenaar <Bram@vim.org> parents: 16089 diff changeset	3581 return FALSE;
16089 4411c38f3d16 patch 8.1.1049: when user tries to exit with CTRL-C message is confusing Bram Moolenaar <Bram@vim.org> parents: 15868 diff changeset	3582 }
4411c38f3d16 patch 8.1.1049: when user tries to exit with CTRL-C message is confusing Bram Moolenaar <Bram@vim.org> parents: 15868 diff changeset	3583
4411c38f3d16 patch 8.1.1049: when user tries to exit with CTRL-C message is confusing Bram Moolenaar <Bram@vim.org> parents: 15868 diff changeset	3584 /*
13012 8d5b451d7bab patch 8.0.1382: get "no write since last change" message if terminal is open Christian Brabandt <cb@256bit.org> parents: 12827 diff changeset	3585 * Like bufIsChanged() but ignoring a terminal window.
8d5b451d7bab patch 8.0.1382: get "no write since last change" message if terminal is open Christian Brabandt <cb@256bit.org> parents: 12827 diff changeset	3586 */
8d5b451d7bab patch 8.0.1382: get "no write since last change" message if terminal is open Christian Brabandt <cb@256bit.org> parents: 12827 diff changeset	3587 int
8d5b451d7bab patch 8.0.1382: get "no write since last change" message if terminal is open Christian Brabandt <cb@256bit.org> parents: 12827 diff changeset	3588 bufIsChangedNotTerm(buf_T *buf)
8d5b451d7bab patch 8.0.1382: get "no write since last change" message if terminal is open Christian Brabandt <cb@256bit.org> parents: 12827 diff changeset	3589 {
14147 de75c249723d patch 8.1.0091: MS-Windows: Cannot interrupt gdb when program is running Christian Brabandt <cb@256bit.org> parents: 13610 diff changeset	3590 // In a "prompt" buffer we do respect 'modified', so that we can control
de75c249723d patch 8.1.0091: MS-Windows: Cannot interrupt gdb when program is running Christian Brabandt <cb@256bit.org> parents: 13610 diff changeset	3591 // closing the window by setting or resetting that option.
de75c249723d patch 8.1.0091: MS-Windows: Cannot interrupt gdb when program is running Christian Brabandt <cb@256bit.org> parents: 13610 diff changeset	3592 return (!bt_dontwrite(buf) \|\| bt_prompt(buf))
11957 bc0fee081e1e patch 8.0.0858: can exit while a terminal is still running a job Christian Brabandt <cb@256bit.org> parents: 11836 diff changeset	3593 && (buf->b_changed \|\| file_ff_differs(buf, TRUE));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3594 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3595
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3596 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3597 curbufIsChanged(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3598 {
11957 bc0fee081e1e patch 8.0.0858: can exit while a terminal is still running a job Christian Brabandt <cb@256bit.org> parents: 11836 diff changeset	3599 return bufIsChanged(curbuf);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3600 }
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3601
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3602 #if defined(FEAT_EVAL) \|\| defined(PROTO)
17970 684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3603
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3604 /*
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3605 * For undotree(): Append the list of undo blocks at "first_uhp" to "list".
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3606 * Recursive.
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3607 */
18051 d1e77015f60b patch 8.1.2021: some global functions can be local to the file Bram Moolenaar <Bram@vim.org> parents: 18025 diff changeset	3608 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3609 u_eval_tree(u_header_T first_uhp, list_T list)
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3610 {
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3611 u_header_T *uhp = first_uhp;
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3612 dict_T *dict;
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3613
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3614 while (uhp != NULL)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3615 {
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3616 dict = dict_alloc();
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3617 if (dict == NULL)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3618 return;
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 14237 diff changeset	3619 dict_add_number(dict, "seq", uhp->uh_seq);
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 14237 diff changeset	3620 dict_add_number(dict, "time", (long)uhp->uh_time);
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3621 if (uhp == curbuf->b_u_newhead)
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 14237 diff changeset	3622 dict_add_number(dict, "newhead", 1);
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3623 if (uhp == curbuf->b_u_curhead)
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 14237 diff changeset	3624 dict_add_number(dict, "curhead", 1);
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3625 if (uhp->uh_save_nr > 0)
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 14237 diff changeset	3626 dict_add_number(dict, "save", uhp->uh_save_nr);
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3627
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3628 if (uhp->uh_alt_next.ptr != NULL)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3629 {
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3630 list_T *alt_list = list_alloc();
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3631
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3632 if (alt_list != NULL)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3633 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3634 // Recursive call to add alternate undo tree.
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3635 u_eval_tree(uhp->uh_alt_next.ptr, alt_list);
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3636 dict_add_list(dict, "alt", alt_list);
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3637 }
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3638 }
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3639
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3640 list_append_dict(list, dict);
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3641 uhp = uhp->uh_prev.ptr;
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3642 }
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3643 }
17970 684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3644
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3645 /*
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3646 * "undofile(name)" function
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3647 */
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3648 void
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3649 f_undofile(typval_T argvars UNUSED, typval_T rettv)
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3650 {
25384 e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25362 diff changeset	3651 if (in_vim9script() && check_for_string_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: 25362 diff changeset	3652 return;
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25362 diff changeset	3653
17970 684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3654 rettv->v_type = VAR_STRING;
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3655 #ifdef FEAT_PERSISTENT_UNDO
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3656 {
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3657 char_u *fname = tv_get_string(&argvars[0]);
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3658
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3659 if (*fname == NUL)
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3660 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3661 // If there is no file name there will be no undo file.
17970 684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3662 rettv->vval.v_string = NULL;
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3663 }
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3664 else
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3665 {
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3666 char_u *ffname = FullName_save(fname, TRUE);
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3667
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3668 if (ffname != NULL)
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3669 rettv->vval.v_string = u_get_undo_file_name(ffname, FALSE);
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3670 vim_free(ffname);
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3671 }
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3672 }
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3673 #else
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3674 rettv->vval.v_string = NULL;
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3675 #endif
17970 684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3676 }
25362 68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3677 #ifdef FEAT_PERSISTENT_UNDO
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3678 /*
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3679 * Reset undofile option and delete the undofile
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3680 */
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3681 void
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3682 u_undofile_reset_and_delete(buf_T *buf)
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3683 {
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3684 char_u *file_name;
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3685
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3686 if (!buf->b_p_udf)
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3687 return;
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3688
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3689 file_name = u_get_undo_file_name(buf->b_ffname, TRUE);
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3690 if (file_name != NULL)
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3691 {
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3692 mch_remove(file_name);
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3693 vim_free(file_name);
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3694 }
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3695
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3696 set_option_value((char_u *)"undofile", 0L, NULL, OPT_LOCAL);
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3697 }
68a7e6d70a5e patch 8.2.3218: when using xchaha20 crypt undo file is not removed Bram Moolenaar <Bram@vim.org> parents: 25320 diff changeset	3698 #endif
17970 684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3699
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3700 /*
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3701 * "undotree()" function
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3702 */
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3703 void
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3704 f_undotree(typval_T argvars UNUSED, typval_T rettv)
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3705 {
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3706 if (rettv_dict_alloc(rettv) == OK)
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3707 {
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3708 dict_T *dict = rettv->vval.v_dict;
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3709 list_T *list;
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3710
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3711 dict_add_number(dict, "synced", (long)curbuf->b_u_synced);
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3712 dict_add_number(dict, "seq_last", curbuf->b_u_seq_last);
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27378 diff changeset	3713 dict_add_number(dict, "save_last", curbuf->b_u_save_nr_last);
17970 684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3714 dict_add_number(dict, "seq_cur", curbuf->b_u_seq_cur);
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3715 dict_add_number(dict, "time_cur", (long)curbuf->b_u_time_cur);
27426 41e0dcf38521 patch 8.2.4241: some type casts are redundant Bram Moolenaar <Bram@vim.org> parents: 27378 diff changeset	3716 dict_add_number(dict, "save_cur", curbuf->b_u_save_nr_cur);
17970 684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3717
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3718 list = list_alloc();
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3719 if (list != NULL)
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3720 {
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3721 u_eval_tree(curbuf->b_u_oldhead, list);
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3722 dict_add_list(dict, "entries", list);
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3723 }
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3724 }
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3725 }
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3726
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3727 #endif

Mercurial > vim

annotate src/undo.c @ 27884:6061cd922df1