vim: src/undo.c annotate

annotate src/undo.c @ 14147:de75c249723d v8.1.0091

patch 8.1.0091: MS-Windows: Cannot interrupt gdb when program is running commit https://github.com/vim/vim/commit/4551c0a9fcdbdef52836d4852686d54b5e47fdaf Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jun 20 22:38:21 2018 +0200 patch 8.1.0091: MS-Windows: Cannot interrupt gdb when program is running Problem: MS-Windows: Cannot interrupt gdb when program is running. Solution: Add debugbreak() and use it in the terminal debugger. Respect 'modified' in a prompt buffer.

author	Christian Brabandt <cb@256bit.org>
date	Wed, 20 Jun 2018 22:45:05 +0200
parents	e76499e85744
children	487d7bda80ea

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
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	78 /* Uncomment the next line for including the u_check() function. This warns
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	79 * for errors in the debug information. */
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	80 /* #define U_DEBUG 1 */
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	81 #define UH_MAGIC 0x18dade /* value for uh_magic when in use */
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	82 #define UE_MAGIC 0xabc123 /* value for ue_magic when in use */
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	83
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	84 /* Size of buffer used for encryption. */
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
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	89 /* Structure passed around between functions.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	90 * Avoids passing cryptstate_T when encryption not available. */
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;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	96 char_u bi_buffer; / CRYPT_BUF_SIZE, NULL when not buffering */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	97 size_t bi_used; /* bytes written to/read from bi_buffer */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	98 size_t bi_avail; /* bytes available in bi_buffer */
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 long get_undolevel(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	104 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	105 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	106 static void u_getbot(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	107 static void u_doit(int count);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	108 static void u_undoredo(int undo);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	109 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	110 static void u_add_time(char_u *buf, size_t buflen, time_t tt);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	111 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	112 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	113 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	114 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	115 #ifdef FEAT_PERSISTENT_UNDO
7805 0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	116 static void corruption_error(char mesg, char_u file_name);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	117 static void u_free_uhp(u_header_T *uhp);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	118 static int undo_write(bufinfo_T bi, char_u ptr, size_t len);
8128 985cd5917560 commit https://github.com/vim/vim/commit/1d6fbe654066845ff2a182ed258e6e9d3408fa90 Christian Brabandt <cb@256bit.org> parents: 7835 diff changeset	119 # ifdef FEAT_CRYPT
7805 0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	120 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	121 # endif
7805 0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	122 static int fwrite_crypt(bufinfo_T bi, char_u ptr, size_t len);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	123 static int undo_write_bytes(bufinfo_T *bi, long_u nr, int len);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	124 static void put_header_ptr(bufinfo_T bi, u_header_T uhp);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	125 static int undo_read_4c(bufinfo_T *bi);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	126 static int undo_read_2c(bufinfo_T *bi);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	127 static int undo_read_byte(bufinfo_T *bi);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	128 static time_t undo_read_time(bufinfo_T *bi);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	129 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	130 static char_u read_string_decrypt(bufinfo_T bi, int len);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	131 static int serialize_header(bufinfo_T bi, char_u hash);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	132 static int serialize_uhp(bufinfo_T bi, u_header_T uhp);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	133 static u_header_T unserialize_uhp(bufinfo_T bi, char_u *file_name);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	134 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	135 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	136 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	137 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	138 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	139 static void unserialize_visualinfo(bufinfo_T bi, visualinfo_T info);
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	140 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	141
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	142 #define U_ALLOC_LINE(size) lalloc((long_u)(size), FALSE)
7805 0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077 Christian Brabandt <cb@256bit.org> parents: 6771 diff changeset	143 static char_u *u_save_line(linenr_T);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	144
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	145 /* used in undo_end() to report number of added and deleted lines */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	146 static long u_newcount, u_oldcount;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	147
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	148 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	149 * When 'u' flag included in 'cpoptions', we behave like vi. Need to remember
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	150 * the action that "u" should do.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	151 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	152 static int undo_undoes = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	153
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	154 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	155
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	156 #if defined(U_DEBUG) \|\| defined(PROTO)
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	157 /*
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	158 * Check the undo structures for being valid. Print a warning when something
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	159 * looks wrong.
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	160 */
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	161 static int seen_b_u_curhead;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	162 static int seen_b_u_newhead;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	163 static int header_count;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	164
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	165 static void
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	166 u_check_tree(u_header_T *uhp,
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	167 u_header_T *exp_uh_next,
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	168 u_header_T *exp_uh_alt_prev)
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 u_entry_T *uep;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	171
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	172 if (uhp == NULL)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	173 return;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	174 ++header_count;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	175 if (uhp == curbuf->b_u_curhead && ++seen_b_u_curhead > 1)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	176 {
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	177 EMSG("b_u_curhead found twice (looping?)");
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	178 return;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	179 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	180 if (uhp == curbuf->b_u_newhead && ++seen_b_u_newhead > 1)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	181 {
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	182 EMSG("b_u_newhead found twice (looping?)");
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	183 return;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	184 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	185
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	186 if (uhp->uh_magic != UH_MAGIC)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	187 EMSG("uh_magic wrong (may be using freed memory)");
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	188 else
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	189 {
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	190 /* 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	191 if (uhp->uh_next.ptr != exp_uh_next)
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	192 {
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	193 EMSG("uh_next wrong");
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	194 smsg((char_u *)"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	195 exp_uh_next, uhp->uh_next.ptr);
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	196 }
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	197 if (uhp->uh_alt_prev.ptr != exp_uh_alt_prev)
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	198 {
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	199 EMSG("uh_alt_prev wrong");
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	200 smsg((char_u *)"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	201 exp_uh_alt_prev, uhp->uh_alt_prev.ptr);
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	202 }
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 /* Check the undo tree at this header. */
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	205 for (uep = uhp->uh_entry; uep != NULL; uep = uep->ue_next)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	206 {
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	207 if (uep->ue_magic != UE_MAGIC)
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 EMSG("ue_magic wrong (may be using freed memory)");
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	210 break;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	211 }
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
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	214 /* 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	215 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	216
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	217 /* 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	218 u_check_tree(uhp->uh_prev.ptr, uhp, NULL);
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	219 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	220 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	221
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	222 static void
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	223 u_check(int newhead_may_be_NULL)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	224 {
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	225 seen_b_u_newhead = 0;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	226 seen_b_u_curhead = 0;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	227 header_count = 0;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	228
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	229 u_check_tree(curbuf->b_u_oldhead, NULL, NULL);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	230
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	231 if (seen_b_u_newhead == 0 && curbuf->b_u_oldhead != NULL
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	232 && !(newhead_may_be_NULL && curbuf->b_u_newhead == NULL))
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	233 EMSGN("b_u_newhead invalid: 0x%x", curbuf->b_u_newhead);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	234 if (curbuf->b_u_curhead != NULL && seen_b_u_curhead == 0)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	235 EMSGN("b_u_curhead invalid: 0x%x", curbuf->b_u_curhead);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	236 if (header_count != curbuf->b_u_numhead)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	237 {
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	238 EMSG("b_u_numhead invalid");
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	239 smsg((char_u *)"expected: %ld, actual: %ld",
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	240 (long)header_count, (long)curbuf->b_u_numhead);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	241 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	242 }
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	243 #endif
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	244
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	245 /*
344 7033303ea0c0 updated for version 7.0089 vimboss parents: 179 diff changeset	246 * 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	247 * Careful: may trigger autocommands that reload the buffer.
344 7033303ea0c0 updated for version 7.0089 vimboss parents: 179 diff changeset	248 * Returns OK or FAIL.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	249 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	250 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	251 u_save_cursor(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	252 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	253 return (u_save((linenr_T)(curwin->w_cursor.lnum - 1),
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	254 (linenr_T)(curwin->w_cursor.lnum + 1)));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	255 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	256
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	257 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	258 * Save the lines between "top" and "bot" for both the "u" and "U" command.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	259 * "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	260 * Careful: may trigger autocommands that reload the buffer.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	261 * Returns FAIL when lines could not be saved, OK otherwise.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	262 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	263 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	264 u_save(linenr_T top, linenr_T bot)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	265 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	266 if (undo_off)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	267 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	268
4303 790238e5a46c updated for version 7.3.901 Bram Moolenaar <bram@vim.org> parents: 3751 diff changeset	269 if (top > curbuf->b_ml.ml_line_count
790238e5a46c updated for version 7.3.901 Bram Moolenaar <bram@vim.org> parents: 3751 diff changeset	270 \|\| top >= bot
790238e5a46c updated for version 7.3.901 Bram Moolenaar <bram@vim.org> parents: 3751 diff changeset	271 \|\| bot > curbuf->b_ml.ml_line_count + 1)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	272 return FALSE; /* rely on caller to do error messages */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	273
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	274 if (top + 2 == bot)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	275 u_saveline((linenr_T)(top + 1));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	276
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	277 return (u_savecommon(top, bot, (linenr_T)0, FALSE));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	278 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	279
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	280 /*
2181 f838615313cd updated for version 7.2.441 Bram Moolenaar <bram@vim.org> parents: 2165 diff changeset	281 * Save the line "lnum" (used by ":s" and "~" command).
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	282 * 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	283 * 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	284 * Returns FAIL when lines could not be saved, OK otherwise.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	285 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	286 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	287 u_savesub(linenr_T lnum)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	288 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	289 if (undo_off)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	290 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	291
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	292 return (u_savecommon(lnum - 1, lnum + 1, lnum + 1, FALSE));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	293 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	294
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	295 /*
2181 f838615313cd updated for version 7.2.441 Bram Moolenaar <bram@vim.org> parents: 2165 diff changeset	296 * A new line is inserted before line "lnum" (used by :s command).
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	297 * 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	298 * 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	299 * Returns FAIL when lines could not be saved, OK otherwise.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	300 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	301 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	302 u_inssub(linenr_T lnum)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	303 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	304 if (undo_off)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	305 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	306
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	307 return (u_savecommon(lnum - 1, lnum, lnum + 1, FALSE));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	308 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	309
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	310 /*
2181 f838615313cd updated for version 7.2.441 Bram Moolenaar <bram@vim.org> parents: 2165 diff changeset	311 * Save the lines "lnum" - "lnum" + nlines (used by delete command).
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	312 * The lines are deleted, so the new bottom line is lnum, unless the buffer
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	313 * 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	314 * 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	315 * Returns FAIL when lines could not be saved, OK otherwise.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	316 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	317 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	318 u_savedel(linenr_T lnum, long nlines)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	319 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	320 if (undo_off)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	321 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	322
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	323 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	324 nlines == curbuf->b_ml.ml_line_count ? 2 : lnum, FALSE));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	325 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	326
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	327 /*
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	328 * Return TRUE when undo is allowed. Otherwise give an error message and
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	329 * return FALSE.
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	330 */
912 adf6a9dcaded updated for version 7.0-038 vimboss parents: 839 diff changeset	331 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	332 undo_allowed(void)
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	333 {
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	334 /* Don't allow changes when 'modifiable' is off. */
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	335 if (!curbuf->b_p_ma)
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	336 {
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	337 EMSG(_(e_modifiable));
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	338 return FALSE;
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	339 }
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	340
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	341 #ifdef HAVE_SANDBOX
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	342 /* In the sandbox it's not allowed to change the text. */
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	343 if (sandbox != 0)
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	344 {
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	345 EMSG(_(e_sandbox));
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	346 return FALSE;
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	347 }
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	348 #endif
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	349
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	350 /* Don't allow changes in the buffer while editing the cmdline. The
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	351 * caller of getcmdline() may get confused. */
634 1c586ee8dd45 updated for version 7.0183 vimboss parents: 632 diff changeset	352 if (textlock != 0)
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	353 {
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	354 EMSG(_(e_secure));
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	355 return FALSE;
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	356 }
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	357
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	358 return TRUE;
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	359 }
b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	360
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	361 /*
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	362 * Get the undolevle value for the current buffer.
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	363 */
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	364 static long
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	365 get_undolevel(void)
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	366 {
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	367 if (curbuf->b_p_ul == NO_LOCAL_UNDOLEVEL)
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	368 return p_ul;
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	369 return curbuf->b_p_ul;
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	370 }
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	371
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	372 /*
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	373 * 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	374 * "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	375 * "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	376 * "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	377 * "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	378 * 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	379 * 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	380 */
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	381 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	382 u_savecommon(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	383 linenr_T top,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	384 linenr_T bot,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	385 linenr_T newbot,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	386 int reload)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	387 {
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	388 linenr_T lnum;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	389 long i;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	390 u_header_T *uhp;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	391 u_header_T *old_curhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	392 u_entry_T *uep;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	393 u_entry_T *prev_uep;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	394 long size;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	395
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	396 if (!reload)
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	397 {
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	398 /* When making changes is not allowed return FAIL. It's a crude way
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	399 * to make all change commands fail. */
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	400 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	401 return FAIL;
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	402
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	403 #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	404 /*
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	405 * 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	406 * 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	407 */
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	408 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	409 {
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	410 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	411 {
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	412 EMSG(_(e_guarded));
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	413 return FAIL;
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	414 }
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	415 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	416 {
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	417 EMSG(_(e_nbreadonly));
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	418 return FAIL;
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	419 }
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	420 }
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	421 #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	422 #ifdef FEAT_TERMINAL
f080b225a2a4 patch 8.0.0798: no highlighting in a terminal window with a finished job Christian Brabandt <cb@256bit.org> parents: 11506 diff changeset	423 /* A change in a terminal buffer removes the highlighting. */
f080b225a2a4 patch 8.0.0798: no highlighting in a terminal window with a finished job Christian Brabandt <cb@256bit.org> parents: 11506 diff changeset	424 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	425 #endif
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	426
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	427 /*
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	428 * 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	429 * 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	430 * 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	431 * (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	432 */
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	433 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	434 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	435 {
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	436 /* This happens when the FileChangedRO autocommand changes the
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	437 * file in a way it becomes shorter. */
5621 be61f315eafe updated for version 7.4.157 Bram Moolenaar <bram@vim.org> parents: 5448 diff changeset	438 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	439 return FAIL;
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	440 }
a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	441 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	442
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	443 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	444 u_check(FALSE);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	445 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	446
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	447 size = bot - top - 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	448
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	449 /*
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	450 * If curbuf->b_u_synced == TRUE make a new header.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	451 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	452 if (curbuf->b_u_synced)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	453 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	454 #ifdef FEAT_JUMPLIST
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	455 /* Need to create new entry in b_changelist. */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	456 curbuf->b_new_change = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	457 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	458
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	459 if (get_undolevel() >= 0)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	460 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	461 /*
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	462 * 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	463 * up the undo info when out of memory.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	464 */
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	465 uhp = (u_header_T *)U_ALLOC_LINE(sizeof(u_header_T));
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	466 if (uhp == NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	467 goto nomem;
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	468 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	469 uhp->uh_magic = UH_MAGIC;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	470 #endif
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	471 }
766 f0d0d3d3a1e2 updated for version 7.0225 vimboss parents: 758 diff changeset	472 else
f0d0d3d3a1e2 updated for version 7.0225 vimboss parents: 758 diff changeset	473 uhp = NULL;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	474
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	475 /*
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	476 * If we undid more than we redid, move the entry lists before and
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	477 * including curbuf->b_u_curhead to an alternate branch.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	478 */
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	479 old_curhead = curbuf->b_u_curhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	480 if (old_curhead != NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	481 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	482 curbuf->b_u_newhead = old_curhead->uh_next.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	483 curbuf->b_u_curhead = NULL;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	484 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	485
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	486 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	487 * free headers to keep the size right
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	488 */
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	489 while (curbuf->b_u_numhead > get_undolevel()
d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	490 && curbuf->b_u_oldhead != NULL)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	491 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	492 u_header_T *uhfree = curbuf->b_u_oldhead;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	493
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	494 if (uhfree == old_curhead)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	495 /* Can't reconnect the branch, delete all of it. */
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	496 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	497 else if (uhfree->uh_alt_next.ptr == NULL)
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	498 /* There is no branch, only free one header. */
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	499 u_freeheader(curbuf, uhfree, &old_curhead);
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	500 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	501 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	502 /* 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	503 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	504 uhfree = uhfree->uh_alt_next.ptr;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	505 u_freebranch(curbuf, uhfree, &old_curhead);
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	506 }
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	507 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	508 u_check(TRUE);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	509 #endif
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	510 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	511
766 f0d0d3d3a1e2 updated for version 7.0225 vimboss parents: 758 diff changeset	512 if (uhp == NULL) /* no undo at all */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	513 {
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	514 if (old_curhead != NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	515 u_freebranch(curbuf, old_curhead, NULL);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	516 curbuf->b_u_synced = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	517 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	518 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	519
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	520 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	521 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	522 uhp->uh_alt_next.ptr = old_curhead;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	523 if (old_curhead != NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	524 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	525 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	526 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	527 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	528 old_curhead->uh_alt_prev.ptr = uhp;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	529 if (curbuf->b_u_oldhead == old_curhead)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	530 curbuf->b_u_oldhead = uhp;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	531 }
1056 e6d25347de2c updated for version 7.0-182 vimboss parents: 944 diff changeset	532 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	533 uhp->uh_alt_prev.ptr = NULL;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	534 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	535 curbuf->b_u_newhead->uh_prev.ptr = uhp;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	536
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	537 uhp->uh_seq = ++curbuf->b_u_seq_last;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	538 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	539 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	540 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	541 curbuf->b_u_time_cur = uhp->uh_time + 1;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	542
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	543 uhp->uh_walk = 0;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	544 uhp->uh_entry = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	545 uhp->uh_getbot_entry = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	546 uhp->uh_cursor = curwin->w_cursor; /* save cursor pos. for undo */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	547 #ifdef FEAT_VIRTUALEDIT
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	548 if (virtual_active() && curwin->w_cursor.coladd > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	549 uhp->uh_cursor_vcol = getviscol();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	550 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	551 uhp->uh_cursor_vcol = -1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	552 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	553
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	554 /* save changed and buffer empty flag for undo */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	555 uhp->uh_flags = (curbuf->b_changed ? UH_CHANGED : 0) +
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	556 ((curbuf->b_ml.ml_flags & ML_EMPTY) ? UH_EMPTYBUF : 0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	557
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	558 /* save named marks and Visual marks for undo */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	559 mch_memmove(uhp->uh_namedm, curbuf->b_namedm, sizeof(pos_T) * NMARKS);
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	560 uhp->uh_visual = curbuf->b_visual;
a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	561
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	562 curbuf->b_u_newhead = uhp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	563 if (curbuf->b_u_oldhead == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	564 curbuf->b_u_oldhead = uhp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	565 ++curbuf->b_u_numhead;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	566 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	567 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	568 {
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	569 if (get_undolevel() < 0) /* no undo at all */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	570 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	571
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	572 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	573 * When saving a single line, and it has been saved just before, it
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	574 * doesn't make sense saving it again. Saves a lot of memory when
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	575 * making lots of changes inside the same line.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	576 * This is only possible if the previous change didn't increase or
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	577 * decrease the number of lines.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	578 * Check the ten last changes. More doesn't make sense and takes too
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	579 * long.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	580 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	581 if (size == 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	582 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	583 uep = u_get_headentry();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	584 prev_uep = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	585 for (i = 0; i < 10; ++i)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	586 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	587 if (uep == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	588 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	589
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	590 /* If lines have been inserted/deleted we give up.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	591 * Also when the line was included in a multi-line save. */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	592 if ((curbuf->b_u_newhead->uh_getbot_entry != uep
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	593 ? (uep->ue_top + uep->ue_size + 1
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	594 != (uep->ue_bot == 0
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	595 ? curbuf->b_ml.ml_line_count + 1
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	596 : uep->ue_bot))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	597 : uep->ue_lcount != curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	598 \|\| (uep->ue_size > 1
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	599 && top >= uep->ue_top
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	600 && top + 2 <= uep->ue_top + uep->ue_size + 1))
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	601 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	602
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	603 /* If it's the same line we can skip saving it again. */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	604 if (uep->ue_size == 1 && uep->ue_top == top)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	605 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	606 if (i > 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	607 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	608 /* It's not the last entry: get ue_bot for the last
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	609 * entry now. Following deleted/inserted lines go to
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	610 * the re-used entry. */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	611 u_getbot();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	612 curbuf->b_u_synced = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	613
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	614 /* Move the found entry to become the last entry. The
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	615 * order of undo/redo doesn't matter for the entries
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	616 * we move it over, since they don't change the line
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	617 * count and don't include this line. It does matter
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	618 * for the found entry if the line count is changed by
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	619 * the executed command. */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	620 prev_uep->ue_next = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	621 uep->ue_next = curbuf->b_u_newhead->uh_entry;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	622 curbuf->b_u_newhead->uh_entry = uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	623 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	624
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	625 /* The executed command may change the line count. */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	626 if (newbot != 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	627 uep->ue_bot = newbot;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	628 else if (bot > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	629 uep->ue_bot = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	630 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	631 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	632 uep->ue_lcount = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	633 curbuf->b_u_newhead->uh_getbot_entry = uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	634 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	635 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	636 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	637 prev_uep = uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	638 uep = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	639 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	640 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	641
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	642 /* find line number for ue_bot for previous u_save() */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	643 u_getbot();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	644 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	645
9536 b2aada04d84e commit https://github.com/vim/vim/commit/a06ecab7a5159e744448ace731036f0dc5f87dd4 Christian Brabandt <cb@256bit.org> parents: 9387 diff changeset	646 #if !defined(UNIX) && !defined(WIN32)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	647 /*
8212 05b88224cea1 commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce Christian Brabandt <cb@256bit.org> parents: 8128 diff changeset	648 * With Amiga we can't handle big undo's, because
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	649 * then u_alloc_line would have to allocate a block larger than 32K
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	650 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	651 if (size >= 8000)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	652 goto nomem;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	653 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	654
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	655 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	656 * add lines in front of entry list
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	657 */
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	658 uep = (u_entry_T *)U_ALLOC_LINE(sizeof(u_entry_T));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	659 if (uep == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	660 goto nomem;
2215 cccb71c2c5c1 Fix uninit memory read in undo code. Fix uint32_t in proto file. Bram Moolenaar <bram@vim.org> parents: 2214 diff changeset	661 vim_memset(uep, 0, sizeof(u_entry_T));
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	662 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	663 uep->ue_magic = UE_MAGIC;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	664 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	665
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	666 uep->ue_size = size;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	667 uep->ue_top = top;
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 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	671 * Use 0 for ue_bot if bot is below last line.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	672 * Otherwise we have to compute ue_bot later.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	673 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	674 else if (bot > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	675 uep->ue_bot = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	676 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	677 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	678 uep->ue_lcount = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	679 curbuf->b_u_newhead->uh_getbot_entry = uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	680 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	681
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	682 if (size > 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	683 {
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	684 if ((uep->ue_array = (char_u **)U_ALLOC_LINE(
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	685 sizeof(char_u ) size)) == NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	686 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	687 u_freeentry(uep, 0L);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	688 goto nomem;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	689 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	690 for (i = 0, lnum = top + 1; i < size; ++i)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	691 {
481 66080ac5dab7 updated for version 7.0130 vimboss parents: 414 diff changeset	692 fast_breakcheck();
66080ac5dab7 updated for version 7.0130 vimboss parents: 414 diff changeset	693 if (got_int)
66080ac5dab7 updated for version 7.0130 vimboss parents: 414 diff changeset	694 {
66080ac5dab7 updated for version 7.0130 vimboss parents: 414 diff changeset	695 u_freeentry(uep, i);
66080ac5dab7 updated for version 7.0130 vimboss parents: 414 diff changeset	696 return FAIL;
66080ac5dab7 updated for version 7.0130 vimboss parents: 414 diff changeset	697 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	698 if ((uep->ue_array[i] = u_save_line(lnum++)) == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	699 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	700 u_freeentry(uep, i);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	701 goto nomem;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	702 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	703 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	704 }
359 6c62b9b939bd updated for version 7.0093 vimboss parents: 356 diff changeset	705 else
6c62b9b939bd updated for version 7.0093 vimboss parents: 356 diff changeset	706 uep->ue_array = NULL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	707 uep->ue_next = curbuf->b_u_newhead->uh_entry;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	708 curbuf->b_u_newhead->uh_entry = uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	709 curbuf->b_u_synced = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	710 undo_undoes = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	711
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	712 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	713 u_check(FALSE);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	714 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	715 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	716
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	717 nomem:
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	718 msg_silent = 0; /* must display the prompt */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	719 if (ask_yesno((char_u *)_("No undo possible; continue anyway"), TRUE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	720 == 'y')
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	721 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	722 undo_off = TRUE; /* will be reset when character typed */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	723 return OK;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	724 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	725 do_outofmem_msg((long_u)0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	726 return FAIL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	727 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	728
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	729 #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	730
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	731 # define UF_START_MAGIC "Vim\237UnDo\345" /* magic at start of undofile */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	732 # define UF_START_MAGIC_LEN 9
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	733 # define UF_HEADER_MAGIC 0x5fd0 /* magic at start of header */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	734 # define UF_HEADER_END_MAGIC 0xe7aa /* magic after last header */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	735 # define UF_ENTRY_MAGIC 0xf518 /* magic at start of entry */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	736 # define UF_ENTRY_END_MAGIC 0x3581 /* magic after last entry */
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	737 # define UF_VERSION 2 /* 2-byte undofile version number */
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	738 # define UF_VERSION_CRYPT 0x8002 /* idem, encrypted */
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	739
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	740 /* extra fields for header */
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	741 # 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	742
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	743 /* extra fields for uhp */
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	744 # 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	745
2229 d45902a5c61c Fix a few more things for persistent undo. Bram Moolenaar <bram@vim.org> parents: 2223 diff changeset	746 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	747
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	748 /*
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	749 * 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	750 */
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	751 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	752 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	753 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	754 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	755 linenr_T lnum;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	756 char_u *p;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	757
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	758 sha256_start(&ctx);
3194 972bd3fca556 updated for version 7.3.367 Bram Moolenaar <bram@vim.org> parents: 2689 diff changeset	759 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	760 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	761 p = ml_get(lnum);
2217 120502692d82 Improve the MS-Windows installer. Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	762 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	763 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	764 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	765 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	766
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	767 /*
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	768 * 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	769 * 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	770 * 'undodir'.
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	771 * 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	772 * 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	773 */
2236 dc2e5ec0500d Added the undofile() function. Updated runtime files. Bram Moolenaar <bram@vim.org> parents: 2235 diff changeset	774 char_u *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	775 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	776 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	777 char_u *dirp;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	778 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	779 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	780 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	781 int dir_len;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	782 char_u *p;
9387 f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	783 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	784 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	785 #ifdef HAVE_READLINK
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	786 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	787 #endif
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	788
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	789 if (ffname == NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	790 return NULL;
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 #ifdef HAVE_READLINK
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	793 /* Expand symlink in the file name, so that we put the undo file with the
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	794 * actual file instead of with the symlink. */
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	795 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	796 ffname = fname_buf;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	797 #endif
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 /* Loop over 'undodir'. When reading find the first file that exists.
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	800 * When not reading use the first directory that exists or ".". */
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	801 dirp = p_udir;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	802 while (*dirp != NUL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	803 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	804 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	805 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	806 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	807 /* Use same directory as the ffname,
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	808 * "dir/name" -> "dir/.name.un~" */
2217 120502692d82 Improve the MS-Windows installer. Bram Moolenaar <bram@vim.org> parents: 2215 diff changeset	809 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	810 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	811 break;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	812 p = gettail(undo_file_name);
5704 47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	813 #ifdef VMS
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	814 /* VMS can not handle more than one dot in the filenames
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	815 * use "dir/name" -> "dir/_un_name" - add _un_
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	816 * at the beginning to keep the extension */
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	817 mch_memmove(p + 4, p, STRLEN(p) + 1);
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	818 mch_memmove(p, "_un_", 4);
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	819
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	820 #else
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	821 /* Use same directory as the ffname,
47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	822 * "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	823 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	824 *p = '.';
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	825 STRCAT(p, ".un~");
5704 47a673b20e49 updated for version 7.4.197 Bram Moolenaar <bram@vim.org> parents: 5621 diff changeset	826 #endif
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	827 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	828 else
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 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	831 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	832 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	833 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	834 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	835 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	836 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	837 return NULL;
11127 506f5d8b7d8b patch 8.0.0451: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 11121 diff changeset	838 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	839 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	840 *p = '%';
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	841 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	842 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	843 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	844 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	845
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	846 /* When reading check if the file exists. */
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	847 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	848 \|\| 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	849 break;
13244 ac42c4b11dbc patch 8.0.1496: clearing a pointer takes two lines Christian Brabandt <cb@256bit.org> parents: 13138 diff changeset	850 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	851 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	852
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	853 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	854 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	855 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	856
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	857 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	858 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	859 {
2271 2b33a7678e7b Fix compiler warnings for shadowed variables. Make 'conceal' a long instead Bram Moolenaar <bram@vim.org> parents: 2267 diff changeset	860 EMSG3(_("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	861 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	862
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	863 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	864 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	865 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	866 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	867 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	868
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	869 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	870 while (uep != NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	871 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	872 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	873 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	874 uep = nuep;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	875 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	876 vim_free(uhp);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	877 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	878
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	879 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	880 * 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	881 * Buffers and encrypts as needed.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	882 * Returns OK or FAIL.
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	883 */
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	884 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	885 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	886 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	887 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	888 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	889 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	890 size_t len_todo = len;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	891 char_u *p = ptr;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	892
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	893 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	894 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	895 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	896
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	897 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	898 len_todo -= n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	899 p += n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	900 bi->bi_used = CRYPT_BUF_SIZE;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	901 if (undo_flush(bi) == FAIL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	902 return FAIL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	903 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	904 if (len_todo > 0)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	905 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	906 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	907 bi->bi_used += len_todo;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	908 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	909 return OK;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	910 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	911 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	912 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	913 return FAIL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	914 return OK;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	915 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	916
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	917 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	918 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	919 undo_flush(bufinfo_T *bi)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	920 {
12216 e971ef6c0dee patch 8.0.0988: warning from Covscan about using NULL pointer Christian Brabandt <cb@256bit.org> parents: 11957 diff changeset	921 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	922 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	923 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	924 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	925 return FAIL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	926 bi->bi_used = 0;
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 return OK;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	929 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	930 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	931
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	932 /*
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	933 * 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	934 * Returns OK or FAIL.
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 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	937 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	938 {
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	939 #ifdef FEAT_CRYPT
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	940 char_u *copy;
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	941 char_u small_buf[100];
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	942 size_t i;
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	943
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	944 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	945 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	946 /* crypting every piece of text separately */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	947 if (len < 100)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	948 copy = small_buf; /* no malloc()/free() for short strings */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	949 else
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	950 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	951 copy = lalloc(len, FALSE);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	952 if (copy == NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	953 return 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	954 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	955 crypt_encode(bi->bi_state, ptr, len, copy);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	956 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	957 if (copy != small_buf)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	958 vim_free(copy);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	959 return i == 1 ? OK : FAIL;
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	960 }
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	961 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	962 return undo_write(bi, ptr, len);
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
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	965 /*
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	966 * Write a number, MSB first, in "len" bytes.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	967 * Must match with undo_read_?c() functions.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	968 * Returns OK or FAIL.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	969 */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	970 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	971 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	972 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	973 char_u buf[8];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	974 int i;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	975 int bufi = 0;
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 for (i = len - 1; i >= 0; --i)
6132 0242c27e40e1 updated for version 7.4.404 Bram Moolenaar <bram@vim.org> parents: 6128 diff changeset	978 buf[bufi++] = (char_u)(nr >> (i * 8));
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	979 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	980 }
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	981
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	982 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	983 * 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	984 * 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	985 * pointers when reading. */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	986 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	987 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	988 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	989 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	990 }
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 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	993 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	994 {
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	995 #ifdef FEAT_CRYPT
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	996 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	997 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	998 char_u buf[4];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	999 int n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1000
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1001 undo_read(bi, buf, (size_t)4);
6216 f1ba154c3a12 updated for version 7.4.443 Bram Moolenaar <bram@vim.org> parents: 6132 diff changeset	1002 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	1003 return n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1004 }
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1005 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1006 return get4c(bi->bi_fp);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1007 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1008
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1009 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1010 undo_read_2c(bufinfo_T *bi)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1011 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1012 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1013 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1014 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1015 char_u buf[2];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1016 int n;
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 undo_read(bi, buf, (size_t)2);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1019 n = (buf[0] << 8) + buf[1];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1020 return n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1021 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1022 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1023 return get2c(bi->bi_fp);
2266 ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1024 }
ae2e615a7320 Fix tiny build, move functions to undo.c. Bram Moolenaar <bram@vim.org> parents: 2262 diff changeset	1025
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1026 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1027 undo_read_byte(bufinfo_T *bi)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1028 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1029 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1030 if (bi->bi_buffer != NULL)
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 char_u buf[1];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1033
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1034 undo_read(bi, buf, (size_t)1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1035 return buf[0];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1036 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1037 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1038 return getc(bi->bi_fp);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1039 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1040
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1041 static time_t
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1042 undo_read_time(bufinfo_T *bi)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1043 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1044 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1045 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1046 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1047 char_u buf[8];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1048 time_t n = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1049 int i;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1050
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1051 undo_read(bi, buf, (size_t)8);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1052 for (i = 0; i < 8; ++i)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1053 n = (n << 8) + buf[i];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1054 return n;
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 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1057 return get8ctime(bi->bi_fp);
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
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1060 /*
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1061 * Read "buffer[size]" from the undo file.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1062 * Return OK or FAIL.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1063 */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1064 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1065 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	1066 {
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	1067 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	1068
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1069 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1070 if (bi->bi_buffer != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1071 {
6132 0242c27e40e1 updated for version 7.4.404 Bram Moolenaar <bram@vim.org> parents: 6128 diff changeset	1072 int size_todo = (int)size;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1073 char_u *p = buffer;
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 while (size_todo > 0)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1076 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1077 size_t n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1078
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1079 if (bi->bi_used >= bi->bi_avail)
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 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	1082 if (n == 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1083 {
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	1084 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	1085 break;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1086 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1087 bi->bi_avail = n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1088 bi->bi_used = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1089 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	1090 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1091 n = size_todo;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1092 if (n > bi->bi_avail - bi->bi_used)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1093 n = bi->bi_avail - bi->bi_used;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1094 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	1095 bi->bi_used += n;
6132 0242c27e40e1 updated for version 7.4.404 Bram Moolenaar <bram@vim.org> parents: 6128 diff changeset	1096 size_todo -= (int)n;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1097 p += n;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1098 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1099 }
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	1100 else
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1101 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1102 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	1103 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	1104
7140ff4857eb patch 8.0.0636: when reading the undo file fails may use uninitialized data Christian Brabandt <cb@256bit.org> parents: 11158 diff changeset	1105 if (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	1106 /* Error may be checked for only later. Fill with zeros,
7140ff4857eb patch 8.0.0636: when reading the undo file fails may use uninitialized data Christian Brabandt <cb@256bit.org> parents: 11158 diff changeset	1107 * so that the reader won't use garbage. */
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 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	1109 return retval;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1110 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1111
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1112 /*
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1113 * 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	1114 * "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	1115 * Decrypt the bytes if needed.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1116 * Append a NUL.
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1117 * 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	1118 */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1119 static char_u *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1120 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	1121 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1122 char_u *ptr = alloc((unsigned)len + 1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1123
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1124 if (ptr != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1125 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1126 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	1127 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1128 vim_free(ptr);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1129 return NULL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1130 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1131 ptr[len] = NUL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1132 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1133 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	1134 crypt_decode_inplace(bi->bi_state, ptr, len);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1135 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1136 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1137 return ptr;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1138 }
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 /*
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1141 * 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	1142 */
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1143 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1144 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	1145 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1146 int len;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1147 buf_T *buf = bi->bi_buf;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1148 FILE *fp = bi->bi_fp;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1149 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	1150
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1151 /* Start writing, first the magic marker and undo info version. */
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1152 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	1153 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	1154
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1155 /* If the buffer is encrypted then all text bytes following will be
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1156 * encrypted. Numbers and other info is not crypted. */
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1157 #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	1158 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	1159 {
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1160 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	1161 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	1162
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1163 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	1164 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	1165 buf->b_p_key, &header, &header_len);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1166 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	1167 return FAIL;
2245 4e0124f5aee2 Optimize the blowfish crypt/decrypt code a bit more. Bram Moolenaar <bram@vim.org> parents: 2242 diff changeset	1168 len = (int)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	1169 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	1170 if (len != 1)
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	1171 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1172 crypt_free_state(bi->bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1173 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	1174 return FAIL;
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	1175 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1176
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1177 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	1178 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1179 bi->bi_buffer = alloc(CRYPT_BUF_SIZE);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1180 if (bi->bi_buffer == NULL)
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 crypt_free_state(bi->bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1183 bi->bi_state = NULL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1184 return FAIL;
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 bi->bi_used = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1187 }
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1188 }
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1189 else
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1190 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1191 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	1192
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1193
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1194 /* Write a hash of the buffer text, so that we can verify it is still the
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1195 * same when reading the buffer text. */
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1196 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	1197 return FAIL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1198
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1199 /* buffer-specific data */
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1200 undo_write_bytes(bi, (long_u)buf->b_ml.ml_line_count, 4);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1201 len = buf->b_u_line_ptr != NULL ? (int)STRLEN(buf->b_u_line_ptr) : 0;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1202 undo_write_bytes(bi, (long_u)len, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1203 if (len > 0 && fwrite_crypt(bi, buf->b_u_line_ptr, (size_t)len) == FAIL)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1204 return FAIL;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1205 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	1206 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	1207
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1208 /* Undo structures header data */
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1209 put_header_ptr(bi, buf->b_u_oldhead);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1210 put_header_ptr(bi, buf->b_u_newhead);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1211 put_header_ptr(bi, buf->b_u_curhead);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1212
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1213 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	1214 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	1215 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	1216 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	1217 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	1218
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1219 /* Optional fields. */
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1220 undo_write_bytes(bi, 4, 1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1221 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	1222 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	1223
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1224 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	1225
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1226 return OK;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1227 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1228
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1229 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1230 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	1231 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1232 int i;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1233 u_entry_T *uep;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1234 char_u time_buf[8];
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1235
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1236 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	1237 return FAIL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1238
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1239 put_header_ptr(bi, uhp->uh_next.ptr);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1240 put_header_ptr(bi, uhp->uh_prev.ptr);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1241 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	1242 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	1243 undo_write_bytes(bi, uhp->uh_seq, 4);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1244 serialize_pos(bi, uhp->uh_cursor);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1245 #ifdef FEAT_VIRTUALEDIT
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1246 undo_write_bytes(bi, (long_u)uhp->uh_cursor_vcol, 4);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1247 #else
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1248 undo_write_bytes(bi, (long_u)0, 4);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1249 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1250 undo_write_bytes(bi, (long_u)uhp->uh_flags, 2);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1251 /* Assume NMARKS will stay the same. */
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1252 for (i = 0; i < NMARKS; ++i)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1253 serialize_pos(bi, uhp->uh_namedm[i]);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1254 serialize_visualinfo(bi, &uhp->uh_visual);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1255 time_to_bytes(uhp->uh_time, time_buf);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1256 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	1257
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1258 /* Optional fields. */
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1259 undo_write_bytes(bi, 4, 1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1260 undo_write_bytes(bi, UHP_SAVE_NR, 1);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1261 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	1262
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1263 undo_write_bytes(bi, 0, 1); /* end marker */
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1264
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1265 /* Write all the entries. */
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1266 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	1267 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1268 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	1269 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	1270 return FAIL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1271 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1272 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	1273 return OK;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1274 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1275
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1276 static u_header_T *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1277 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	1278 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1279 u_header_T *uhp;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1280 int i;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1281 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	1282 int c;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1283 int error;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1284
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1285 uhp = (u_header_T *)U_ALLOC_LINE(sizeof(u_header_T));
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1286 if (uhp == NULL)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1287 return NULL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1288 vim_memset(uhp, 0, sizeof(u_header_T));
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1289 #ifdef U_DEBUG
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1290 uhp->uh_magic = UH_MAGIC;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1291 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1292 uhp->uh_next.seq = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1293 uhp->uh_prev.seq = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1294 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	1295 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	1296 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	1297 if (uhp->uh_seq <= 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1298 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1299 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	1300 vim_free(uhp);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1301 return NULL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1302 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1303 unserialize_pos(bi, &uhp->uh_cursor);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1304 #ifdef FEAT_VIRTUALEDIT
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1305 uhp->uh_cursor_vcol = undo_read_4c(bi);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1306 #else
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1307 (void)undo_read_4c(bi);
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1308 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1309 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	1310 for (i = 0; i < NMARKS; ++i)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1311 unserialize_pos(bi, &uhp->uh_namedm[i]);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1312 unserialize_visualinfo(bi, &uhp->uh_visual);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1313 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	1314
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1315 /* Optional fields. */
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1316 for (;;)
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1317 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1318 int len = undo_read_byte(bi);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1319 int what;
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1320
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1321 if (len == 0)
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1322 break;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1323 what = undo_read_byte(bi);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1324 switch (what)
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1325 {
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1326 case UHP_SAVE_NR:
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1327 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	1328 break;
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1329 default:
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1330 /* field not supported, skip */
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1331 while (--len >= 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1332 (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	1333 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1334 }
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1335
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1336 /* Unserialize the uep list. */
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1337 last_uep = NULL;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1338 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	1339 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1340 error = FALSE;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1341 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	1342 if (last_uep == NULL)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1343 uhp->uh_entry = uep;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1344 else
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1345 last_uep->ue_next = uep;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1346 last_uep = uep;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1347 if (uep == NULL \|\| error)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1348 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1349 u_free_uhp(uhp);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1350 return NULL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1351 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1352 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1353 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	1354 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1355 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	1356 u_free_uhp(uhp);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1357 return NULL;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1358 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1359
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1360 return uhp;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1361 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1362
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1363 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1364 * Serialize "uep".
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1365 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1366 static int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1367 serialize_uep(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1368 bufinfo_T *bi,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1369 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	1370 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1371 int i;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1372 size_t len;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1373
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1374 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	1375 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	1376 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	1377 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	1378 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	1379 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1380 len = STRLEN(uep->ue_array[i]);
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1381 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	1382 return FAIL;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1383 if (len > 0 && fwrite_crypt(bi, uep->ue_array[i], len) == FAIL)
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1384 return FAIL;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1385 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1386 return OK;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1387 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1388
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1389 static u_entry_T *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1390 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	1391 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1392 int i;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1393 u_entry_T *uep;
10978 f3d64d9e5d76 patch 8.0.0378: possible overflow when reading corrupted undo file Christian Brabandt <cb@256bit.org> parents: 10976 diff changeset	1394 char_u **array = NULL;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1395 char_u *line;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1396 int line_len;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1397
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1398 uep = (u_entry_T *)U_ALLOC_LINE(sizeof(u_entry_T));
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1399 if (uep == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1400 return NULL;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1401 vim_memset(uep, 0, sizeof(u_entry_T));
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1402 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1403 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	1404 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1405 uep->ue_top = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1406 uep->ue_bot = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1407 uep->ue_lcount = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1408 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	1409 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	1410 {
10978 f3d64d9e5d76 patch 8.0.0378: possible overflow when reading corrupted undo file Christian Brabandt <cb@256bit.org> parents: 10976 diff changeset	1411 if (uep->ue_size < LONG_MAX / (int)sizeof(char_u *))
f3d64d9e5d76 patch 8.0.0378: possible overflow when reading corrupted undo file Christian Brabandt <cb@256bit.org> parents: 10976 diff changeset	1412 array = (char_u *)U_ALLOC_LINE(sizeof(char_u ) * 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	1413 if (array == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1414 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1415 *error = TRUE;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1416 return uep;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1417 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1418 vim_memset(array, 0, sizeof(char_u ) uep->ue_size);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1419 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1420 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	1421
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1422 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	1423 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1424 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	1425 if (line_len >= 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1426 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	1427 else
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1428 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1429 line = NULL;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1430 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	1431 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1432 if (line == NULL)
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 *error = TRUE;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1435 return uep;
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 array[i] = line;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1438 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1439 return uep;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1440 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1441
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1442 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1443 * Serialize "pos".
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1444 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1445 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1446 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	1447 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1448 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	1449 undo_write_bytes(bi, (long_u)pos.col, 4);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1450 #ifdef FEAT_VIRTUALEDIT
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1451 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	1452 #else
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1453 undo_write_bytes(bi, (long_u)0, 4);
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1454 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1455 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1456
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1457 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1458 * 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	1459 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1460 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1461 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	1462 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1463 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	1464 if (pos->lnum < 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1465 pos->lnum = 0;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1466 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	1467 if (pos->col < 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1468 pos->col = 0;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1469 #ifdef FEAT_VIRTUALEDIT
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1470 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	1471 if (pos->coladd < 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1472 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	1473 #else
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1474 (void)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	1475 #endif
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
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1478 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1479 * Serialize "info".
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1480 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1481 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1482 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	1483 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1484 serialize_pos(bi, info->vi_start);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1485 serialize_pos(bi, info->vi_end);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1486 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	1487 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	1488 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1489
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1490 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1491 * 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	1492 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1493 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1494 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	1495 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1496 unserialize_pos(bi, &info->vi_start);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1497 unserialize_pos(bi, &info->vi_end);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1498 info->vi_mode = undo_read_4c(bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1499 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	1500 }
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 /*
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1503 * 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	1504 * 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	1505 * 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	1506 * "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	1507 * permissions.
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1508 * "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	1509 * "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	1510 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1511 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1512 u_write_undo(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1513 char_u *name,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1514 int forceit,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1515 buf_T *buf,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1516 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	1517 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1518 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	1519 char_u *file_name;
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1520 int mark;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1521 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1522 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	1523 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1524 int fd;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1525 FILE *fp = NULL;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1526 int perm;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1527 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	1528 #ifdef UNIX
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1529 int st_old_valid = FALSE;
9387 f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	1530 stat_T st_old;
f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	1531 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	1532 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1533 bufinfo_T bi;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1534
6128 3aa37ad2c4ed updated for version 7.4.402 Bram Moolenaar <bram@vim.org> parents: 6122 diff changeset	1535 vim_memset(&bi, 0, sizeof(bi));
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1536
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1537 if (name == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1538 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1539 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	1540 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	1541 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1542 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	1543 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1544 verbose_enter();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1545 smsg((char_u *)
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1546 _("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	1547 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1548 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1549 return;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1550 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1551 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1552 else
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1553 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	1554
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 * 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	1557 * 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	1558 * 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	1559 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1560 perm = 0600;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1561 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	1562 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1563 #ifdef UNIX
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1564 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	1565 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1566 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	1567 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	1568 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1569 #else
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1570 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	1571 if (perm < 0)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1572 perm = 0600;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1573 #endif
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
6771 63b2bc619d5a patch 7.4.707 Bram Moolenaar <bram@vim.org> parents: 6616 diff changeset	1576 /* strip any s-bit and executable bit */
63b2bc619d5a patch 7.4.707 Bram Moolenaar <bram@vim.org> parents: 6616 diff changeset	1577 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	1578
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1579 /* If the undo file already exists, verify that it actually is an undo
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1580 * file, and delete it. */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1581 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	1582 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1583 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	1584 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1585 /* Check we can read it and it's an undo file. */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1586 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	1587 if (fd < 0)
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 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	1590 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1591 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	1592 verbose_enter();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1593 smsg((char_u *)
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1594 _("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	1595 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	1596 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	1597 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1598 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1599 goto theend;
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 else
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1602 {
2271 2b33a7678e7b Fix compiler warnings for shadowed variables. Make 'conceal' a long instead Bram Moolenaar <bram@vim.org> parents: 2267 diff changeset	1603 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	1604 int len;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1605
2664 033e7b49356c updated for version 7.3.083 Bram Moolenaar <bram@vim.org> parents: 2627 diff changeset	1606 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	1607 close(fd);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1608 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	1609 \|\| 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	1610 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1611 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	1612 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1613 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	1614 verbose_enter();
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1615 smsg((char_u *)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1616 _("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	1617 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	1618 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	1619 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1620 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1621 goto theend;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1622 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1623 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1624 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1625 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	1626 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1627
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1628 /* If there is no undo information at all, quit here after deleting any
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1629 * existing undo file. */
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1630 if (buf->b_u_numhead == 0 && buf->b_u_line_ptr == NULL)
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1631 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1632 if (p_verbose > 0)
2262 771f21e35ec5 Minor typo and docs update. Bram Moolenaar <bram@vim.org> parents: 2251 diff changeset	1633 verb_msg((char_u *)_("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	1634 goto theend;
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1635 }
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 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	1638 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	1639 if (fd < 0)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1640 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1641 EMSG2(_(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	1642 goto theend;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1643 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1644 (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	1645 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	1646 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1647 verbose_enter();
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1648 smsg((char_u *)_("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	1649 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1650 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1651
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1652 #ifdef U_DEBUG
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1653 /* 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	1654 u_check(FALSE);
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1655 #endif
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1656
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1657 #ifdef UNIX
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1658 /*
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1659 * 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	1660 * 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	1661 * 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	1662 */
2367 76b7ba68a098 Fix build problem when fchown() not available. (Gary Johnson) Bram Moolenaar <bram@vim.org> parents: 2348 diff changeset	1663 if (st_old_valid
76b7ba68a098 Fix build problem when fchown() not available. (Gary Johnson) Bram Moolenaar <bram@vim.org> parents: 2348 diff changeset	1664 && 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	1665 && st_new.st_gid != st_old.st_gid
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1666 # 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	1667 && 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	1668 # endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1669 )
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1670 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	1671 # 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	1672 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	1673 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	1674 # endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1675 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1676
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1677 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	1678 if (fp == NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1679 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1680 EMSG2(_(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	1681 close(fd);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1682 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	1683 goto theend;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1684 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1685
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1686 /* Undo must be synced. */
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1687 u_sync(TRUE);
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	1688
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1689 /*
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1690 * 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	1691 */
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1692 bi.bi_buf = buf;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1693 bi.bi_fp = fp;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1694 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	1695 goto write_error;
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 /*
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1698 * 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	1699 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1700 mark = ++lastmark;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1701 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	1702 while (uhp != NULL)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1703 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1704 /* Serialize current UHP if we haven't seen it */
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1705 if (uhp->uh_walk != mark)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1706 {
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1707 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	1708 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1709 ++headers_written;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1710 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1711 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	1712 goto write_error;
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1713 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1714
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1715 /* Now walk through the tree - algorithm from undo_time(). */
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1716 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	1717 uhp = uhp->uh_prev.ptr;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1718 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	1719 && 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	1720 uhp = uhp->uh_alt_next.ptr;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1721 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	1722 && uhp->uh_next.ptr->uh_walk != mark)
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1723 uhp = uhp->uh_next.ptr;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1724 else if (uhp->uh_alt_prev.ptr != NULL)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1725 uhp = uhp->uh_alt_prev.ptr;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1726 else
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1727 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	1728 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1729
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1730 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	1731 write_ok = TRUE;
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1732 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1733 if (headers_written != buf->b_u_numhead)
4827 60301d4d1682 updated for version 7.3.1160 Bram Moolenaar <bram@vim.org> parents: 4303 diff changeset	1734 {
60301d4d1682 updated for version 7.3.1160 Bram Moolenaar <bram@vim.org> parents: 4303 diff changeset	1735 EMSGN("Written %ld headers, ...", headers_written);
60301d4d1682 updated for version 7.3.1160 Bram Moolenaar <bram@vim.org> parents: 4303 diff changeset	1736 EMSGN("... but numhead is %ld", buf->b_u_numhead);
60301d4d1682 updated for version 7.3.1160 Bram Moolenaar <bram@vim.org> parents: 4303 diff changeset	1737 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1738 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1739
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1740 #ifdef FEAT_CRYPT
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1741 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	1742 write_ok = FALSE;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1743 #endif
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1744
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1745 write_error:
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1746 fclose(fp);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1747 if (!write_ok)
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1748 EMSG2(_("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	1749
12716 351cf7c67bbe patch 8.0.1236: Mac features are confusing Christian Brabandt <cb@256bit.org> parents: 12293 diff changeset	1750 #if defined(WIN3264)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1751 /* Copy file attributes; for systems where this can only be done after
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1752 * 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	1753 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	1754 (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	1755 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1756 #ifdef HAVE_ACL
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1757 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	1758 {
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1759 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	1760
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1761 /* For systems that support ACL: get the ACL from the original file. */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1762 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	1763 mch_set_acl(file_name, acl);
3545 74d51b51f3e6 updated for version 7.3.533 Bram Moolenaar <bram@vim.org> parents: 3194 diff changeset	1764 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	1765 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1766 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1767
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1768 theend:
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	1769 #ifdef FEAT_CRYPT
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1770 if (bi.bi_state != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1771 crypt_free_state(bi.bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1772 vim_free(bi.bi_buffer);
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	1773 #endif
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1774 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	1775 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	1776 }
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1777
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1778 /*
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1779 * 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	1780 * 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	1781 * 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	1782 * 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	1783 * "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	1784 */
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1785 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	1786 u_read_undo(char_u name, char_u hash, char_u *orig_name)
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1787 {
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1788 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	1789 FILE *fp;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1790 long version, str_len;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1791 char_u *line_ptr = NULL;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1792 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	1793 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	1794 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	1795 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	1796 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	1797 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	1798 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	1799 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	1800 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	1801 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	1802 int i, j;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1803 int c;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1804 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	1805 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	1806 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	1807 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	1808 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1809 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	1810 #endif
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1811 #ifdef UNIX
9387 f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	1812 stat_T st_orig;
f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe Christian Brabandt <cb@256bit.org> parents: 8568 diff changeset	1813 stat_T st_undo;
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1814 #endif
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1815 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	1816
6128 3aa37ad2c4ed updated for version 7.4.402 Bram Moolenaar <bram@vim.org> parents: 6122 diff changeset	1817 vim_memset(&bi, 0, sizeof(bi));
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1818 if (name == NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1819 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1820 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	1821 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	1822 return;
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1823
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1824 #ifdef UNIX
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1825 /* For safety we only read an undo file if the owner is equal to the
5343 00d61a47df66 updated for version 7.4.024 Bram Moolenaar <bram@vim.org> parents: 4827 diff changeset	1826 * 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	1827 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	1828 && 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	1829 && st_orig.st_uid != st_undo.st_uid
00d61a47df66 updated for version 7.4.024 Bram Moolenaar <bram@vim.org> parents: 4827 diff changeset	1830 && 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	1831 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1832 if (p_verbose > 0)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1833 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1834 verbose_enter();
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1835 smsg((char_u *)_("Not reading undo file, owner differs: %s"),
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1836 file_name);
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1837 verbose_leave();
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1838 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1839 return;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1840 }
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1841 #endif
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1842 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1843 else
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1844 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	1845
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1846 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	1847 {
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1848 verbose_enter();
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1849 smsg((char_u *)_("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	1850 verbose_leave();
4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1851 }
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1852
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1853 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	1854 if (fp == NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1855 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1856 if (name != NULL \|\| p_verbose > 0)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1857 EMSG2(_("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	1858 goto error;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1859 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1860 bi.bi_buf = curbuf;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1861 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	1862
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1863 /*
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1864 * 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	1865 */
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1866 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	1867 \|\| 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	1868 {
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1869 EMSG2(_("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	1870 goto error;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1871 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1872 version = get2c(fp);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1873 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	1874 {
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1875 #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	1876 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	1877 {
646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file. Bram Moolenaar <bram@vim.org> parents: 2245 diff changeset	1878 EMSG2(_("E832: Non-encrypted file has encrypted undo file: %s"),
646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file. Bram Moolenaar <bram@vim.org> parents: 2245 diff changeset	1879 file_name);
646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file. Bram Moolenaar <bram@vim.org> parents: 2245 diff changeset	1880 goto error;
646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file. Bram Moolenaar <bram@vim.org> parents: 2245 diff changeset	1881 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1882 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	1883 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	1884 {
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1885 EMSG2(_("E826: Undo file decryption failed: %s"), file_name);
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1886 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	1887 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1888 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	1889 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1890 bi.bi_buffer = alloc(CRYPT_BUF_SIZE);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1891 if (bi.bi_buffer == NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1892 {
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1893 crypt_free_state(bi.bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1894 bi.bi_state = NULL;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1895 goto error;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1896 }
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1897 bi.bi_avail = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1898 bi.bi_used = 0;
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1899 }
2239 732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1900 #else
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1901 EMSG2(_("E827: Undo file is encrypted: %s"), file_name);
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1902 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	1903 #endif
732cb7b31956 Crypt the text in the undo file if the file itself is crypted. Bram Moolenaar <bram@vim.org> parents: 2238 diff changeset	1904 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1905 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	1906 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1907 EMSG2(_("E824: Incompatible undo file: %s"), file_name);
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1908 goto error;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1909 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1910
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1911 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	1912 {
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	1913 corruption_error("hash", file_name);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1914 goto error;
2229 d45902a5c61c Fix a few more things for persistent undo. Bram Moolenaar <bram@vim.org> parents: 2223 diff changeset	1915 }
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1916 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	1917 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	1918 \|\| 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	1919 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1920 if (p_verbose > 0 \|\| name != NULL)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1921 {
2235 4ba83ae8d505 Do not write an undo file if there is nothing to undo. Bram Moolenaar <bram@vim.org> parents: 2234 diff changeset	1922 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	1923 verbose_enter();
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1924 give_warning((char_u *)
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1925 _("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	1926 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	1927 verbose_leave();
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1928 }
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1929 goto error;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1930 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1931
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1932 /* Read undo data for "U" command. */
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1933 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	1934 if (str_len < 0)
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	1935 goto error;
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1936 if (str_len > 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1937 line_ptr = read_string_decrypt(&bi, str_len);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1938 line_lnum = (linenr_T)undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1939 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	1940 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	1941 {
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1942 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	1943 goto error;
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1944 }
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1945
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1946 /* Begin general undo data */
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1947 old_header_seq = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1948 new_header_seq = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1949 cur_header_seq = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1950 num_head = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1951 seq_last = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1952 seq_cur = undo_read_4c(&bi);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1953 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	1954
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1955 /* Optional header fields. */
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1956 for (;;)
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1957 {
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1958 int len = undo_read_byte(&bi);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1959 int what;
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1960
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1961 if (len == 0 \|\| len == EOF)
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1962 break;
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1963 what = undo_read_byte(&bi);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1964 switch (what)
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1965 {
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1966 case UF_LAST_SAVE_NR:
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1967 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	1968 break;
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1969 default:
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1970 /* field not supported, skip */
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1971 while (--len >= 0)
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1972 (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	1973 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2311 diff changeset	1974 }
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	1975
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1976 /* uhp_table will store the freshly created undo headers we allocate
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1977 * until we insert them into curbuf. The table remains sorted by the
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	1978 * sequence numbers of the headers.
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	1979 * When there are no headers uhp_table is NULL. */
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	1980 if (num_head > 0)
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	1981 {
10976 f97a72ad8ffa patch 8.0.0377: possible overflow when reading corrupted undo file Christian Brabandt <cb@256bit.org> parents: 10631 diff changeset	1982 if (num_head < LONG_MAX / (long)sizeof(u_header_T *))
f97a72ad8ffa patch 8.0.0377: possible overflow when reading corrupted undo file Christian Brabandt <cb@256bit.org> parents: 10631 diff changeset	1983 uhp_table = (u_header_T **)U_ALLOC_LINE(
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	1984 num_head * sizeof(u_header_T *));
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	1985 if (uhp_table == NULL)
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	1986 goto error;
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	1987 }
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	1988
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1989 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	1990 {
2223 81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	1991 if (num_read_uhps >= num_head)
81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	1992 {
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1993 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	1994 goto error;
81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	1995 }
81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	1996
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	1997 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	1998 if (uhp == NULL)
3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	1999 goto error;
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2000 uhp_table[num_read_uhps++] = uhp;
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2001 }
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2002
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2003 if (num_read_uhps != num_head)
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2004 {
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2005 corruption_error("num_head", file_name);
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2006 goto error;
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2007 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2008 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	2009 {
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2010 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	2011 goto error;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2012 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2013
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2014 #ifdef U_DEBUG
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2015 uhp_table_used = (int *)alloc_clear(
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2016 (unsigned)(sizeof(int) * num_head + 1));
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2017 # 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	2018 #else
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2019 # 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	2020 #endif
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2021
2238 3d0a7beb0d75 Made reading/writing undo info a bit more robust. Bram Moolenaar <bram@vim.org> parents: 2236 diff changeset	2022 /* We have put all of the headers into a table. Now we iterate through the
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2023 * table and swizzle each sequence number we have stored in uh_*_seq into
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2024 * 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	2025 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	2026 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2027 uhp = uhp_table[i];
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2028 if (uhp == NULL)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2029 continue;
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2030 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2031 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	2032 && 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	2033 {
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2034 corruption_error("duplicate uh_seq", file_name);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2035 goto error;
2233 43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2036 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2037 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2038 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	2039 && 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	2040 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2041 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	2042 SET_FLAG(j);
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2043 break;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2044 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2045 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2046 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	2047 && 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	2048 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2049 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	2050 SET_FLAG(j);
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2051 break;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2052 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2053 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2054 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	2055 && 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	2056 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2057 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	2058 SET_FLAG(j);
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2059 break;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2060 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2061 for (j = 0; j < num_head; j++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2062 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	2063 && 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	2064 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2065 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	2066 SET_FLAG(j);
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2067 break;
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2068 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2069 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	2070 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2071 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	2072 SET_FLAG(i);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2073 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2074 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	2075 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2076 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	2077 SET_FLAG(i);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2078 }
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2079 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	2080 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2081 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	2082 SET_FLAG(i);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2083 }
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2084 }
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2085
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2086 /* Now that we have read the undo info successfully, free the current undo
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2087 * 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	2088 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	2089 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	2090 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	2091 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	2092 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	2093 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	2094 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	2095 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	2096 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	2097 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	2098 curbuf->b_u_time_cur = seq_time;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2099 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	2100 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	2101
43cad213cb7f A bit of cleanup and simplification for undofile. Bram Moolenaar <bram@vim.org> parents: 2232 diff changeset	2102 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	2103 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	2104
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2105 #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	2106 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	2107 if (uhp_table_used[i] == 0)
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2108 EMSGN("uhp_table entry %ld not used, leaking memory", i);
aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2109 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	2110 u_check(TRUE);
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2111 #endif
2231 aa6412cab544 Various improvements to undo file code to make it more robust. Bram Moolenaar <bram@vim.org> parents: 2230 diff changeset	2112
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2113 if (name != NULL)
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2114 smsg((char_u *)_("Finished reading undo file %s"), file_name);
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2115 goto theend;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2116
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2117 error:
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2118 vim_free(line_ptr);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2119 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	2120 {
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2121 for (i = 0; i < num_read_uhps; i++)
ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2122 if (uhp_table[i] != NULL)
2223 81b83a19e127 More strict checks for the undo file. Bram Moolenaar <bram@vim.org> parents: 2222 diff changeset	2123 u_free_uhp(uhp_table[i]);
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2124 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	2125 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2126
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2127 theend:
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	2128 #ifdef FEAT_CRYPT
6122 18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2129 if (bi.bi_state != NULL)
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2130 crypt_free_state(bi.bi_state);
18ac55444b37 updated for version 7.4.399 Bram Moolenaar <bram@vim.org> parents: 5788 diff changeset	2131 vim_free(bi.bi_buffer);
2267 c08f91142c41 Crypt the swapfile. Bram Moolenaar <bram@vim.org> parents: 2266 diff changeset	2132 #endif
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2133 if (fp != NULL)
2311 ccda151dde4e Support completion for ":find". (Nazri Ramliy) Bram Moolenaar <bram@vim.org> parents: 2289 diff changeset	2134 fclose(fp);
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2135 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	2136 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	2137 return;
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2138 }
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2139
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2140 #endif /* FEAT_PERSISTENT_UNDO */
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2141
f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2142
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2143 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2144 * If 'cpoptions' contains 'u': Undo the previous undo or redo (vi compatible).
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2145 * If 'cpoptions' does not contain 'u': Always undo.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2146 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2147 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2148 u_undo(int count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2149 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2150 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2151 * If we get an undo command while executing a macro, we behave like the
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2152 * original vi. If this happens twice in one macro the result will not
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2153 * be compatible.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2154 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2155 if (curbuf->b_u_synced == FALSE)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2156 {
825 6675076019ae updated for version 7.0d vimboss parents: 810 diff changeset	2157 u_sync(TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2158 count = 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2159 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2160
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2161 if (vim_strchr(p_cpo, CPO_UNDO) == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2162 undo_undoes = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2163 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2164 undo_undoes = !undo_undoes;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2165 u_doit(count);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2166 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2167
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2168 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2169 * If 'cpoptions' contains 'u': Repeat the previous undo or redo.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2170 * If 'cpoptions' does not contain 'u': Always redo.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2171 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2172 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2173 u_redo(int count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2174 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2175 if (vim_strchr(p_cpo, CPO_UNDO) == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2176 undo_undoes = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2177 u_doit(count);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2178 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2179
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2180 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2181 * Undo or redo, depending on 'undo_undoes', 'count' times.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2182 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2183 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2184 u_doit(int startcount)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2185 {
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2186 int count = startcount;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2187
632 b6632d553df3 updated for version 7.0182 vimboss parents: 481 diff changeset	2188 if (!undo_allowed())
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2189 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2190
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2191 u_newcount = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2192 u_oldcount = 0;
179 7fd70926e2e1 updated for version 7.0055 vimboss parents: 168 diff changeset	2193 if (curbuf->b_ml.ml_flags & ML_EMPTY)
7fd70926e2e1 updated for version 7.0055 vimboss parents: 168 diff changeset	2194 u_oldcount = -1;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2195 while (count--)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2196 {
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2197 /* Do the change warning now, so that it triggers FileChangedRO when
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2198 * needed. This may cause the file to be reloaded, that must happen
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2199 * before we do anything, because it may change curbuf->b_u_curhead
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2200 * and more. */
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2201 change_warning(0);
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2202
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2203 if (undo_undoes)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2204 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2205 if (curbuf->b_u_curhead == NULL) /* first undo */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2206 curbuf->b_u_curhead = curbuf->b_u_newhead;
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	2207 else if (get_undolevel() > 0) /* multi level undo */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2208 /* get next undo */
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2209 curbuf->b_u_curhead = curbuf->b_u_curhead->uh_next.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2210 /* nothing to undo */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2211 if (curbuf->b_u_numhead == 0 \|\| curbuf->b_u_curhead == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2212 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2213 /* stick curbuf->b_u_curhead at end */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2214 curbuf->b_u_curhead = curbuf->b_u_oldhead;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2215 beep_flush();
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2216 if (count == startcount - 1)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2217 {
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2218 MSG(_("Already at oldest change"));
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2219 return;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2220 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2221 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2222 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2223
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2224 u_undoredo(TRUE);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2225 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2226 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2227 {
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	2228 if (curbuf->b_u_curhead == NULL \|\| get_undolevel() <= 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2229 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2230 beep_flush(); /* nothing to redo */
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2231 if (count == startcount - 1)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2232 {
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2233 MSG(_("Already at newest change"));
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2234 return;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2235 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2236 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2237 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2238
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2239 u_undoredo(FALSE);
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2240
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2241 /* Advance for next redo. Set "newhead" when at the end of the
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2242 * redoable changes. */
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2243 if (curbuf->b_u_curhead->uh_prev.ptr == NULL)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2244 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	2245 curbuf->b_u_curhead = curbuf->b_u_curhead->uh_prev.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2246 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2247 }
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2248 u_undo_end(undo_undoes, FALSE);
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2249 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2250
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2251 /*
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2252 * Undo or redo over the timeline.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2253 * 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	2254 * 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	2255 * seconds.
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2256 * When "file" is TRUE use "step" as a number of file writes.
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2257 * When "absolute" is TRUE use "step" as the sequence number to jump to.
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2258 * "sec" must be FALSE then.
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2259 */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2260 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2261 undo_time(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2262 long step,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2263 int sec,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2264 int file,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2265 int absolute)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2266 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2267 long target;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2268 long closest;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2269 long closest_start;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2270 long closest_seq = 0;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2271 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	2272 u_header_T *uhp = NULL;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2273 u_header_T *last;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2274 int mark;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2275 int nomark;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2276 int round;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2277 int dosec = sec;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2278 int dofile = file;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2279 int above = FALSE;
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	2280 int did_undo = TRUE;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2281
766 f0d0d3d3a1e2 updated for version 7.0225 vimboss parents: 758 diff changeset	2282 /* First make sure the current undoable change is synced. */
f0d0d3d3a1e2 updated for version 7.0225 vimboss parents: 758 diff changeset	2283 if (curbuf->b_u_synced == FALSE)
825 6675076019ae updated for version 7.0d vimboss parents: 810 diff changeset	2284 u_sync(TRUE);
766 f0d0d3d3a1e2 updated for version 7.0225 vimboss parents: 758 diff changeset	2285
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2286 u_newcount = 0;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2287 u_oldcount = 0;
179 7fd70926e2e1 updated for version 7.0055 vimboss parents: 168 diff changeset	2288 if (curbuf->b_ml.ml_flags & ML_EMPTY)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2289 u_oldcount = -1;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2290
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2291 /* "target" is the node below which we want to be.
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2292 * Init "closest" to a value we can't reach. */
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2293 if (absolute)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2294 {
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2295 target = step;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2296 closest = -1;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2297 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2298 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2299 {
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2300 if (dosec)
10518 de77fa909414 commit https://github.com/vim/vim/commit/cbd4de44e8d08fba3c09eb40ad6e36e83faf020a Christian Brabandt <cb@256bit.org> parents: 10359 diff changeset	2301 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	2302 else if (dofile)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2303 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2304 if (step < 0)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2305 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2306 /* Going back to a previous write. If there were changes after
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2307 * the last write, count that as moving one file-write, so
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2308 * that ":earlier 1f" undoes all changes since the last save. */
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2309 uhp = curbuf->b_u_curhead;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2310 if (uhp != NULL)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2311 uhp = uhp->uh_next.ptr;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2312 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2313 uhp = curbuf->b_u_newhead;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2314 if (uhp != NULL && uhp->uh_save_nr != 0)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2315 /* "uh_save_nr" was set in the last block, that means
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2316 * there were no changes since the last write */
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2317 target = curbuf->b_u_save_nr_cur + step;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2318 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2319 /* count the changes since the last write as one step */
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2320 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	2321 if (target <= 0)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2322 /* Go to before first write: before the oldest change. Use
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2323 * the sequence number for that. */
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2324 dofile = FALSE;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2325 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2326 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2327 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2328 /* Moving forward to a newer write. */
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2329 target = curbuf->b_u_save_nr_cur + step;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2330 if (target > curbuf->b_u_save_nr_last)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2331 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2332 /* Go to after last write: after the latest change. Use
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2333 * the sequence number for that. */
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2334 target = curbuf->b_u_seq_last + 1;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2335 dofile = FALSE;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2336 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2337 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2338 }
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2339 else
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2340 target = curbuf->b_u_seq_cur + step;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2341 if (step < 0)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2342 {
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2343 if (target < 0)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2344 target = 0;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2345 closest = -1;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2346 }
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2347 else
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2348 {
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2349 if (dosec)
10518 de77fa909414 commit https://github.com/vim/vim/commit/cbd4de44e8d08fba3c09eb40ad6e36e83faf020a Christian Brabandt <cb@256bit.org> parents: 10359 diff changeset	2350 closest = (long)(vim_time() + 1);
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2351 else if (dofile)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2352 closest = curbuf->b_u_save_nr_last + 2;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2353 else
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2354 closest = curbuf->b_u_seq_last + 2;
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2355 if (target >= closest)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2356 target = closest - 1;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2357 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2358 }
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2359 closest_start = closest;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2360 closest_seq = curbuf->b_u_seq_cur;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2361
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2362 /* When "target" is 0; Back to origin. */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2363 if (target == 0)
13138 0f906f414c69 patch 8.0.1443: compiler complains about uninitialized variable Christian Brabandt <cb@256bit.org> parents: 13134 diff changeset	2364 {
0f906f414c69 patch 8.0.1443: compiler complains about uninitialized variable Christian Brabandt <cb@256bit.org> parents: 13134 diff changeset	2365 mark = lastmark; /* avoid that GCC complains */
0f906f414c69 patch 8.0.1443: compiler complains about uninitialized variable Christian Brabandt <cb@256bit.org> parents: 13134 diff changeset	2366 goto target_zero;
0f906f414c69 patch 8.0.1443: compiler complains about uninitialized variable Christian Brabandt <cb@256bit.org> parents: 13134 diff changeset	2367 }
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2368
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2369 /*
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2370 * May do this twice:
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2371 * 1. Search for "target", update "closest" to the best match found.
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2372 * 2. If "target" not found search for "closest".
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2373 *
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2374 * When using the closest time we use the sequence number in the second
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2375 * round, because there may be several entries with the same time.
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2376 */
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2377 for (round = 1; round <= 2; ++round)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2378 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2379 /* Find the path from the current state to where we want to go. The
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2380 * desired state can be anywhere in the undo tree, need to go all over
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2381 * it. We put "nomark" in uh_walk where we have been without success,
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2382 * "mark" where it could possibly be. */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2383 mark = ++lastmark;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2384 nomark = ++lastmark;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2385
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2386 if (curbuf->b_u_curhead == NULL) /* at leaf of the tree */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2387 uhp = curbuf->b_u_newhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2388 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2389 uhp = curbuf->b_u_curhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2390
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2391 while (uhp != NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2392 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2393 uhp->uh_walk = mark;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2394 if (dosec)
10518 de77fa909414 commit https://github.com/vim/vim/commit/cbd4de44e8d08fba3c09eb40ad6e36e83faf020a Christian Brabandt <cb@256bit.org> parents: 10359 diff changeset	2395 val = (long)(uhp->uh_time);
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2396 else if (dofile)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2397 val = uhp->uh_save_nr;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2398 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2399 val = uhp->uh_seq;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2400
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2401 if (round == 1 && !(dofile && val == 0))
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2402 {
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2403 /* Remember the header that is closest to the target.
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2404 * It must be at least in the right direction (checked with
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2405 * "b_u_seq_cur"). When the timestamp is equal find the
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2406 * highest/lowest sequence number. */
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2407 if ((step < 0 ? uhp->uh_seq <= curbuf->b_u_seq_cur
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2408 : uhp->uh_seq > curbuf->b_u_seq_cur)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2409 && ((dosec && val == closest)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2410 ? (step < 0
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2411 ? uhp->uh_seq < closest_seq
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2412 : uhp->uh_seq > closest_seq)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2413 : closest == closest_start
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2414 \|\| (val > target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2415 ? (closest > target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2416 ? val - target <= closest - target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2417 : val - target <= target - closest)
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2418 : (closest > target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2419 ? target - val <= closest - target
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2420 : target - val <= target - closest))))
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2421 {
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2422 closest = val;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2423 closest_seq = uhp->uh_seq;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2424 }
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2425 }
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2426
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2427 /* Quit searching when we found a match. But when searching for a
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2428 * time we need to continue looking for the best uh_seq. */
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2429 if (target == val && !dosec)
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2430 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2431 target = uhp->uh_seq;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2432 break;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2433 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2434
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2435 /* 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	2436 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	2437 && 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	2438 uhp = uhp->uh_prev.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2439
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2440 /* 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	2441 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	2442 && 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	2443 && 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	2444 uhp = uhp->uh_alt_next.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2445
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2446 /* go up in the tree if we haven't been there and we are at the
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2447 * 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	2448 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	2449 && 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	2450 && uhp->uh_next.ptr->uh_walk != mark)
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2451 {
95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2452 /* If still at the start we don't go through this change. */
95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2453 if (uhp == curbuf->b_u_curhead)
95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2454 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	2455 uhp = uhp->uh_next.ptr;
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2456 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2457
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2458 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2459 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2460 /* need to backtrack; mark this node as useless */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2461 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	2462 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	2463 uhp = uhp->uh_alt_prev.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2464 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2465 uhp = uhp->uh_next.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2466 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2467 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2468
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2469 if (uhp != NULL) /* found it */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2470 break;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2471
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2472 if (absolute)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2473 {
2214 f8222d1f9a73 Included patch for persistent undo. Lots of changes and added test. Bram Moolenaar <bram@vim.org> parents: 2210 diff changeset	2474 EMSGN(_("E830: Undo number %ld not found"), step);
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2475 return;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2476 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2477
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2478 if (closest == closest_start)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2479 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2480 if (step < 0)
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2481 MSG(_("Already at oldest change"));
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2482 else
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2483 MSG(_("Already at newest change"));
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2484 return;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2485 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2486
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2487 target = closest_seq;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2488 dosec = FALSE;
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2489 dofile = FALSE;
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2490 if (step < 0)
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2491 above = TRUE; /* stop above the header */
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2492 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2493
13138 0f906f414c69 patch 8.0.1443: compiler complains about uninitialized variable Christian Brabandt <cb@256bit.org> parents: 13134 diff changeset	2494 target_zero:
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2495 /* 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	2496 if (uhp != NULL \|\| target == 0)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2497 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2498 /*
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2499 * First go up the tree as much as needed.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2500 */
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2501 while (!got_int)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2502 {
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2503 /* Do the change warning now, for the same reason as above. */
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2504 change_warning(0);
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2505
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2506 uhp = curbuf->b_u_curhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2507 if (uhp == NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2508 uhp = curbuf->b_u_newhead;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2509 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2510 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	2511 if (uhp == NULL \|\| (target > 0 && uhp->uh_walk != mark)
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2512 \|\| (uhp->uh_seq == target && !above))
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2513 break;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2514 curbuf->b_u_curhead = uhp;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2515 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	2516 if (target > 0)
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2517 uhp->uh_walk = nomark; /* don't go back down here */
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2518 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2519
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2520 /* When back to origin, redo is not needed. */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2521 if (target > 0)
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2522 {
13134 c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2523 /*
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2524 * 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	2525 */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2526 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	2527 {
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2528 /* Do the change warning now, for the same reason as above. */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2529 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	2530
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2531 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	2532 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	2533 break;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2534
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2535 /* Go back to the first branch with a mark. */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2536 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	2537 && 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	2538 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	2539
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2540 /* Find the last branch with a mark, that's the one. */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2541 last = uhp;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2542 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	2543 && 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	2544 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	2545 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	2546 {
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2547 /* Make the used branch the first entry in the list of
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2548 * alternatives to make "u" and CTRL-R take this branch. */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2549 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	2550 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	2551 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	2552 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	2553 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	2554 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	2555 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	2556 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	2557 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	2558 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	2559
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2560 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	2561 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	2562 uhp = last;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2563 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	2564 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	2565 }
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2566 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	2567
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2568 if (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	2569 break; /* must have reached the target */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2570
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2571 /* Stop when going backwards in time and didn't find the exact
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2572 * header we were looking for. */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2573 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	2574 {
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2575 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	2576 break;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2577 }
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2578
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2579 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	2580
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2581 /* Advance "curhead" to below the header we last used. If it
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2582 * becomes NULL then we need to set "newhead" to this leaf. */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2583 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	2584 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	2585 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	2586 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	2587
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2588 if (uhp->uh_seq == target) /* found it! */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2589 break;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2590
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2591 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	2592 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	2593 {
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2594 /* Need to redo more but can't find it... */
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2595 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	2596 break;
c4b5ad2b3596 patch 8.0.1441: using ":undo 0" leaves undo in wrong state Christian Brabandt <cb@256bit.org> parents: 13012 diff changeset	2597 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2598 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2599 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2600 }
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2601 u_undo_end(did_undo, absolute);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2602 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2603
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2604 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2605 * u_undoredo: common code for undo and redo
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2606 *
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2607 * 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	2608 * 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	2609 * list for the next undo/redo.
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2610 *
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2611 * 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	2612 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2613 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2614 u_undoredo(int undo)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2615 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2616 char_u **newarray = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2617 linenr_T oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2618 linenr_T newsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2619 linenr_T top, bot;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2620 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2621 linenr_T newlnum = MAXLNUM;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2622 long i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2623 u_entry_T uep, nuep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2624 u_entry_T *newlist = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2625 int old_flags;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2626 int new_flags;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2627 pos_T namedm[NMARKS];
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	2628 visualinfo_T visualinfo;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2629 int empty_buffer; /* buffer became empty */
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2630 u_header_T *curhead = curbuf->b_u_curhead;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2631
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2632 /* Don't want autocommands using the undo structures here, they are
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2633 * invalid till the end. */
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2634 block_autocmds();
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2635
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2636 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2637 u_check(FALSE);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2638 #endif
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2639 old_flags = curhead->uh_flags;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2640 new_flags = (curbuf->b_changed ? UH_CHANGED : 0) +
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2641 ((curbuf->b_ml.ml_flags & ML_EMPTY) ? UH_EMPTYBUF : 0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2642 setpcmark();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2643
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2644 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2645 * save marks before undo/redo
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2646 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2647 mch_memmove(namedm, curbuf->b_namedm, sizeof(pos_T) * NMARKS);
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	2648 visualinfo = curbuf->b_visual;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2649 curbuf->b_op_start.lnum = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2650 curbuf->b_op_start.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2651 curbuf->b_op_end.lnum = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2652 curbuf->b_op_end.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2653
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2654 for (uep = curhead->uh_entry; uep != NULL; uep = nuep)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2655 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2656 top = uep->ue_top;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2657 bot = uep->ue_bot;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2658 if (bot == 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2659 bot = curbuf->b_ml.ml_line_count + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2660 if (top > curbuf->b_ml.ml_line_count \|\| top >= bot
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2661 \|\| bot > curbuf->b_ml.ml_line_count + 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2662 {
2189 cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2663 unblock_autocmds();
10359 66f1b5bf3fa6 commit https://github.com/vim/vim/commit/95f096030ed1a8afea028f2ea295d6f6a70f466f Christian Brabandt <cb@256bit.org> parents: 10336 diff changeset	2664 IEMSG(_("E438: u_undo: line numbers wrong"));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2665 changed(); /* don't want UNCHANGED now */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2666 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2667 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2668
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2669 oldsize = bot - top - 1; /* number of lines before undo */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2670 newsize = uep->ue_size; /* number of lines after undo */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2671
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2672 if (top < newlnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2673 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2674 /* If the saved cursor is somewhere in this undo block, move it to
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2675 * the remembered position. Makes "gwap" put the cursor back
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2676 * where it was. */
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2677 lnum = curhead->uh_cursor.lnum;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2678 if (lnum >= top && lnum <= top + newsize + 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2679 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2680 curwin->w_cursor = curhead->uh_cursor;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2681 newlnum = curwin->w_cursor.lnum - 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2682 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2683 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2684 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2685 /* Use the first line that actually changed. Avoids that
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2686 * undoing auto-formatting puts the cursor in the previous
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2687 * line. */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2688 for (i = 0; i < newsize && i < oldsize; ++i)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2689 if (STRCMP(uep->ue_array[i], ml_get(top + 1 + i)) != 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2690 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2691 if (i == newsize && newlnum == MAXLNUM && uep->ue_next == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2692 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2693 newlnum = top;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2694 curwin->w_cursor.lnum = newlnum + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2695 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2696 else if (i < newsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2697 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2698 newlnum = top + i;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2699 curwin->w_cursor.lnum = newlnum + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2700 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2701 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2702 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2703
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2704 empty_buffer = FALSE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2705
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2706 /* delete the lines between top and bot and save them in newarray */
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	2707 if (oldsize > 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2708 {
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	2709 if ((newarray = (char_u **)U_ALLOC_LINE(
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2710 sizeof(char_u ) oldsize)) == NULL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2711 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2712 do_outofmem_msg((long_u)(sizeof(char_u ) oldsize));
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2713 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2714 * We have messed up the entry list, repair is impossible.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2715 * we have to free the rest of the list.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2716 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2717 while (uep != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2718 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2719 nuep = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2720 u_freeentry(uep, uep->ue_size);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2721 uep = nuep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2722 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2723 break;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2724 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2725 /* delete backwards, it goes faster in most cases */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2726 for (lnum = bot - 1, i = oldsize; --i >= 0; --lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2727 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2728 /* what can we do when we run out of memory? */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2729 if ((newarray[i] = u_save_line(lnum)) == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2730 do_outofmem_msg((long_u)0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2731 /* remember we deleted the last line in the buffer, and a
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2732 * dummy empty line will be inserted */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2733 if (curbuf->b_ml.ml_line_count == 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2734 empty_buffer = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2735 ml_delete(lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2736 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2737 }
414 8ab9c77240d4 updated for version 7.0108 vimboss parents: 407 diff changeset	2738 else
8ab9c77240d4 updated for version 7.0108 vimboss parents: 407 diff changeset	2739 newarray = NULL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2740
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2741 /* insert the lines in u_array between top and bot */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2742 if (newsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2743 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2744 for (lnum = top, i = 0; i < newsize; ++i, ++lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2745 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2746 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2747 * If the file is empty, there is an empty line 1 that we
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2748 * should get rid of, by replacing it with the new line
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2749 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2750 if (empty_buffer && lnum == 0)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2751 ml_replace((linenr_T)1, uep->ue_array[i], TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2752 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2753 ml_append(lnum, uep->ue_array[i], (colnr_T)0, FALSE);
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2754 vim_free(uep->ue_array[i]);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2755 }
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	2756 vim_free((char_u *)uep->ue_array);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2757 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2758
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2759 /* adjust marks */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2760 if (oldsize != newsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2761 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2762 mark_adjust(top + 1, top + oldsize, (long)MAXLNUM,
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2763 (long)newsize - (long)oldsize);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2764 if (curbuf->b_op_start.lnum > top + oldsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2765 curbuf->b_op_start.lnum += newsize - oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2766 if (curbuf->b_op_end.lnum > top + oldsize)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2767 curbuf->b_op_end.lnum += newsize - oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2768 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2769
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2770 changed_lines(top + 1, 0, bot, newsize - oldsize);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2771
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2772 /* set '[ and '] mark */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2773 if (top + 1 < curbuf->b_op_start.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2774 curbuf->b_op_start.lnum = top + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2775 if (newsize == 0 && top + 1 > curbuf->b_op_end.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2776 curbuf->b_op_end.lnum = top + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2777 else if (top + newsize > curbuf->b_op_end.lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2778 curbuf->b_op_end.lnum = top + newsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2779
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2780 u_newcount += newsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2781 u_oldcount += oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2782 uep->ue_size = oldsize;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2783 uep->ue_array = newarray;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2784 uep->ue_bot = top + newsize + 1;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2785
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2786 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2787 * insert this entry in front of the new entry list
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2788 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2789 nuep = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2790 uep->ue_next = newlist;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2791 newlist = uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2792 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2793
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2794 curhead->uh_entry = newlist;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2795 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	2796 if ((old_flags & UH_EMPTYBUF) && BUFEMPTY())
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2797 curbuf->b_ml.ml_flags \|= ML_EMPTY;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2798 if (old_flags & UH_CHANGED)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2799 changed();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2800 else
33 f6033dcbaf31 updated for version 7.0020 vimboss parents: 7 diff changeset	2801 #ifdef FEAT_NETBEANS_INTG
f6033dcbaf31 updated for version 7.0020 vimboss parents: 7 diff changeset	2802 /* per netbeans undo rules, keep it as modified */
f6033dcbaf31 updated for version 7.0020 vimboss parents: 7 diff changeset	2803 if (!isNetbeansModified(curbuf))
f6033dcbaf31 updated for version 7.0020 vimboss parents: 7 diff changeset	2804 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2805 unchanged(curbuf, FALSE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2806
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2807 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2808 * restore marks from before undo/redo
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2809 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2810 for (i = 0; i < NMARKS; ++i)
6616 290631797b76 updated for version 7.4.634 Bram Moolenaar <bram@vim.org> parents: 6216 diff changeset	2811 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2812 if (curhead->uh_namedm[i].lnum != 0)
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2813 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	2814 if (namedm[i].lnum != 0)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2815 curhead->uh_namedm[i] = namedm[i];
6616 290631797b76 updated for version 7.4.634 Bram Moolenaar <bram@vim.org> parents: 6216 diff changeset	2816 else
290631797b76 updated for version 7.4.634 Bram Moolenaar <bram@vim.org> parents: 6216 diff changeset	2817 curhead->uh_namedm[i].lnum = 0;
290631797b76 updated for version 7.4.634 Bram Moolenaar <bram@vim.org> parents: 6216 diff changeset	2818 }
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2819 if (curhead->uh_visual.vi_start.lnum != 0)
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	2820 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2821 curbuf->b_visual = curhead->uh_visual;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2822 curhead->uh_visual = visualinfo;
692 a28f83d37113 updated for version 7.0208 vimboss parents: 634 diff changeset	2823 }
7 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 * 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	2827 * before starting the change (for the "o" command).
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2828 * Otherwise the cursor should go to the first undone line.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2829 */
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2830 if (curhead->uh_cursor.lnum + 1 == curwin->w_cursor.lnum
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2831 && curwin->w_cursor.lnum > 1)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2832 --curwin->w_cursor.lnum;
2501 c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2833 if (curwin->w_cursor.lnum <= curbuf->b_ml.ml_line_count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2834 {
2501 c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2835 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	2836 {
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2837 curwin->w_cursor.col = curhead->uh_cursor.col;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2838 #ifdef FEAT_VIRTUALEDIT
2501 c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2839 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	2840 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	2841 else
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2842 curwin->w_cursor.coladd = 0;
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2843 #endif
c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2844 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2845 else
2501 c43e99e9baaf Fix: ml_get errors when using undo with 'virtualedit'. Bram Moolenaar <bram@vim.org> parents: 2482 diff changeset	2846 beginline(BL_SOL \| BL_FIX);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2847 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2848 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2849 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2850 /* We get here with the current cursor line being past the end (eg
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2851 * after adding lines at the end of the file, and then undoing it).
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2852 * check_cursor() will move the cursor to the last line. Move it to
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2853 * the first column here. */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2854 curwin->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2855 #ifdef FEAT_VIRTUALEDIT
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2856 curwin->w_cursor.coladd = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2857 #endif
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2858 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2859
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2860 /* Make sure the cursor is on an existing line and column. */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2861 check_cursor();
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2862
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2863 /* Remember where we are for "g-" and ":earlier 10s". */
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	2864 curbuf->b_u_seq_cur = curhead->uh_seq;
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2865 if (undo)
12827 ff494a964ab7 patch 8.0.1290: seq_cur of undotree() wrong after undo Christian Brabandt <cb@256bit.org> parents: 12716 diff changeset	2866 {
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2867 /* We are below the previous undo. However, to make ":earlier 1s"
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2868 * 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	2869 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	2870 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	2871 else
ff494a964ab7 patch 8.0.1290: seq_cur of undotree() wrong after undo Christian Brabandt <cb@256bit.org> parents: 12716 diff changeset	2872 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	2873 }
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2874
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2875 /* Remember where we are for ":earlier 1f" and ":later 1f". */
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2876 if (curhead->uh_save_nr != 0)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2877 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2878 if (undo)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2879 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	2880 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2881 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	2882 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	2883
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2884 /* The timestamp can be the same for multiple changes, just use the one of
f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2885 * 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	2886 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	2887
cb94c42c0e1a updated for version 7.2.445 Bram Moolenaar <bram@vim.org> parents: 2181 diff changeset	2888 unblock_autocmds();
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2889 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2890 u_check(FALSE);
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	2891 #endif
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2892 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2893
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2894 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2895 * If we deleted or added lines, report the number of less/more lines.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2896 * Otherwise, report the number of changes (this may be incorrect
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2897 * in some cases, but it's better than nothing).
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2898 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2899 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2900 u_undo_end(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2901 int did_undo, /* just did an undo */
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2902 int absolute) /* used ":undo N" */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2903 {
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2904 char *msgstr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2905 u_header_T *uhp;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2906 char_u msgbuf[80];
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2907
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2908 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2909 if ((fdo_flags & FDO_UNDO) && KeyTyped)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2910 foldOpenCursor();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2911 #endif
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2912
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2913 if (global_busy /* no messages now, wait until global is finished */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2914 \|\| !messaging()) /* 'lazyredraw' set, don't do messages now */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2915 return;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2916
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2917 if (curbuf->b_ml.ml_flags & ML_EMPTY)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2918 --u_newcount;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2919
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2920 u_oldcount -= u_newcount;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2921 if (u_oldcount == -1)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2922 msgstr = N_("more line");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2923 else if (u_oldcount < 0)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2924 msgstr = N_("more lines");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2925 else if (u_oldcount == 1)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2926 msgstr = N_("line less");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2927 else if (u_oldcount > 1)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2928 msgstr = N_("fewer lines");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2929 else
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2930 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2931 u_oldcount = u_newcount;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2932 if (u_newcount == 1)
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2933 msgstr = N_("change");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2934 else
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2935 msgstr = N_("changes");
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2936 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2937
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2938 if (curbuf->b_u_curhead != NULL)
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	2939 {
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2940 /* 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	2941 if (absolute && curbuf->b_u_curhead->uh_next.ptr != NULL)
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2942 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2943 uhp = curbuf->b_u_curhead->uh_next.ptr;
798 95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2944 did_undo = FALSE;
95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2945 }
95dac6af3b3a updated for version 7.0232 vimboss parents: 794 diff changeset	2946 else if (did_undo)
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	2947 uhp = curbuf->b_u_curhead;
f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	2948 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	2949 uhp = curbuf->b_u_curhead->uh_next.ptr;
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	2950 }
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2951 else
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2952 uhp = curbuf->b_u_newhead;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	2953
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2954 if (uhp == NULL)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2955 *msgbuf = NUL;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2956 else
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2957 u_add_time(msgbuf, sizeof(msgbuf), uhp->uh_time);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	2958
2282 a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	2959 #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	2960 {
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	2961 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	2962
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	2963 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	2964 {
2378 85b7dc8da5eb Add the 'concealcursor' option to decide when the cursor line is to be Bram Moolenaar <bram@vim.org> parents: 2367 diff changeset	2965 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	2966 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	2967 }
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	2968 }
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	2969 #endif
a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	2970
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	2971 smsg((char_u *)_("%ld %s; %s #%ld %s"),
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	2972 u_oldcount < 0 ? -u_oldcount : u_oldcount,
944 b2dcb8457067 updated for version 7.0-070 vimboss parents: 912 diff changeset	2973 _(msgstr),
794 f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	2974 did_undo ? _("before") : _("after"),
f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	2975 uhp == NULL ? 0L : uhp->uh_seq,
f19994020dad updated for version 7.0231 vimboss parents: 777 diff changeset	2976 msgbuf);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2977 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2978
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2979 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2980 * u_sync: stop adding to the current entry list
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2981 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2982 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2983 u_sync(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	2984 int force) /* Also sync when no_u_sync is set. */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2985 {
825 6675076019ae updated for version 7.0d vimboss parents: 810 diff changeset	2986 /* Skip it when already synced or syncing is disabled. */
6675076019ae updated for version 7.0d vimboss parents: 810 diff changeset	2987 if (curbuf->b_u_synced \|\| (!force && no_u_sync > 0))
6675076019ae updated for version 7.0d vimboss parents: 810 diff changeset	2988 return;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2989 #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	2990 if (p_imst == IM_ON_THE_SPOT && im_is_preediting())
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2991 return; /* XIM is busy, don't break an undo sequence */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2992 #endif
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	2993 if (get_undolevel() < 0)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2994 curbuf->b_u_synced = TRUE; /* no entries, nothing to do */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2995 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2996 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2997 u_getbot(); /* compute ue_bot of previous u_save */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2998 curbuf->b_u_curhead = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	2999 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3000 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3001
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3002 /*
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3003 * ":undolist": List the leafs of the undo tree
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3004 */
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3005 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3006 ex_undolist(exarg_T *eap UNUSED)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3007 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3008 garray_T ga;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3009 u_header_T *uhp;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3010 int mark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3011 int nomark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3012 int changes = 1;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3013 int i;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3014
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3015 /*
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3016 * 1: walk the tree to find all leafs, put the info in "ga".
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3017 * 2: sort the lines
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3018 * 3: display the list
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3019 */
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3020 mark = ++lastmark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3021 nomark = ++lastmark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3022 ga_init2(&ga, (int)sizeof(char *), 20);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3023
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3024 uhp = curbuf->b_u_oldhead;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3025 while (uhp != NULL)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3026 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3027 if (uhp->uh_prev.ptr == NULL && uhp->uh_walk != nomark
777 f664cc974a7a updated for version 7.0227 vimboss parents: 772 diff changeset	3028 && uhp->uh_walk != mark)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3029 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3030 if (ga_grow(&ga, 1) == FAIL)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3031 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	3032 vim_snprintf((char *)IObuff, IOSIZE, "%6ld %7d ",
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3033 uhp->uh_seq, changes);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3034 u_add_time(IObuff + STRLEN(IObuff), IOSIZE - STRLEN(IObuff),
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3035 uhp->uh_time);
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3036 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	3037 {
2627 fae6fb779a6b updated for version 7.3.048 Bram Moolenaar <bram@vim.org> parents: 2577 diff changeset	3038 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	3039 STRCAT(IObuff, " ");
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3040 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	3041 " %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	3042 }
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3043 ((char_u **)(ga.ga_data))[ga.ga_len++] = vim_strsave(IObuff);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3044 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3045
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3046 uhp->uh_walk = mark;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3047
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3048 /* 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	3049 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	3050 && uhp->uh_prev.ptr->uh_walk != mark)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3051 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3052 uhp = uhp->uh_prev.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3053 ++changes;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3054 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3055
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3056 /* 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	3057 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	3058 && 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	3059 && 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	3060 uhp = uhp->uh_alt_next.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3061
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3062 /* go up in the tree if we haven't been there and we are at the
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3063 * 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	3064 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	3065 && 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	3066 && uhp->uh_next.ptr->uh_walk != mark)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3067 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3068 uhp = uhp->uh_next.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3069 --changes;
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 else
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3073 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3074 /* need to backtrack; mark this node as done */
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3075 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	3076 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	3077 uhp = uhp->uh_alt_prev.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3078 else
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3079 {
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3080 uhp = uhp->uh_next.ptr;
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3081 --changes;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3082 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3083 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3084 }
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.ga_len == 0)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3087 MSG(_("Nothing to undo"));
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3088 else
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3089 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3090 sort_strings((char_u **)ga.ga_data, ga.ga_len);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3091
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3092 msg_start();
2627 fae6fb779a6b updated for version 7.3.048 Bram Moolenaar <bram@vim.org> parents: 2577 diff changeset	3093 msg_puts_attr((char_u *)_("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	3094 HL_ATTR(HLF_T));
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3095 for (i = 0; i < ga.ga_len && !got_int; ++i)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3096 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3097 msg_putchar('\n');
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3098 if (got_int)
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3099 break;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3100 msg_puts(((char_u **)ga.ga_data)[i]);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3101 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3102 msg_end();
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3103
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3104 ga_clear_strings(&ga);
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3105 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3106 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3107
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3108 /*
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3109 * Put the timestamp of an undo header in "buf[buflen]" in a nice format.
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3110 */
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3111 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3112 u_add_time(char_u *buf, size_t buflen, time_t tt)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3113 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3114 #ifdef HAVE_STRFTIME
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3115 struct tm *curtime;
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3116
9674 adc7212951ee commit https://github.com/vim/vim/commit/170b10b421f0c9fda08b7cfd3bb043c064f3659a Christian Brabandt <cb@256bit.org> parents: 9536 diff changeset	3117 if (vim_time() - tt >= 100)
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3118 {
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3119 curtime = localtime(&tt);
9674 adc7212951ee commit https://github.com/vim/vim/commit/170b10b421f0c9fda08b7cfd3bb043c064f3659a Christian Brabandt <cb@256bit.org> parents: 9536 diff changeset	3120 if (vim_time() - tt < (60L * 60L * 12L))
2627 fae6fb779a6b updated for version 7.3.048 Bram Moolenaar <bram@vim.org> parents: 2577 diff changeset	3121 /* within 12 hours */
fae6fb779a6b updated for version 7.3.048 Bram Moolenaar <bram@vim.org> parents: 2577 diff changeset	3122 (void)strftime((char *)buf, buflen, "%H:%M:%S", curtime);
fae6fb779a6b updated for version 7.3.048 Bram Moolenaar <bram@vim.org> parents: 2577 diff changeset	3123 else
3751 b7eea2409507 updated for version 7.3.634 Bram Moolenaar <bram@vim.org> parents: 3545 diff changeset	3124 /* longer ago */
2689 26fb122355d4 updated for version 7.3.107 Bram Moolenaar <bram@vim.org> parents: 2685 diff changeset	3125 (void)strftime((char *)buf, buflen, "%Y/%m/%d %H:%M:%S", curtime);
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3126 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3127 else
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3128 #endif
835 8bebcabccc2c updated for version 7.0e01 vimboss parents: 825 diff changeset	3129 vim_snprintf((char *)buf, buflen, _("%ld seconds ago"),
9674 adc7212951ee commit https://github.com/vim/vim/commit/170b10b421f0c9fda08b7cfd3bb043c064f3659a Christian Brabandt <cb@256bit.org> parents: 9536 diff changeset	3130 (long)(vim_time() - tt));
772 aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3131 }
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3132
aaaca5077255 updated for version 7.0226 vimboss parents: 766 diff changeset	3133 /*
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3134 * ":undojoin": continue adding to the last entry list
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3135 */
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3136 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3137 ex_undojoin(exarg_T *eap UNUSED)
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3138 {
839 1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3139 if (curbuf->b_u_newhead == NULL)
1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3140 return; /* nothing changed before */
1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3141 if (curbuf->b_u_curhead != NULL)
1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3142 {
1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3143 EMSG(_("E790: undojoin is not allowed after undo"));
1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3144 return;
1f3b1021f002 updated for version 7.0e05 vimboss parents: 835 diff changeset	3145 }
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3146 if (!curbuf->b_u_synced)
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3147 return; /* already unsynced */
5446 d0595545e98a updated for version 7.4.073 Bram Moolenaar <bram@vim.org> parents: 5343 diff changeset	3148 if (get_undolevel() < 0)
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3149 return; /* no entries, nothing to do */
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3150 else
10631 cbf17371627c patch 8.0.0205: wrong behavior after :undojoin Christian Brabandt <cb@256bit.org> parents: 10518 diff changeset	3151 /* Append next change to the last entry */
cbf17371627c patch 8.0.0205: wrong behavior after :undojoin Christian Brabandt <cb@256bit.org> parents: 10518 diff changeset	3152 curbuf->b_u_synced = FALSE;
697 f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3153 }
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3154
f08390485cd3 updated for version 7.0210 vimboss parents: 692 diff changeset	3155 /*
2394 a3aca345aafa Add the 'undoreload' option to be able to undo a file reload. Bram Moolenaar <bram@vim.org> parents: 2378 diff changeset	3156 * Called after writing or reloading the file and setting b_changed to FALSE.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3157 * Now an undo means that the buffer is modified.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3158 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3159 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3160 u_unchanged(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3161 {
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3162 u_unch_branch(buf->b_u_oldhead);
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3163 buf->b_did_warn = FALSE;
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3164 }
d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3165
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3166 /*
2482 88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3167 * 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	3168 * 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	3169 */
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3170 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3171 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	3172 {
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3173 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	3174 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	3175 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	3176
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3177 if (curbuf->b_u_curhead != NULL \|\| uhp == NULL)
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3178 return; /* undid something in an autocmd? */
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3179
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3180 /* Check that the last undo block was for the whole file. */
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3181 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	3182 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	3183 return;
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3184
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3185 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	3186 && lnum <= uep->ue_size; ++lnum)
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3187 if (STRCMP(ml_get_buf(curbuf, lnum, FALSE),
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3188 uep->ue_array[lnum - 1]) != 0)
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3189 {
11121 778c10516955 patch 8.0.0448: some macros are in lower case Christian Brabandt <cb@256bit.org> parents: 10978 diff changeset	3190 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	3191 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	3192 return;
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3193 }
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3194 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	3195 {
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3196 /* 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	3197 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	3198 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	3199 }
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
88751831fa0a When undoing a reload, move the cursor to the first changed line. Bram Moolenaar <bram@vim.org> parents: 2410 diff changeset	3202 /*
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3203 * 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	3204 * used for "u".
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3205 */
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3206 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3207 u_update_save_nr(buf_T *buf)
2281 e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3208 {
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3209 u_header_T *uhp;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3210
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3211 ++buf->b_u_save_nr_last;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3212 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	3213 uhp = buf->b_u_curhead;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3214 if (uhp != NULL)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3215 uhp = uhp->uh_next.ptr;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3216 else
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3217 uhp = buf->b_u_newhead;
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3218 if (uhp != NULL)
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3219 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	3220 }
e41433ea71df Added ":earlier 1f" and ":later 1f". Bram Moolenaar <bram@vim.org> parents: 2280 diff changeset	3221
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3222 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3223 u_unch_branch(u_header_T *uhp)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3224 {
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3225 u_header_T *uh;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3226
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3227 for (uh = uhp; uh != NULL; uh = uh->uh_prev.ptr)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3228 {
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3229 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	3230 if (uh->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	3231 u_unch_branch(uh->uh_alt_next.ptr); /* recursive */
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3232 }
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3233 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3234
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3235 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3236 * Get pointer to last added entry.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3237 * If it's not valid, give an error message and return NULL.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3238 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3239 static u_entry_T *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3240 u_get_headentry(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3241 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3242 if (curbuf->b_u_newhead == NULL \|\| curbuf->b_u_newhead->uh_entry == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3243 {
10359 66f1b5bf3fa6 commit https://github.com/vim/vim/commit/95f096030ed1a8afea028f2ea295d6f6a70f466f Christian Brabandt <cb@256bit.org> parents: 10336 diff changeset	3244 IEMSG(_("E439: undo list corrupt"));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3245 return NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3246 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3247 return curbuf->b_u_newhead->uh_entry;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3248 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3249
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3250 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3251 * u_getbot(): compute the line number of the previous u_save
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3252 * It is called only when b_u_synced is FALSE.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3253 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3254 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3255 u_getbot(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3256 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3257 u_entry_T *uep;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3258 linenr_T extra;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3259
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3260 uep = u_get_headentry(); /* check for corrupt undo list */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3261 if (uep == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3262 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3263
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3264 uep = curbuf->b_u_newhead->uh_getbot_entry;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3265 if (uep != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3266 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3267 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3268 * the new ue_bot is computed from the number of lines that has been
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3269 * inserted (0 - deleted) since calling u_save. This is equal to the
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3270 * old line count subtracted from the current line count.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3271 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3272 extra = curbuf->b_ml.ml_line_count - uep->ue_lcount;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3273 uep->ue_bot = uep->ue_top + uep->ue_size + 1 + extra;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3274 if (uep->ue_bot < 1 \|\| uep->ue_bot > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3275 {
10359 66f1b5bf3fa6 commit https://github.com/vim/vim/commit/95f096030ed1a8afea028f2ea295d6f6a70f466f Christian Brabandt <cb@256bit.org> parents: 10336 diff changeset	3276 IEMSG(_("E440: undo line missing"));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3277 uep->ue_bot = uep->ue_top + 1; /* assume all lines deleted, will
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3278 * get all the old lines back
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3279 * without deleting the current
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3280 * ones */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3281 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3282
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3283 curbuf->b_u_newhead->uh_getbot_entry = NULL;
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 curbuf->b_u_synced = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3287 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3288
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3289 /*
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3290 * Free one header "uhp" and its entry list and adjust the pointers.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3291 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3292 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3293 u_freeheader(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3294 buf_T *buf,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3295 u_header_T *uhp,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3296 u_header_T *uhpp) / if not NULL reset when freeing this header */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3297 {
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3298 u_header_T *uhap;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3299
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3300 /* When there is an alternate redo list free that branch completely,
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3301 * 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	3302 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	3303 u_freebranch(buf, uhp->uh_alt_next.ptr, uhpp);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3304
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3305 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	3306 uhp->uh_alt_prev.ptr->uh_alt_next.ptr = NULL;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3307
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3308 /* 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	3309 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	3310 buf->b_u_oldhead = uhp->uh_prev.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3311 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3312 uhp->uh_next.ptr->uh_prev.ptr = uhp->uh_prev.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3313
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3314 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	3315 buf->b_u_newhead = uhp->uh_next.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3316 else
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3317 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	3318 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	3319 uhap->uh_next.ptr = uhp->uh_next.ptr;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3320
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3321 u_freeentries(buf, uhp, uhpp);
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3322 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3323
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3324 /*
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3325 * Free an alternate branch and any following alternate branches.
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3326 */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 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_freebranch(
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,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3331 u_header_T *uhpp) / if not NULL reset when freeing this header */
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3332 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3333 u_header_T tofree, next;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3334
1440 93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3335 /* If this is the top branch we may need to use u_freeheader() to update
93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3336 * all the pointers. */
93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3337 if (uhp == buf->b_u_oldhead)
93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3338 {
5448 9818311eeca0 updated for version 7.4.074 Bram Moolenaar <bram@vim.org> parents: 5446 diff changeset	3339 while (buf->b_u_oldhead != NULL)
9818311eeca0 updated for version 7.4.074 Bram Moolenaar <bram@vim.org> parents: 5446 diff changeset	3340 u_freeheader(buf, buf->b_u_oldhead, uhpp);
1440 93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3341 return;
93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3342 }
93ffa40b5320 updated for version 7.1-155 vimboss parents: 1415 diff changeset	3343
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_alt_prev.ptr != NULL)
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3345 uhp->uh_alt_prev.ptr->uh_alt_next.ptr = NULL;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3346
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3347 next = uhp;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3348 while (next != NULL)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3349 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3350 tofree = next;
2242 bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3351 if (tofree->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	3352 u_freebranch(buf, tofree->uh_alt_next.ptr, uhpp); /* recursive */
bc4685345719 Don't use pointers to store numbers, use a union. Bram Moolenaar <bram@vim.org> parents: 2239 diff changeset	3353 next = tofree->uh_prev.ptr;
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3354 u_freeentries(buf, tofree, uhpp);
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3355 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3356 }
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 * Free all the undo entries for one header and the header itself.
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3360 * This means that "uhp" is invalid when returning.
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_freeentries(
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,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 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_entry_T uep, nuep;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3369
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3370 /* Check for pointers to the header that become invalid now. */
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3371 if (buf->b_u_curhead == uhp)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3372 buf->b_u_curhead = NULL;
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3373 if (buf->b_u_newhead == uhp)
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3374 buf->b_u_newhead = NULL; /* freeing the newest entry */
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3375 if (uhpp != NULL && uhp == *uhpp)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3376 *uhpp = NULL;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3377
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3378 for (uep = uhp->uh_entry; uep != NULL; uep = nuep)
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3379 {
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3380 nuep = uep->ue_next;
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3381 u_freeentry(uep, uep->ue_size);
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3382 }
ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3383
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3384 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3385 uhp->uh_magic = 0;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3386 #endif
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3387 vim_free((char_u *)uhp);
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3388 --buf->b_u_numhead;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3389 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3390
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3391 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3392 * free entry 'uep' and 'n' lines in uep->ue_array[]
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3393 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3394 static void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3395 u_freeentry(u_entry_T *uep, long n)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3396 {
414 8ab9c77240d4 updated for version 7.0108 vimboss parents: 407 diff changeset	3397 while (n > 0)
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3398 vim_free(uep->ue_array[--n]);
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3399 vim_free((char_u *)uep->ue_array);
1415 20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3400 #ifdef U_DEBUG
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3401 uep->ue_magic = 0;
20b52d44daaf updated for version 7.1-130 vimboss parents: 1210 diff changeset	3402 #endif
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3403 vim_free((char_u *)uep);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3404 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3405
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3406 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3407 * invalidate the undo buffer; called when storage has already been released
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3408 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3409 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3410 u_clearall(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3411 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3412 buf->b_u_newhead = buf->b_u_oldhead = buf->b_u_curhead = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3413 buf->b_u_synced = TRUE;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3414 buf->b_u_numhead = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3415 buf->b_u_line_ptr = NULL;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3416 buf->b_u_line_lnum = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3417 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3418
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3419 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3420 * save the line "lnum" for the "U" command
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3421 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3422 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3423 u_saveline(linenr_T lnum)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3424 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3425 if (lnum == curbuf->b_u_line_lnum) /* line is already saved */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3426 return;
356 0f2b5d1b8117 updated for version 7.0092 vimboss parents: 344 diff changeset	3427 if (lnum < 1 \|\| lnum > curbuf->b_ml.ml_line_count) /* should never happen */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3428 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3429 u_clearline();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3430 curbuf->b_u_line_lnum = lnum;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3431 if (curwin->w_cursor.lnum == lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3432 curbuf->b_u_line_colnr = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3433 else
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3434 curbuf->b_u_line_colnr = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3435 if ((curbuf->b_u_line_ptr = u_save_line(lnum)) == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3436 do_outofmem_msg((long_u)0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3437 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3438
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3439 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3440 * clear the line saved for the "U" command
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3441 * (this is used externally for crossing a line while in insert mode)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3442 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3443 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3444 u_clearline(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3445 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3446 if (curbuf->b_u_line_ptr != NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3447 {
13244 ac42c4b11dbc patch 8.0.1496: clearing a pointer takes two lines Christian Brabandt <cb@256bit.org> parents: 13138 diff changeset	3448 VIM_CLEAR(curbuf->b_u_line_ptr);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3449 curbuf->b_u_line_lnum = 0;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3450 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3451 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3452
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3453 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3454 * Implementation of the "U" command.
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3455 * Differentiation from vi: "U" can be undone with the next "U".
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3456 * 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	3457 * Careful: may trigger autocommands that reload the buffer.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3458 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3459 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3460 u_undoline(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3461 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3462 colnr_T t;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3463 char_u *oldp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3464
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3465 if (undo_off)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3466 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3467
1534 bdfbf8ef447a updated for version 7.1-249 vimboss parents: 1440 diff changeset	3468 if (curbuf->b_u_line_ptr == NULL
bdfbf8ef447a updated for version 7.1-249 vimboss parents: 1440 diff changeset	3469 \|\| curbuf->b_u_line_lnum > curbuf->b_ml.ml_line_count)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3470 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3471 beep_flush();
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3472 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3473 }
1534 bdfbf8ef447a updated for version 7.1-249 vimboss parents: 1440 diff changeset	3474
bdfbf8ef447a updated for version 7.1-249 vimboss parents: 1440 diff changeset	3475 /* first save the line for the 'u' command */
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3476 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	3477 curbuf->b_u_line_lnum + 1, (linenr_T)0, FALSE) == FAIL)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3478 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3479 oldp = u_save_line(curbuf->b_u_line_lnum);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3480 if (oldp == NULL)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3481 {
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3482 do_outofmem_msg((long_u)0);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3483 return;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3484 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3485 ml_replace(curbuf->b_u_line_lnum, curbuf->b_u_line_ptr, TRUE);
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3486 changed_bytes(curbuf->b_u_line_lnum, 0);
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3487 vim_free(curbuf->b_u_line_ptr);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3488 curbuf->b_u_line_ptr = oldp;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3489
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3490 t = curbuf->b_u_line_colnr;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3491 if (curwin->w_cursor.lnum == curbuf->b_u_line_lnum)
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3492 curbuf->b_u_line_colnr = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3493 curwin->w_cursor.col = t;
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3494 curwin->w_cursor.lnum = curbuf->b_u_line_lnum;
1534 bdfbf8ef447a updated for version 7.1-249 vimboss parents: 1440 diff changeset	3495 check_cursor_col();
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3496 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3497
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3498 /*
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3499 * Free all allocated memory blocks for the buffer 'buf'.
4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3500 */
4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3501 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3502 u_blockfree(buf_T *buf)
168 4d9eabb1396e updated for version 7.0051 vimboss parents: 33 diff changeset	3503 {
753 ac005a544e24 updated for version 7.0223 vimboss parents: 697 diff changeset	3504 while (buf->b_u_oldhead != NULL)
758 d591d4ceeaee updated for version 7.0224 vimboss parents: 753 diff changeset	3505 u_freeheader(buf, buf->b_u_oldhead, NULL);
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3506 vim_free(buf->b_u_line_ptr);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3507 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3508
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3509 /*
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3510 * u_save_line(): allocate memory and copy line 'lnum' into it.
290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3511 * Returns NULL when out of memory.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3512 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3513 static char_u *
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3514 u_save_line(linenr_T lnum)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3515 {
2230 290ee42cae85 Remove old and unused method to allocate memory for undo. Bram Moolenaar <bram@vim.org> parents: 2229 diff changeset	3516 return vim_strsave(ml_get(lnum));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3517 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3518
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3519 /*
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3520 * Check if the 'modified' flag is set, or 'ff' has changed (only need to
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3521 * check the first character, because it can only be "dos", "unix" or "mac").
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3522 * "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	3523 * 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	3524 * job.
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3525 */
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3526 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3527 bufIsChanged(buf_T *buf)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3528 {
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	3529 #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	3530 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	3531 return TRUE;
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3532 #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	3533 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	3534 }
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	3535
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	3536 /*
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	3537 * 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	3538 */
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	3539 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	3540 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	3541 {
14147 de75c249723d patch 8.1.0091: MS-Windows: Cannot interrupt gdb when program is running Christian Brabandt <cb@256bit.org> parents: 13610 diff changeset	3542 // 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	3543 // 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	3544 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	3545 && (buf->b_changed \|\| file_ff_differs(buf, TRUE));
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3546 }
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3547
3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3548 int
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3549 curbufIsChanged(void)
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3550 {
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	3551 return bufIsChanged(curbuf);
7 3fc0f57ecb91 updated for version 7.0001 vimboss parents: diff changeset	3552 }
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3553
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3554 #if defined(FEAT_EVAL) \|\| defined(PROTO)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3555 /*
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3556 * 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	3557 * Recursive.
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3558 */
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3559 void
7835 4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Christian Brabandt <cb@256bit.org> parents: 7805 diff changeset	3560 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	3561 {
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3562 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	3563 dict_T *dict;
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3564
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3565 while (uhp != NULL)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3566 {
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3567 dict = dict_alloc();
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3568 if (dict == NULL)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3569 return;
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3570 dict_add_nr_str(dict, "seq", uhp->uh_seq, NULL);
2282 a888ed7ba375 Make updating text for conceal mode simpler. A few compiler warning fixes. Bram Moolenaar <bram@vim.org> parents: 2281 diff changeset	3571 dict_add_nr_str(dict, "time", (long)uhp->uh_time, NULL);
2280 941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3572 if (uhp == curbuf->b_u_newhead)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3573 dict_add_nr_str(dict, "newhead", 1, NULL);
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3574 if (uhp == curbuf->b_u_curhead)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3575 dict_add_nr_str(dict, "curhead", 1, NULL);
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3576 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	3577 dict_add_nr_str(dict, "save", uhp->uh_save_nr, NULL);
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3578
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3579 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	3580 {
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3581 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	3582
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3583 if (alt_list != NULL)
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3584 {
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3585 /* Recursive call to add alternate undo tree. */
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3586 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	3587 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	3588 }
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3589 }
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3590
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3591 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	3592 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	3593 }
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3594 }
941ff1cd317a Add file save counter to undo information. Add undotree() function. Bram Moolenaar <bram@vim.org> parents: 2271 diff changeset	3595 #endif

Mercurial > vim

annotate src/undo.c @ 14147:de75c249723d v8.1.0091