vim: src/undo.c annotate

annotate src/undo.c @ 20581:e529690f27bc v8.2.0844

patch 8.2.0844: text properties crossing lines not handled correctly Commit: https://github.com/vim/vim/commit/a9d4b84d97fb74061eeb42c1433e111fb58825dc Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 30 14:46:52 2020 +0200 patch 8.2.0844: text properties crossing lines not handled correctly Problem: Text properties crossing lines not handled correctly. Solution: When saving for undo include an extra line when needed and do not adjust properties when undoing. (Axel Forsman, closes #5875)

author	Bram Moolenaar <Bram@vim.org>
date	Sat, 30 May 2020 15:00:03 +0200
parents	06a1dd50463e
children	0b55c9a14ea1

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.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: 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 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	319 emsg(_(e_modifiable));
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 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	327 emsg(_(e_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 {
20118 252d2bb90394 patch 8.2.0614: get ml_get error when deleting a line in 'completefunc' Bram Moolenaar <Bram@vim.org> parents: 20007 diff changeset	336 emsg(_(e_textlock));
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
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	378 /*
20581 e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	379 * 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	380 */
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	381 static int
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	382 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	383 {
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	384 char_u *props;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	385 int i;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	386 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	387
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	388 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	389 {
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	390 textprop_T prop;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	391
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	392 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	393 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	394 return TRUE;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	395 }
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	396 return FALSE;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	397 }
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	398
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	399 /*
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	400 * 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	401 * "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	402 * "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	403 * "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	404 * "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	405 * 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	406 * 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	407 */
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	408 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	409 u_savecommon(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	410 linenr_T top,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	411 linenr_T bot,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	412 linenr_T newbot,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	413 int reload)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	414 {
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	415 linenr_T lnum;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	416 long i;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	417 u_header_T *uhp;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	418 u_header_T *old_curhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	419 u_entry_T *uep;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	420 u_entry_T *prev_uep;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	421 long size;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	422
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	423 if (!reload)
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	424 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	425 // 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	426 // 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	427 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	428 return FAIL;
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	429
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	430 #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	431 /*
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	432 * 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	433 * 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	434 */
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	435 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	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_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	438 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	439 emsg(_(e_guarded));
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	440 return FAIL;
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	441 }
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	442 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	443 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	444 emsg(_(e_nbreadonly));
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	445 return FAIL;
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	446 }
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	447 }
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	448 #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	449 #ifdef FEAT_TERMINAL
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	450 // 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	451 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	452 #endif
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	453
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	454 /*
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	455 * 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	456 * 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	457 * 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	458 * (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	459 */
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	460 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	461 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	462 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	463 // 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	464 // file in a way it becomes shorter.
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	465 emsg(_("E881: 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	466 return FAIL;
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	467 }
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	468 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	469
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	470 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	471 u_check(FALSE);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	472 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	473
20581 e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	474 #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	475 // 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	476 // 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	477 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	478 {
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	479 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	480 --top;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	481 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	482 && 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	483 {
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	484 ++bot;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	485 if (newbot != 0)
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	486 ++newbot;
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	487 }
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	488 }
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	489 #endif
e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	490
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	491 size = bot - top - 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	492
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	493 /*
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	494 * If curbuf->b_u_synced == TRUE make a new header.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	495 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	496 if (curbuf->b_u_synced)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	497 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	498 #ifdef FEAT_JUMPLIST
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	499 // Need to create new entry in b_changelist.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	500 curbuf->b_new_change = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	501 #endif
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
2229 d45902a5c61c Fix a few more things for persistent undo. Bram Moolenaar <bram@vim.org> parents: 2223 diff changeset	787 static char_u e_not_open[] = N_("E828: Cannot open undo file for writing: %s");
d45902a5c61c Fix a few more things for persistent undo. Bram Moolenaar <bram@vim.org> parents: 2223 diff changeset	788
2214 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 * 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	791 */
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	792 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	793 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	794 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	795 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	796 linenr_T lnum;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	797 char_u *p;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	798
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	799 sha256_start(&ctx);
3194 972bd3fca556 updated for version 7.3.367 Bram Moolenaar <bram@vim.org> parents: 2689 diff changeset	800 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	801 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	802 p = ml_get(lnum);
2217 120502692d82 Improve the MS-Windows installer. Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	803 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	804 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	805 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	806 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	807
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	808 /*
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	809 * 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	810 * 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	811 * 'undodir'.
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	812 * 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	813 * 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	814 */
18051 d1e77015f60b patch 8.1.2021: some global functions can be local to the file Bram Moolenaar <Bram@vim.org> parents: 18025 diff changeset	815 static char_u *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	816 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	817 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	818 char_u *dirp;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	819 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	820 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	821 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	822 int dir_len;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	823 char_u *p;
9387 f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	824 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	825 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	826 #ifdef HAVE_READLINK
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	827 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	828 #endif
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	829
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	830 if (ffname == NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	831 return NULL;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	832
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	833 #ifdef HAVE_READLINK
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	834 // 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	835 // 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	836 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	837 ffname = fname_buf;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	838 #endif
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	839
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	840 // 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	841 // 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	842 dirp = p_udir;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	843 while (*dirp != NUL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	844 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	845 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	846 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	847 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	848 // 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	849 // "dir/name" -> "dir/.name.un~"
2217 120502692d82 Improve the MS-Windows installer. Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	850 undo_file_name = vim_strnsave(ffname, (int)(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	851 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	852 break;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	853 p = gettail(undo_file_name);
5704 47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	854 #ifdef VMS
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	855 // 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	856 // 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	857 // at the beginning to keep the extension
5704 47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	858 mch_memmove(p + 4, p, STRLEN(p) + 1);
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	859 mch_memmove(p, "_un_", 4);
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	860
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	861 #else
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	862 // 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	863 // "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	864 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	865 *p = '.';
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	866 STRCAT(p, ".un~");
5704 47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	867 #endif
2214 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 else
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	870 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	871 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	872 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	873 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	874 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	875 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	876 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	877 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	878 return NULL;
11127 506f5d8b7d8b patch 8.0.0451: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11121 diff changeset	879 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	880 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	881 *p = '%';
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 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	884 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	885 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	886
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	887 // 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	888 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	889 \|\| 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	890 break;
13244 ac42c4b11dbc patch 8.0.1496: clearing a pointer takes two lines Christian Brabandt <cb@256bit.org> parents: 13138 diff changeset	891 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	892 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	893
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	894 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	895 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	896 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	897
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	898 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	899 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	900 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	901 semsg(_("E825: Corrupted undo file (%s): %s"), 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	902 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	903
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	904 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	905 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	906 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	907 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	908 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	909
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	910 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	911 while (uep != NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	912 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	913 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	914 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	915 uep = nuep;
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 vim_free(uhp);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	918 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	919
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	920 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	921 * 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	922 * Buffers and encrypts as needed.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	923 * Returns OK or FAIL.
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	924 */
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	925 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	926 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	927 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	928 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	929 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	930 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	931 size_t len_todo = len;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	932 char_u *p = ptr;
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 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	935 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	936 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	937
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	938 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	939 len_todo -= n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	940 p += n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	941 bi->bi_used = CRYPT_BUF_SIZE;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	942 if (undo_flush(bi) == FAIL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	943 return FAIL;
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 if (len_todo > 0)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	946 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	947 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	948 bi->bi_used += len_todo;
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 return OK;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	951 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	952 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	953 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	954 return FAIL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	955 return OK;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	956 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	957
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	958 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	959 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	960 undo_flush(bufinfo_T *bi)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	961 {
12216 e971ef6c0dee patch 8.0.0988: warning from Covscan about using NULL pointer Christian Brabandt <cb@256bit.org> parents: 11957 diff changeset	962 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	963 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	964 crypt_encode_inplace(bi->bi_state, bi->bi_buffer, bi->bi_used);
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 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	996 crypt_encode(bi->bi_state, ptr, len, copy);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	997 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	998 if (copy != small_buf)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	999 vim_free(copy);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1000 return i == 1 ? OK : FAIL;
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1001 }
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1002 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1003 return undo_write(bi, ptr, len);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1004 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1005
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 * Write a number, MSB first, in "len" bytes.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1008 * Must match with undo_read_?c() functions.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1009 * Returns OK or FAIL.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1010 */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1011 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1012 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	1013 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1014 char_u buf[8];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1015 int i;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1016 int bufi = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1017
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1018 for (i = len - 1; i >= 0; --i)
6132 0242c27e40e1 updated for version 7.4.404 Bram Moolenaar <bram@vim.org> parents: 6128 diff changeset	1019 buf[bufi++] = (char_u)(nr >> (i * 8));
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1020 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	1021 }
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1022
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1023 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1024 * 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	1025 * 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	1026 * pointers when reading. */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1027 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1028 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	1029 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1030 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	1031 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1032
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1033 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1034 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	1035 {
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1036 #ifdef FEAT_CRYPT
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1037 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1038 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1039 char_u buf[4];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1040 int n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1041
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1042 undo_read(bi, buf, (size_t)4);
6216 f1ba154c3a12 updated for version 7.4.443 Bram Moolenaar <bram@vim.org> parents: 6132 diff changeset	1043 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	1044 return n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1045 }
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1046 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1047 return get4c(bi->bi_fp);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1048 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1049
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1050 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1051 undo_read_2c(bufinfo_T *bi)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1052 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1053 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1054 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1055 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1056 char_u buf[2];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1057 int n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1058
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1059 undo_read(bi, buf, (size_t)2);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1060 n = (buf[0] << 8) + buf[1];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1061 return n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1062 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1063 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1064 return get2c(bi->bi_fp);
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1065 }
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1066
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1067 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1068 undo_read_byte(bufinfo_T *bi)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1069 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1070 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1071 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1072 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1073 char_u buf[1];
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 undo_read(bi, buf, (size_t)1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1076 return buf[0];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1077 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1078 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1079 return getc(bi->bi_fp);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1080 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1081
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1082 static time_t
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1083 undo_read_time(bufinfo_T *bi)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1084 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1085 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1086 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1087 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1088 char_u buf[8];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1089 time_t n = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1090 int i;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1091
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1092 undo_read(bi, buf, (size_t)8);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1093 for (i = 0; i < 8; ++i)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1094 n = (n << 8) + buf[i];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1095 return n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1096 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1097 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1098 return get8ctime(bi->bi_fp);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1099 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1100
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 * Read "buffer[size]" from the undo file.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1103 * Return OK or FAIL.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1104 */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1105 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1106 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	1107 {
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	1108 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	1109
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1110 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1111 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1112 {
6132 0242c27e40e1 updated for version 7.4.404 Bram Moolenaar <bram@vim.org> parents: 6128 diff changeset	1113 int size_todo = (int)size;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1114 char_u *p = buffer;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1115
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1116 while (size_todo > 0)
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 size_t n;
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 if (bi->bi_used >= bi->bi_avail)
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 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	1123 if (n == 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1124 {
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	1125 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	1126 break;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1127 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1128 bi->bi_avail = n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1129 bi->bi_used = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1130 crypt_decode_inplace(bi->bi_state, bi->bi_buffer, bi->bi_avail);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1131 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1132 n = size_todo;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1133 if (n > bi->bi_avail - bi->bi_used)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1134 n = bi->bi_avail - bi->bi_used;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1135 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	1136 bi->bi_used += n;
6132 0242c27e40e1 updated for version 7.4.404 Bram Moolenaar <bram@vim.org> parents: 6128 diff changeset	1137 size_todo -= (int)n;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1138 p += n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1139 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1140 }
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	1141 else
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1142 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1143 if (fread(buffer, (size_t)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	1144 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	1145
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 if (retval == FAIL)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1147 // 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	1148 // 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	1149 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	1150 return retval;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1151 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1152
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 * 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	1155 * "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	1156 * Decrypt the bytes if needed.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1157 * Append a NUL.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1158 * 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	1159 */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1160 static char_u *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1161 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	1162 {
16764 ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 16627 diff changeset	1163 char_u *ptr = alloc(len + 1);
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1164
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1165 if (ptr != NULL)
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 (len > 0 && undo_read(bi, ptr, len) == FAIL)
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 vim_free(ptr);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1170 return NULL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1171 }
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1172 // 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	1173 // 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	1174 ptr[len] = NUL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1175 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1176 if (bi->bi_state != NULL && bi->bi_buffer == NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1177 crypt_decode_inplace(bi->bi_state, ptr, len);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1178 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1179 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1180 return ptr;
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
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 * 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	1185 */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1186 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1187 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	1188 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1189 long len;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1190 buf_T *buf = bi->bi_buf;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1191 FILE *fp = bi->bi_fp;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1192 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	1193
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1194 // 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	1195 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	1196 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	1197
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1198 // 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	1199 // 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	1200 #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	1201 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	1202 {
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1203 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	1204 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	1205
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1206 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	1207 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	1208 buf->b_p_key, &header, &header_len);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1209 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	1210 return FAIL;
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1211 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	1212 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	1213 if (len != 1)
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	1214 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1215 crypt_free_state(bi->bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1216 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	1217 return FAIL;
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	1218 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1219
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1220 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	1221 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1222 bi->bi_buffer = alloc(CRYPT_BUF_SIZE);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1223 if (bi->bi_buffer == NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1224 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1225 crypt_free_state(bi->bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1226 bi->bi_state = NULL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1227 return FAIL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1228 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1229 bi->bi_used = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1230 }
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1231 }
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1232 else
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1233 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1234 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	1235
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1236
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1237 // 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	1238 // same when reading the buffer text.
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1239 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	1240 return FAIL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1241
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1242 // buffer-specific data
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1243 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	1244 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	1245 ? 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	1246 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	1247 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	1248 == FAIL)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1249 return FAIL;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1250 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	1251 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	1252
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1253 // Undo structures header data
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1254 put_header_ptr(bi, buf->b_u_oldhead);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1255 put_header_ptr(bi, buf->b_u_newhead);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1256 put_header_ptr(bi, buf->b_u_curhead);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1257
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1258 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	1259 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	1260 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	1261 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	1262 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	1263
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1264 // Optional fields.
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1265 undo_write_bytes(bi, 4, 1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1266 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	1267 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	1268
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1269 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	1270
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1271 return OK;
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
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1274 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1275 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	1276 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1277 int i;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1278 u_entry_T *uep;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1279 char_u time_buf[8];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1280
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1281 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	1282 return FAIL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1283
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1284 put_header_ptr(bi, uhp->uh_next.ptr);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1285 put_header_ptr(bi, uhp->uh_prev.ptr);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1286 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	1287 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	1288 undo_write_bytes(bi, uhp->uh_seq, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1289 serialize_pos(bi, uhp->uh_cursor);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1290 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	1291 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	1292 // 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	1293 for (i = 0; i < NMARKS; ++i)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1294 serialize_pos(bi, uhp->uh_namedm[i]);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1295 serialize_visualinfo(bi, &uhp->uh_visual);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1296 time_to_bytes(uhp->uh_time, time_buf);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1297 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	1298
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1299 // Optional fields.
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1300 undo_write_bytes(bi, 4, 1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1301 undo_write_bytes(bi, UHP_SAVE_NR, 1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1302 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	1303
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1304 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	1305
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1306 // Write all the entries.
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1307 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	1308 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1309 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	1310 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	1311 return FAIL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1312 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1313 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	1314 return OK;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1315 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1316
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1317 static u_header_T *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1318 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	1319 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1320 u_header_T *uhp;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1321 int i;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1322 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	1323 int c;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1324 int error;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1325
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	1326 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	1327 if (uhp == NULL)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1328 return NULL;
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 18816 diff changeset	1329 CLEAR_POINTER(uhp);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1330 #ifdef U_DEBUG
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1331 uhp->uh_magic = UH_MAGIC;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1332 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1333 uhp->uh_next.seq = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1334 uhp->uh_prev.seq = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1335 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	1336 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	1337 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	1338 if (uhp->uh_seq <= 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1339 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1340 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	1341 vim_free(uhp);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1342 return NULL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1343 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1344 unserialize_pos(bi, &uhp->uh_cursor);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1345 uhp->uh_cursor_vcol = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1346 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	1347 for (i = 0; i < NMARKS; ++i)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1348 unserialize_pos(bi, &uhp->uh_namedm[i]);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1349 unserialize_visualinfo(bi, &uhp->uh_visual);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1350 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	1351
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1352 // Optional fields.
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1353 for (;;)
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1354 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1355 int len = undo_read_byte(bi);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1356 int what;
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1357
17630 380adf86bf66 patch 8.1.1812: reading a truncted undo file hangs Vim Bram Moolenaar <Bram@vim.org> parents: 17135 diff changeset	1358 if (len == EOF)
380adf86bf66 patch 8.1.1812: reading a truncted undo file hangs Vim Bram Moolenaar <Bram@vim.org> parents: 17135 diff changeset	1359 {
380adf86bf66 patch 8.1.1812: reading a truncted undo file hangs Vim Bram Moolenaar <Bram@vim.org> parents: 17135 diff changeset	1360 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	1361 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	1362 return NULL;
380adf86bf66 patch 8.1.1812: reading a truncted undo file hangs Vim Bram Moolenaar <Bram@vim.org> parents: 17135 diff changeset	1363 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1364 if (len == 0)
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1365 break;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1366 what = undo_read_byte(bi);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1367 switch (what)
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1368 {
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1369 case UHP_SAVE_NR:
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1370 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	1371 break;
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1372 default:
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1373 // field not supported, skip
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1374 while (--len >= 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1375 (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	1376 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1377 }
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1378
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1379 // Unserialize the uep list.
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1380 last_uep = NULL;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1381 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	1382 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1383 error = FALSE;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1384 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	1385 if (last_uep == NULL)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1386 uhp->uh_entry = uep;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1387 else
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1388 last_uep->ue_next = uep;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1389 last_uep = uep;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1390 if (uep == NULL \|\| error)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1391 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1392 u_free_uhp(uhp);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1393 return NULL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1394 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1395 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1396 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	1397 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1398 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	1399 u_free_uhp(uhp);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1400 return NULL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1401 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1402
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1403 return uhp;
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
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1406 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1407 * Serialize "uep".
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1408 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1409 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1410 serialize_uep(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1411 bufinfo_T *bi,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1412 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	1413 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1414 int i;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1415 size_t len;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1416
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1417 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	1418 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	1419 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	1420 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	1421 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	1422 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1423 // 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	1424 // 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	1425 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	1426 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	1427 return FAIL;
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1428 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	1429 return FAIL;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1430 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1431 return OK;
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
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1434 static u_entry_T *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1435 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	1436 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1437 int i;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1438 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	1439 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	1440 char_u *line;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1441 int line_len;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1442
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	1443 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	1444 if (uep == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1445 return NULL;
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 18816 diff changeset	1446 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	1447 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1448 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	1449 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1450 uep->ue_top = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1451 uep->ue_bot = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1452 uep->ue_lcount = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1453 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	1454 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	1455 {
10978 f3d64d9e5d76 patch 8.0.0378: possible overflow when reading corrupted undo file Christian Brabandt <cb@256bit.org> parents: 10976 diff changeset	1456 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	1457 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	1458 if (array == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1459 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1460 *error = TRUE;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1461 return uep;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1462 }
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1463 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	1464 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1465 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	1466
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1467 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	1468 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1469 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	1470 if (line_len >= 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1471 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	1472 else
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1473 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1474 line = NULL;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1475 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	1476 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1477 if (line == NULL)
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 *error = TRUE;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1480 return uep;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1481 }
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1482 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	1483 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	1484 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1485 return uep;
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
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1488 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1489 * Serialize "pos".
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1490 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1491 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1492 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	1493 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1494 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	1495 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	1496 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	1497 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1498
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1499 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1500 * 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	1501 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1502 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1503 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	1504 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1505 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	1506 if (pos->lnum < 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1507 pos->lnum = 0;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1508 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	1509 if (pos->col < 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1510 pos->col = 0;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1511 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	1512 if (pos->coladd < 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1513 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	1514 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1515
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1516 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1517 * Serialize "info".
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1518 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1519 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1520 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	1521 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1522 serialize_pos(bi, info->vi_start);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1523 serialize_pos(bi, info->vi_end);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1524 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	1525 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	1526 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1527
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1528 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1529 * 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	1530 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1531 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1532 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	1533 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1534 unserialize_pos(bi, &info->vi_start);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1535 unserialize_pos(bi, &info->vi_end);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1536 info->vi_mode = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1537 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	1538 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1539
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 * 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	1542 * 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	1543 * 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	1544 * "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	1545 * permissions.
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1546 * "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	1547 * "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	1548 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1549 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1550 u_write_undo(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1551 char_u *name,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1552 int forceit,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1553 buf_T *buf,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1554 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	1555 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1556 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	1557 char_u *file_name;
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1558 int mark;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1559 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1560 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	1561 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1562 int fd;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1563 FILE *fp = NULL;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1564 int perm;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1565 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	1566 #ifdef UNIX
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1567 int st_old_valid = FALSE;
9387 f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	1568 stat_T st_old;
f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	1569 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	1570 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1571 bufinfo_T bi;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1572
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 18816 diff changeset	1573 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	1574
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1575 if (name == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1576 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1577 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	1578 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	1579 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1580 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	1581 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1582 verbose_enter();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1583 smsg(
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1584 _("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	1585 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1586 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1587 return;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1588 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1589 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1590 else
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1591 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	1592
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1593 /*
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1594 * 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	1595 * 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	1596 * 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	1597 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1598 perm = 0600;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1599 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	1600 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1601 #ifdef UNIX
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1602 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	1603 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1604 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	1605 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	1606 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1607 #else
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1608 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	1609 if (perm < 0)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1610 perm = 0600;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1611 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1612 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1613
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1614 // strip any s-bit and executable bit
6771 63b2bc619d5a patch 7.4.707 Bram Moolenaar <bram@vim.org> parents: 6616 diff changeset	1615 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	1616
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1617 // 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	1618 // 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	1619 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	1620 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1621 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	1622 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1623 // 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	1624 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	1625 if (fd < 0)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1626 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1627 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	1628 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1629 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	1630 verbose_enter();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1631 smsg(
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1632 _("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	1633 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	1634 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	1635 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1636 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1637 goto theend;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1638 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1639 else
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1640 {
2271 2b33a7678e7b Fix compiler warnings for shadowed variables. Make 'conceal' a long instead Bram Moolenaar <bram@vim.org> parents: 2267 diff changeset	1641 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	1642 int len;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1643
2664 033e7b49356c updated for version 7.3.083 Bram Moolenaar <bram@vim.org> parents: 2627 diff changeset	1644 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	1645 close(fd);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1646 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	1647 \|\| 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	1648 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1649 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	1650 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1651 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	1652 verbose_enter();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1653 smsg(
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1654 _("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	1655 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	1656 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	1657 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1658 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1659 goto theend;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1660 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1661 }
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 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	1664 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1665
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1666 // 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	1667 // 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	1668 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	1669 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1670 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	1671 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	1672 goto theend;
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1673 }
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1674
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1675 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	1676 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	1677 if (fd < 0)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1678 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1679 semsg(_(e_not_open), file_name);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1680 goto theend;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1681 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1682 (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	1683 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	1684 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1685 verbose_enter();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1686 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	1687 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1688 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1689
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1690 #ifdef U_DEBUG
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1691 // 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	1692 u_check(FALSE);
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1693 #endif
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1694
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1695 #ifdef UNIX
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1696 /*
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1697 * 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	1698 * 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	1699 * 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	1700 */
2367 76b7ba68a098 Fix build problem when fchown() not available. (Gary Johnson) Bram Moolenaar <bram@vim.org> parents: 2348 diff changeset	1701 if (st_old_valid
76b7ba68a098 Fix build problem when fchown() not available. (Gary Johnson) Bram Moolenaar <bram@vim.org> parents: 2348 diff changeset	1702 && 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	1703 && 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	1704 # 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	1705 && 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	1706 # endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1707 )
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1708 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	1709 # 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	1710 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	1711 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	1712 # endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1713 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1714
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1715 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	1716 if (fp == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1717 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1718 semsg(_(e_not_open), file_name);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1719 close(fd);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1720 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	1721 goto theend;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1722 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1723
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1724 // Undo must be synced.
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1725 u_sync(TRUE);
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1726
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1727 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1728 * 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	1729 */
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1730 bi.bi_buf = buf;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1731 bi.bi_fp = fp;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1732 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	1733 goto write_error;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1734
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1735 /*
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1736 * 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	1737 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1738 mark = ++lastmark;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1739 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	1740 while (uhp != NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1741 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1742 // 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	1743 if (uhp->uh_walk != mark)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1744 {
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1745 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	1746 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1747 ++headers_written;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1748 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1749 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	1750 goto write_error;
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1751 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1752
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1753 // 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	1754 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	1755 uhp = uhp->uh_prev.ptr;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1756 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	1757 && 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	1758 uhp = uhp->uh_alt_next.ptr;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1759 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	1760 && uhp->uh_next.ptr->uh_walk != mark)
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1761 uhp = uhp->uh_next.ptr;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1762 else if (uhp->uh_alt_prev.ptr != NULL)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1763 uhp = uhp->uh_alt_prev.ptr;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1764 else
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1765 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	1766 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1767
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1768 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	1769 write_ok = TRUE;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1770 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1771 if (headers_written != buf->b_u_numhead)
4827 60301d4d1682 updated for version 7.3.1160 Bram Moolenaar <bram@vim.org> parents: 4303 diff changeset	1772 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1773 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	1774 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	1775 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1776 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1777
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1778 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1779 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	1780 write_ok = FALSE;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1781 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1782
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1783 write_error:
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1784 fclose(fp);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1785 if (!write_ok)
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1786 semsg(_("E829: write error in undo file: %s"), file_name);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1787
15868 7fad90423bd2 patch 8.1.0941: macros for MS-Windows are inconsistent Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	1788 #if defined(MSWIN)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1789 // 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	1790 // 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	1791 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	1792 (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	1793 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1794 #ifdef HAVE_ACL
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1795 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	1796 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1797 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	1798
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1799 // 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	1800 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	1801 mch_set_acl(file_name, acl);
3545 74d51b51f3e6 updated for version 7.3.533 Bram Moolenaar <bram@vim.org> parents: 3194 diff changeset	1802 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	1803 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1804 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1805
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1806 theend:
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	1807 #ifdef FEAT_CRYPT
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1808 if (bi.bi_state != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1809 crypt_free_state(bi.bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1810 vim_free(bi.bi_buffer);
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	1811 #endif
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1812 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	1813 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	1814 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1815
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1816 /*
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1817 * 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	1818 * 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	1819 * 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	1820 * 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	1821 * "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	1822 */
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1823 void
18139 59bc3cd42cf5 patch 8.1.2064: MS-Windows: compiler warnings for unused arguments Bram Moolenaar <Bram@vim.org> parents: 18051 diff changeset	1824 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	1825 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1826 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	1827 FILE *fp;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1828 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	1829 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	1830 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	1831 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	1832 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	1833 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	1834 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	1835 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	1836 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	1837 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	1838 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	1839 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	1840 int i, j;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1841 int c;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1842 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	1843 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	1844 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	1845 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	1846 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1847 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	1848 #endif
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1849 #ifdef UNIX
9387 f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	1850 stat_T st_orig;
f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	1851 stat_T st_undo;
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1852 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1853 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	1854
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 18816 diff changeset	1855 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	1856 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	1857 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	1858
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1859 if (name == NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1860 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1861 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	1862 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	1863 return;
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1864
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1865 #ifdef UNIX
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1866 // 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	1867 // 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	1868 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	1869 && 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	1870 && st_orig.st_uid != st_undo.st_uid
00d61a47df66 updated for version 7.4.024 Bram Moolenaar <bram@vim.org> parents: 4827 diff changeset	1871 && 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	1872 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1873 if (p_verbose > 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1874 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1875 verbose_enter();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1876 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	1877 file_name);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1878 verbose_leave();
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 return;
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 #endif
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1883 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1884 else
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1885 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	1886
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1887 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	1888 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1889 verbose_enter();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1890 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	1891 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1892 }
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1893
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1894 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	1895 if (fp == NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1896 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1897 if (name != NULL \|\| p_verbose > 0)
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1898 semsg(_("E822: Cannot open undo file for reading: %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	1899 goto error;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1900 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1901 bi.bi_buf = curbuf;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1902 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	1903
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1904 /*
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1905 * 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	1906 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1907 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	1908 \|\| 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	1909 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1910 semsg(_("E823: Not an undo file: %s"), file_name);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1911 goto error;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1912 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1913 version = get2c(fp);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1914 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	1915 {
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1916 #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	1917 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	1918 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1919 semsg(_("E832: Non-encrypted file has encrypted undo file: %s"),
2251 646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file. Bram Moolenaar <bram@vim.org> parents: 2245 diff changeset	1920 file_name);
646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file. Bram Moolenaar <bram@vim.org> parents: 2245 diff changeset	1921 goto error;
646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file. Bram Moolenaar <bram@vim.org> parents: 2245 diff changeset	1922 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1923 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	1924 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	1925 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1926 semsg(_("E826: Undo file decryption failed: %s"), 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	1927 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	1928 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1929 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	1930 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1931 bi.bi_buffer = alloc(CRYPT_BUF_SIZE);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1932 if (bi.bi_buffer == NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1933 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1934 crypt_free_state(bi.bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1935 bi.bi_state = NULL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1936 goto error;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1937 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1938 bi.bi_avail = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1939 bi.bi_used = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1940 }
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1941 #else
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1942 semsg(_("E827: Undo file is encrypted: %s"), file_name);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1943 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	1944 #endif
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1945 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1946 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	1947 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	1948 semsg(_("E824: Incompatible undo file: %s"), file_name);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1949 goto error;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1950 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1951
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1952 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	1953 {
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1954 corruption_error("hash", file_name);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1955 goto error;
2229 d45902a5c61c Fix a few more things for persistent undo. Bram Moolenaar <bram@vim.org> parents: 2223 diff changeset	1956 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1957 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	1958 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	1959 \|\| 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	1960 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1961 if (p_verbose > 0 \|\| name != NULL)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1962 {
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1963 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	1964 verbose_enter();
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1965 give_warning((char_u *)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1966 _("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	1967 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	1968 verbose_leave();
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1969 }
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1970 goto error;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1971 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1972
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1973 // Read undo data for "U" command.
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1974 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	1975 if (str_len < 0)
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1976 goto error;
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1977 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	1978 {
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	1979 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	1980 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	1981 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1982 line_lnum = (linenr_T)undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1983 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	1984 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	1985 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1986 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	1987 goto error;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1988 }
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1989
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1990 // Begin general undo data
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1991 old_header_seq = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1992 new_header_seq = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1993 cur_header_seq = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1994 num_head = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1995 seq_last = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1996 seq_cur = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1997 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	1998
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	1999 // Optional header fields.
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2000 for (;;)
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2001 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2002 int len = undo_read_byte(&bi);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2003 int what;
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2004
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2005 if (len == 0 \|\| len == EOF)
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2006 break;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2007 what = undo_read_byte(&bi);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2008 switch (what)
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	2009 {
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2010 case UF_LAST_SAVE_NR:
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2011 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	2012 break;
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2013 default:
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2014 // field not supported, skip
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2015 while (--len >= 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2016 (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	2017 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	2018 }
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	2019
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2020 // 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	2021 // 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	2022 // sequence numbers of the headers.
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2023 // 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	2024 if (num_head > 0)
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2025 {
10976 f97a72ad8ffa patch 8.0.0377: possible overflow when reading corrupted undo file Christian Brabandt <cb@256bit.org> parents: 10631 diff changeset	2026 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	2027 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	2028 if (uhp_table == NULL)
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2029 goto error;
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2030 }
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2031
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2032 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	2033 {
2223 81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	2034 if (num_read_uhps >= num_head)
81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	2035 {
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	2036 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	2037 goto error;
81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	2038 }
81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	2039
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2040 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	2041 if (uhp == NULL)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	2042 goto error;
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2043 uhp_table[num_read_uhps++] = uhp;
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2044 }
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2045
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2046 if (num_read_uhps != num_head)
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2047 {
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2048 corruption_error("num_head", file_name);
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2049 goto error;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2050 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2051 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	2052 {
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2053 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	2054 goto error;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2055 }
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 #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	2058 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	2059 # 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	2060 #else
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2061 # 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	2062 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2063
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2064 // 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	2065 // 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	2066 // 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	2067 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	2068 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2069 uhp = uhp_table[i];
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2070 if (uhp == NULL)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2071 continue;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2072 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2073 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	2074 && 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	2075 {
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2076 corruption_error("duplicate uh_seq", file_name);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2077 goto error;
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2078 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2079 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2080 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	2081 && 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	2082 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2083 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	2084 SET_FLAG(j);
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2085 break;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2086 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2087 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2088 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	2089 && 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	2090 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2091 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	2092 SET_FLAG(j);
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2093 break;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2094 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2095 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2096 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	2097 && 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	2098 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2099 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	2100 SET_FLAG(j);
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2101 break;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2102 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2103 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2104 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	2105 && 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	2106 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2107 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	2108 SET_FLAG(j);
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2109 break;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2110 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2111 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	2112 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2113 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	2114 SET_FLAG(i);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2115 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2116 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	2117 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2118 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	2119 SET_FLAG(i);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2120 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2121 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	2122 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2123 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	2124 SET_FLAG(i);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2125 }
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2126 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2127
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2128 // 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	2129 // 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	2130 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	2131 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	2132 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	2133 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	2134 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	2135 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	2136 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	2137 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	2138 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	2139 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	2140 curbuf->b_u_time_cur = seq_time;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2141 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	2142 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	2143
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2144 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	2145 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	2146
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2147 #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	2148 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	2149 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	2150 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	2151 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	2152 u_check(TRUE);
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2153 #endif
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2154
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2155 if (name != NULL)
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	2156 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	2157 goto theend;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2158
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2159 error:
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2160 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	2161 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	2162 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2163 for (i = 0; i < num_read_uhps; i++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2164 if (uhp_table[i] != NULL)
2223 81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	2165 u_free_uhp(uhp_table[i]);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2166 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	2167 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2168
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2169 theend:
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	2170 #ifdef FEAT_CRYPT
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2171 if (bi.bi_state != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2172 crypt_free_state(bi.bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2173 vim_free(bi.bi_buffer);
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	2174 #endif
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2175 if (fp != NULL)
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2176 fclose(fp);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2177 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	2178 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	2179 return;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2180 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2181
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2182 #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	2183
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2184
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2185 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2186 * If 'cpoptions' contains 'u': Undo the previous undo or redo (vi compatible).
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2187 * If 'cpoptions' does not contain 'u': Always undo.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2188 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2189 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2190 u_undo(int count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2191 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2192 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2193 * If we get an undo command while executing a macro, we behave like the
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2194 * original vi. If this happens twice in one macro the result will not
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2195 * be compatible.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2196 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2197 if (curbuf->b_u_synced == FALSE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2198 {
825 6675076019ae updated for version 7.0d vimboss parents: 810 diff changeset	2199 u_sync(TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2200 count = 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2201 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2202
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2203 if (vim_strchr(p_cpo, CPO_UNDO) == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2204 undo_undoes = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2205 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2206 undo_undoes = !undo_undoes;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2207 u_doit(count);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2208 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2209
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2210 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2211 * If 'cpoptions' contains 'u': Repeat the previous undo or redo.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2212 * If 'cpoptions' does not contain 'u': Always redo.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2213 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2214 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2215 u_redo(int count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2216 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2217 if (vim_strchr(p_cpo, CPO_UNDO) == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2218 undo_undoes = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2219 u_doit(count);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2220 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2221
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2222 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2223 * Undo or redo, depending on 'undo_undoes', 'count' times.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2224 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2225 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2226 u_doit(int startcount)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2227 {
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2228 int count = startcount;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2229
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	2230 if (!undo_allowed())
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2231 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2232
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2233 u_newcount = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2234 u_oldcount = 0;
179 7fd70926e2e1 updated for version 7.0055 vimboss parents: 168 diff changeset	2235 if (curbuf->b_ml.ml_flags & ML_EMPTY)
7fd70926e2e1 updated for version 7.0055 vimboss parents: 168 diff changeset	2236 u_oldcount = -1;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2237 while (count--)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2238 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2239 // 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	2240 // 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	2241 // 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	2242 // and more.
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2243 change_warning(0);
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2244
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2245 if (undo_undoes)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2246 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2247 if (curbuf->b_u_curhead == NULL) // first undo
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2248 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	2249 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	2250 // get next undo
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2251 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	2252 // nothing to undo
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2253 if (curbuf->b_u_numhead == 0 \|\| curbuf->b_u_curhead == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2254 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2255 // stick curbuf->b_u_curhead at end
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2256 curbuf->b_u_curhead = curbuf->b_u_oldhead;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2257 beep_flush();
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2258 if (count == startcount - 1)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2259 {
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	2260 msg(_("Already at oldest change"));
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2261 return;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2262 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2263 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2264 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2265
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2266 u_undoredo(TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2267 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2268 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2269 {
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	2270 if (curbuf->b_u_curhead == NULL \|\| get_undolevel() <= 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2271 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2272 beep_flush(); // nothing to redo
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2273 if (count == startcount - 1)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2274 {
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	2275 msg(_("Already at newest change"));
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2276 return;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2277 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2278 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2279 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2280
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2281 u_undoredo(FALSE);
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2282
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2283 // 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	2284 // redoable changes.
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2285 if (curbuf->b_u_curhead->uh_prev.ptr == NULL)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2286 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	2287 curbuf->b_u_curhead = curbuf->b_u_curhead->uh_prev.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2288 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2289 }
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2290 u_undo_end(undo_undoes, FALSE);
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2291 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2292
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2293 /*
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2294 * Undo or redo over the timeline.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2295 * 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	2296 * 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	2297 * seconds.
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2298 * When "file" is TRUE use "step" as a number of file writes.
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2299 * When "absolute" is TRUE use "step" as the sequence number to jump to.
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2300 * "sec" must be FALSE then.
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2301 */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2302 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2303 undo_time(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2304 long step,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2305 int sec,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2306 int file,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2307 int absolute)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2308 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2309 long target;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2310 long closest;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2311 long closest_start;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2312 long closest_seq = 0;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2313 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	2314 u_header_T *uhp = NULL;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2315 u_header_T *last;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2316 int mark;
16405 840fa633ad64 patch 8.1.1207: some compilers give warning messages Bram Moolenaar <Bram@vim.org> parents: 16097 diff changeset	2317 int nomark = 0; // shut up compiler
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2318 int round;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2319 int dosec = sec;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2320 int dofile = file;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2321 int above = FALSE;
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	2322 int did_undo = TRUE;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2323
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2324 // First make sure the current undoable change is synced.
766 f0d0d3d3a1e2 updated for version 7.0225 vimboss parents: 758 diff changeset	2325 if (curbuf->b_u_synced == FALSE)
825 6675076019ae updated for version 7.0d vimboss parents: 810 diff changeset	2326 u_sync(TRUE);
766 f0d0d3d3a1e2 updated for version 7.0225 vimboss parents: 758 diff changeset	2327
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2328 u_newcount = 0;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2329 u_oldcount = 0;
179 7fd70926e2e1 updated for version 7.0055 vimboss parents: 168 diff changeset	2330 if (curbuf->b_ml.ml_flags & ML_EMPTY)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2331 u_oldcount = -1;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2332
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2333 // "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	2334 // Init "closest" to a value we can't reach.
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2335 if (absolute)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2336 {
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2337 target = step;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2338 closest = -1;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2339 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2340 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2341 {
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2342 if (dosec)
10518 de77fa909414 commit https://github.com/vim/vim/commit/cbd4de44e8d08fba3c09eb40ad6e36e83faf020a Christian Brabandt <cb@256bit.org> parents: 10359 diff changeset	2343 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	2344 else if (dofile)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2345 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2346 if (step < 0)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2347 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2348 // 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	2349 // 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	2350 // 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	2351 uhp = curbuf->b_u_curhead;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2352 if (uhp != NULL)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2353 uhp = uhp->uh_next.ptr;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2354 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2355 uhp = curbuf->b_u_newhead;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2356 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	2357 // "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	2358 // 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	2359 target = curbuf->b_u_save_nr_cur + step;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2360 else
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2361 // 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	2362 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	2363 if (target <= 0)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2364 // 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	2365 // the sequence number for that.
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2366 dofile = FALSE;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2367 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2368 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2369 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2370 // Moving forward to a newer write.
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2371 target = curbuf->b_u_save_nr_cur + step;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2372 if (target > curbuf->b_u_save_nr_last)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2373 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2374 // 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	2375 // the sequence number for that.
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2376 target = curbuf->b_u_seq_last + 1;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2377 dofile = FALSE;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2378 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2379 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2380 }
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2381 else
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2382 target = curbuf->b_u_seq_cur + step;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2383 if (step < 0)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2384 {
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2385 if (target < 0)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2386 target = 0;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2387 closest = -1;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2388 }
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2389 else
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2390 {
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2391 if (dosec)
10518 de77fa909414 commit https://github.com/vim/vim/commit/cbd4de44e8d08fba3c09eb40ad6e36e83faf020a Christian Brabandt <cb@256bit.org> parents: 10359 diff changeset	2392 closest = (long)(vim_time() + 1);
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2393 else if (dofile)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2394 closest = curbuf->b_u_save_nr_last + 2;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2395 else
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2396 closest = curbuf->b_u_seq_last + 2;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2397 if (target >= closest)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2398 target = closest - 1;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2399 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2400 }
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2401 closest_start = closest;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2402 closest_seq = curbuf->b_u_seq_cur;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2403
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2404 // 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	2405 if (target == 0)
13138 0f906f414c69 patch 8.0.1443: compiler complains about uninitialized variable Christian Brabandt <cb@256bit.org> parents: 13134 diff changeset	2406 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2407 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	2408 goto target_zero;
0f906f414c69 patch 8.0.1443: compiler complains about uninitialized variable Christian Brabandt <cb@256bit.org> parents: 13134 diff changeset	2409 }
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2410
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2411 /*
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2412 * May do this twice:
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2413 * 1. Search for "target", update "closest" to the best match found.
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2414 * 2. If "target" not found search for "closest".
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2415 *
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2416 * When using the closest time we use the sequence number in the second
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2417 * round, because there may be several entries with the same time.
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2418 */
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2419 for (round = 1; round <= 2; ++round)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2420 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2421 // 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	2422 // 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	2423 // 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	2424 // "mark" where it could possibly be.
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2425 mark = ++lastmark;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2426 nomark = ++lastmark;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2427
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2428 if (curbuf->b_u_curhead == NULL) // at leaf of the tree
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2429 uhp = curbuf->b_u_newhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2430 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2431 uhp = curbuf->b_u_curhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2432
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2433 while (uhp != NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2434 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2435 uhp->uh_walk = mark;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2436 if (dosec)
10518 de77fa909414 commit https://github.com/vim/vim/commit/cbd4de44e8d08fba3c09eb40ad6e36e83faf020a Christian Brabandt <cb@256bit.org> parents: 10359 diff changeset	2437 val = (long)(uhp->uh_time);
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2438 else if (dofile)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2439 val = uhp->uh_save_nr;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2440 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2441 val = uhp->uh_seq;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2442
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2443 if (round == 1 && !(dofile && val == 0))
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2444 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2445 // 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	2446 // 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	2447 // "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	2448 // highest/lowest sequence number.
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2449 if ((step < 0 ? uhp->uh_seq <= curbuf->b_u_seq_cur
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2450 : uhp->uh_seq > curbuf->b_u_seq_cur)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2451 && ((dosec && val == closest)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2452 ? (step < 0
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2453 ? uhp->uh_seq < closest_seq
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2454 : uhp->uh_seq > closest_seq)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2455 : closest == closest_start
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2456 \|\| (val > target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2457 ? (closest > target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2458 ? val - target <= closest - target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2459 : val - target <= target - closest)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2460 : (closest > target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2461 ? target - val <= closest - target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2462 : target - val <= target - closest))))
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2463 {
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2464 closest = val;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2465 closest_seq = uhp->uh_seq;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2466 }
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2467 }
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2468
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2469 // 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	2470 // time we need to continue looking for the best uh_seq.
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2471 if (target == val && !dosec)
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2472 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2473 target = uhp->uh_seq;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2474 break;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2475 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2476
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2477 // 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	2478 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	2479 && 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	2480 uhp = uhp->uh_prev.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2481
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2482 // 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	2483 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	2484 && 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	2485 && 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	2486 uhp = uhp->uh_alt_next.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 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	2489 // 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	2490 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	2491 && 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	2492 && uhp->uh_next.ptr->uh_walk != mark)
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2493 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2494 // If still at the start we don't go through this change.
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2495 if (uhp == curbuf->b_u_curhead)
95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2496 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	2497 uhp = uhp->uh_next.ptr;
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2498 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2499
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2500 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2501 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2502 // need to backtrack; mark this node as useless
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2503 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	2504 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	2505 uhp = uhp->uh_alt_prev.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2506 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2507 uhp = uhp->uh_next.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2508 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2509 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2510
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2511 if (uhp != NULL) // found it
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2512 break;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2513
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2514 if (absolute)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2515 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	2516 semsg(_("E830: Undo number %ld not found"), step);
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2517 return;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2518 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2519
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2520 if (closest == closest_start)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2521 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2522 if (step < 0)
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	2523 msg(_("Already at oldest change"));
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2524 else
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	2525 msg(_("Already at newest change"));
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2526 return;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2527 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2528
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2529 target = closest_seq;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2530 dosec = FALSE;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2531 dofile = FALSE;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2532 if (step < 0)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2533 above = TRUE; // stop above the header
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2534 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2535
13138 0f906f414c69 patch 8.0.1443: compiler complains about uninitialized variable Christian Brabandt <cb@256bit.org> parents: 13134 diff changeset	2536 target_zero:
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2537 // 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	2538 if (uhp != NULL \|\| target == 0)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2539 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2540 /*
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2541 * First go up the tree as much as needed.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2542 */
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2543 while (!got_int)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2544 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2545 // 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	2546 change_warning(0);
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2547
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2548 uhp = curbuf->b_u_curhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2549 if (uhp == NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2550 uhp = curbuf->b_u_newhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2551 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2552 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	2553 if (uhp == NULL \|\| (target > 0 && uhp->uh_walk != mark)
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2554 \|\| (uhp->uh_seq == target && !above))
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2555 break;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2556 curbuf->b_u_curhead = uhp;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2557 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	2558 if (target > 0)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2559 uhp->uh_walk = nomark; // don't go back down here
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2560 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2561
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2562 // 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	2563 if (target > 0)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2564 {
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2565 /*
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2566 * 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	2567 */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2568 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	2569 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2570 // 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	2571 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	2572
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2573 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	2574 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	2575 break;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2576
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2577 // 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	2578 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	2579 && 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	2580 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	2581
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2582 // 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	2583 last = uhp;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2584 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	2585 && 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	2586 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	2587 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	2588 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2589 // 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	2590 // 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	2591 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	2592 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	2593 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	2594 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	2595 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	2596 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	2597 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	2598 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	2599 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	2600 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	2601
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2602 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	2603 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	2604 uhp = last;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2605 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	2606 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	2607 }
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2608 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	2609
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2610 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	2611 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	2612
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2613 // 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	2614 // 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	2615 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	2616 {
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2617 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	2618 break;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2619 }
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2620
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2621 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	2622
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2623 // 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	2624 // 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	2625 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	2626 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	2627 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	2628 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	2629
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2630 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	2631 break;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2632
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2633 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	2634 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	2635 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2636 // 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	2637 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	2638 break;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2639 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2640 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2641 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2642 }
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2643 u_undo_end(did_undo, absolute);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2644 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2645
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2646 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2647 * u_undoredo: common code for undo and redo
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2648 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2649 * 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	2650 * 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	2651 * list for the next undo/redo.
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2652 *
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2653 * 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	2654 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2655 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2656 u_undoredo(int undo)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2657 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2658 undoline_T *newarray = NULL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2659 linenr_T oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2660 linenr_T newsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2661 linenr_T top, bot;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2662 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2663 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	2664 pos_T new_curpos = curwin->w_cursor;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2665 long i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2666 u_entry_T uep, nuep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2667 u_entry_T *newlist = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2668 int old_flags;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2669 int new_flags;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2670 pos_T namedm[NMARKS];
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	2671 visualinfo_T visualinfo;
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2672 int empty_buffer; // buffer became empty
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2673 u_header_T *curhead = curbuf->b_u_curhead;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2674
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2675 // 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	2676 // invalid till the end.
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2677 block_autocmds();
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2678
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2679 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2680 u_check(FALSE);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2681 #endif
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2682 old_flags = curhead->uh_flags;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2683 new_flags = (curbuf->b_changed ? UH_CHANGED : 0) +
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2684 ((curbuf->b_ml.ml_flags & ML_EMPTY) ? UH_EMPTYBUF : 0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2685 setpcmark();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2686
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2687 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2688 * save marks before undo/redo
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2689 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2690 mch_memmove(namedm, curbuf->b_namedm, sizeof(pos_T) * NMARKS);
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	2691 visualinfo = curbuf->b_visual;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2692 curbuf->b_op_start.lnum = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2693 curbuf->b_op_start.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2694 curbuf->b_op_end.lnum = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2695 curbuf->b_op_end.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2696
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2697 for (uep = curhead->uh_entry; uep != NULL; uep = nuep)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2698 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2699 top = uep->ue_top;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2700 bot = uep->ue_bot;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2701 if (bot == 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2702 bot = curbuf->b_ml.ml_line_count + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2703 if (top > curbuf->b_ml.ml_line_count \|\| top >= bot
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2704 \|\| bot > curbuf->b_ml.ml_line_count + 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2705 {
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2706 unblock_autocmds();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	2707 iemsg(_("E438: 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	2708 changed(); // don't want UNCHANGED now
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2709 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2710 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2711
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2712 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	2713 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	2714
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2715 // 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	2716 // 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	2717 if (top < newlnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2718 {
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2719 // 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	2720 // 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	2721 // where it was.
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2722 lnum = curhead->uh_cursor.lnum;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2723 if (lnum >= top && lnum <= top + newsize + 1)
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 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	2726 newlnum = new_curpos.lnum - 1;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2727 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2728 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2729 {
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2730 // 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	2731 // 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	2732 // line.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2733 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	2734 {
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2735 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	2736
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2737 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	2738 \|\| 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	2739 curbuf->b_ml.ml_line_len) != 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2740 break;
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2741 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2742 if (i == newsize && newlnum == MAXLNUM && uep->ue_next == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2743 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2744 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	2745 new_curpos.lnum = newlnum + 1;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2746 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2747 else if (i < newsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2748 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2749 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	2750 new_curpos.lnum = newlnum + 1;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2751 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2752 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2753 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2754
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2755 empty_buffer = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2756
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2757 /*
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2758 * 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	2759 */
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	2760 if (oldsize > 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2761 {
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	2762 if ((newarray = U_ALLOC_LINE(sizeof(undoline_T) * oldsize)) == NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2763 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2764 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	2765
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2766 // 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	2767 // we have to free the rest of the list.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2768 while (uep != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2769 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2770 nuep = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2771 u_freeentry(uep, uep->ue_size);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2772 uep = nuep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2773 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2774 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2775 }
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2776 // delete backwards, it goes faster in most cases
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2777 for (lnum = bot - 1, i = oldsize; --i >= 0; --lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2778 {
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2779 // 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	2780 if (u_save_line(&newarray[i], lnum) == FAIL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2781 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	2782 // 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	2783 // dummy empty line will be inserted
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2784 if (curbuf->b_ml.ml_line_count == 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2785 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	2786 ml_delete_flags(lnum, ML_DEL_UNDO);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2787 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2788 }
414 8ab9c77240d4 updated for version 7.0108 vimboss parents: 407 diff changeset	2789 else
8ab9c77240d4 updated for version 7.0108 vimboss parents: 407 diff changeset	2790 newarray = NULL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2791
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2792 // 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	2793 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	2794
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2795 /*
d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2796 * 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	2797 */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2798 if (newsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2799 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2800 for (lnum = top, i = 0; i < newsize; ++i, ++lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2801 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	2802 // 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	2803 // should get rid of, by replacing it with the new line.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2804 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	2805 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	2806 uep->ue_array[i].ul_len, TRUE, TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2807 else
20581 e529690f27bc patch 8.2.0844: text properties crossing lines not handled correctly Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	2808 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	2809 (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	2810 vim_free(uep->ue_array[i].ul_line);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2811 }
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2812 vim_free((char_u *)uep->ue_array);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2813 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2814
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2815 // adjust marks
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2816 if (oldsize != newsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2817 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2818 mark_adjust(top + 1, top + oldsize, (long)MAXLNUM,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2819 (long)newsize - (long)oldsize);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2820 if (curbuf->b_op_start.lnum > top + oldsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2821 curbuf->b_op_start.lnum += newsize - oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2822 if (curbuf->b_op_end.lnum > top + oldsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2823 curbuf->b_op_end.lnum += newsize - oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2824 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2825
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2826 changed_lines(top + 1, 0, bot, newsize - oldsize);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2827
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2828 // set '[ and '] mark
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2829 if (top + 1 < curbuf->b_op_start.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2830 curbuf->b_op_start.lnum = top + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2831 if (newsize == 0 && top + 1 > curbuf->b_op_end.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2832 curbuf->b_op_end.lnum = top + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2833 else if (top + newsize > curbuf->b_op_end.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2834 curbuf->b_op_end.lnum = top + newsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2835
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2836 u_newcount += newsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2837 u_oldcount += oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2838 uep->ue_size = oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2839 uep->ue_array = newarray;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2840 uep->ue_bot = top + newsize + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2841
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2842 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2843 * insert this entry in front of the new entry list
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2844 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2845 nuep = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2846 uep->ue_next = newlist;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2847 newlist = uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2848 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2849
18025 d19caa851682 patch 8.1.2008: error for invalid range when using listener and undo Bram Moolenaar <Bram@vim.org> parents: 17970 diff changeset	2850 // 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	2851 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	2852 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	2853
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2854 curhead->uh_entry = newlist;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2855 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	2856 if ((old_flags & UH_EMPTYBUF) && BUFEMPTY())
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2857 curbuf->b_ml.ml_flags \|= ML_EMPTY;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2858 if (old_flags & UH_CHANGED)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2859 changed();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2860 else
33 f6033dcbaf31 updated for version 7.0020 vimboss parents: 7 diff changeset	2861 #ifdef FEAT_NETBEANS_INTG
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2862 // per netbeans undo rules, keep it as modified
33 f6033dcbaf31 updated for version 7.0020 vimboss parents: 7 diff changeset	2863 if (!isNetbeansModified(curbuf))
f6033dcbaf31 updated for version 7.0020 vimboss parents: 7 diff changeset	2864 #endif
16996 d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	2865 unchanged(curbuf, FALSE, TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2866
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2867 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2868 * restore marks from before undo/redo
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2869 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2870 for (i = 0; i < NMARKS; ++i)
6616 290631797b76 updated for version 7.4.634 Bram Moolenaar <bram@vim.org> parents: 6216 diff changeset	2871 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2872 if (curhead->uh_namedm[i].lnum != 0)
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2873 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	2874 if (namedm[i].lnum != 0)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2875 curhead->uh_namedm[i] = namedm[i];
6616 290631797b76 updated for version 7.4.634 Bram Moolenaar <bram@vim.org> parents: 6216 diff changeset	2876 else
290631797b76 updated for version 7.4.634 Bram Moolenaar <bram@vim.org> parents: 6216 diff changeset	2877 curhead->uh_namedm[i].lnum = 0;
290631797b76 updated for version 7.4.634 Bram Moolenaar <bram@vim.org> parents: 6216 diff changeset	2878 }
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2879 if (curhead->uh_visual.vi_start.lnum != 0)
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	2880 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2881 curbuf->b_visual = curhead->uh_visual;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2882 curhead->uh_visual = visualinfo;
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	2883 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2884
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2885 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2886 * 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	2887 * before starting the change (for the "o" command).
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2888 * Otherwise the cursor should go to the first undone line.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2889 */
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2890 if (curhead->uh_cursor.lnum + 1 == curwin->w_cursor.lnum
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2891 && curwin->w_cursor.lnum > 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2892 --curwin->w_cursor.lnum;
2501 c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2893 if (curwin->w_cursor.lnum <= curbuf->b_ml.ml_line_count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2894 {
2501 c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2895 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	2896 {
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2897 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	2898 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	2899 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	2900 else
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2901 curwin->w_cursor.coladd = 0;
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2902 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2903 else
2501 c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2904 beginline(BL_SOL \| BL_FIX);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2905 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2906 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2907 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2908 // 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	2909 // 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	2910 // 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	2911 // the first column here.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2912 curwin->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2913 curwin->w_cursor.coladd = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2914 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2915
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2916 // Make sure the cursor is on an existing line and column.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2917 check_cursor();
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2918
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2919 // Remember where we are for "g-" and ":earlier 10s".
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2920 curbuf->b_u_seq_cur = curhead->uh_seq;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2921 if (undo)
12827 ff494a964ab7 patch 8.0.1290: seq_cur of undotree() wrong after undo Christian Brabandt <cb@256bit.org> parents: 12716 diff changeset	2922 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2923 // 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	2924 // 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	2925 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	2926 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	2927 else
ff494a964ab7 patch 8.0.1290: seq_cur of undotree() wrong after undo Christian Brabandt <cb@256bit.org> parents: 12716 diff changeset	2928 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	2929 }
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2930
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2931 // 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	2932 if (curhead->uh_save_nr != 0)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2933 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2934 if (undo)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2935 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	2936 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2937 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	2938 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2939
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2940 // 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	2941 // 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	2942 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	2943
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2944 unblock_autocmds();
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2945 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2946 u_check(FALSE);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2947 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2948 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2949
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2950 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2951 * If we deleted or added lines, report the number of less/more lines.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2952 * Otherwise, report the number of changes (this may be incorrect
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2953 * in some cases, but it's better than nothing).
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2954 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2955 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2956 u_undo_end(
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2957 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	2958 int absolute) // used ":undo N"
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2959 {
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2960 char *msgstr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2961 u_header_T *uhp;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2962 char_u msgbuf[80];
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2963
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2964 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2965 if ((fdo_flags & FDO_UNDO) && KeyTyped)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2966 foldOpenCursor();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2967 #endif
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2968
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2969 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	2970 \|\| !messaging()) // 'lazyredraw' set, don't do messages now
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2971 return;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2972
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2973 if (curbuf->b_ml.ml_flags & ML_EMPTY)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2974 --u_newcount;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2975
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2976 u_oldcount -= u_newcount;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2977 if (u_oldcount == -1)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2978 msgstr = N_("more line");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2979 else if (u_oldcount < 0)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2980 msgstr = N_("more lines");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2981 else if (u_oldcount == 1)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2982 msgstr = N_("line less");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2983 else if (u_oldcount > 1)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2984 msgstr = N_("fewer lines");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2985 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2986 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2987 u_oldcount = u_newcount;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2988 if (u_newcount == 1)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2989 msgstr = N_("change");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2990 else
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2991 msgstr = N_("changes");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2992 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2993
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2994 if (curbuf->b_u_curhead != NULL)
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	2995 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	2996 // 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	2997 if (absolute && curbuf->b_u_curhead->uh_next.ptr != NULL)
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2998 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2999 uhp = curbuf->b_u_curhead->uh_next.ptr;
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	3000 did_undo = FALSE;
95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	3001 }
95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	3002 else if (did_undo)
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	3003 uhp = curbuf->b_u_curhead;
f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	3004 else
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;
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	3006 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3007 else
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3008 uhp = curbuf->b_u_newhead;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3009
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3010 if (uhp == NULL)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3011 *msgbuf = NUL;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3012 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	3013 add_time(msgbuf, sizeof(msgbuf), uhp->uh_time);
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3014
2282 a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3015 #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	3016 {
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3017 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	3018
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3019 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	3020 {
2378 85b7dc8da5eb Add the 'concealcursor' option to decide when the cursor line is to be Bram Moolenaar <bram@vim.org> parents: 2367 diff changeset	3021 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	3022 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	3023 }
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 #endif
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3026
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	3027 smsg_attr_keep(0, _("%ld %s; %s #%ld %s"),
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	3028 u_oldcount < 0 ? -u_oldcount : u_oldcount,
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	3029 _(msgstr),
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	3030 did_undo ? _("before") : _("after"),
f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	3031 uhp == NULL ? 0L : uhp->uh_seq,
f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	3032 msgbuf);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3033 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3034
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3035 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3036 * u_sync: stop adding to the current entry list
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3037 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3038 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3039 u_sync(
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3040 int force) // Also sync when no_u_sync is set.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3041 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3042 // Skip it when already synced or syncing is disabled.
825 6675076019ae updated for version 7.0d vimboss parents: 810 diff changeset	3043 if (curbuf->b_u_synced \|\| (!force && no_u_sync > 0))
6675076019ae updated for version 7.0d vimboss parents: 810 diff changeset	3044 return;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3045 #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	3046 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	3047 return; // XIM is busy, don't break an undo sequence
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3048 #endif
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	3049 if (get_undolevel() < 0)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3050 curbuf->b_u_synced = TRUE; // no entries, nothing to do
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3051 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3052 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3053 u_getbot(); // compute ue_bot of previous u_save
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3054 curbuf->b_u_curhead = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3055 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3056 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3057
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3058 /*
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3059 * ":undolist": List the leafs of the undo tree
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3060 */
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3061 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3062 ex_undolist(exarg_T *eap UNUSED)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3063 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3064 garray_T ga;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3065 u_header_T *uhp;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3066 int mark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3067 int nomark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3068 int changes = 1;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3069 int i;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3070
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3071 /*
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3072 * 1: walk the tree to find all leafs, put the info in "ga".
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3073 * 2: sort the lines
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3074 * 3: display the list
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3075 */
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3076 mark = ++lastmark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3077 nomark = ++lastmark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3078 ga_init2(&ga, (int)sizeof(char *), 20);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3079
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3080 uhp = curbuf->b_u_oldhead;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3081 while (uhp != NULL)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3082 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3083 if (uhp->uh_prev.ptr == NULL && uhp->uh_walk != nomark
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	3084 && uhp->uh_walk != mark)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3085 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3086 if (ga_grow(&ga, 1) == FAIL)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3087 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	3088 vim_snprintf((char *)IObuff, IOSIZE, "%6ld %7d ",
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3089 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	3090 add_time(IObuff + STRLEN(IObuff), IOSIZE - STRLEN(IObuff),
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3091 uhp->uh_time);
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3092 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	3093 {
2627 fae6fb779a6b updated for version 7.3.048 Bram Moolenaar <bram@vim.org> parents: 2577 diff changeset	3094 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	3095 STRCAT(IObuff, " ");
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3096 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	3097 " %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	3098 }
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3099 ((char_u **)(ga.ga_data))[ga.ga_len++] = vim_strsave(IObuff);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3100 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3101
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3102 uhp->uh_walk = mark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3103
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3104 // 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	3105 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	3106 && uhp->uh_prev.ptr->uh_walk != mark)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3107 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3108 uhp = uhp->uh_prev.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3109 ++changes;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3110 }
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 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	3113 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	3114 && 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	3115 && 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	3116 uhp = uhp->uh_alt_next.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3117
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3118 // 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	3119 // 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	3120 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	3121 && 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	3122 && uhp->uh_next.ptr->uh_walk != mark)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3123 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3124 uhp = uhp->uh_next.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3125 --changes;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3126 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3127
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3128 else
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3129 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3130 // need to backtrack; mark this node as done
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3131 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	3132 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	3133 uhp = uhp->uh_alt_prev.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3134 else
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3135 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3136 uhp = uhp->uh_next.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3137 --changes;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3138 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3139 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3140 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3141
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3142 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	3143 msg(_("Nothing to undo"));
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3144 else
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3145 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3146 sort_strings((char_u **)ga.ga_data, ga.ga_len);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3147
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3148 msg_start();
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	3149 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	3150 HL_ATTR(HLF_T));
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3151 for (i = 0; i < ga.ga_len && !got_int; ++i)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3152 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3153 msg_putchar('\n');
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3154 if (got_int)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3155 break;
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	3156 msg_puts(((char **)ga.ga_data)[i]);
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3157 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3158 msg_end();
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3159
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3160 ga_clear_strings(&ga);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3161 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3162 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3163
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3164 /*
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3165 * ":undojoin": continue adding to the last entry list
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3166 */
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3167 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3168 ex_undojoin(exarg_T *eap UNUSED)
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3169 {
839 1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3170 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	3171 return; // nothing changed before
839 1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3172 if (curbuf->b_u_curhead != NULL)
1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3173 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	3174 emsg(_("E790: undojoin is not allowed after undo"));
839 1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3175 return;
1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3176 }
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3177 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	3178 return; // already unsynced
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	3179 if (get_undolevel() < 0)
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3180 return; // no entries, nothing to do
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3181 else
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3182 // 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	3183 curbuf->b_u_synced = FALSE;
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3184 }
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3185
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3186 /*
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	3187 * Called after writing or reloading the file and setting b_changed to FALSE.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3188 * Now an undo means that the buffer is modified.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3189 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3190 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3191 u_unchanged(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3192 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3193 u_unch_branch(buf->b_u_oldhead);
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3194 buf->b_did_warn = FALSE;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3195 }
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3196
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3197 /*
2482 88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3198 * 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	3199 * 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	3200 */
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3201 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3202 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	3203 {
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3204 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	3205 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	3206 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	3207
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3208 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	3209 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	3210
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3211 // 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	3212 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	3213 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	3214 return;
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 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	3217 && 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	3218 {
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3219 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	3220
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3221 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	3222 \|\| 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	3223 {
11121 778c10516955 patch 8.0.0448: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 10978 diff changeset	3224 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	3225 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	3226 return;
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3227 }
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3228 }
2482 88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3229 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	3230 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3231 // 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	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 }
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3235 }
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3236
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3237 /*
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3238 * 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	3239 * used for "u".
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3240 */
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3241 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3242 u_update_save_nr(buf_T *buf)
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3243 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3244 u_header_T *uhp;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3245
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3246 ++buf->b_u_save_nr_last;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3247 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	3248 uhp = buf->b_u_curhead;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3249 if (uhp != NULL)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3250 uhp = uhp->uh_next.ptr;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3251 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3252 uhp = buf->b_u_newhead;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3253 if (uhp != NULL)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3254 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	3255 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3256
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3257 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3258 u_unch_branch(u_header_T *uhp)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3259 {
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3260 u_header_T *uh;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3261
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3262 for (uh = uhp; uh != NULL; uh = uh->uh_prev.ptr)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3263 {
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3264 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	3265 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	3266 u_unch_branch(uh->uh_alt_next.ptr); // recursive
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3267 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3268 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3269
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3270 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3271 * Get pointer to last added entry.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3272 * If it's not valid, give an error message and return NULL.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3273 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3274 static u_entry_T *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3275 u_get_headentry(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3276 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3277 if (curbuf->b_u_newhead == NULL \|\| curbuf->b_u_newhead->uh_entry == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3278 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	3279 iemsg(_("E439: undo list corrupt"));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3280 return NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3281 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3282 return curbuf->b_u_newhead->uh_entry;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3283 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3284
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3285 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3286 * u_getbot(): compute the line number of the previous u_save
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3287 * It is called only when b_u_synced is FALSE.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3288 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3289 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3290 u_getbot(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3291 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3292 u_entry_T *uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3293 linenr_T extra;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3294
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3295 uep = u_get_headentry(); // check for corrupt undo list
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3296 if (uep == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3297 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3298
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3299 uep = curbuf->b_u_newhead->uh_getbot_entry;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3300 if (uep != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3301 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3302 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3303 * the new ue_bot is computed from the number of lines that has been
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3304 * inserted (0 - deleted) since calling u_save. This is equal to the
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3305 * old line count subtracted from the current line count.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3306 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3307 extra = curbuf->b_ml.ml_line_count - uep->ue_lcount;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3308 uep->ue_bot = uep->ue_top + uep->ue_size + 1 + extra;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3309 if (uep->ue_bot < 1 \|\| uep->ue_bot > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3310 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15390 diff changeset	3311 iemsg(_("E440: undo line missing"));
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3312 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	3313 // 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	3314 // without deleting the current
15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3315 // ones
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3316 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3317
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3318 curbuf->b_u_newhead->uh_getbot_entry = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3319 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3320
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3321 curbuf->b_u_synced = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3322 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3323
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3324 /*
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3325 * Free one header "uhp" and its entry list and adjust the pointers.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3326 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3327 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3328 u_freeheader(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3329 buf_T *buf,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3330 u_header_T *uhp,
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3331 u_header_T **uhpp) // if not NULL reset when freeing this header
7 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 u_header_T *uhap;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3334
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3335 // 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	3336 // 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	3337 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	3338 u_freebranch(buf, uhp->uh_alt_next.ptr, uhpp);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3339
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3340 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	3341 uhp->uh_alt_prev.ptr->uh_alt_next.ptr = NULL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3342
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3343 // 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	3344 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	3345 buf->b_u_oldhead = uhp->uh_prev.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3346 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3347 uhp->uh_next.ptr->uh_prev.ptr = uhp->uh_prev.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3348
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3349 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	3350 buf->b_u_newhead = uhp->uh_next.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3351 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3352 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	3353 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	3354 uhap->uh_next.ptr = uhp->uh_next.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3355
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3356 u_freeentries(buf, uhp, uhpp);
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3357 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3358
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3359 /*
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3360 * Free an alternate branch and any following alternate branches.
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3361 */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3362 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3363 u_freebranch(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3364 buf_T *buf,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3365 u_header_T *uhp,
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3366 u_header_T **uhpp) // if not NULL reset when freeing this header
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3367 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3368 u_header_T tofree, next;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3369
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3370 // 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	3371 // all the pointers.
1440 93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3372 if (uhp == buf->b_u_oldhead)
93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3373 {
5448 9818311eeca0 updated for version 7.4.074 Bram Moolenaar <bram@vim.org> parents: 5446 diff changeset	3374 while (buf->b_u_oldhead != NULL)
9818311eeca0 updated for version 7.4.074 Bram Moolenaar <bram@vim.org> parents: 5446 diff changeset	3375 u_freeheader(buf, buf->b_u_oldhead, uhpp);
1440 93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3376 return;
93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3377 }
93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3378
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3379 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	3380 uhp->uh_alt_prev.ptr->uh_alt_next.ptr = NULL;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3381
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3382 next = uhp;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3383 while (next != NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3384 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3385 tofree = next;
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3386 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	3387 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	3388 next = tofree->uh_prev.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3389 u_freeentries(buf, tofree, uhpp);
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3390 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3391 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3392
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3393 /*
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3394 * Free all the undo entries for one header and the header itself.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3395 * This means that "uhp" is invalid when returning.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3396 */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3397 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3398 u_freeentries(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3399 buf_T *buf,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3400 u_header_T *uhp,
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3401 u_header_T **uhpp) // if not NULL reset when freeing this header
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3402 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3403 u_entry_T uep, nuep;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3404
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3405 // Check for pointers to the header that become invalid now.
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3406 if (buf->b_u_curhead == uhp)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3407 buf->b_u_curhead = NULL;
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3408 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	3409 buf->b_u_newhead = NULL; // freeing the newest entry
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3410 if (uhpp != NULL && uhp == *uhpp)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3411 *uhpp = NULL;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3412
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3413 for (uep = uhp->uh_entry; uep != NULL; uep = nuep)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3414 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3415 nuep = uep->ue_next;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3416 u_freeentry(uep, uep->ue_size);
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3417 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3418
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3419 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3420 uhp->uh_magic = 0;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3421 #endif
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3422 vim_free((char_u *)uhp);
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3423 --buf->b_u_numhead;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3424 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3425
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3426 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3427 * free entry 'uep' and 'n' lines in uep->ue_array[]
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3428 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3429 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3430 u_freeentry(u_entry_T *uep, long n)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3431 {
414 8ab9c77240d4 updated for version 7.0108 vimboss parents: 407 diff changeset	3432 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	3433 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	3434 vim_free((char_u *)uep->ue_array);
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3435 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3436 uep->ue_magic = 0;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3437 #endif
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3438 vim_free((char_u *)uep);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3439 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3440
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3441 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3442 * invalidate the undo buffer; called when storage has already been released
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3443 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3444 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3445 u_clearall(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3446 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3447 buf->b_u_newhead = buf->b_u_oldhead = buf->b_u_curhead = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3448 buf->b_u_synced = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3449 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	3450 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	3451 buf->b_u_line_ptr.ul_len = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3452 buf->b_u_line_lnum = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3453 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3454
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3455 /*
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3456 * Save the line "lnum" for the "U" command.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3457 */
17789 0f7ae8010787 patch 8.1.1891: functions used in one file are global Bram Moolenaar <Bram@vim.org> parents: 17630 diff changeset	3458 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3459 u_saveline(linenr_T lnum)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3460 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3461 if (lnum == curbuf->b_u_line_lnum) // line is already saved
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3462 return;
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3463 if (lnum < 1 \|\| lnum > curbuf->b_ml.ml_line_count) // should never happen
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3464 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3465 u_clearline();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3466 curbuf->b_u_line_lnum = lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3467 if (curwin->w_cursor.lnum == lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3468 curbuf->b_u_line_colnr = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3469 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3470 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	3471 if (u_save_line(&curbuf->b_u_line_ptr, lnum) == FAIL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3472 do_outofmem_msg((long_u)0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3473 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3474
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3475 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3476 * clear the line saved for the "U" command
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3477 * (this is used externally for crossing a line while in insert mode)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3478 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3479 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3480 u_clearline(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3481 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3482 if (curbuf->b_u_line_ptr.ul_line != NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3483 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3484 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	3485 curbuf->b_u_line_ptr.ul_len = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3486 curbuf->b_u_line_lnum = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3487 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3488 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3489
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3490 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3491 * Implementation of the "U" command.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3492 * Differentiation from vi: "U" can be undone with the next "U".
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3493 * 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	3494 * Careful: may trigger autocommands that reload the buffer.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3495 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3496 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3497 u_undoline(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3498 {
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3499 colnr_T t;
58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3500 undoline_T oldp;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3501
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3502 if (undo_off)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3503 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3504
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3505 if (curbuf->b_u_line_ptr.ul_line == NULL
1534 bdfbf8ef447a updated for version 7.1-249 vimboss parents: 1440 diff changeset	3506 \|\| curbuf->b_u_line_lnum > curbuf->b_ml.ml_line_count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3507 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3508 beep_flush();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3509 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3510 }
1534 bdfbf8ef447a updated for version 7.1-249 vimboss parents: 1440 diff changeset	3511
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3512 // first save the line for the 'u' command
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3513 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	3514 curbuf->b_u_line_lnum + 1, (linenr_T)0, FALSE) == FAIL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3515 return;
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3516 if (u_save_line(&oldp, curbuf->b_u_line_lnum) == FAIL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3517 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3518 do_outofmem_msg((long_u)0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3519 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3520 }
15361 58b125df3e9b patch 8.1.0688: text properties are not restored by undo Bram Moolenaar <Bram@vim.org> parents: 14862 diff changeset	3521 ml_replace_len(curbuf->b_u_line_lnum, curbuf->b_u_line_ptr.ul_line, curbuf->b_u_line_ptr.ul_len, TRUE, FALSE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3522 changed_bytes(curbuf->b_u_line_lnum, 0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3523 curbuf->b_u_line_ptr = oldp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3524
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3525 t = curbuf->b_u_line_colnr;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3526 if (curwin->w_cursor.lnum == curbuf->b_u_line_lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3527 curbuf->b_u_line_colnr = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3528 curwin->w_cursor.col = t;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3529 curwin->w_cursor.lnum = curbuf->b_u_line_lnum;
1534 bdfbf8ef447a updated for version 7.1-249 vimboss parents: 1440 diff changeset	3530 check_cursor_col();
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3531 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3532
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3533 /*
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3534 * Free all allocated memory blocks for the buffer 'buf'.
4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3535 */
4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3536 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3537 u_blockfree(buf_T *buf)
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3538 {
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3539 while (buf->b_u_oldhead != NULL)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3540 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	3541 vim_free(buf->b_u_line_ptr.ul_line);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3542 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3543
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3544 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3545 * Check if the 'modified' flag is set, or 'ff' has changed (only need to
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3546 * check the first character, because it can only be "dos", "unix" or "mac").
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3547 * "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	3548 * 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	3549 * job.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3550 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3551 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3552 bufIsChanged(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3553 {
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	3554 #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	3555 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	3556 return TRUE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3557 #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	3558 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	3559 }
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	3560
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	3561 /*
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	3562 * 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	3563 */
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	3564 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	3565 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	3566 {
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	3567 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	3568
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	3569 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	3570 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	3571 return TRUE;
16097 d45e42b45470 patch 8.1.1053: warning for missing return statement Bram Moolenaar <Bram@vim.org> parents: 16089 diff changeset	3572 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	3573 }
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
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 /*
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	3576 * 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	3577 */
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	3578 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	3579 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	3580 {
14147 de75c249723d patch 8.1.0091: MS-Windows: Cannot interrupt gdb when program is running Christian Brabandt <cb@256bit.org> parents: 13610 diff changeset	3581 // 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	3582 // 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	3583 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	3584 && (buf->b_changed \|\| file_ff_differs(buf, TRUE));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3585 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3586
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3587 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3588 curbufIsChanged(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3589 {
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	3590 return bufIsChanged(curbuf);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3591 }
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3592
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3593 #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	3594
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3595 /*
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3596 * 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	3597 * Recursive.
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3598 */
18051 d1e77015f60b patch 8.1.2021: some global functions can be local to the file Bram Moolenaar <Bram@vim.org> parents: 18025 diff changeset	3599 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3600 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	3601 {
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3602 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	3603 dict_T *dict;
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 while (uhp != NULL)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3606 {
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3607 dict = dict_alloc();
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3608 if (dict == NULL)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3609 return;
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 14237 diff changeset	3610 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	3611 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	3612 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	3613 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	3614 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	3615 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	3616 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	3617 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	3618
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3619 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	3620 {
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3621 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	3622
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3623 if (alt_list != NULL)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3624 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3625 // 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	3626 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	3627 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	3628 }
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
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3631 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	3632 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	3633 }
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3634 }
17970 684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3635
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3636 /*
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3637 * "undofile(name)" function
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3638 */
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3639 void
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3640 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	3641 {
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3642 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	3643 #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	3644 {
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3645 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	3646
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3647 if (*fname == NUL)
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3648 {
18816 15539899a112 patch 8.1.2396: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18498 diff changeset	3649 // 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	3650 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	3651 }
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3652 else
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3653 {
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3654 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	3655
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3656 if (ffname != NULL)
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3657 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	3658 vim_free(ffname);
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3659 }
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3660 }
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3661 #else
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;
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3663 #endif
17970 684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3664 }
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 /*
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3667 * "undotree()" function
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3668 */
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3669 void
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3670 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	3671 {
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3672 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	3673 {
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3674 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	3675 list_T *list;
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3676
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3677 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	3678 dict_add_number(dict, "seq_last", curbuf->b_u_seq_last);
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3679 dict_add_number(dict, "save_last", (long)curbuf->b_u_save_nr_last);
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3680 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	3681 dict_add_number(dict, "time_cur", (long)curbuf->b_u_time_cur);
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3682 dict_add_number(dict, "save_cur", (long)curbuf->b_u_save_nr_cur);
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3683
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3684 list = list_alloc();
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3685 if (list != NULL)
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3686 {
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3687 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	3688 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	3689 }
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3690 }
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3691 }
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3692
684a15da9929 patch 8.1.1981: the evalfunc.c file is too big Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	3693 #endif

Mercurial > vim

annotate src/undo.c @ 20581:e529690f27bc v8.2.0844