Mercurial > vim
annotate src/mark.c @ 15636:6f1c7e9a6393 v8.1.0826
patch 8.1.0826: too many #ifdefs
commit https://github.com/vim/vim/commit/29ddebef4038d2d2b3bc9d8d3b0109f4046d6fbf
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 26 17:28:26 2019 +0100
patch 8.1.0826: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Graduate FEAT_VIRTUALEDIT. Adds about 10Kbyte to the code.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 26 Jan 2019 17:30:15 +0100 |
| parents | dd725a8ab112 |
| children | dd4e6f077874 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * mark.c: functions for setting marks and jumping to them | |
| 12 */ | |
| 13 | |
| 14 #include "vim.h" | |
| 15 | |
| 16 /* | |
| 17 * This file contains routines to maintain and manipulate marks. | |
| 18 */ | |
| 19 | |
| 20 /* | |
| 21 * If a named file mark's lnum is non-zero, it is valid. | |
| 22 * If a named file mark's fnum is non-zero, it is for an existing buffer, | |
| 23 * otherwise it is from .viminfo and namedfm[n].fname is the file name. | |
| 24 * There are marks 'A - 'Z (set by user) and '0 to '9 (set when writing | |
| 25 * viminfo). | |
| 26 */ | |
| 27 #define EXTRA_MARKS 10 /* marks 0-9 */ | |
| 28 static xfmark_T namedfm[NMARKS + EXTRA_MARKS]; /* marks with file nr */ | |
| 29 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
5735
diff
changeset
|
30 static void fmarks_check_one(xfmark_T *fm, char_u *name, buf_T *buf); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
5735
diff
changeset
|
31 static char_u *mark_line(pos_T *mp, int lead_len); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
5735
diff
changeset
|
32 static void show_one_mark(int, char_u *, pos_T *, char_u *, int current); |
| 7 | 33 #ifdef FEAT_VIMINFO |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
5735
diff
changeset
|
34 static void write_one_filemark(FILE *fp, xfmark_T *fm, int c1, int c2); |
| 7 | 35 #endif |
|
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
36 static void mark_adjust_internal(linenr_T line1, linenr_T line2, long amount, |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
37 long amount_after, int adjust_folds); |
| 7 | 38 |
| 39 /* | |
| 706 | 40 * Set named mark "c" at current cursor position. |
| 7 | 41 * Returns OK on success, FAIL if bad name given. |
| 42 */ | |
| 43 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
44 setmark(int c) |
| 7 | 45 { |
| 706 | 46 return setmark_pos(c, &curwin->w_cursor, curbuf->b_fnum); |
| 47 } | |
| 48 | |
| 49 /* | |
| 50 * Set named mark "c" to position "pos". | |
| 51 * When "c" is upper case use file "fnum". | |
| 52 * Returns OK on success, FAIL if bad name given. | |
| 53 */ | |
| 54 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
55 setmark_pos(int c, pos_T *pos, int fnum) |
| 706 | 56 { |
| 7 | 57 int i; |
|
10730
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
58 buf_T *buf; |
| 7 | 59 |
| 60 /* Check for a special key (may cause islower() to crash). */ | |
| 61 if (c < 0) | |
| 62 return FAIL; | |
| 63 | |
| 64 if (c == '\'' || c == '`') | |
| 65 { | |
| 706 | 66 if (pos == &curwin->w_cursor) |
| 67 { | |
| 68 setpcmark(); | |
| 69 /* keep it even when the cursor doesn't move */ | |
| 70 curwin->w_prev_pcmark = curwin->w_pcmark; | |
| 71 } | |
| 72 else | |
| 73 curwin->w_pcmark = *pos; | |
| 7 | 74 return OK; |
| 75 } | |
| 76 | |
|
10730
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
77 buf = buflist_findnr(fnum); |
|
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
78 if (buf == NULL) |
|
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
79 return FAIL; |
|
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
80 |
| 1533 | 81 if (c == '"') |
| 82 { | |
|
10730
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
83 buf->b_last_cursor = *pos; |
| 1533 | 84 return OK; |
| 85 } | |
| 86 | |
| 7 | 87 /* Allow setting '[ and '] for an autocommand that simulates reading a |
| 88 * file. */ | |
| 89 if (c == '[') | |
| 90 { | |
|
10730
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
91 buf->b_op_start = *pos; |
| 7 | 92 return OK; |
| 93 } | |
| 94 if (c == ']') | |
| 95 { | |
|
10730
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
96 buf->b_op_end = *pos; |
| 7 | 97 return OK; |
| 98 } | |
| 99 | |
|
5265
cd971e951b06
updated for version 7.4b.009
Bram Moolenaar <bram@vim.org>
parents:
4092
diff
changeset
|
100 if (c == '<' || c == '>') |
| 3660 | 101 { |
|
5265
cd971e951b06
updated for version 7.4b.009
Bram Moolenaar <bram@vim.org>
parents:
4092
diff
changeset
|
102 if (c == '<') |
|
10730
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
103 buf->b_visual.vi_start = *pos; |
|
5265
cd971e951b06
updated for version 7.4b.009
Bram Moolenaar <bram@vim.org>
parents:
4092
diff
changeset
|
104 else |
|
10730
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
105 buf->b_visual.vi_end = *pos; |
|
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
106 if (buf->b_visual.vi_mode == NUL) |
|
5265
cd971e951b06
updated for version 7.4b.009
Bram Moolenaar <bram@vim.org>
parents:
4092
diff
changeset
|
107 /* Visual_mode has not yet been set, use a sane default. */ |
|
10730
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
108 buf->b_visual.vi_mode = 'v'; |
| 3660 | 109 return OK; |
| 110 } | |
| 111 | |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
112 if (ASCII_ISLOWER(c)) |
| 7 | 113 { |
| 114 i = c - 'a'; | |
|
10730
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
115 buf->b_namedm[i] = *pos; |
| 7 | 116 return OK; |
| 117 } | |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
118 if (ASCII_ISUPPER(c) || VIM_ISDIGIT(c)) |
| 7 | 119 { |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
120 if (VIM_ISDIGIT(c)) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
121 i = c - '0' + NMARKS; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
122 else |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
123 i = c - 'A'; |
| 706 | 124 namedfm[i].fmark.mark = *pos; |
| 125 namedfm[i].fmark.fnum = fnum; | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
126 VIM_CLEAR(namedfm[i].fname); |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
127 #ifdef FEAT_VIMINFO |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
128 namedfm[i].time_set = vim_time(); |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
129 #endif |
| 7 | 130 return OK; |
| 131 } | |
| 132 return FAIL; | |
| 133 } | |
| 134 | |
| 135 /* | |
| 136 * Set the previous context mark to the current position and add it to the | |
| 137 * jump list. | |
| 138 */ | |
| 139 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
140 setpcmark(void) |
| 7 | 141 { |
| 142 #ifdef FEAT_JUMPLIST | |
| 143 int i; | |
| 144 xfmark_T *fm; | |
| 145 #endif | |
| 146 #ifdef JUMPLIST_ROTATE | |
| 147 xfmark_T tempmark; | |
| 148 #endif | |
| 149 | |
| 150 /* for :global the mark is set only once */ | |
| 151 if (global_busy || listcmd_busy || cmdmod.keepjumps) | |
| 152 return; | |
| 153 | |
| 154 curwin->w_prev_pcmark = curwin->w_pcmark; | |
| 155 curwin->w_pcmark = curwin->w_cursor; | |
| 156 | |
| 157 #ifdef FEAT_JUMPLIST | |
| 158 # ifdef JUMPLIST_ROTATE | |
| 159 /* | |
| 160 * If last used entry is not at the top, put it at the top by rotating | |
| 161 * the stack until it is (the newer entries will be at the bottom). | |
| 162 * Keep one entry (the last used one) at the top. | |
| 163 */ | |
| 164 if (curwin->w_jumplistidx < curwin->w_jumplistlen) | |
| 165 ++curwin->w_jumplistidx; | |
| 166 while (curwin->w_jumplistidx < curwin->w_jumplistlen) | |
| 167 { | |
| 168 tempmark = curwin->w_jumplist[curwin->w_jumplistlen - 1]; | |
| 169 for (i = curwin->w_jumplistlen - 1; i > 0; --i) | |
| 170 curwin->w_jumplist[i] = curwin->w_jumplist[i - 1]; | |
| 171 curwin->w_jumplist[0] = tempmark; | |
| 172 ++curwin->w_jumplistidx; | |
| 173 } | |
| 174 # endif | |
| 175 | |
| 176 /* If jumplist is full: remove oldest entry */ | |
| 177 if (++curwin->w_jumplistlen > JUMPLISTSIZE) | |
| 178 { | |
| 179 curwin->w_jumplistlen = JUMPLISTSIZE; | |
| 180 vim_free(curwin->w_jumplist[0].fname); | |
| 181 for (i = 1; i < JUMPLISTSIZE; ++i) | |
| 182 curwin->w_jumplist[i - 1] = curwin->w_jumplist[i]; | |
| 183 } | |
| 184 curwin->w_jumplistidx = curwin->w_jumplistlen; | |
| 185 fm = &curwin->w_jumplist[curwin->w_jumplistlen - 1]; | |
| 186 | |
| 187 fm->fmark.mark = curwin->w_pcmark; | |
| 188 fm->fmark.fnum = curbuf->b_fnum; | |
| 189 fm->fname = NULL; | |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
190 # ifdef FEAT_VIMINFO |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
191 fm->time_set = vim_time(); |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
192 # endif |
| 7 | 193 #endif |
| 194 } | |
| 195 | |
| 196 /* | |
| 197 * To change context, call setpcmark(), then move the current position to | |
| 198 * where ever, then call checkpcmark(). This ensures that the previous | |
| 199 * context will only be changed if the cursor moved to a different line. | |
| 200 * If pcmark was deleted (with "dG") the previous mark is restored. | |
| 201 */ | |
| 202 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
203 checkpcmark(void) |
| 7 | 204 { |
| 205 if (curwin->w_prev_pcmark.lnum != 0 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10730
diff
changeset
|
206 && (EQUAL_POS(curwin->w_pcmark, curwin->w_cursor) |
| 7 | 207 || curwin->w_pcmark.lnum == 0)) |
| 208 { | |
| 209 curwin->w_pcmark = curwin->w_prev_pcmark; | |
| 210 curwin->w_prev_pcmark.lnum = 0; /* Show it has been checked */ | |
| 211 } | |
| 212 } | |
| 213 | |
| 214 #if defined(FEAT_JUMPLIST) || defined(PROTO) | |
| 215 /* | |
| 216 * move "count" positions in the jump list (count may be negative) | |
| 217 */ | |
| 218 pos_T * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
219 movemark(int count) |
| 7 | 220 { |
| 221 pos_T *pos; | |
| 222 xfmark_T *jmp; | |
| 223 | |
|
13278
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
224 cleanup_jumplist(curwin, TRUE); |
| 7 | 225 |
| 226 if (curwin->w_jumplistlen == 0) /* nothing to jump to */ | |
| 227 return (pos_T *)NULL; | |
| 228 | |
| 229 for (;;) | |
| 230 { | |
| 231 if (curwin->w_jumplistidx + count < 0 | |
| 232 || curwin->w_jumplistidx + count >= curwin->w_jumplistlen) | |
| 233 return (pos_T *)NULL; | |
| 234 | |
| 235 /* | |
| 236 * if first CTRL-O or CTRL-I command after a jump, add cursor position | |
| 1188 | 237 * to list. Careful: If there are duplicates (CTRL-O immediately after |
| 7 | 238 * starting Vim on a file), another entry may have been removed. |
| 239 */ | |
| 240 if (curwin->w_jumplistidx == curwin->w_jumplistlen) | |
| 241 { | |
| 242 setpcmark(); | |
| 243 --curwin->w_jumplistidx; /* skip the new entry */ | |
| 244 if (curwin->w_jumplistidx + count < 0) | |
| 245 return (pos_T *)NULL; | |
| 246 } | |
| 247 | |
| 248 curwin->w_jumplistidx += count; | |
| 249 | |
| 250 jmp = curwin->w_jumplist + curwin->w_jumplistidx; | |
| 251 if (jmp->fmark.fnum == 0) | |
| 252 fname2fnum(jmp); | |
| 253 if (jmp->fmark.fnum != curbuf->b_fnum) | |
| 254 { | |
| 255 /* jump to other file */ | |
| 256 if (buflist_findnr(jmp->fmark.fnum) == NULL) | |
| 257 { /* Skip this one .. */ | |
| 258 count += count < 0 ? -1 : 1; | |
| 259 continue; | |
| 260 } | |
| 261 if (buflist_getfile(jmp->fmark.fnum, jmp->fmark.mark.lnum, | |
| 262 0, FALSE) == FAIL) | |
| 263 return (pos_T *)NULL; | |
| 264 /* Set lnum again, autocommands my have changed it */ | |
| 265 curwin->w_cursor = jmp->fmark.mark; | |
| 266 pos = (pos_T *)-1; | |
| 267 } | |
| 268 else | |
| 269 pos = &(jmp->fmark.mark); | |
| 270 return pos; | |
| 271 } | |
| 272 } | |
| 273 | |
| 274 /* | |
| 275 * Move "count" positions in the changelist (count may be negative). | |
| 276 */ | |
| 277 pos_T * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
278 movechangelist(int count) |
| 7 | 279 { |
| 280 int n; | |
| 281 | |
| 282 if (curbuf->b_changelistlen == 0) /* nothing to jump to */ | |
| 283 return (pos_T *)NULL; | |
| 284 | |
| 285 n = curwin->w_changelistidx; | |
| 286 if (n + count < 0) | |
| 287 { | |
| 288 if (n == 0) | |
| 289 return (pos_T *)NULL; | |
| 290 n = 0; | |
| 291 } | |
| 292 else if (n + count >= curbuf->b_changelistlen) | |
| 293 { | |
| 294 if (n == curbuf->b_changelistlen - 1) | |
| 295 return (pos_T *)NULL; | |
| 296 n = curbuf->b_changelistlen - 1; | |
| 297 } | |
| 298 else | |
| 299 n += count; | |
| 300 curwin->w_changelistidx = n; | |
| 301 return curbuf->b_changelist + n; | |
| 302 } | |
| 303 #endif | |
| 304 | |
| 305 /* | |
| 4043 | 306 * Find mark "c" in buffer pointed to by "buf". |
| 706 | 307 * If "changefile" is TRUE it's allowed to edit another file for '0, 'A, etc. |
| 308 * If "fnum" is not NULL store the fnum there for '0, 'A etc., don't edit | |
| 309 * another file. | |
| 7 | 310 * Returns: |
| 311 * - pointer to pos_T if found. lnum is 0 when mark not set, -1 when mark is | |
| 312 * in another file which can't be gotten. (caller needs to check lnum!) | |
| 313 * - NULL if there is no mark called 'c'. | |
| 314 * - -1 if mark is in other file and jumped there (only if changefile is TRUE) | |
| 315 */ | |
| 316 pos_T * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
317 getmark_buf(buf_T *buf, int c, int changefile) |
| 4043 | 318 { |
| 319 return getmark_buf_fnum(buf, c, changefile, NULL); | |
| 320 } | |
| 321 | |
| 322 pos_T * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
323 getmark(int c, int changefile) |
| 706 | 324 { |
| 4043 | 325 return getmark_buf_fnum(curbuf, c, changefile, NULL); |
| 706 | 326 } |
| 327 | |
| 328 pos_T * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
329 getmark_buf_fnum( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
330 buf_T *buf, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
331 int c, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
332 int changefile, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
333 int *fnum) |
| 7 | 334 { |
| 335 pos_T *posp; | |
| 336 pos_T *startp, *endp; | |
| 337 static pos_T pos_copy; | |
| 338 | |
| 339 posp = NULL; | |
| 340 | |
| 341 /* Check for special key, can't be a mark name and might cause islower() | |
| 342 * to crash. */ | |
| 343 if (c < 0) | |
| 344 return posp; | |
| 345 #ifndef EBCDIC | |
| 346 if (c > '~') /* check for islower()/isupper() */ | |
| 347 ; | |
| 348 else | |
| 349 #endif | |
| 350 if (c == '\'' || c == '`') /* previous context mark */ | |
| 351 { | |
| 352 pos_copy = curwin->w_pcmark; /* need to make a copy because */ | |
| 353 posp = &pos_copy; /* w_pcmark may be changed soon */ | |
| 354 } | |
| 355 else if (c == '"') /* to pos when leaving buffer */ | |
| 4043 | 356 posp = &(buf->b_last_cursor); |
| 7 | 357 else if (c == '^') /* to where Insert mode stopped */ |
| 4043 | 358 posp = &(buf->b_last_insert); |
| 7 | 359 else if (c == '.') /* to where last change was made */ |
| 4043 | 360 posp = &(buf->b_last_change); |
| 7 | 361 else if (c == '[') /* to start of previous operator */ |
| 4043 | 362 posp = &(buf->b_op_start); |
| 7 | 363 else if (c == ']') /* to end of previous operator */ |
| 4043 | 364 posp = &(buf->b_op_end); |
| 7 | 365 else if (c == '{' || c == '}') /* to previous/next paragraph */ |
| 366 { | |
| 367 pos_T pos; | |
| 368 oparg_T oa; | |
| 369 int slcb = listcmd_busy; | |
| 370 | |
| 371 pos = curwin->w_cursor; | |
| 372 listcmd_busy = TRUE; /* avoid that '' is changed */ | |
| 503 | 373 if (findpar(&oa.inclusive, |
| 374 c == '}' ? FORWARD : BACKWARD, 1L, NUL, FALSE)) | |
| 7 | 375 { |
| 376 pos_copy = curwin->w_cursor; | |
| 377 posp = &pos_copy; | |
| 378 } | |
| 379 curwin->w_cursor = pos; | |
| 380 listcmd_busy = slcb; | |
| 381 } | |
| 382 else if (c == '(' || c == ')') /* to previous/next sentence */ | |
| 383 { | |
| 384 pos_T pos; | |
| 385 int slcb = listcmd_busy; | |
| 386 | |
| 387 pos = curwin->w_cursor; | |
| 388 listcmd_busy = TRUE; /* avoid that '' is changed */ | |
| 389 if (findsent(c == ')' ? FORWARD : BACKWARD, 1L)) | |
| 390 { | |
| 391 pos_copy = curwin->w_cursor; | |
| 392 posp = &pos_copy; | |
| 393 } | |
| 394 curwin->w_cursor = pos; | |
| 395 listcmd_busy = slcb; | |
| 396 } | |
| 397 else if (c == '<' || c == '>') /* start/end of visual area */ | |
| 398 { | |
| 4043 | 399 startp = &buf->b_visual.vi_start; |
| 400 endp = &buf->b_visual.vi_end; | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10730
diff
changeset
|
401 if (((c == '<') == LT_POS(*startp, *endp) || endp->lnum == 0) |
|
10730
44e9340dc604
patch 8.0.0255: setpos() does not use the buffer argument for all marks
Christian Brabandt <cb@256bit.org>
parents:
10285
diff
changeset
|
402 && startp->lnum != 0) |
| 7 | 403 posp = startp; |
| 404 else | |
| 405 posp = endp; | |
| 406 /* | |
| 407 * For Visual line mode, set mark at begin or end of line | |
| 408 */ | |
| 4043 | 409 if (buf->b_visual.vi_mode == 'V') |
| 7 | 410 { |
| 411 pos_copy = *posp; | |
| 412 posp = &pos_copy; | |
| 413 if (c == '<') | |
| 414 pos_copy.col = 0; | |
| 415 else | |
| 416 pos_copy.col = MAXCOL; | |
| 417 pos_copy.coladd = 0; | |
| 418 } | |
| 419 } | |
| 420 else if (ASCII_ISLOWER(c)) /* normal named mark */ | |
| 421 { | |
| 4043 | 422 posp = &(buf->b_namedm[c - 'a']); |
| 7 | 423 } |
| 424 else if (ASCII_ISUPPER(c) || VIM_ISDIGIT(c)) /* named file mark */ | |
| 425 { | |
| 426 if (VIM_ISDIGIT(c)) | |
| 427 c = c - '0' + NMARKS; | |
| 428 else | |
| 429 c -= 'A'; | |
| 430 posp = &(namedfm[c].fmark.mark); | |
| 431 | |
| 432 if (namedfm[c].fmark.fnum == 0) | |
| 433 fname2fnum(&namedfm[c]); | |
| 706 | 434 |
| 435 if (fnum != NULL) | |
| 436 *fnum = namedfm[c].fmark.fnum; | |
| 4043 | 437 else if (namedfm[c].fmark.fnum != buf->b_fnum) |
| 7 | 438 { |
| 706 | 439 /* mark is in another file */ |
| 7 | 440 posp = &pos_copy; |
| 441 | |
| 442 if (namedfm[c].fmark.mark.lnum != 0 | |
| 443 && changefile && namedfm[c].fmark.fnum) | |
| 444 { | |
| 445 if (buflist_getfile(namedfm[c].fmark.fnum, | |
| 446 (linenr_T)1, GETF_SETMARK, FALSE) == OK) | |
| 447 { | |
| 448 /* Set the lnum now, autocommands could have changed it */ | |
| 449 curwin->w_cursor = namedfm[c].fmark.mark; | |
| 450 return (pos_T *)-1; | |
| 451 } | |
| 452 pos_copy.lnum = -1; /* can't get file */ | |
| 453 } | |
| 454 else | |
| 455 pos_copy.lnum = 0; /* mark exists, but is not valid in | |
| 456 current buffer */ | |
| 457 } | |
| 458 } | |
| 459 | |
| 460 return posp; | |
| 461 } | |
| 462 | |
| 463 /* | |
| 464 * Search for the next named mark in the current file. | |
| 465 * | |
| 466 * Returns pointer to pos_T of the next mark or NULL if no mark is found. | |
| 467 */ | |
| 468 pos_T * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
469 getnextmark( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
470 pos_T *startpos, /* where to start */ |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
471 int dir, /* direction for search */ |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
472 int begin_line) |
| 7 | 473 { |
| 474 int i; | |
| 475 pos_T *result = NULL; | |
| 476 pos_T pos; | |
| 477 | |
| 478 pos = *startpos; | |
| 479 | |
| 480 /* When searching backward and leaving the cursor on the first non-blank, | |
| 481 * position must be in a previous line. | |
| 482 * When searching forward and leaving the cursor on the first non-blank, | |
| 483 * position must be in a next line. */ | |
| 484 if (dir == BACKWARD && begin_line) | |
| 485 pos.col = 0; | |
| 486 else if (dir == FORWARD && begin_line) | |
| 487 pos.col = MAXCOL; | |
| 488 | |
| 489 for (i = 0; i < NMARKS; i++) | |
| 490 { | |
| 491 if (curbuf->b_namedm[i].lnum > 0) | |
| 492 { | |
| 493 if (dir == FORWARD) | |
| 494 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10730
diff
changeset
|
495 if ((result == NULL || LT_POS(curbuf->b_namedm[i], *result)) |
|
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10730
diff
changeset
|
496 && LT_POS(pos, curbuf->b_namedm[i])) |
| 7 | 497 result = &curbuf->b_namedm[i]; |
| 498 } | |
| 499 else | |
| 500 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10730
diff
changeset
|
501 if ((result == NULL || LT_POS(*result, curbuf->b_namedm[i])) |
|
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10730
diff
changeset
|
502 && LT_POS(curbuf->b_namedm[i], pos)) |
| 7 | 503 result = &curbuf->b_namedm[i]; |
| 504 } | |
| 505 } | |
| 506 } | |
| 507 | |
| 508 return result; | |
| 509 } | |
| 510 | |
| 511 /* | |
| 512 * For an xtended filemark: set the fnum from the fname. | |
| 513 * This is used for marks obtained from the .viminfo file. It's postponed | |
| 514 * until the mark is used to avoid a long startup delay. | |
| 515 */ | |
|
13248
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
516 void |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
517 fname2fnum(xfmark_T *fm) |
| 7 | 518 { |
| 519 char_u *p; | |
| 520 | |
| 521 if (fm->fname != NULL) | |
| 522 { | |
| 523 /* | |
| 524 * First expand "~/" in the file name to the home directory. | |
| 1480 | 525 * Don't expand the whole name, it may contain other '~' chars. |
| 7 | 526 */ |
| 1480 | 527 if (fm->fname[0] == '~' && (fm->fname[1] == '/' |
| 528 #ifdef BACKSLASH_IN_FILENAME | |
| 529 || fm->fname[1] == '\\' | |
| 530 #endif | |
| 531 )) | |
| 532 { | |
| 533 int len; | |
| 534 | |
| 535 expand_env((char_u *)"~/", NameBuff, MAXPATHL); | |
| 1570 | 536 len = (int)STRLEN(NameBuff); |
| 1480 | 537 vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1); |
| 538 } | |
| 539 else | |
| 540 vim_strncpy(NameBuff, fm->fname, MAXPATHL - 1); | |
| 541 | |
| 542 /* Try to shorten the file name. */ | |
| 7 | 543 mch_dirname(IObuff, IOSIZE); |
| 544 p = shorten_fname(NameBuff, IObuff); | |
| 545 | |
| 546 /* buflist_new() will call fmarks_check_names() */ | |
| 547 (void)buflist_new(NameBuff, p, (linenr_T)1, 0); | |
| 548 } | |
| 549 } | |
| 550 | |
| 551 /* | |
| 552 * Check all file marks for a name that matches the file name in buf. | |
| 553 * May replace the name with an fnum. | |
| 554 * Used for marks that come from the .viminfo file. | |
| 555 */ | |
| 556 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
557 fmarks_check_names(buf_T *buf) |
| 7 | 558 { |
| 559 char_u *name; | |
| 560 int i; | |
| 561 #ifdef FEAT_JUMPLIST | |
| 562 win_T *wp; | |
| 563 #endif | |
| 564 | |
| 565 if (buf->b_ffname == NULL) | |
| 566 return; | |
| 567 | |
| 568 name = home_replace_save(buf, buf->b_ffname); | |
| 569 if (name == NULL) | |
| 570 return; | |
| 571 | |
| 572 for (i = 0; i < NMARKS + EXTRA_MARKS; ++i) | |
| 573 fmarks_check_one(&namedfm[i], name, buf); | |
| 574 | |
| 575 #ifdef FEAT_JUMPLIST | |
| 576 FOR_ALL_WINDOWS(wp) | |
| 577 { | |
| 578 for (i = 0; i < wp->w_jumplistlen; ++i) | |
| 579 fmarks_check_one(&wp->w_jumplist[i], name, buf); | |
| 580 } | |
| 581 #endif | |
| 582 | |
| 583 vim_free(name); | |
| 584 } | |
| 585 | |
| 586 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
587 fmarks_check_one(xfmark_T *fm, char_u *name, buf_T *buf) |
| 7 | 588 { |
| 589 if (fm->fmark.fnum == 0 | |
| 590 && fm->fname != NULL | |
| 591 && fnamecmp(name, fm->fname) == 0) | |
| 592 { | |
| 593 fm->fmark.fnum = buf->b_fnum; | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
594 VIM_CLEAR(fm->fname); |
| 7 | 595 } |
| 596 } | |
| 597 | |
| 598 /* | |
| 599 * Check a if a position from a mark is valid. | |
| 600 * Give and error message and return FAIL if not. | |
| 601 */ | |
| 602 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
603 check_mark(pos_T *pos) |
| 7 | 604 { |
| 605 if (pos == NULL) | |
| 606 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
607 emsg(_(e_umark)); |
| 7 | 608 return FAIL; |
| 609 } | |
| 610 if (pos->lnum <= 0) | |
| 611 { | |
| 612 /* lnum is negative if mark is in another file can can't get that | |
| 613 * file, error message already give then. */ | |
| 614 if (pos->lnum == 0) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
615 emsg(_(e_marknotset)); |
| 7 | 616 return FAIL; |
| 617 } | |
| 618 if (pos->lnum > curbuf->b_ml.ml_line_count) | |
| 619 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
620 emsg(_(e_markinval)); |
| 7 | 621 return FAIL; |
| 622 } | |
| 623 return OK; | |
| 624 } | |
| 625 | |
| 626 /* | |
| 627 * clrallmarks() - clear all marks in the buffer 'buf' | |
| 628 * | |
| 629 * Used mainly when trashing the entire buffer during ":e" type commands | |
| 630 */ | |
| 631 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
632 clrallmarks(buf_T *buf) |
| 7 | 633 { |
| 634 static int i = -1; | |
| 635 | |
| 636 if (i == -1) /* first call ever: initialize */ | |
| 637 for (i = 0; i < NMARKS + 1; i++) | |
| 638 { | |
| 639 namedfm[i].fmark.mark.lnum = 0; | |
| 640 namedfm[i].fname = NULL; | |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
641 #ifdef FEAT_VIMINFO |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
642 namedfm[i].time_set = 0; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
643 #endif |
| 7 | 644 } |
| 645 | |
| 646 for (i = 0; i < NMARKS; i++) | |
| 647 buf->b_namedm[i].lnum = 0; | |
| 648 buf->b_op_start.lnum = 0; /* start/end op mark cleared */ | |
| 649 buf->b_op_end.lnum = 0; | |
| 650 buf->b_last_cursor.lnum = 1; /* '" mark cleared */ | |
| 651 buf->b_last_cursor.col = 0; | |
| 652 buf->b_last_cursor.coladd = 0; | |
| 653 buf->b_last_insert.lnum = 0; /* '^ mark cleared */ | |
| 654 buf->b_last_change.lnum = 0; /* '. mark cleared */ | |
| 655 #ifdef FEAT_JUMPLIST | |
| 656 buf->b_changelistlen = 0; | |
| 657 #endif | |
| 658 } | |
| 659 | |
| 660 /* | |
| 661 * Get name of file from a filemark. | |
| 662 * When it's in the current buffer, return the text at the mark. | |
| 663 * Returns an allocated string. | |
| 664 */ | |
| 665 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
666 fm_getname(fmark_T *fmark, int lead_len) |
| 7 | 667 { |
| 668 if (fmark->fnum == curbuf->b_fnum) /* current buffer */ | |
| 669 return mark_line(&(fmark->mark), lead_len); | |
| 670 return buflist_nr2name(fmark->fnum, FALSE, TRUE); | |
| 671 } | |
| 672 | |
| 673 /* | |
| 674 * Return the line at mark "mp". Truncate to fit in window. | |
| 675 * The returned string has been allocated. | |
| 676 */ | |
| 677 static char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
678 mark_line(pos_T *mp, int lead_len) |
| 7 | 679 { |
| 680 char_u *s, *p; | |
| 681 int len; | |
| 682 | |
| 683 if (mp->lnum == 0 || mp->lnum > curbuf->b_ml.ml_line_count) | |
| 684 return vim_strsave((char_u *)"-invalid-"); | |
|
14305
8a4c0ab88201
patch 8.1.0168: output of :marks is too short with multi-byte chars
Christian Brabandt <cb@256bit.org>
parents:
13278
diff
changeset
|
685 // Allow for up to 5 bytes per character. |
|
8a4c0ab88201
patch 8.1.0168: output of :marks is too short with multi-byte chars
Christian Brabandt <cb@256bit.org>
parents:
13278
diff
changeset
|
686 s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (int)Columns * 5); |
| 7 | 687 if (s == NULL) |
| 688 return NULL; | |
|
14305
8a4c0ab88201
patch 8.1.0168: output of :marks is too short with multi-byte chars
Christian Brabandt <cb@256bit.org>
parents:
13278
diff
changeset
|
689 // Truncate the line to fit it in the window. |
| 7 | 690 len = 0; |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
691 for (p = s; *p != NUL; MB_PTR_ADV(p)) |
| 7 | 692 { |
| 693 len += ptr2cells(p); | |
| 694 if (len >= Columns - lead_len) | |
| 695 break; | |
| 696 } | |
| 697 *p = NUL; | |
| 698 return s; | |
| 699 } | |
| 700 | |
| 701 /* | |
| 702 * print the marks | |
| 703 */ | |
| 704 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
705 do_marks(exarg_T *eap) |
| 7 | 706 { |
| 707 char_u *arg = eap->arg; | |
| 708 int i; | |
| 709 char_u *name; | |
| 710 | |
| 711 if (arg != NULL && *arg == NUL) | |
| 712 arg = NULL; | |
| 713 | |
| 714 show_one_mark('\'', arg, &curwin->w_pcmark, NULL, TRUE); | |
| 715 for (i = 0; i < NMARKS; ++i) | |
| 716 show_one_mark(i + 'a', arg, &curbuf->b_namedm[i], NULL, TRUE); | |
| 717 for (i = 0; i < NMARKS + EXTRA_MARKS; ++i) | |
| 718 { | |
| 719 if (namedfm[i].fmark.fnum != 0) | |
| 720 name = fm_getname(&namedfm[i].fmark, 15); | |
| 721 else | |
| 722 name = namedfm[i].fname; | |
| 723 if (name != NULL) | |
| 724 { | |
| 725 show_one_mark(i >= NMARKS ? i - NMARKS + '0' : i + 'A', | |
| 726 arg, &namedfm[i].fmark.mark, name, | |
| 727 namedfm[i].fmark.fnum == curbuf->b_fnum); | |
| 728 if (namedfm[i].fmark.fnum != 0) | |
| 729 vim_free(name); | |
| 730 } | |
| 731 } | |
| 732 show_one_mark('"', arg, &curbuf->b_last_cursor, NULL, TRUE); | |
| 733 show_one_mark('[', arg, &curbuf->b_op_start, NULL, TRUE); | |
| 734 show_one_mark(']', arg, &curbuf->b_op_end, NULL, TRUE); | |
| 735 show_one_mark('^', arg, &curbuf->b_last_insert, NULL, TRUE); | |
| 736 show_one_mark('.', arg, &curbuf->b_last_change, NULL, TRUE); | |
| 690 | 737 show_one_mark('<', arg, &curbuf->b_visual.vi_start, NULL, TRUE); |
| 738 show_one_mark('>', arg, &curbuf->b_visual.vi_end, NULL, TRUE); | |
| 7 | 739 show_one_mark(-1, arg, NULL, NULL, FALSE); |
| 740 } | |
| 741 | |
| 742 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
743 show_one_mark( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
744 int c, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
745 char_u *arg, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
746 pos_T *p, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
747 char_u *name, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
748 int current) /* in current file */ |
| 7 | 749 { |
| 750 static int did_title = FALSE; | |
| 751 int mustfree = FALSE; | |
| 752 | |
| 753 if (c == -1) /* finish up */ | |
| 754 { | |
| 755 if (did_title) | |
| 756 did_title = FALSE; | |
| 757 else | |
| 758 { | |
| 759 if (arg == NULL) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
760 msg(_("No marks set")); |
| 7 | 761 else |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
762 semsg(_("E283: No marks matching \"%s\""), arg); |
| 7 | 763 } |
| 764 } | |
| 765 /* don't output anything if 'q' typed at --more-- prompt */ | |
| 766 else if (!got_int | |
| 767 && (arg == NULL || vim_strchr(arg, c) != NULL) | |
| 768 && p->lnum != 0) | |
| 769 { | |
| 770 if (!did_title) | |
| 771 { | |
| 772 /* Highlight title */ | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
773 msg_puts_title(_("\nmark line col file/text")); |
| 7 | 774 did_title = TRUE; |
| 775 } | |
| 776 msg_putchar('\n'); | |
| 777 if (!got_int) | |
| 778 { | |
| 779 sprintf((char *)IObuff, " %c %6ld %4d ", c, p->lnum, p->col); | |
| 780 msg_outtrans(IObuff); | |
| 781 if (name == NULL && current) | |
| 782 { | |
| 783 name = mark_line(p, 15); | |
| 784 mustfree = TRUE; | |
| 785 } | |
| 786 if (name != NULL) | |
| 787 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11140
diff
changeset
|
788 msg_outtrans_attr(name, current ? HL_ATTR(HLF_D) : 0); |
| 7 | 789 if (mustfree) |
| 790 vim_free(name); | |
| 791 } | |
| 792 } | |
| 793 out_flush(); /* show one line at a time */ | |
| 794 } | |
| 795 } | |
| 796 | |
| 24 | 797 /* |
| 798 * ":delmarks[!] [marks]" | |
| 799 */ | |
| 800 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
801 ex_delmarks(exarg_T *eap) |
| 24 | 802 { |
| 803 char_u *p; | |
| 804 int from, to; | |
| 805 int i; | |
| 806 int lower; | |
| 807 int digit; | |
| 808 int n; | |
| 809 | |
| 810 if (*eap->arg == NUL && eap->forceit) | |
| 811 /* clear all marks */ | |
| 812 clrallmarks(curbuf); | |
| 813 else if (eap->forceit) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
814 emsg(_(e_invarg)); |
| 24 | 815 else if (*eap->arg == NUL) |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
816 emsg(_(e_argreq)); |
| 24 | 817 else |
| 818 { | |
| 819 /* clear specified marks only */ | |
| 820 for (p = eap->arg; *p != NUL; ++p) | |
| 821 { | |
| 822 lower = ASCII_ISLOWER(*p); | |
| 823 digit = VIM_ISDIGIT(*p); | |
| 824 if (lower || digit || ASCII_ISUPPER(*p)) | |
| 825 { | |
| 826 if (p[1] == '-') | |
| 827 { | |
| 828 /* clear range of marks */ | |
| 829 from = *p; | |
| 830 to = p[2]; | |
| 831 if (!(lower ? ASCII_ISLOWER(p[2]) | |
| 832 : (digit ? VIM_ISDIGIT(p[2]) | |
| 833 : ASCII_ISUPPER(p[2]))) | |
| 834 || to < from) | |
| 835 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
836 semsg(_(e_invarg2), p); |
| 24 | 837 return; |
| 838 } | |
| 839 p += 2; | |
| 840 } | |
| 841 else | |
| 842 /* clear one lower case mark */ | |
| 843 from = to = *p; | |
| 844 | |
| 845 for (i = from; i <= to; ++i) | |
| 846 { | |
| 847 if (lower) | |
| 848 curbuf->b_namedm[i - 'a'].lnum = 0; | |
| 849 else | |
| 850 { | |
| 851 if (digit) | |
| 852 n = i - '0' + NMARKS; | |
| 853 else | |
| 854 n = i - 'A'; | |
| 855 namedfm[n].fmark.mark.lnum = 0; | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
856 VIM_CLEAR(namedfm[n].fname); |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
857 #ifdef FEAT_VIMINFO |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
858 namedfm[n].time_set = 0; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
859 #endif |
| 24 | 860 } |
| 861 } | |
| 862 } | |
| 863 else | |
| 864 switch (*p) | |
| 865 { | |
| 866 case '"': curbuf->b_last_cursor.lnum = 0; break; | |
| 867 case '^': curbuf->b_last_insert.lnum = 0; break; | |
| 868 case '.': curbuf->b_last_change.lnum = 0; break; | |
| 869 case '[': curbuf->b_op_start.lnum = 0; break; | |
| 870 case ']': curbuf->b_op_end.lnum = 0; break; | |
| 690 | 871 case '<': curbuf->b_visual.vi_start.lnum = 0; break; |
| 872 case '>': curbuf->b_visual.vi_end.lnum = 0; break; | |
| 24 | 873 case ' ': break; |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
874 default: semsg(_(e_invarg2), p); |
| 24 | 875 return; |
| 876 } | |
| 877 } | |
| 878 } | |
| 879 } | |
| 880 | |
| 7 | 881 #if defined(FEAT_JUMPLIST) || defined(PROTO) |
| 882 /* | |
| 883 * print the jumplist | |
| 884 */ | |
| 885 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
886 ex_jumps(exarg_T *eap UNUSED) |
| 7 | 887 { |
| 888 int i; | |
| 889 char_u *name; | |
| 890 | |
|
13278
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
891 cleanup_jumplist(curwin, TRUE); |
|
13248
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
892 |
| 7 | 893 /* Highlight title */ |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
894 msg_puts_title(_("\n jump line col file/text")); |
| 7 | 895 for (i = 0; i < curwin->w_jumplistlen && !got_int; ++i) |
| 896 { | |
| 897 if (curwin->w_jumplist[i].fmark.mark.lnum != 0) | |
| 898 { | |
| 899 name = fm_getname(&curwin->w_jumplist[i].fmark, 16); | |
|
14968
c5ec5ddbe814
patch 8.1.0495: :filter only supports some commands
Bram Moolenaar <Bram@vim.org>
parents:
14305
diff
changeset
|
900 |
|
c5ec5ddbe814
patch 8.1.0495: :filter only supports some commands
Bram Moolenaar <Bram@vim.org>
parents:
14305
diff
changeset
|
901 // apply :filter /pat/ or file name not available |
|
c5ec5ddbe814
patch 8.1.0495: :filter only supports some commands
Bram Moolenaar <Bram@vim.org>
parents:
14305
diff
changeset
|
902 if (name == NULL || message_filtered(name)) |
| 7 | 903 continue; |
| 904 | |
| 905 msg_putchar('\n'); | |
| 906 if (got_int) | |
| 1702 | 907 { |
| 908 vim_free(name); | |
| 7 | 909 break; |
| 1702 | 910 } |
| 7 | 911 sprintf((char *)IObuff, "%c %2d %5ld %4d ", |
| 912 i == curwin->w_jumplistidx ? '>' : ' ', | |
| 913 i > curwin->w_jumplistidx ? i - curwin->w_jumplistidx | |
| 914 : curwin->w_jumplistidx - i, | |
| 915 curwin->w_jumplist[i].fmark.mark.lnum, | |
| 916 curwin->w_jumplist[i].fmark.mark.col); | |
| 917 msg_outtrans(IObuff); | |
| 918 msg_outtrans_attr(name, | |
| 919 curwin->w_jumplist[i].fmark.fnum == curbuf->b_fnum | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11140
diff
changeset
|
920 ? HL_ATTR(HLF_D) : 0); |
| 7 | 921 vim_free(name); |
| 922 ui_breakcheck(); | |
| 923 } | |
| 924 out_flush(); | |
| 925 } | |
| 926 if (curwin->w_jumplistidx == curwin->w_jumplistlen) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
927 msg_puts("\n>"); |
| 7 | 928 } |
| 929 | |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
930 void |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
931 ex_clearjumps(exarg_T *eap UNUSED) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
932 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
933 free_jumplist(curwin); |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
934 curwin->w_jumplistlen = 0; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
935 curwin->w_jumplistidx = 0; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
936 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
937 |
| 7 | 938 /* |
| 939 * print the changelist | |
| 940 */ | |
| 941 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
942 ex_changes(exarg_T *eap UNUSED) |
| 7 | 943 { |
| 944 int i; | |
| 945 char_u *name; | |
| 946 | |
| 947 /* Highlight title */ | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
948 msg_puts_title(_("\nchange line col text")); |
| 7 | 949 |
| 950 for (i = 0; i < curbuf->b_changelistlen && !got_int; ++i) | |
| 951 { | |
| 952 if (curbuf->b_changelist[i].lnum != 0) | |
| 953 { | |
| 954 msg_putchar('\n'); | |
| 955 if (got_int) | |
| 956 break; | |
| 957 sprintf((char *)IObuff, "%c %3d %5ld %4d ", | |
| 958 i == curwin->w_changelistidx ? '>' : ' ', | |
| 959 i > curwin->w_changelistidx ? i - curwin->w_changelistidx | |
| 960 : curwin->w_changelistidx - i, | |
| 961 (long)curbuf->b_changelist[i].lnum, | |
| 962 curbuf->b_changelist[i].col); | |
| 963 msg_outtrans(IObuff); | |
| 964 name = mark_line(&curbuf->b_changelist[i], 17); | |
| 965 if (name == NULL) | |
| 966 break; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11140
diff
changeset
|
967 msg_outtrans_attr(name, HL_ATTR(HLF_D)); |
| 7 | 968 vim_free(name); |
| 969 ui_breakcheck(); | |
| 970 } | |
| 971 out_flush(); | |
| 972 } | |
| 973 if (curwin->w_changelistidx == curbuf->b_changelistlen) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
974 msg_puts("\n>"); |
| 7 | 975 } |
| 976 #endif | |
| 977 | |
| 978 #define one_adjust(add) \ | |
| 979 { \ | |
| 980 lp = add; \ | |
| 981 if (*lp >= line1 && *lp <= line2) \ | |
| 982 { \ | |
| 983 if (amount == MAXLNUM) \ | |
| 984 *lp = 0; \ | |
| 985 else \ | |
| 986 *lp += amount; \ | |
| 987 } \ | |
| 988 else if (amount_after && *lp > line2) \ | |
| 989 *lp += amount_after; \ | |
| 990 } | |
| 991 | |
| 992 /* don't delete the line, just put at first deleted line */ | |
| 993 #define one_adjust_nodel(add) \ | |
| 994 { \ | |
| 995 lp = add; \ | |
| 996 if (*lp >= line1 && *lp <= line2) \ | |
| 997 { \ | |
| 998 if (amount == MAXLNUM) \ | |
| 999 *lp = line1; \ | |
| 1000 else \ | |
| 1001 *lp += amount; \ | |
| 1002 } \ | |
| 1003 else if (amount_after && *lp > line2) \ | |
| 1004 *lp += amount_after; \ | |
| 1005 } | |
| 1006 | |
| 1007 /* | |
| 1008 * Adjust marks between line1 and line2 (inclusive) to move 'amount' lines. | |
| 1009 * Must be called before changed_*(), appended_lines() or deleted_lines(). | |
| 1010 * May be called before or after changing the text. | |
| 1011 * When deleting lines line1 to line2, use an 'amount' of MAXLNUM: The marks | |
| 1012 * within this range are made invalid. | |
| 1013 * If 'amount_after' is non-zero adjust marks after line2. | |
| 1014 * Example: Delete lines 34 and 35: mark_adjust(34, 35, MAXLNUM, -2); | |
| 1015 * Example: Insert two lines below 55: mark_adjust(56, MAXLNUM, 2, 0); | |
| 1016 * or: mark_adjust(56, 55, MAXLNUM, 2); | |
| 1017 */ | |
| 1018 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1019 mark_adjust( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1020 linenr_T line1, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1021 linenr_T line2, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1022 long amount, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1023 long amount_after) |
| 7 | 1024 { |
|
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1025 mark_adjust_internal(line1, line2, amount, amount_after, TRUE); |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1026 } |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1027 |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1028 void |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1029 mark_adjust_nofold( |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1030 linenr_T line1, |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1031 linenr_T line2, |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1032 long amount, |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1033 long amount_after) |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1034 { |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1035 mark_adjust_internal(line1, line2, amount, amount_after, FALSE); |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1036 } |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1037 |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1038 static void |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1039 mark_adjust_internal( |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1040 linenr_T line1, |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1041 linenr_T line2, |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1042 long amount, |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1043 long amount_after, |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1044 int adjust_folds UNUSED) |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1045 { |
| 7 | 1046 int i; |
| 1047 int fnum = curbuf->b_fnum; | |
| 1048 linenr_T *lp; | |
| 1049 win_T *win; | |
| 1863 | 1050 tabpage_T *tab; |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1051 static pos_T initpos = {1, 0, 0}; |
| 7 | 1052 |
| 1053 if (line2 < line1 && amount_after == 0L) /* nothing to do */ | |
| 1054 return; | |
| 1055 | |
| 1056 if (!cmdmod.lockmarks) | |
| 1057 { | |
| 1058 /* named marks, lower case and upper case */ | |
| 1059 for (i = 0; i < NMARKS; i++) | |
| 1060 { | |
| 1061 one_adjust(&(curbuf->b_namedm[i].lnum)); | |
| 1062 if (namedfm[i].fmark.fnum == fnum) | |
| 1063 one_adjust_nodel(&(namedfm[i].fmark.mark.lnum)); | |
| 1064 } | |
| 1065 for (i = NMARKS; i < NMARKS + EXTRA_MARKS; i++) | |
| 1066 { | |
| 1067 if (namedfm[i].fmark.fnum == fnum) | |
| 1068 one_adjust_nodel(&(namedfm[i].fmark.mark.lnum)); | |
| 1069 } | |
| 1070 | |
| 1071 /* last Insert position */ | |
| 1072 one_adjust(&(curbuf->b_last_insert.lnum)); | |
| 1073 | |
| 1074 /* last change position */ | |
| 1075 one_adjust(&(curbuf->b_last_change.lnum)); | |
| 1076 | |
| 4092 | 1077 /* last cursor position, if it was set */ |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10730
diff
changeset
|
1078 if (!EQUAL_POS(curbuf->b_last_cursor, initpos)) |
| 4092 | 1079 one_adjust(&(curbuf->b_last_cursor.lnum)); |
| 1080 | |
| 1081 | |
| 7 | 1082 #ifdef FEAT_JUMPLIST |
| 1083 /* list of change positions */ | |
| 1084 for (i = 0; i < curbuf->b_changelistlen; ++i) | |
| 1085 one_adjust_nodel(&(curbuf->b_changelist[i].lnum)); | |
| 1086 #endif | |
| 1087 | |
| 1088 /* Visual area */ | |
| 690 | 1089 one_adjust_nodel(&(curbuf->b_visual.vi_start.lnum)); |
| 1090 one_adjust_nodel(&(curbuf->b_visual.vi_end.lnum)); | |
| 7 | 1091 |
| 1092 #ifdef FEAT_QUICKFIX | |
| 1093 /* quickfix marks */ | |
| 643 | 1094 qf_mark_adjust(NULL, line1, line2, amount, amount_after); |
| 1095 /* location lists */ | |
| 1863 | 1096 FOR_ALL_TAB_WINDOWS(tab, win) |
| 643 | 1097 qf_mark_adjust(win, line1, line2, amount, amount_after); |
| 7 | 1098 #endif |
| 1099 | |
| 1100 #ifdef FEAT_SIGNS | |
| 1101 sign_mark_adjust(line1, line2, amount, amount_after); | |
| 1102 #endif | |
| 1103 } | |
| 1104 | |
| 1105 /* previous context mark */ | |
| 1106 one_adjust(&(curwin->w_pcmark.lnum)); | |
| 1107 | |
| 1108 /* previous pcmark */ | |
| 1109 one_adjust(&(curwin->w_prev_pcmark.lnum)); | |
| 1110 | |
| 1111 /* saved cursor for formatting */ | |
| 1112 if (saved_cursor.lnum != 0) | |
| 1113 one_adjust_nodel(&(saved_cursor.lnum)); | |
| 1114 | |
| 1115 /* | |
| 1116 * Adjust items in all windows related to the current buffer. | |
| 1117 */ | |
| 1863 | 1118 FOR_ALL_TAB_WINDOWS(tab, win) |
| 7 | 1119 { |
| 1120 #ifdef FEAT_JUMPLIST | |
| 1121 if (!cmdmod.lockmarks) | |
| 1122 /* Marks in the jumplist. When deleting lines, this may create | |
| 1123 * duplicate marks in the jumplist, they will be removed later. */ | |
| 1124 for (i = 0; i < win->w_jumplistlen; ++i) | |
| 1125 if (win->w_jumplist[i].fmark.fnum == fnum) | |
| 1126 one_adjust_nodel(&(win->w_jumplist[i].fmark.mark.lnum)); | |
| 1127 #endif | |
| 1128 | |
| 1129 if (win->w_buffer == curbuf) | |
| 1130 { | |
| 1131 if (!cmdmod.lockmarks) | |
| 1132 /* marks in the tag stack */ | |
| 1133 for (i = 0; i < win->w_tagstacklen; i++) | |
| 1134 if (win->w_tagstack[i].fmark.fnum == fnum) | |
| 1135 one_adjust_nodel(&(win->w_tagstack[i].fmark.mark.lnum)); | |
| 1136 | |
| 1137 /* the displayed Visual area */ | |
| 1138 if (win->w_old_cursor_lnum != 0) | |
| 1139 { | |
| 1140 one_adjust_nodel(&(win->w_old_cursor_lnum)); | |
| 1141 one_adjust_nodel(&(win->w_old_visual_lnum)); | |
| 1142 } | |
| 1143 | |
| 1144 /* topline and cursor position for windows with the same buffer | |
| 1145 * other than the current window */ | |
| 1146 if (win != curwin) | |
| 1147 { | |
| 1148 if (win->w_topline >= line1 && win->w_topline <= line2) | |
| 1149 { | |
| 1150 if (amount == MAXLNUM) /* topline is deleted */ | |
| 1151 { | |
| 1152 if (line1 <= 1) | |
| 1153 win->w_topline = 1; | |
| 1154 else | |
| 1155 win->w_topline = line1 - 1; | |
| 1156 } | |
| 1157 else /* keep topline on the same line */ | |
| 1158 win->w_topline += amount; | |
| 1159 #ifdef FEAT_DIFF | |
| 1160 win->w_topfill = 0; | |
| 1161 #endif | |
| 1162 } | |
| 1163 else if (amount_after && win->w_topline > line2) | |
| 1164 { | |
| 1165 win->w_topline += amount_after; | |
| 1166 #ifdef FEAT_DIFF | |
| 1167 win->w_topfill = 0; | |
| 1168 #endif | |
| 1169 } | |
| 1170 if (win->w_cursor.lnum >= line1 && win->w_cursor.lnum <= line2) | |
| 1171 { | |
| 1172 if (amount == MAXLNUM) /* line with cursor is deleted */ | |
| 1173 { | |
| 1174 if (line1 <= 1) | |
| 1175 win->w_cursor.lnum = 1; | |
| 1176 else | |
| 1177 win->w_cursor.lnum = line1 - 1; | |
| 1178 win->w_cursor.col = 0; | |
| 1179 } | |
| 1180 else /* keep cursor on the same line */ | |
| 1181 win->w_cursor.lnum += amount; | |
| 1182 } | |
| 1183 else if (amount_after && win->w_cursor.lnum > line2) | |
| 1184 win->w_cursor.lnum += amount_after; | |
| 1185 } | |
| 1186 | |
| 1187 #ifdef FEAT_FOLDING | |
| 1188 /* adjust folds */ | |
|
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1189 if (adjust_folds) |
|
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1190 foldMarkAdjust(win, line1, line2, amount, amount_after); |
| 7 | 1191 #endif |
| 1192 } | |
| 1193 } | |
| 1194 | |
| 1195 #ifdef FEAT_DIFF | |
| 1196 /* adjust diffs */ | |
| 1197 diff_mark_adjust(line1, line2, amount, amount_after); | |
| 1198 #endif | |
| 1199 } | |
| 1200 | |
| 1201 /* This code is used often, needs to be fast. */ | |
| 1202 #define col_adjust(pp) \ | |
| 1203 { \ | |
| 1204 posp = pp; \ | |
| 1205 if (posp->lnum == lnum && posp->col >= mincol) \ | |
| 1206 { \ | |
| 1207 posp->lnum += lnum_amount; \ | |
| 1208 if (col_amount < 0 && posp->col <= (colnr_T)-col_amount) \ | |
| 1209 posp->col = 0; \ | |
|
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
14968
diff
changeset
|
1210 else if (posp->col < spaces_removed) \ |
|
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
14968
diff
changeset
|
1211 posp->col = col_amount + spaces_removed; \ |
| 7 | 1212 else \ |
| 1213 posp->col += col_amount; \ | |
| 1214 } \ | |
| 1215 } | |
| 1216 | |
| 1217 /* | |
| 1218 * Adjust marks in line "lnum" at column "mincol" and further: add | |
| 1219 * "lnum_amount" to the line number and add "col_amount" to the column | |
| 1220 * position. | |
|
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
14968
diff
changeset
|
1221 * "spaces_removed" is the number of spaces that were removed, matters when the |
|
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
14968
diff
changeset
|
1222 * cursor is inside them. |
| 7 | 1223 */ |
| 1224 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1225 mark_col_adjust( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1226 linenr_T lnum, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1227 colnr_T mincol, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1228 long lnum_amount, |
|
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
14968
diff
changeset
|
1229 long col_amount, |
|
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
14968
diff
changeset
|
1230 int spaces_removed) |
| 7 | 1231 { |
| 1232 int i; | |
| 1233 int fnum = curbuf->b_fnum; | |
| 1234 win_T *win; | |
| 1235 pos_T *posp; | |
| 1236 | |
| 1237 if ((col_amount == 0L && lnum_amount == 0L) || cmdmod.lockmarks) | |
| 1238 return; /* nothing to do */ | |
| 1239 | |
| 1240 /* named marks, lower case and upper case */ | |
| 1241 for (i = 0; i < NMARKS; i++) | |
| 1242 { | |
| 1243 col_adjust(&(curbuf->b_namedm[i])); | |
| 1244 if (namedfm[i].fmark.fnum == fnum) | |
| 1245 col_adjust(&(namedfm[i].fmark.mark)); | |
| 1246 } | |
| 1247 for (i = NMARKS; i < NMARKS + EXTRA_MARKS; i++) | |
| 1248 { | |
| 1249 if (namedfm[i].fmark.fnum == fnum) | |
| 1250 col_adjust(&(namedfm[i].fmark.mark)); | |
| 1251 } | |
| 1252 | |
| 1253 /* last Insert position */ | |
| 1254 col_adjust(&(curbuf->b_last_insert)); | |
| 1255 | |
| 1256 /* last change position */ | |
| 1257 col_adjust(&(curbuf->b_last_change)); | |
| 1258 | |
| 1259 #ifdef FEAT_JUMPLIST | |
| 1260 /* list of change positions */ | |
| 1261 for (i = 0; i < curbuf->b_changelistlen; ++i) | |
| 1262 col_adjust(&(curbuf->b_changelist[i])); | |
| 1263 #endif | |
| 1264 | |
| 1265 /* Visual area */ | |
| 690 | 1266 col_adjust(&(curbuf->b_visual.vi_start)); |
| 1267 col_adjust(&(curbuf->b_visual.vi_end)); | |
| 7 | 1268 |
| 1269 /* previous context mark */ | |
| 1270 col_adjust(&(curwin->w_pcmark)); | |
| 1271 | |
| 1272 /* previous pcmark */ | |
| 1273 col_adjust(&(curwin->w_prev_pcmark)); | |
| 1274 | |
| 1275 /* saved cursor for formatting */ | |
| 1276 col_adjust(&saved_cursor); | |
| 1277 | |
| 1278 /* | |
| 1279 * Adjust items in all windows related to the current buffer. | |
| 1280 */ | |
| 1281 FOR_ALL_WINDOWS(win) | |
| 1282 { | |
| 1283 #ifdef FEAT_JUMPLIST | |
| 1284 /* marks in the jumplist */ | |
| 1285 for (i = 0; i < win->w_jumplistlen; ++i) | |
| 1286 if (win->w_jumplist[i].fmark.fnum == fnum) | |
| 1287 col_adjust(&(win->w_jumplist[i].fmark.mark)); | |
| 1288 #endif | |
| 1289 | |
| 1290 if (win->w_buffer == curbuf) | |
| 1291 { | |
| 1292 /* marks in the tag stack */ | |
| 1293 for (i = 0; i < win->w_tagstacklen; i++) | |
| 1294 if (win->w_tagstack[i].fmark.fnum == fnum) | |
| 1295 col_adjust(&(win->w_tagstack[i].fmark.mark)); | |
| 1296 | |
| 1297 /* cursor position for other windows with the same buffer */ | |
| 1298 if (win != curwin) | |
| 1299 col_adjust(&win->w_cursor); | |
| 1300 } | |
| 1301 } | |
| 1302 } | |
| 1303 | |
| 1304 #ifdef FEAT_JUMPLIST | |
| 1305 /* | |
| 1306 * When deleting lines, this may create duplicate marks in the | |
|
13248
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1307 * jumplist. They will be removed here for the specified window. |
|
13278
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1308 * When "loadfiles" is TRUE first ensure entries have the "fnum" field set |
|
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1309 * (this may be a bit slow). |
| 7 | 1310 */ |
|
13248
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1311 void |
|
13278
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1312 cleanup_jumplist(win_T *wp, int loadfiles) |
| 7 | 1313 { |
| 1314 int i; | |
| 1315 int from, to; | |
| 1316 | |
|
13278
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1317 if (loadfiles) |
|
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1318 { |
|
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1319 /* If specified, load all the files from the jump list. This is |
|
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1320 * needed to properly clean up duplicate entries, but will take some |
|
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1321 * time. */ |
|
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1322 for (i = 0; i < wp->w_jumplistlen; ++i) |
|
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1323 { |
|
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1324 if ((wp->w_jumplist[i].fmark.fnum == 0) && |
|
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1325 (wp->w_jumplist[i].fmark.mark.lnum != 0)) |
|
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1326 fname2fnum(&wp->w_jumplist[i]); |
|
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1327 } |
|
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1328 } |
|
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1329 |
| 7 | 1330 to = 0; |
|
13248
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1331 for (from = 0; from < wp->w_jumplistlen; ++from) |
| 7 | 1332 { |
|
13248
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1333 if (wp->w_jumplistidx == from) |
|
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1334 wp->w_jumplistidx = to; |
|
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1335 for (i = from + 1; i < wp->w_jumplistlen; ++i) |
|
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1336 if (wp->w_jumplist[i].fmark.fnum |
|
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1337 == wp->w_jumplist[from].fmark.fnum |
|
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1338 && wp->w_jumplist[from].fmark.fnum != 0 |
|
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1339 && wp->w_jumplist[i].fmark.mark.lnum |
|
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1340 == wp->w_jumplist[from].fmark.mark.lnum) |
| 7 | 1341 break; |
|
13248
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1342 if (i >= wp->w_jumplistlen) /* no duplicate */ |
|
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1343 wp->w_jumplist[to++] = wp->w_jumplist[from]; |
| 7 | 1344 else |
|
13248
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1345 vim_free(wp->w_jumplist[from].fname); |
| 7 | 1346 } |
|
13248
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1347 if (wp->w_jumplistidx == wp->w_jumplistlen) |
|
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1348 wp->w_jumplistidx = to; |
|
5958573d8a72
patch 8.0.1498: getjumplist() returns duplicate entries
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1349 wp->w_jumplistlen = to; |
| 7 | 1350 } |
| 1351 | |
| 1352 /* | |
| 1353 * Copy the jumplist from window "from" to window "to". | |
| 1354 */ | |
| 1355 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1356 copy_jumplist(win_T *from, win_T *to) |
| 7 | 1357 { |
| 1358 int i; | |
| 1359 | |
| 1360 for (i = 0; i < from->w_jumplistlen; ++i) | |
| 1361 { | |
| 1362 to->w_jumplist[i] = from->w_jumplist[i]; | |
| 1363 if (from->w_jumplist[i].fname != NULL) | |
| 1364 to->w_jumplist[i].fname = vim_strsave(from->w_jumplist[i].fname); | |
| 1365 } | |
| 1366 to->w_jumplistlen = from->w_jumplistlen; | |
| 1367 to->w_jumplistidx = from->w_jumplistidx; | |
| 1368 } | |
| 1369 | |
| 1370 /* | |
| 1371 * Free items in the jumplist of window "wp". | |
| 1372 */ | |
| 1373 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1374 free_jumplist(win_T *wp) |
| 7 | 1375 { |
| 1376 int i; | |
| 1377 | |
| 1378 for (i = 0; i < wp->w_jumplistlen; ++i) | |
| 1379 vim_free(wp->w_jumplist[i].fname); | |
| 1380 } | |
| 1381 #endif /* FEAT_JUMPLIST */ | |
| 1382 | |
| 1383 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1384 set_last_cursor(win_T *win) |
| 7 | 1385 { |
| 5417 | 1386 if (win->w_buffer != NULL) |
| 1387 win->w_buffer->b_last_cursor = win->w_cursor; | |
| 7 | 1388 } |
| 1389 | |
| 358 | 1390 #if defined(EXITFREE) || defined(PROTO) |
| 1391 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1392 free_all_marks(void) |
| 358 | 1393 { |
| 1394 int i; | |
| 1395 | |
| 1396 for (i = 0; i < NMARKS + EXTRA_MARKS; i++) | |
| 1397 if (namedfm[i].fmark.mark.lnum != 0) | |
| 1398 vim_free(namedfm[i].fname); | |
| 1399 } | |
| 1400 #endif | |
| 1401 | |
| 7 | 1402 #if defined(FEAT_VIMINFO) || defined(PROTO) |
| 1403 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1404 read_viminfo_filemark(vir_T *virp, int force) |
| 7 | 1405 { |
| 1406 char_u *str; | |
| 1407 xfmark_T *fm; | |
| 1408 int i; | |
| 1409 | |
| 1410 /* We only get here if line[0] == '\'' or '-'. | |
| 1411 * Illegal mark names are ignored (for future expansion). */ | |
| 1412 str = virp->vir_line + 1; | |
| 1413 if ( | |
| 1414 #ifndef EBCDIC | |
| 1415 *str <= 127 && | |
| 1416 #endif | |
| 1417 ((*virp->vir_line == '\'' && (VIM_ISDIGIT(*str) || isupper(*str))) | |
| 1418 || (*virp->vir_line == '-' && *str == '\''))) | |
| 1419 { | |
| 1420 if (*str == '\'') | |
| 1421 { | |
| 1422 #ifdef FEAT_JUMPLIST | |
| 1423 /* If the jumplist isn't full insert fmark as oldest entry */ | |
| 1424 if (curwin->w_jumplistlen == JUMPLISTSIZE) | |
| 1425 fm = NULL; | |
| 1426 else | |
| 1427 { | |
| 1428 for (i = curwin->w_jumplistlen; i > 0; --i) | |
| 1429 curwin->w_jumplist[i] = curwin->w_jumplist[i - 1]; | |
| 1430 ++curwin->w_jumplistidx; | |
| 1431 ++curwin->w_jumplistlen; | |
| 1432 fm = &curwin->w_jumplist[0]; | |
| 1433 fm->fmark.mark.lnum = 0; | |
| 1434 fm->fname = NULL; | |
| 1435 } | |
| 1436 #else | |
| 1437 fm = NULL; | |
| 1438 #endif | |
| 1439 } | |
| 1440 else if (VIM_ISDIGIT(*str)) | |
| 1441 fm = &namedfm[*str - '0' + NMARKS]; | |
| 1442 else | |
| 1443 fm = &namedfm[*str - 'A']; | |
| 1444 if (fm != NULL && (fm->fmark.mark.lnum == 0 || force)) | |
| 1445 { | |
| 1446 str = skipwhite(str + 1); | |
| 1447 fm->fmark.mark.lnum = getdigits(&str); | |
| 1448 str = skipwhite(str); | |
| 1449 fm->fmark.mark.col = getdigits(&str); | |
| 1450 fm->fmark.mark.coladd = 0; | |
| 1451 fm->fmark.fnum = 0; | |
| 1452 str = skipwhite(str); | |
| 1453 vim_free(fm->fname); | |
| 1454 fm->fname = viminfo_readstring(virp, (int)(str - virp->vir_line), | |
| 1455 FALSE); | |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1456 fm->time_set = 0; |
| 7 | 1457 } |
| 1458 } | |
| 1459 return vim_fgets(virp->vir_line, LSIZE, virp->vir_fd); | |
| 1460 } | |
| 1461 | |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1462 static xfmark_T *vi_namedfm = NULL; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1463 #ifdef FEAT_JUMPLIST |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1464 static xfmark_T *vi_jumplist = NULL; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1465 static int vi_jumplist_len = 0; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1466 #endif |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1467 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1468 /* |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1469 * Prepare for reading viminfo marks when writing viminfo later. |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1470 */ |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1471 void |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1472 prepare_viminfo_marks(void) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1473 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1474 vi_namedfm = (xfmark_T *)alloc_clear((NMARKS + EXTRA_MARKS) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1475 * (int)sizeof(xfmark_T)); |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1476 #ifdef FEAT_JUMPLIST |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1477 vi_jumplist = (xfmark_T *)alloc_clear(JUMPLISTSIZE |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1478 * (int)sizeof(xfmark_T)); |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1479 vi_jumplist_len = 0; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1480 #endif |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1481 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1482 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1483 void |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1484 finish_viminfo_marks(void) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1485 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1486 int i; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1487 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1488 if (vi_namedfm != NULL) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1489 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1490 for (i = 0; i < NMARKS + EXTRA_MARKS; ++i) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1491 vim_free(vi_namedfm[i].fname); |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1492 VIM_CLEAR(vi_namedfm); |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1493 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1494 #ifdef FEAT_JUMPLIST |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1495 if (vi_jumplist != NULL) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1496 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1497 for (i = 0; i < vi_jumplist_len; ++i) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1498 vim_free(vi_jumplist[i].fname); |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1499 VIM_CLEAR(vi_jumplist); |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1500 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1501 #endif |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1502 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1503 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1504 /* |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1505 * Accept a new style mark line from the viminfo, store it when it's new. |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1506 */ |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1507 void |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1508 handle_viminfo_mark(garray_T *values, int force) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1509 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1510 bval_T *vp = (bval_T *)values->ga_data; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1511 int name; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1512 linenr_T lnum; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1513 colnr_T col; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1514 time_t timestamp; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1515 xfmark_T *fm = NULL; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1516 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1517 /* Check the format: |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1518 * |{bartype},{name},{lnum},{col},{timestamp},{filename} */ |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1519 if (values->ga_len < 5 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1520 || vp[0].bv_type != BVAL_NR |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1521 || vp[1].bv_type != BVAL_NR |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1522 || vp[2].bv_type != BVAL_NR |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1523 || vp[3].bv_type != BVAL_NR |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1524 || vp[4].bv_type != BVAL_STRING) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1525 return; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1526 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1527 name = vp[0].bv_nr; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1528 if (name != '\'' && !VIM_ISDIGIT(name) && !ASCII_ISUPPER(name)) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1529 return; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1530 lnum = vp[1].bv_nr; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1531 col = vp[2].bv_nr; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1532 if (lnum <= 0 || col < 0) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1533 return; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1534 timestamp = (time_t)vp[3].bv_nr; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1535 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1536 if (name == '\'') |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1537 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1538 #ifdef FEAT_JUMPLIST |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1539 if (vi_jumplist != NULL) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1540 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1541 if (vi_jumplist_len < JUMPLISTSIZE) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1542 fm = &vi_jumplist[vi_jumplist_len++]; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1543 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1544 else |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1545 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1546 int idx; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1547 int i; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1548 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1549 /* If we have a timestamp insert it in the right place. */ |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1550 if (timestamp != 0) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1551 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1552 for (idx = curwin->w_jumplistlen - 1; idx >= 0; --idx) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1553 if (curwin->w_jumplist[idx].time_set < timestamp) |
|
9299
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1554 { |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1555 ++idx; |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1556 break; |
|
9299
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1557 } |
|
9322
f2e534fdbe65
commit https://github.com/vim/vim/commit/678e480529bce7ba3c09e71233249e3b56531b24
Christian Brabandt <cb@256bit.org>
parents:
9313
diff
changeset
|
1558 /* idx cannot be zero now */ |
|
9299
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1559 if (idx < 0 && curwin->w_jumplistlen < JUMPLISTSIZE) |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1560 /* insert as the oldest entry */ |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1561 idx = 0; |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1562 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1563 else if (curwin->w_jumplistlen < JUMPLISTSIZE) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1564 /* insert as oldest entry */ |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1565 idx = 0; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1566 else |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1567 idx = -1; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1568 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1569 if (idx >= 0) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1570 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1571 if (curwin->w_jumplistlen == JUMPLISTSIZE) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1572 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1573 /* Drop the oldest entry. */ |
|
9313
c0760b25f31d
commit https://github.com/vim/vim/commit/28607ba2b82668503f8406bc13690d59af46deb3
Christian Brabandt <cb@256bit.org>
parents:
9311
diff
changeset
|
1574 --idx; |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1575 vim_free(curwin->w_jumplist[0].fname); |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1576 for (i = 0; i < idx; ++i) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1577 curwin->w_jumplist[i] = curwin->w_jumplist[i + 1]; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1578 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1579 else |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1580 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1581 /* Move newer entries forward. */ |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1582 for (i = curwin->w_jumplistlen; i > idx; --i) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1583 curwin->w_jumplist[i] = curwin->w_jumplist[i - 1]; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1584 ++curwin->w_jumplistidx; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1585 ++curwin->w_jumplistlen; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1586 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1587 fm = &curwin->w_jumplist[idx]; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1588 fm->fmark.mark.lnum = 0; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1589 fm->fname = NULL; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1590 fm->time_set = 0; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1591 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1592 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1593 #endif |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1594 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1595 else |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1596 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1597 int idx; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1598 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1599 if (VIM_ISDIGIT(name)) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1600 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1601 if (vi_namedfm != NULL) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1602 idx = name - '0' + NMARKS; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1603 else |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1604 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1605 int i; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1606 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1607 /* Do not use the name from the viminfo file, insert in time |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1608 * order. */ |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1609 for (idx = NMARKS; idx < NMARKS + EXTRA_MARKS; ++idx) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1610 if (namedfm[idx].time_set < timestamp) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1611 break; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1612 if (idx == NMARKS + EXTRA_MARKS) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1613 /* All existing entries are newer. */ |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1614 return; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1615 i = NMARKS + EXTRA_MARKS - 1; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1616 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1617 vim_free(namedfm[i].fname); |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1618 for ( ; i > idx; --i) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1619 namedfm[i] = namedfm[i - 1]; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1620 namedfm[idx].fname = NULL; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1621 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1622 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1623 else |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1624 idx = name - 'A'; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1625 if (vi_namedfm != NULL) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1626 fm = &vi_namedfm[idx]; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1627 else |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1628 fm = &namedfm[idx]; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1629 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1630 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1631 if (fm != NULL) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1632 { |
|
10285
cd16ef948ad1
commit https://github.com/vim/vim/commit/156919f99afd1ac11d19d4270afbc1afb7245640
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1633 if (vi_namedfm != NULL || fm->fmark.mark.lnum == 0 |
|
cd16ef948ad1
commit https://github.com/vim/vim/commit/156919f99afd1ac11d19d4270afbc1afb7245640
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1634 || fm->time_set < timestamp || force) |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1635 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1636 fm->fmark.mark.lnum = lnum; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1637 fm->fmark.mark.col = col; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1638 fm->fmark.mark.coladd = 0; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1639 fm->fmark.fnum = 0; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1640 vim_free(fm->fname); |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1641 if (vp[4].bv_allocated) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1642 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1643 fm->fname = vp[4].bv_string; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1644 vp[4].bv_string = NULL; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1645 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1646 else |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1647 fm->fname = vim_strsave(vp[4].bv_string); |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1648 fm->time_set = timestamp; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1649 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1650 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1651 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1652 |
|
12100
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1653 /* |
|
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1654 * Return TRUE if marks for "buf" should not be written. |
|
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1655 */ |
|
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1656 static int |
|
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1657 skip_for_viminfo(buf_T *buf) |
|
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1658 { |
|
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1659 return |
|
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1660 #ifdef FEAT_TERMINAL |
|
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1661 bt_terminal(buf) || |
|
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1662 #endif |
|
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1663 removable(buf->b_ffname); |
|
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1664 } |
|
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1665 |
| 7 | 1666 void |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1667 write_viminfo_filemarks(FILE *fp) |
| 7 | 1668 { |
| 1669 int i; | |
| 1670 char_u *name; | |
| 1671 buf_T *buf; | |
| 1672 xfmark_T *fm; | |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1673 int vi_idx; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1674 int idx; |
| 7 | 1675 |
| 1676 if (get_viminfo_parameter('f') == 0) | |
| 1677 return; | |
| 1678 | |
|
2545
298d8d6e69be
Avoid warnings from the clang compiler. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
1880
diff
changeset
|
1679 fputs(_("\n# File marks:\n"), fp); |
| 7 | 1680 |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1681 /* Write the filemarks 'A - 'Z */ |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1682 for (i = 0; i < NMARKS; i++) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1683 { |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1684 if (vi_namedfm != NULL && (vi_namedfm[i].time_set > namedfm[i].time_set |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1685 || namedfm[i].fmark.mark.lnum == 0)) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1686 fm = &vi_namedfm[i]; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1687 else |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1688 fm = &namedfm[i]; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1689 write_one_filemark(fp, fm, '\'', i + 'A'); |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1690 } |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1691 |
| 7 | 1692 /* |
| 1693 * Find a mark that is the same file and position as the cursor. | |
| 1694 * That one, or else the last one is deleted. | |
| 1695 * Move '0 to '1, '1 to '2, etc. until the matching one or '9 | |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1696 * Set the '0 mark to current cursor position. |
| 7 | 1697 */ |
|
12100
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1698 if (curbuf->b_ffname != NULL && !skip_for_viminfo(curbuf)) |
| 7 | 1699 { |
| 1700 name = buflist_nr2name(curbuf->b_fnum, TRUE, FALSE); | |
| 1701 for (i = NMARKS; i < NMARKS + EXTRA_MARKS - 1; ++i) | |
| 1702 if (namedfm[i].fmark.mark.lnum == curwin->w_cursor.lnum | |
| 1703 && (namedfm[i].fname == NULL | |
| 1704 ? namedfm[i].fmark.fnum == curbuf->b_fnum | |
| 1705 : (name != NULL | |
| 1706 && STRCMP(name, namedfm[i].fname) == 0))) | |
| 1707 break; | |
| 1708 vim_free(name); | |
| 1709 | |
| 1710 vim_free(namedfm[i].fname); | |
| 1711 for ( ; i > NMARKS; --i) | |
| 1712 namedfm[i] = namedfm[i - 1]; | |
| 1713 namedfm[NMARKS].fmark.mark = curwin->w_cursor; | |
| 1714 namedfm[NMARKS].fmark.fnum = curbuf->b_fnum; | |
| 1715 namedfm[NMARKS].fname = NULL; | |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1716 namedfm[NMARKS].time_set = vim_time(); |
| 7 | 1717 } |
| 1718 | |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1719 /* Write the filemarks '0 - '9. Newest (highest timestamp) first. */ |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1720 vi_idx = NMARKS; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1721 idx = NMARKS; |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1722 for (i = NMARKS; i < NMARKS + EXTRA_MARKS; i++) |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1723 { |
|
9311
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1724 xfmark_T *vi_fm = vi_namedfm != NULL ? &vi_namedfm[vi_idx] : NULL; |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1725 |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1726 if (vi_fm != NULL |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1727 && vi_fm->fmark.mark.lnum != 0 |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1728 && (vi_fm->time_set > namedfm[idx].time_set |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1729 || namedfm[idx].fmark.mark.lnum == 0)) |
|
9311
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1730 { |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1731 fm = vi_fm; |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1732 ++vi_idx; |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1733 } |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1734 else |
|
9311
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1735 { |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1736 fm = &namedfm[idx++]; |
|
9311
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1737 if (vi_fm != NULL |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1738 && vi_fm->fmark.mark.lnum == fm->fmark.mark.lnum |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1739 && vi_fm->time_set == fm->time_set |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1740 && ((vi_fm->fmark.fnum != 0 |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1741 && vi_fm->fmark.fnum == fm->fmark.fnum) |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1742 || (vi_fm->fname != NULL |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1743 && fm->fname != NULL |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1744 && STRCMP(vi_fm->fname, fm->fname) == 0))) |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1745 ++vi_idx; /* skip duplicate */ |
|
7a6f64de57d5
commit https://github.com/vim/vim/commit/36f0f0686ca313ef7b76387378cd5dc7acea1924
Christian Brabandt <cb@256bit.org>
parents:
9299
diff
changeset
|
1746 } |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1747 write_one_filemark(fp, fm, '\'', i - NMARKS + '0'); |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1748 } |
| 7 | 1749 |
| 1750 #ifdef FEAT_JUMPLIST | |
| 1751 /* Write the jumplist with -' */ | |
|
2545
298d8d6e69be
Avoid warnings from the clang compiler. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
1880
diff
changeset
|
1752 fputs(_("\n# Jumplist (newest first):\n"), fp); |
| 7 | 1753 setpcmark(); /* add current cursor position */ |
|
13278
28ae299c6af0
patch 8.0.1513: the jumplist is not always properly cleaned up
Christian Brabandt <cb@256bit.org>
parents:
13248
diff
changeset
|
1754 cleanup_jumplist(curwin, FALSE); |
|
9299
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1755 vi_idx = 0; |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1756 idx = curwin->w_jumplistlen - 1; |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1757 for (i = 0; i < JUMPLISTSIZE; ++i) |
| 7 | 1758 { |
|
9299
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1759 xfmark_T *vi_fm; |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1760 |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1761 fm = idx >= 0 ? &curwin->w_jumplist[idx] : NULL; |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1762 vi_fm = vi_idx < vi_jumplist_len ? &vi_jumplist[vi_idx] : NULL; |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1763 if (fm == NULL && vi_fm == NULL) |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1764 break; |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1765 if (fm == NULL || (vi_fm != NULL && fm->time_set < vi_fm->time_set)) |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1766 { |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1767 fm = vi_fm; |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1768 ++vi_idx; |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1769 } |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1770 else |
|
8000f0a44744
commit https://github.com/vim/vim/commit/ece74ab103eca15e17435efbe9cb21039787f1ea
Christian Brabandt <cb@256bit.org>
parents:
9284
diff
changeset
|
1771 --idx; |
| 7 | 1772 if (fm->fmark.fnum == 0 |
| 1773 || ((buf = buflist_findnr(fm->fmark.fnum)) != NULL | |
|
12100
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1774 && !skip_for_viminfo(buf))) |
| 7 | 1775 write_one_filemark(fp, fm, '-', '\''); |
| 1776 } | |
| 1777 #endif | |
| 1778 } | |
| 1779 | |
| 1780 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1781 write_one_filemark( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1782 FILE *fp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1783 xfmark_T *fm, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1784 int c1, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1785 int c2) |
| 7 | 1786 { |
| 1787 char_u *name; | |
| 1788 | |
| 1789 if (fm->fmark.mark.lnum == 0) /* not set */ | |
| 1790 return; | |
| 1791 | |
| 1792 if (fm->fmark.fnum != 0) /* there is a buffer */ | |
| 1793 name = buflist_nr2name(fm->fmark.fnum, TRUE, FALSE); | |
| 1794 else | |
| 1795 name = fm->fname; /* use name from .viminfo */ | |
| 1796 if (name != NULL && *name != NUL) | |
| 1797 { | |
| 1798 fprintf(fp, "%c%c %ld %ld ", c1, c2, (long)fm->fmark.mark.lnum, | |
| 1799 (long)fm->fmark.mark.col); | |
| 1800 viminfo_writestring(fp, name); | |
|
9284
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1801 |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1802 /* Barline: |{bartype},{name},{lnum},{col},{timestamp},{filename} |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1803 * size up to filename: 8 + 3 * 20 */ |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1804 fprintf(fp, "|%d,%d,%ld,%ld,%ld,", BARTYPE_MARK, c2, |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1805 (long)fm->fmark.mark.lnum, (long)fm->fmark.mark.col, |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1806 (long)fm->time_set); |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1807 barline_writestring(fp, name, LSIZE - 70); |
|
78712a2f687a
commit https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Christian Brabandt <cb@256bit.org>
parents:
7827
diff
changeset
|
1808 putc('\n', fp); |
| 7 | 1809 } |
| 1810 | |
| 1811 if (fm->fmark.fnum != 0) | |
| 1812 vim_free(name); | |
| 1813 } | |
| 1814 | |
| 1815 /* | |
| 1816 * Return TRUE if "name" is on removable media (depending on 'viminfo'). | |
| 1817 */ | |
| 1818 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1819 removable(char_u *name) |
| 7 | 1820 { |
| 1821 char_u *p; | |
| 1822 char_u part[51]; | |
| 1823 int retval = FALSE; | |
| 307 | 1824 size_t n; |
| 7 | 1825 |
| 1826 name = home_replace_save(NULL, name); | |
| 1827 if (name != NULL) | |
| 1828 { | |
| 1829 for (p = p_viminfo; *p; ) | |
| 1830 { | |
| 1831 copy_option_part(&p, part, 51, ", "); | |
| 307 | 1832 if (part[0] == 'r') |
| 7 | 1833 { |
| 307 | 1834 n = STRLEN(part + 1); |
| 1835 if (MB_STRNICMP(part + 1, name, n) == 0) | |
| 1836 { | |
| 1837 retval = TRUE; | |
| 1838 break; | |
| 1839 } | |
| 7 | 1840 } |
| 1841 } | |
| 1842 vim_free(name); | |
| 1843 } | |
| 1844 return retval; | |
| 1845 } | |
| 1846 | |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1847 static void |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1848 write_one_mark(FILE *fp_out, int c, pos_T *pos) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1849 { |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1850 if (pos->lnum != 0) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1851 fprintf(fp_out, "\t%c\t%ld\t%d\n", c, (long)pos->lnum, (int)pos->col); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1852 } |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1853 |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1854 |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1855 static void |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1856 write_buffer_marks(buf_T *buf, FILE *fp_out) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1857 { |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1858 int i; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1859 pos_T pos; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1860 |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1861 home_replace(NULL, buf->b_ffname, IObuff, IOSIZE, TRUE); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1862 fprintf(fp_out, "\n> "); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1863 viminfo_writestring(fp_out, IObuff); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1864 |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1865 /* Write the last used timestamp as the lnum of the non-existing mark '*'. |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1866 * Older Vims will ignore it and/or copy it. */ |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1867 pos.lnum = (linenr_T)buf->b_last_used; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1868 pos.col = 0; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1869 write_one_mark(fp_out, '*', &pos); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1870 |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1871 write_one_mark(fp_out, '"', &buf->b_last_cursor); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1872 write_one_mark(fp_out, '^', &buf->b_last_insert); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1873 write_one_mark(fp_out, '.', &buf->b_last_change); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1874 #ifdef FEAT_JUMPLIST |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1875 /* changelist positions are stored oldest first */ |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1876 for (i = 0; i < buf->b_changelistlen; ++i) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1877 { |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1878 /* skip duplicates */ |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10730
diff
changeset
|
1879 if (i == 0 || !EQUAL_POS(buf->b_changelist[i - 1], |
|
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10730
diff
changeset
|
1880 buf->b_changelist[i])) |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1881 write_one_mark(fp_out, '+', &buf->b_changelist[i]); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1882 } |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1883 #endif |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1884 for (i = 0; i < NMARKS; i++) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1885 write_one_mark(fp_out, 'a' + i, &buf->b_namedm[i]); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1886 } |
| 7 | 1887 |
| 1888 /* | |
| 1889 * Write all the named marks for all buffers. | |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1890 * When "buflist" is not NULL fill it with the buffers for which marks are to |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1891 * be written. |
| 7 | 1892 */ |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1893 void |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1894 write_viminfo_marks(FILE *fp_out, garray_T *buflist) |
| 7 | 1895 { |
| 1896 buf_T *buf; | |
| 1897 int is_mark_set; | |
| 1898 int i; | |
| 1899 win_T *win; | |
| 671 | 1900 tabpage_T *tp; |
| 7 | 1901 |
| 1902 /* | |
| 1903 * Set b_last_cursor for the all buffers that have a window. | |
| 1904 */ | |
| 671 | 1905 FOR_ALL_TAB_WINDOWS(tp, win) |
| 7 | 1906 set_last_cursor(win); |
| 1907 | |
|
2545
298d8d6e69be
Avoid warnings from the clang compiler. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
1880
diff
changeset
|
1908 fputs(_("\n# History of marks within files (newest to oldest):\n"), fp_out); |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9414
diff
changeset
|
1909 FOR_ALL_BUFFERS(buf) |
| 7 | 1910 { |
| 1911 /* | |
| 1912 * Only write something if buffer has been loaded and at least one | |
| 1913 * mark is set. | |
| 1914 */ | |
| 1915 if (buf->b_marks_read) | |
| 1916 { | |
| 1917 if (buf->b_last_cursor.lnum != 0) | |
| 1918 is_mark_set = TRUE; | |
| 1919 else | |
| 1920 { | |
| 1921 is_mark_set = FALSE; | |
| 1922 for (i = 0; i < NMARKS; i++) | |
| 1923 if (buf->b_namedm[i].lnum != 0) | |
| 1924 { | |
| 1925 is_mark_set = TRUE; | |
| 1926 break; | |
| 1927 } | |
| 1928 } | |
| 1929 if (is_mark_set && buf->b_ffname != NULL | |
|
12100
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1930 && buf->b_ffname[0] != NUL |
|
d4ffc3dc9fb0
patch 8.0.0930: terminal buffers are stored in the viminfo file
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1931 && !skip_for_viminfo(buf)) |
| 7 | 1932 { |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1933 if (buflist == NULL) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1934 write_buffer_marks(buf, fp_out); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1935 else if (ga_grow(buflist, 1) == OK) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1936 ((buf_T **)buflist->ga_data)[buflist->ga_len++] = buf; |
| 7 | 1937 } |
| 1938 } | |
| 1939 } | |
| 1940 } | |
| 1941 | |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1942 /* |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1943 * Compare functions for qsort() below, that compares b_last_used. |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1944 */ |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1945 static int |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1946 #ifdef __BORLANDC__ |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1947 _RTLENTRYF |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1948 #endif |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1949 buf_compare(const void *s1, const void *s2) |
| 7 | 1950 { |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1951 buf_T *buf1 = *(buf_T **)s1; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1952 buf_T *buf2 = *(buf_T **)s2; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1953 |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1954 if (buf1->b_last_used == buf2->b_last_used) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1955 return 0; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1956 return buf1->b_last_used > buf2->b_last_used ? -1 : 1; |
| 7 | 1957 } |
| 1958 | |
| 1959 /* | |
| 1960 * Handle marks in the viminfo file: | |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1961 * fp_out != NULL: copy marks, in time order with buffers in "buflist". |
| 1733 | 1962 * fp_out == NULL && (flags & VIF_WANT_MARKS): read marks for curbuf only |
| 1963 * fp_out == NULL && (flags & VIF_GET_OLDFILES | VIF_FORCEIT): fill v:oldfiles | |
| 7 | 1964 */ |
| 1965 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1966 copy_viminfo_marks( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1967 vir_T *virp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1968 FILE *fp_out, |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1969 garray_T *buflist, |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1970 int eof, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1971 int flags) |
| 7 | 1972 { |
| 1973 char_u *line = virp->vir_line; | |
| 1974 buf_T *buf; | |
| 1975 int num_marked_files; | |
| 1976 int load_marks; | |
| 1977 int copy_marks_out; | |
| 1978 char_u *str; | |
| 1979 int i; | |
| 1980 char_u *p; | |
| 1981 char_u *name_buf; | |
| 1982 pos_T pos; | |
| 1733 | 1983 #ifdef FEAT_EVAL |
| 1984 list_T *list = NULL; | |
| 1985 #endif | |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1986 int count = 0; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1987 int buflist_used = 0; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1988 buf_T *buflist_buf = NULL; |
| 7 | 1989 |
| 1990 if ((name_buf = alloc(LSIZE)) == NULL) | |
| 1991 return; | |
| 1992 *name_buf = NUL; | |
| 1733 | 1993 |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1994 if (fp_out != NULL && buflist->ga_len > 0) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1995 { |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1996 /* Sort the list of buffers on b_last_used. */ |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1997 qsort(buflist->ga_data, (size_t)buflist->ga_len, |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1998 sizeof(buf_T *), buf_compare); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
1999 buflist_buf = ((buf_T **)buflist->ga_data)[0]; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2000 } |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2001 |
| 1733 | 2002 #ifdef FEAT_EVAL |
| 2003 if (fp_out == NULL && (flags & (VIF_GET_OLDFILES | VIF_FORCEIT))) | |
| 2004 { | |
| 2005 list = list_alloc(); | |
| 2006 if (list != NULL) | |
| 2007 set_vim_var_list(VV_OLDFILES, list); | |
| 2008 } | |
| 2009 #endif | |
| 2010 | |
| 7 | 2011 num_marked_files = get_viminfo_parameter('\''); |
| 2012 while (!eof && (count < num_marked_files || fp_out == NULL)) | |
| 2013 { | |
| 2014 if (line[0] != '>') | |
| 2015 { | |
| 2016 if (line[0] != '\n' && line[0] != '\r' && line[0] != '#') | |
| 2017 { | |
| 2018 if (viminfo_error("E576: ", _("Missing '>'"), line)) | |
| 2019 break; /* too many errors, return now */ | |
| 2020 } | |
| 2021 eof = vim_fgets(line, LSIZE, virp->vir_fd); | |
| 2022 continue; /* Skip this dud line */ | |
| 2023 } | |
| 2024 | |
| 2025 /* | |
| 2026 * Handle long line and translate escaped characters. | |
| 2027 * Find file name, set str to start. | |
| 2028 * Ignore leading and trailing white space. | |
| 2029 */ | |
| 2030 str = skipwhite(line + 1); | |
| 2031 str = viminfo_readstring(virp, (int)(str - virp->vir_line), FALSE); | |
| 2032 if (str == NULL) | |
| 2033 continue; | |
| 2034 p = str + STRLEN(str); | |
| 2035 while (p != str && (*p == NUL || vim_isspace(*p))) | |
| 2036 p--; | |
| 2037 if (*p) | |
| 2038 p++; | |
| 2039 *p = NUL; | |
| 2040 | |
| 1733 | 2041 #ifdef FEAT_EVAL |
| 2042 if (list != NULL) | |
| 2043 list_append_string(list, str, -1); | |
| 2044 #endif | |
| 2045 | |
| 7 | 2046 /* |
| 2047 * If fp_out == NULL, load marks for current buffer. | |
| 2048 * If fp_out != NULL, copy marks for buffers not in buflist. | |
| 2049 */ | |
| 2050 load_marks = copy_marks_out = FALSE; | |
| 2051 if (fp_out == NULL) | |
| 2052 { | |
| 1733 | 2053 if ((flags & VIF_WANT_MARKS) && curbuf->b_ffname != NULL) |
| 7 | 2054 { |
| 2055 if (*name_buf == NUL) /* only need to do this once */ | |
| 2056 home_replace(NULL, curbuf->b_ffname, name_buf, LSIZE, TRUE); | |
| 2057 if (fnamecmp(str, name_buf) == 0) | |
| 2058 load_marks = TRUE; | |
| 2059 } | |
| 2060 } | |
| 2061 else /* fp_out != NULL */ | |
| 2062 { | |
| 2063 /* This is slow if there are many buffers!! */ | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9414
diff
changeset
|
2064 FOR_ALL_BUFFERS(buf) |
| 7 | 2065 if (buf->b_ffname != NULL) |
| 2066 { | |
| 2067 home_replace(NULL, buf->b_ffname, name_buf, LSIZE, TRUE); | |
| 2068 if (fnamecmp(str, name_buf) == 0) | |
| 2069 break; | |
| 2070 } | |
| 2071 | |
| 2072 /* | |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2073 * Copy marks if the buffer has not been loaded. |
| 7 | 2074 */ |
| 2075 if (buf == NULL || !buf->b_marks_read) | |
| 2076 { | |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2077 int did_read_line = FALSE; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2078 |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2079 if (buflist_buf != NULL) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2080 { |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2081 /* Read the next line. If it has the "*" mark compare the |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2082 * time stamps. Write entries from "buflist" that are |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2083 * newer. */ |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2084 if (!(eof = viminfo_readline(virp)) && line[0] == TAB) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2085 { |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2086 did_read_line = TRUE; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2087 if (line[1] == '*') |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2088 { |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2089 long ltime; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2090 |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2091 sscanf((char *)line + 2, "%ld ", <ime); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2092 while ((time_T)ltime < buflist_buf->b_last_used) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2093 { |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2094 write_buffer_marks(buflist_buf, fp_out); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2095 if (++count >= num_marked_files) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2096 break; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2097 if (++buflist_used == buflist->ga_len) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2098 { |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2099 buflist_buf = NULL; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2100 break; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2101 } |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2102 buflist_buf = |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2103 ((buf_T **)buflist->ga_data)[buflist_used]; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2104 } |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2105 } |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2106 else |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2107 { |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2108 /* No timestamp, must be written by an older Vim. |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2109 * Assume all remaining buffers are older then |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2110 * ours. */ |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2111 while (count < num_marked_files |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2112 && buflist_used < buflist->ga_len) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2113 { |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2114 buflist_buf = ((buf_T **)buflist->ga_data) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2115 [buflist_used++]; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2116 write_buffer_marks(buflist_buf, fp_out); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2117 ++count; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2118 } |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2119 buflist_buf = NULL; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2120 } |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2121 |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2122 if (count >= num_marked_files) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2123 { |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2124 vim_free(str); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2125 break; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2126 } |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2127 } |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2128 } |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2129 |
| 7 | 2130 fputs("\n> ", fp_out); |
| 2131 viminfo_writestring(fp_out, str); | |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2132 if (did_read_line) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2133 fputs((char *)line, fp_out); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2134 |
| 7 | 2135 count++; |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2136 copy_marks_out = TRUE; |
| 7 | 2137 } |
| 2138 } | |
| 2139 vim_free(str); | |
| 2140 | |
| 2141 pos.coladd = 0; | |
| 2142 while (!(eof = viminfo_readline(virp)) && line[0] == TAB) | |
| 2143 { | |
| 2144 if (load_marks) | |
| 2145 { | |
| 2146 if (line[1] != NUL) | |
| 2147 { | |
| 2712 | 2148 unsigned u; |
| 2149 | |
| 2150 sscanf((char *)line + 2, "%ld %u", &pos.lnum, &u); | |
| 2151 pos.col = u; | |
| 7 | 2152 switch (line[1]) |
| 2153 { | |
| 2154 case '"': curbuf->b_last_cursor = pos; break; | |
| 2155 case '^': curbuf->b_last_insert = pos; break; | |
| 2156 case '.': curbuf->b_last_change = pos; break; | |
| 2157 case '+': | |
| 2158 #ifdef FEAT_JUMPLIST | |
| 2159 /* changelist positions are stored oldest | |
| 2160 * first */ | |
| 2161 if (curbuf->b_changelistlen == JUMPLISTSIZE) | |
| 2162 /* list is full, remove oldest entry */ | |
| 2163 mch_memmove(curbuf->b_changelist, | |
| 2164 curbuf->b_changelist + 1, | |
| 2165 sizeof(pos_T) * (JUMPLISTSIZE - 1)); | |
| 2166 else | |
| 2167 ++curbuf->b_changelistlen; | |
| 2168 curbuf->b_changelist[ | |
| 2169 curbuf->b_changelistlen - 1] = pos; | |
| 2170 #endif | |
| 2171 break; | |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2172 |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2173 /* Using the line number for the last-used |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2174 * timestamp. */ |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2175 case '*': curbuf->b_last_used = pos.lnum; break; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2176 |
| 7 | 2177 default: if ((i = line[1] - 'a') >= 0 && i < NMARKS) |
| 2178 curbuf->b_namedm[i] = pos; | |
| 2179 } | |
| 2180 } | |
| 2181 } | |
| 2182 else if (copy_marks_out) | |
| 2183 fputs((char *)line, fp_out); | |
| 2184 } | |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2185 |
| 7 | 2186 if (load_marks) |
| 2187 { | |
| 2188 #ifdef FEAT_JUMPLIST | |
| 2189 win_T *wp; | |
| 2190 | |
| 2191 FOR_ALL_WINDOWS(wp) | |
| 2192 { | |
| 2193 if (wp->w_buffer == curbuf) | |
| 2194 wp->w_changelistidx = curbuf->b_changelistlen; | |
| 2195 } | |
| 2196 #endif | |
| 2197 break; | |
| 2198 } | |
| 2199 } | |
|
9414
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2200 |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2201 if (fp_out != NULL) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2202 /* Write any remaining entries from buflist. */ |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2203 while (count < num_marked_files && buflist_used < buflist->ga_len) |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2204 { |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2205 buflist_buf = ((buf_T **)buflist->ga_data)[buflist_used++]; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2206 write_buffer_marks(buflist_buf, fp_out); |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2207 ++count; |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2208 } |
|
1003973c99df
commit https://github.com/vim/vim/commit/ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
Christian Brabandt <cb@256bit.org>
parents:
9401
diff
changeset
|
2209 |
| 7 | 2210 vim_free(name_buf); |
| 2211 } | |
| 2212 #endif /* FEAT_VIMINFO */ |