Mercurial > vim
annotate src/change.c @ 16662:1fc9cd08cf3c v8.1.1333
patch 8.1.1333: text properties don't always move after changes
commit https://github.com/vim/vim/commit/45dd07f10af9bea86f8df77e92788209e209fdab
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed May 15 22:45:37 2019 +0200
patch 8.1.1333: text properties don't always move after changes
Problem: Text properties don't always move after changes.
Solution: Update properties before reporting changes to listeners. Move text
property when splitting a line.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 15 May 2019 23:00:15 +0200 |
parents | 04c2614af21c |
children | 978bcd70883d |
rev | line source |
---|---|
16631
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3 * VIM - Vi IMproved by Bram Moolenaar |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5 * Do ":help uganda" in Vim to read copying and usage conditions. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6 * Do ":help credits" in Vim to see a list of people who contributed. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
7 * See README.txt for an overview of the Vim source code. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
8 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
9 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
10 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
11 * change.c: functions related to changing text |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
12 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
13 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
14 #include "vim.h" |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
15 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
16 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
17 * If the file is readonly, give a warning message with the first change. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
18 * Don't do this for autocommands. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
19 * Doesn't use emsg(), because it flushes the macro buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
20 * If we have undone all changes b_changed will be FALSE, but "b_did_warn" |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
21 * will be TRUE. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
22 * "col" is the column for the message; non-zero when in insert mode and |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
23 * 'showmode' is on. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
24 * Careful: may trigger autocommands that reload the buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
25 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
26 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
27 change_warning(int col) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
28 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
29 static char *w_readonly = N_("W10: Warning: Changing a readonly file"); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
30 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
31 if (curbuf->b_did_warn == FALSE |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
32 && curbufIsChanged() == 0 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
33 && !autocmd_busy |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
34 && curbuf->b_p_ro) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
35 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
36 ++curbuf_lock; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
37 apply_autocmds(EVENT_FILECHANGEDRO, NULL, NULL, FALSE, curbuf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
38 --curbuf_lock; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
39 if (!curbuf->b_p_ro) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
40 return; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
41 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
42 // Do what msg() does, but with a column offset if the warning should |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
43 // be after the mode message. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
44 msg_start(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
45 if (msg_row == Rows - 1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
46 msg_col = col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
47 msg_source(HL_ATTR(HLF_W)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
48 msg_puts_attr(_(w_readonly), HL_ATTR(HLF_W) | MSG_HIST); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
49 #ifdef FEAT_EVAL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
50 set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_readonly), -1); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
51 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
52 msg_clr_eos(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
53 (void)msg_end(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
54 if (msg_silent == 0 && !silent_mode |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
55 #ifdef FEAT_EVAL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
56 && time_for_testing != 1 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
57 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
58 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
59 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
60 out_flush(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
61 ui_delay(1000L, TRUE); // give the user time to think about it |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
62 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
63 curbuf->b_did_warn = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
64 redraw_cmdline = FALSE; // don't redraw and erase the message |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
65 if (msg_row < Rows - 1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
66 showmode(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
67 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
68 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
69 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
70 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
71 * Call this function when something in the current buffer is changed. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
72 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
73 * Most often called through changed_bytes() and changed_lines(), which also |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
74 * mark the area of the display to be redrawn. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
75 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
76 * Careful: may trigger autocommands that reload the buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
77 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
78 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
79 changed(void) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
80 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
81 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
82 if (p_imst == IM_ON_THE_SPOT) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
83 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
84 // The text of the preediting area is inserted, but this doesn't |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
85 // mean a change of the buffer yet. That is delayed until the |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
86 // text is committed. (this means preedit becomes empty) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
87 if (im_is_preediting() && !xim_changed_while_preediting) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
88 return; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
89 xim_changed_while_preediting = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
90 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
91 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
92 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
93 if (!curbuf->b_changed) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
94 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
95 int save_msg_scroll = msg_scroll; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
96 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
97 // Give a warning about changing a read-only file. This may also |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
98 // check-out the file, thus change "curbuf"! |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
99 change_warning(0); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
100 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
101 // Create a swap file if that is wanted. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
102 // Don't do this for "nofile" and "nowrite" buffer types. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
103 if (curbuf->b_may_swap |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
104 #ifdef FEAT_QUICKFIX |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
105 && !bt_dontwrite(curbuf) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
106 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
107 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
108 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
109 int save_need_wait_return = need_wait_return; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
110 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
111 need_wait_return = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
112 ml_open_file(curbuf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
113 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
114 // The ml_open_file() can cause an ATTENTION message. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
115 // Wait two seconds, to make sure the user reads this unexpected |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
116 // message. Since we could be anywhere, call wait_return() now, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
117 // and don't let the emsg() set msg_scroll. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
118 if (need_wait_return && emsg_silent == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
119 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
120 out_flush(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
121 ui_delay(2000L, TRUE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
122 wait_return(TRUE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
123 msg_scroll = save_msg_scroll; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
124 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
125 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
126 need_wait_return = save_need_wait_return; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
127 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
128 changed_internal(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
129 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
130 ++CHANGEDTICK(curbuf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
131 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
132 #ifdef FEAT_SEARCH_EXTRA |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
133 // If a pattern is highlighted, the position may now be invalid. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
134 highlight_match = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
135 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
136 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
137 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
138 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
139 * Internal part of changed(), no user interaction. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
140 * Also used for recovery. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
141 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
142 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
143 changed_internal(void) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
144 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
145 curbuf->b_changed = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
146 ml_setflags(curbuf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
147 check_status(curbuf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
148 redraw_tabline = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
149 #ifdef FEAT_TITLE |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
150 need_maketitle = TRUE; // set window title later |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
151 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
152 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
153 |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
154 #ifdef FEAT_EVAL |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
155 static list_T *recorded_changes = NULL; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
156 static long next_listener_id = 0; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
157 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
158 /* |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
159 * Record a change for listeners added with listener_add(). |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
160 */ |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
161 static void |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
162 may_record_change( |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
163 linenr_T lnum, |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
164 colnr_T col, |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
165 linenr_T lnume, |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
166 long xtra) |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
167 { |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
168 dict_T *dict; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
169 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
170 if (curbuf->b_listener == NULL) |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
171 return; |
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
172 |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
173 // If the new change is going to change the line numbers in already listed |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
174 // changes, then flush. |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
175 if (recorded_changes != NULL && xtra != 0) |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
176 { |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
177 listitem_T *li; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
178 linenr_T nr; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
179 |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
180 for (li = recorded_changes->lv_first; li != NULL; li = li->li_next) |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
181 { |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
182 nr = (linenr_T)dict_get_number( |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
183 li->li_tv.vval.v_dict, (char_u *)"lnum"); |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
184 if (nr >= lnum || nr > lnume) |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
185 { |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
186 if (li->li_next == NULL && lnum == nr |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
187 && col + 1 == (colnr_T)dict_get_number( |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
188 li->li_tv.vval.v_dict, (char_u *)"col")) |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
189 { |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
190 dictitem_T *di; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
191 |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
192 // Same start point and nothing is following, entries can |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
193 // be merged. |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
194 di = dict_find(li->li_tv.vval.v_dict, (char_u *)"end", -1); |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
195 nr = tv_get_number(&di->di_tv); |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
196 if (lnume > nr) |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
197 di->di_tv.vval.v_number = lnume; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
198 di = dict_find(li->li_tv.vval.v_dict, |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
199 (char_u *)"added", -1); |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
200 di->di_tv.vval.v_number += xtra; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
201 return; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
202 } |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
203 |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
204 // the current change is going to make the line number in the |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
205 // older change invalid, flush now |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
206 invoke_listeners(curbuf); |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
207 break; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
208 } |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
209 } |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
210 } |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
211 |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
212 if (recorded_changes == NULL) |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
213 { |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
214 recorded_changes = list_alloc(); |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
215 if (recorded_changes == NULL) // out of memory |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
216 return; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
217 ++recorded_changes->lv_refcount; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
218 recorded_changes->lv_lock = VAR_FIXED; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
219 } |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
220 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
221 dict = dict_alloc(); |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
222 if (dict == NULL) |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
223 return; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
224 dict_add_number(dict, "lnum", (varnumber_T)lnum); |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
225 dict_add_number(dict, "end", (varnumber_T)lnume); |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
226 dict_add_number(dict, "added", (varnumber_T)xtra); |
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
227 dict_add_number(dict, "col", (varnumber_T)col + 1); |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
228 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
229 list_append_dict(recorded_changes, dict); |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
230 } |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
231 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
232 /* |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
233 * listener_add() function |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
234 */ |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
235 void |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
236 f_listener_add(typval_T *argvars, typval_T *rettv) |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
237 { |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
238 char_u *callback; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
239 partial_T *partial; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
240 listener_T *lnr; |
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
241 buf_T *buf = curbuf; |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
242 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
243 callback = get_callback(&argvars[0], &partial); |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
244 if (callback == NULL) |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
245 return; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
246 |
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
247 if (argvars[1].v_type != VAR_UNKNOWN) |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
248 { |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
249 buf = get_buf_arg(&argvars[1]); |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
250 if (buf == NULL) |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
251 return; |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
252 } |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
253 |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
254 lnr = (listener_T *)alloc_clear((sizeof(listener_T))); |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
255 if (lnr == NULL) |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
256 { |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
257 free_callback(callback, partial); |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
258 return; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
259 } |
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
260 lnr->lr_next = buf->b_listener; |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
261 buf->b_listener = lnr; |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
262 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
263 if (partial == NULL) |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
264 lnr->lr_callback = vim_strsave(callback); |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
265 else |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
266 lnr->lr_callback = callback; // pointer into the partial |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
267 lnr->lr_partial = partial; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
268 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
269 lnr->lr_id = ++next_listener_id; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
270 rettv->vval.v_number = lnr->lr_id; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
271 } |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
272 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
273 /* |
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
274 * listener_flush() function |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
275 */ |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
276 void |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
277 f_listener_flush(typval_T *argvars, typval_T *rettv UNUSED) |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
278 { |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
279 buf_T *buf = curbuf; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
280 |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
281 if (argvars[0].v_type != VAR_UNKNOWN) |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
282 { |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
283 buf = get_buf_arg(&argvars[0]); |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
284 if (buf == NULL) |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
285 return; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
286 } |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
287 invoke_listeners(buf); |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
288 } |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
289 |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
290 /* |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
291 * listener_remove() function |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
292 */ |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
293 void |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
294 f_listener_remove(typval_T *argvars, typval_T *rettv UNUSED) |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
295 { |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
296 listener_T *lnr; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
297 listener_T *next; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
298 listener_T *prev = NULL; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
299 int id = tv_get_number(argvars); |
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
300 buf_T *buf; |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
301 |
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
302 for (buf = firstbuf; buf != NULL; buf = buf->b_next) |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
303 for (lnr = buf->b_listener; lnr != NULL; lnr = next) |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
304 { |
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
305 next = lnr->lr_next; |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
306 if (lnr->lr_id == id) |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
307 { |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
308 if (prev != NULL) |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
309 prev->lr_next = lnr->lr_next; |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
310 else |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
311 buf->b_listener = lnr->lr_next; |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
312 free_callback(lnr->lr_callback, lnr->lr_partial); |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
313 vim_free(lnr); |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
314 } |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
315 prev = lnr; |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
316 } |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
317 } |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
318 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
319 /* |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
320 * Called when a sequence of changes is done: invoke listeners added with |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
321 * listener_add(). |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
322 */ |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
323 void |
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
324 invoke_listeners(buf_T *buf) |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
325 { |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
326 listener_T *lnr; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
327 typval_T rettv; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
328 int dummy; |
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
329 typval_T argv[6]; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
330 listitem_T *li; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
331 linenr_T start = MAXLNUM; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
332 linenr_T end = 0; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
333 linenr_T added = 0; |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
334 |
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
335 if (recorded_changes == NULL // nothing changed |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
336 || buf->b_listener == NULL) // no listeners |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
337 return; |
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
338 |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
339 argv[0].v_type = VAR_NUMBER; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
340 argv[0].vval.v_number = buf->b_fnum; // a:bufnr |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
341 |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
342 |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
343 for (li = recorded_changes->lv_first; li != NULL; li = li->li_next) |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
344 { |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
345 varnumber_T lnum; |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
346 |
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
347 lnum = dict_get_number(li->li_tv.vval.v_dict, (char_u *)"lnum"); |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
348 if (start > lnum) |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
349 start = lnum; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
350 lnum = dict_get_number(li->li_tv.vval.v_dict, (char_u *)"end"); |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
351 if (lnum > end) |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
352 end = lnum; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
353 added = dict_get_number(li->li_tv.vval.v_dict, (char_u *)"added"); |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
354 } |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
355 argv[1].v_type = VAR_NUMBER; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
356 argv[1].vval.v_number = start; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
357 argv[2].v_type = VAR_NUMBER; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
358 argv[2].vval.v_number = end; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
359 argv[3].v_type = VAR_NUMBER; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
360 argv[3].vval.v_number = added; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
361 |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
362 argv[4].v_type = VAR_LIST; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
363 argv[4].vval.v_list = recorded_changes; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
364 ++textlock; |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
365 |
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
366 for (lnr = buf->b_listener; lnr != NULL; lnr = lnr->lr_next) |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
367 { |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
368 call_func(lnr->lr_callback, -1, &rettv, |
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
369 5, argv, NULL, 0L, 0L, &dummy, TRUE, lnr->lr_partial, NULL); |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
370 clear_tv(&rettv); |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
371 } |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
372 |
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
373 --textlock; |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
374 list_unref(recorded_changes); |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
375 recorded_changes = NULL; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
376 } |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
377 #endif |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
378 |
16631
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
379 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
380 * Common code for when a change was made. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
381 * See changed_lines() for the arguments. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
382 * Careful: may trigger autocommands that reload the buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
383 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
384 static void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
385 changed_common( |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
386 linenr_T lnum, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
387 colnr_T col, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
388 linenr_T lnume, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
389 long xtra) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
390 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
391 win_T *wp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
392 tabpage_T *tp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
393 int i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
394 #ifdef FEAT_JUMPLIST |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
395 int cols; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
396 pos_T *p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
397 int add; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
398 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
399 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
400 // mark the buffer as modified |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
401 changed(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
402 |
16636
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
403 #ifdef FEAT_EVAL |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
404 may_record_change(lnum, col, lnume, xtra); |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
405 #endif |
16631
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
406 #ifdef FEAT_DIFF |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
407 if (curwin->w_p_diff && diff_internal()) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
408 curtab->tp_diff_update = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
409 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
410 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
411 // set the '. mark |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
412 if (!cmdmod.keepjumps) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
413 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
414 curbuf->b_last_change.lnum = lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
415 curbuf->b_last_change.col = col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
416 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
417 #ifdef FEAT_JUMPLIST |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
418 // Create a new entry if a new undo-able change was started or we |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
419 // don't have an entry yet. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
420 if (curbuf->b_new_change || curbuf->b_changelistlen == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
421 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
422 if (curbuf->b_changelistlen == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
423 add = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
424 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
425 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
426 // Don't create a new entry when the line number is the same |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
427 // as the last one and the column is not too far away. Avoids |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
428 // creating many entries for typing "xxxxx". |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
429 p = &curbuf->b_changelist[curbuf->b_changelistlen - 1]; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
430 if (p->lnum != lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
431 add = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
432 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
433 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
434 cols = comp_textwidth(FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
435 if (cols == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
436 cols = 79; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
437 add = (p->col + cols < col || col + cols < p->col); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
438 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
439 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
440 if (add) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
441 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
442 // This is the first of a new sequence of undo-able changes |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
443 // and it's at some distance of the last change. Use a new |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
444 // position in the changelist. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
445 curbuf->b_new_change = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
446 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
447 if (curbuf->b_changelistlen == JUMPLISTSIZE) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
448 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
449 // changelist is full: remove oldest entry |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
450 curbuf->b_changelistlen = JUMPLISTSIZE - 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
451 mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
452 sizeof(pos_T) * (JUMPLISTSIZE - 1)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
453 FOR_ALL_TAB_WINDOWS(tp, wp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
454 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
455 // Correct position in changelist for other windows on |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
456 // this buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
457 if (wp->w_buffer == curbuf && wp->w_changelistidx > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
458 --wp->w_changelistidx; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
459 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
460 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
461 FOR_ALL_TAB_WINDOWS(tp, wp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
462 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
463 // For other windows, if the position in the changelist is |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
464 // at the end it stays at the end. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
465 if (wp->w_buffer == curbuf |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
466 && wp->w_changelistidx == curbuf->b_changelistlen) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
467 ++wp->w_changelistidx; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
468 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
469 ++curbuf->b_changelistlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
470 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
471 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
472 curbuf->b_changelist[curbuf->b_changelistlen - 1] = |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
473 curbuf->b_last_change; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
474 // The current window is always after the last change, so that "g," |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
475 // takes you back to it. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
476 curwin->w_changelistidx = curbuf->b_changelistlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
477 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
478 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
479 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
480 FOR_ALL_TAB_WINDOWS(tp, wp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
481 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
482 if (wp->w_buffer == curbuf) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
483 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
484 // Mark this window to be redrawn later. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
485 if (wp->w_redr_type < VALID) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
486 wp->w_redr_type = VALID; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
487 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
488 // Check if a change in the buffer has invalidated the cached |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
489 // values for the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
490 #ifdef FEAT_FOLDING |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
491 // Update the folds for this window. Can't postpone this, because |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
492 // a following operator might work on the whole fold: ">>dd". |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
493 foldUpdate(wp, lnum, lnume + xtra - 1); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
494 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
495 // The change may cause lines above or below the change to become |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
496 // included in a fold. Set lnum/lnume to the first/last line that |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
497 // might be displayed differently. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
498 // Set w_cline_folded here as an efficient way to update it when |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
499 // inserting lines just above a closed fold. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
500 i = hasFoldingWin(wp, lnum, &lnum, NULL, FALSE, NULL); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
501 if (wp->w_cursor.lnum == lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
502 wp->w_cline_folded = i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
503 i = hasFoldingWin(wp, lnume, NULL, &lnume, FALSE, NULL); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
504 if (wp->w_cursor.lnum == lnume) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
505 wp->w_cline_folded = i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
506 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
507 // If the changed line is in a range of previously folded lines, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
508 // compare with the first line in that range. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
509 if (wp->w_cursor.lnum <= lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
510 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
511 i = find_wl_entry(wp, lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
512 if (i >= 0 && wp->w_cursor.lnum > wp->w_lines[i].wl_lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
513 changed_line_abv_curs_win(wp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
514 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
515 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
516 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
517 if (wp->w_cursor.lnum > lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
518 changed_line_abv_curs_win(wp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
519 else if (wp->w_cursor.lnum == lnum && wp->w_cursor.col >= col) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
520 changed_cline_bef_curs_win(wp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
521 if (wp->w_botline >= lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
522 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
523 // Assume that botline doesn't change (inserted lines make |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
524 // other lines scroll down below botline). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
525 approximate_botline_win(wp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
526 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
527 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
528 // Check if any w_lines[] entries have become invalid. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
529 // For entries below the change: Correct the lnums for |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
530 // inserted/deleted lines. Makes it possible to stop displaying |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
531 // after the change. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
532 for (i = 0; i < wp->w_lines_valid; ++i) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
533 if (wp->w_lines[i].wl_valid) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
534 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
535 if (wp->w_lines[i].wl_lnum >= lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
536 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
537 if (wp->w_lines[i].wl_lnum < lnume) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
538 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
539 // line included in change |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
540 wp->w_lines[i].wl_valid = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
541 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
542 else if (xtra != 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
543 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
544 // line below change |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
545 wp->w_lines[i].wl_lnum += xtra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
546 #ifdef FEAT_FOLDING |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
547 wp->w_lines[i].wl_lastlnum += xtra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
548 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
549 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
550 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
551 #ifdef FEAT_FOLDING |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
552 else if (wp->w_lines[i].wl_lastlnum >= lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
553 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
554 // change somewhere inside this range of folded lines, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
555 // may need to be redrawn |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
556 wp->w_lines[i].wl_valid = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
557 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
558 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
559 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
560 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
561 #ifdef FEAT_FOLDING |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
562 // Take care of side effects for setting w_topline when folds have |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
563 // changed. Esp. when the buffer was changed in another window. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
564 if (hasAnyFolding(wp)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
565 set_topline(wp, wp->w_topline); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
566 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
567 // relative numbering may require updating more |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
568 if (wp->w_p_rnu) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
569 redraw_win_later(wp, SOME_VALID); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
570 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
571 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
572 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
573 // Call update_screen() later, which checks out what needs to be redrawn, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
574 // since it notices b_mod_set and then uses b_mod_*. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
575 if (must_redraw < VALID) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
576 must_redraw = VALID; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
577 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
578 // when the cursor line is changed always trigger CursorMoved |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
579 if (lnum <= curwin->w_cursor.lnum |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
580 && lnume + (xtra < 0 ? -xtra : xtra) > curwin->w_cursor.lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
581 last_cursormoved.lnum = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
582 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
583 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
584 static void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
585 changedOneline(buf_T *buf, linenr_T lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
586 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
587 if (buf->b_mod_set) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
588 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
589 // find the maximum area that must be redisplayed |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
590 if (lnum < buf->b_mod_top) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
591 buf->b_mod_top = lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
592 else if (lnum >= buf->b_mod_bot) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
593 buf->b_mod_bot = lnum + 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
594 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
595 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
596 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
597 // set the area that must be redisplayed to one line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
598 buf->b_mod_set = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
599 buf->b_mod_top = lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
600 buf->b_mod_bot = lnum + 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
601 buf->b_mod_xlines = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
602 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
603 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
604 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
605 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
606 * Changed bytes within a single line for the current buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
607 * - marks the windows on this buffer to be redisplayed |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
608 * - marks the buffer changed by calling changed() |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
609 * - invalidates cached values |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
610 * Careful: may trigger autocommands that reload the buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
611 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
612 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
613 changed_bytes(linenr_T lnum, colnr_T col) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
614 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
615 changedOneline(curbuf, lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
616 changed_common(lnum, col, lnum + 1, 0L); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
617 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
618 #ifdef FEAT_DIFF |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
619 // Diff highlighting in other diff windows may need to be updated too. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
620 if (curwin->w_p_diff) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
621 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
622 win_T *wp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
623 linenr_T wlnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
624 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
625 FOR_ALL_WINDOWS(wp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
626 if (wp->w_p_diff && wp != curwin) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
627 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
628 redraw_win_later(wp, VALID); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
629 wlnum = diff_lnum_win(lnum, wp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
630 if (wlnum > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
631 changedOneline(wp->w_buffer, wlnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
632 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
633 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
634 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
635 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
636 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
637 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
638 * Like changed_bytes() but also adjust text properties for "added" bytes. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
639 * When "added" is negative text was deleted. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
640 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
641 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
642 inserted_bytes(linenr_T lnum, colnr_T col, int added UNUSED) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
643 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
644 #ifdef FEAT_TEXT_PROP |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
645 if (curbuf->b_has_textprop && added != 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
646 adjust_prop_columns(lnum, col, added); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
647 #endif |
16662
1fc9cd08cf3c
patch 8.1.1333: text properties don't always move after changes
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
648 |
1fc9cd08cf3c
patch 8.1.1333: text properties don't always move after changes
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
649 changed_bytes(lnum, col); |
16631
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
650 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
651 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
652 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
653 * Appended "count" lines below line "lnum" in the current buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
654 * Must be called AFTER the change and after mark_adjust(). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
655 * Takes care of marking the buffer to be redrawn and sets the changed flag. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
656 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
657 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
658 appended_lines(linenr_T lnum, long count) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
659 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
660 changed_lines(lnum + 1, 0, lnum + 1, count); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
661 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
662 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
663 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
664 * Like appended_lines(), but adjust marks first. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
665 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
666 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
667 appended_lines_mark(linenr_T lnum, long count) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
668 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
669 // Skip mark_adjust when adding a line after the last one, there can't |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
670 // be marks there. But it's still needed in diff mode. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
671 if (lnum + count < curbuf->b_ml.ml_line_count |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
672 #ifdef FEAT_DIFF |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
673 || curwin->w_p_diff |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
674 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
675 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
676 mark_adjust(lnum + 1, (linenr_T)MAXLNUM, count, 0L); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
677 changed_lines(lnum + 1, 0, lnum + 1, count); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
678 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
679 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
680 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
681 * Deleted "count" lines at line "lnum" in the current buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
682 * Must be called AFTER the change and after mark_adjust(). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
683 * Takes care of marking the buffer to be redrawn and sets the changed flag. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
684 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
685 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
686 deleted_lines(linenr_T lnum, long count) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
687 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
688 changed_lines(lnum, 0, lnum + count, -count); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
689 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
690 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
691 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
692 * Like deleted_lines(), but adjust marks first. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
693 * Make sure the cursor is on a valid line before calling, a GUI callback may |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
694 * be triggered to display the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
695 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
696 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
697 deleted_lines_mark(linenr_T lnum, long count) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
698 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
699 mark_adjust(lnum, (linenr_T)(lnum + count - 1), (long)MAXLNUM, -count); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
700 changed_lines(lnum, 0, lnum + count, -count); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
701 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
702 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
703 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
704 * Marks the area to be redrawn after a change. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
705 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
706 static void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
707 changed_lines_buf( |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
708 buf_T *buf, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
709 linenr_T lnum, // first line with change |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
710 linenr_T lnume, // line below last changed line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
711 long xtra) // number of extra lines (negative when deleting) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
712 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
713 if (buf->b_mod_set) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
714 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
715 // find the maximum area that must be redisplayed |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
716 if (lnum < buf->b_mod_top) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
717 buf->b_mod_top = lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
718 if (lnum < buf->b_mod_bot) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
719 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
720 // adjust old bot position for xtra lines |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
721 buf->b_mod_bot += xtra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
722 if (buf->b_mod_bot < lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
723 buf->b_mod_bot = lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
724 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
725 if (lnume + xtra > buf->b_mod_bot) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
726 buf->b_mod_bot = lnume + xtra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
727 buf->b_mod_xlines += xtra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
728 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
729 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
730 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
731 // set the area that must be redisplayed |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
732 buf->b_mod_set = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
733 buf->b_mod_top = lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
734 buf->b_mod_bot = lnume + xtra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
735 buf->b_mod_xlines = xtra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
736 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
737 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
738 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
739 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
740 * Changed lines for the current buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
741 * Must be called AFTER the change and after mark_adjust(). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
742 * - mark the buffer changed by calling changed() |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
743 * - mark the windows on this buffer to be redisplayed |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
744 * - invalidate cached values |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
745 * "lnum" is the first line that needs displaying, "lnume" the first line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
746 * below the changed lines (BEFORE the change). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
747 * When only inserting lines, "lnum" and "lnume" are equal. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
748 * Takes care of calling changed() and updating b_mod_*. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
749 * Careful: may trigger autocommands that reload the buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
750 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
751 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
752 changed_lines( |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
753 linenr_T lnum, // first line with change |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
754 colnr_T col, // column in first line with change |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
755 linenr_T lnume, // line below last changed line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
756 long xtra) // number of extra lines (negative when deleting) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
757 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
758 changed_lines_buf(curbuf, lnum, lnume, xtra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
759 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
760 #ifdef FEAT_DIFF |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
761 if (xtra == 0 && curwin->w_p_diff && !diff_internal()) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
762 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
763 // When the number of lines doesn't change then mark_adjust() isn't |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
764 // called and other diff buffers still need to be marked for |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
765 // displaying. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
766 win_T *wp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
767 linenr_T wlnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
768 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
769 FOR_ALL_WINDOWS(wp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
770 if (wp->w_p_diff && wp != curwin) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
771 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
772 redraw_win_later(wp, VALID); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
773 wlnum = diff_lnum_win(lnum, wp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
774 if (wlnum > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
775 changed_lines_buf(wp->w_buffer, wlnum, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
776 lnume - lnum + wlnum, 0L); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
777 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
778 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
779 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
780 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
781 changed_common(lnum, col, lnume, xtra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
782 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
783 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
784 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
785 * Called when the changed flag must be reset for buffer "buf". |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
786 * When "ff" is TRUE also reset 'fileformat'. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
787 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
788 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
789 unchanged(buf_T *buf, int ff) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
790 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
791 if (buf->b_changed || (ff && file_ff_differs(buf, FALSE))) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
792 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
793 buf->b_changed = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
794 ml_setflags(buf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
795 if (ff) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
796 save_file_ff(buf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
797 check_status(buf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
798 redraw_tabline = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
799 #ifdef FEAT_TITLE |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
800 need_maketitle = TRUE; // set window title later |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
801 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
802 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
803 ++CHANGEDTICK(buf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
804 #ifdef FEAT_NETBEANS_INTG |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
805 netbeans_unmodified(buf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
806 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
807 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
808 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
809 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
810 * Insert string "p" at the cursor position. Stops at a NUL byte. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
811 * Handles Replace mode and multi-byte characters. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
812 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
813 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
814 ins_bytes(char_u *p) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
815 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
816 ins_bytes_len(p, (int)STRLEN(p)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
817 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
818 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
819 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
820 * Insert string "p" with length "len" at the cursor position. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
821 * Handles Replace mode and multi-byte characters. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
822 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
823 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
824 ins_bytes_len(char_u *p, int len) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
825 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
826 int i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
827 int n; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
828 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
829 if (has_mbyte) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
830 for (i = 0; i < len; i += n) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
831 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
832 if (enc_utf8) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
833 // avoid reading past p[len] |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
834 n = utfc_ptr2len_len(p + i, len - i); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
835 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
836 n = (*mb_ptr2len)(p + i); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
837 ins_char_bytes(p + i, n); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
838 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
839 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
840 for (i = 0; i < len; ++i) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
841 ins_char(p[i]); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
842 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
843 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
844 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
845 * Insert or replace a single character at the cursor position. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
846 * When in REPLACE or VREPLACE mode, replace any existing character. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
847 * Caller must have prepared for undo. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
848 * For multi-byte characters we get the whole character, the caller must |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
849 * convert bytes to a character. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
850 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
851 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
852 ins_char(int c) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
853 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
854 char_u buf[MB_MAXBYTES + 1]; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
855 int n = (*mb_char2bytes)(c, buf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
856 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
857 // When "c" is 0x100, 0x200, etc. we don't want to insert a NUL byte. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
858 // Happens for CTRL-Vu9900. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
859 if (buf[0] == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
860 buf[0] = '\n'; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
861 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
862 ins_char_bytes(buf, n); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
863 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
864 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
865 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
866 ins_char_bytes(char_u *buf, int charlen) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
867 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
868 int c = buf[0]; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
869 int newlen; // nr of bytes inserted |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
870 int oldlen; // nr of bytes deleted (0 when not replacing) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
871 char_u *p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
872 char_u *newp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
873 char_u *oldp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
874 int linelen; // length of old line including NUL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
875 colnr_T col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
876 linenr_T lnum = curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
877 int i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
878 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
879 // Break tabs if needed. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
880 if (virtual_active() && curwin->w_cursor.coladd > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
881 coladvance_force(getviscol()); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
882 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
883 col = curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
884 oldp = ml_get(lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
885 linelen = (int)STRLEN(oldp) + 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
886 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
887 // The lengths default to the values for when not replacing. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
888 oldlen = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
889 newlen = charlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
890 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
891 if (State & REPLACE_FLAG) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
892 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
893 if (State & VREPLACE_FLAG) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
894 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
895 colnr_T new_vcol = 0; // init for GCC |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
896 colnr_T vcol; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
897 int old_list; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
898 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
899 // Disable 'list' temporarily, unless 'cpo' contains the 'L' flag. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
900 // Returns the old value of list, so when finished, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
901 // curwin->w_p_list should be set back to this. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
902 old_list = curwin->w_p_list; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
903 if (old_list && vim_strchr(p_cpo, CPO_LISTWM) == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
904 curwin->w_p_list = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
905 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
906 // In virtual replace mode each character may replace one or more |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
907 // characters (zero if it's a TAB). Count the number of bytes to |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
908 // be deleted to make room for the new character, counting screen |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
909 // cells. May result in adding spaces to fill a gap. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
910 getvcol(curwin, &curwin->w_cursor, NULL, &vcol, NULL); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
911 new_vcol = vcol + chartabsize(buf, vcol); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
912 while (oldp[col + oldlen] != NUL && vcol < new_vcol) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
913 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
914 vcol += chartabsize(oldp + col + oldlen, vcol); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
915 // Don't need to remove a TAB that takes us to the right |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
916 // position. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
917 if (vcol > new_vcol && oldp[col + oldlen] == TAB) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
918 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
919 oldlen += (*mb_ptr2len)(oldp + col + oldlen); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
920 // Deleted a bit too much, insert spaces. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
921 if (vcol > new_vcol) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
922 newlen += vcol - new_vcol; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
923 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
924 curwin->w_p_list = old_list; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
925 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
926 else if (oldp[col] != NUL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
927 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
928 // normal replace |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
929 oldlen = (*mb_ptr2len)(oldp + col); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
930 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
931 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
932 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
933 // Push the replaced bytes onto the replace stack, so that they can be |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
934 // put back when BS is used. The bytes of a multi-byte character are |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
935 // done the other way around, so that the first byte is popped off |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
936 // first (it tells the byte length of the character). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
937 replace_push(NUL); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
938 for (i = 0; i < oldlen; ++i) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
939 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
940 if (has_mbyte) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
941 i += replace_push_mb(oldp + col + i) - 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
942 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
943 replace_push(oldp[col + i]); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
944 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
945 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
946 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
947 newp = alloc_check((unsigned)(linelen + newlen - oldlen)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
948 if (newp == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
949 return; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
950 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
951 // Copy bytes before the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
952 if (col > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
953 mch_memmove(newp, oldp, (size_t)col); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
954 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
955 // Copy bytes after the changed character(s). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
956 p = newp + col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
957 if (linelen > col + oldlen) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
958 mch_memmove(p + newlen, oldp + col + oldlen, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
959 (size_t)(linelen - col - oldlen)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
960 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
961 // Insert or overwrite the new character. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
962 mch_memmove(p, buf, charlen); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
963 i = charlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
964 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
965 // Fill with spaces when necessary. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
966 while (i < newlen) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
967 p[i++] = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
968 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
969 // Replace the line in the buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
970 ml_replace(lnum, newp, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
971 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
972 // mark the buffer as changed and prepare for displaying |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
973 inserted_bytes(lnum, col, newlen - oldlen); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
974 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
975 // If we're in Insert or Replace mode and 'showmatch' is set, then briefly |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
976 // show the match for right parens and braces. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
977 if (p_sm && (State & INSERT) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
978 && msg_silent == 0 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
979 #ifdef FEAT_INS_EXPAND |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
980 && !ins_compl_active() |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
981 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
982 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
983 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
984 if (has_mbyte) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
985 showmatch(mb_ptr2char(buf)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
986 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
987 showmatch(c); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
988 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
989 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
990 #ifdef FEAT_RIGHTLEFT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
991 if (!p_ri || (State & REPLACE_FLAG)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
992 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
993 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
994 // Normal insert: move cursor right |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
995 curwin->w_cursor.col += charlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
996 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
997 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
998 // TODO: should try to update w_row here, to avoid recomputing it later. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
999 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1000 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1001 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1002 * Insert a string at the cursor position. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1003 * Note: Does NOT handle Replace mode. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1004 * Caller must have prepared for undo. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1005 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1006 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1007 ins_str(char_u *s) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1008 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1009 char_u *oldp, *newp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1010 int newlen = (int)STRLEN(s); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1011 int oldlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1012 colnr_T col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1013 linenr_T lnum = curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1014 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1015 if (virtual_active() && curwin->w_cursor.coladd > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1016 coladvance_force(getviscol()); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1017 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1018 col = curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1019 oldp = ml_get(lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1020 oldlen = (int)STRLEN(oldp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1021 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1022 newp = alloc_check((unsigned)(oldlen + newlen + 1)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1023 if (newp == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1024 return; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1025 if (col > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1026 mch_memmove(newp, oldp, (size_t)col); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1027 mch_memmove(newp + col, s, (size_t)newlen); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1028 mch_memmove(newp + col + newlen, oldp + col, (size_t)(oldlen - col + 1)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1029 ml_replace(lnum, newp, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1030 inserted_bytes(lnum, col, newlen); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1031 curwin->w_cursor.col += newlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1032 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1033 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1034 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1035 * Delete one character under the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1036 * If "fixpos" is TRUE, don't leave the cursor on the NUL after the line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1037 * Caller must have prepared for undo. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1038 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1039 * return FAIL for failure, OK otherwise |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1040 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1041 int |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1042 del_char(int fixpos) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1043 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1044 if (has_mbyte) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1045 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1046 // Make sure the cursor is at the start of a character. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1047 mb_adjust_cursor(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1048 if (*ml_get_cursor() == NUL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1049 return FAIL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1050 return del_chars(1L, fixpos); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1051 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1052 return del_bytes(1L, fixpos, TRUE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1053 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1054 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1055 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1056 * Like del_bytes(), but delete characters instead of bytes. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1057 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1058 int |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1059 del_chars(long count, int fixpos) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1060 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1061 long bytes = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1062 long i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1063 char_u *p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1064 int l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1065 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1066 p = ml_get_cursor(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1067 for (i = 0; i < count && *p != NUL; ++i) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1068 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1069 l = (*mb_ptr2len)(p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1070 bytes += l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1071 p += l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1072 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1073 return del_bytes(bytes, fixpos, TRUE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1074 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1075 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1076 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1077 * Delete "count" bytes under the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1078 * If "fixpos" is TRUE, don't leave the cursor on the NUL after the line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1079 * Caller must have prepared for undo. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1080 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1081 * Return FAIL for failure, OK otherwise. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1082 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1083 int |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1084 del_bytes( |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1085 long count, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1086 int fixpos_arg, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1087 int use_delcombine UNUSED) // 'delcombine' option applies |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1088 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1089 char_u *oldp, *newp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1090 colnr_T oldlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1091 colnr_T newlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1092 linenr_T lnum = curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1093 colnr_T col = curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1094 int alloc_newp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1095 long movelen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1096 int fixpos = fixpos_arg; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1097 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1098 oldp = ml_get(lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1099 oldlen = (int)STRLEN(oldp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1100 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1101 // Can't do anything when the cursor is on the NUL after the line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1102 if (col >= oldlen) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1103 return FAIL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1104 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1105 // If "count" is zero there is nothing to do. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1106 if (count == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1107 return OK; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1108 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1109 // If "count" is negative the caller must be doing something wrong. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1110 if (count < 1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1111 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1112 siemsg("E950: Invalid count for del_bytes(): %ld", count); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1113 return FAIL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1114 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1115 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1116 // If 'delcombine' is set and deleting (less than) one character, only |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1117 // delete the last combining character. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1118 if (p_deco && use_delcombine && enc_utf8 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1119 && utfc_ptr2len(oldp + col) >= count) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1120 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1121 int cc[MAX_MCO]; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1122 int n; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1123 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1124 (void)utfc_ptr2char(oldp + col, cc); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1125 if (cc[0] != NUL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1126 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1127 // Find the last composing char, there can be several. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1128 n = col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1129 do |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1130 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1131 col = n; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1132 count = utf_ptr2len(oldp + n); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1133 n += count; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1134 } while (UTF_COMPOSINGLIKE(oldp + col, oldp + n)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1135 fixpos = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1136 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1137 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1138 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1139 // When count is too big, reduce it. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1140 movelen = (long)oldlen - (long)col - count + 1; // includes trailing NUL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1141 if (movelen <= 1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1142 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1143 // If we just took off the last character of a non-blank line, and |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1144 // fixpos is TRUE, we don't want to end up positioned at the NUL, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1145 // unless "restart_edit" is set or 'virtualedit' contains "onemore". |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1146 if (col > 0 && fixpos && restart_edit == 0 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1147 && (ve_flags & VE_ONEMORE) == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1148 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1149 --curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1150 curwin->w_cursor.coladd = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1151 if (has_mbyte) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1152 curwin->w_cursor.col -= |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1153 (*mb_head_off)(oldp, oldp + curwin->w_cursor.col); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1154 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1155 count = oldlen - col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1156 movelen = 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1157 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1158 newlen = oldlen - count; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1159 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1160 // If the old line has been allocated the deletion can be done in the |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1161 // existing line. Otherwise a new line has to be allocated |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1162 // Can't do this when using Netbeans, because we would need to invoke |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1163 // netbeans_removed(), which deallocates the line. Let ml_replace() take |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1164 // care of notifying Netbeans. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1165 #ifdef FEAT_NETBEANS_INTG |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1166 if (netbeans_active()) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1167 alloc_newp = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1168 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1169 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1170 alloc_newp = !ml_line_alloced(); // check if oldp was allocated |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1171 if (!alloc_newp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1172 newp = oldp; // use same allocated memory |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1173 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1174 { // need to allocate a new line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1175 newp = alloc((unsigned)(newlen + 1)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1176 if (newp == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1177 return FAIL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1178 mch_memmove(newp, oldp, (size_t)col); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1179 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1180 mch_memmove(newp + col, oldp + col + count, (size_t)movelen); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1181 if (alloc_newp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1182 ml_replace(lnum, newp, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1183 #ifdef FEAT_TEXT_PROP |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1184 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1185 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1186 // Also move any following text properties. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1187 if (oldlen + 1 < curbuf->b_ml.ml_line_len) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1188 mch_memmove(newp + newlen + 1, oldp + oldlen + 1, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1189 (size_t)curbuf->b_ml.ml_line_len - oldlen - 1); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1190 curbuf->b_ml.ml_line_len -= count; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1191 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1192 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1193 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1194 // mark the buffer as changed and prepare for displaying |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1195 inserted_bytes(lnum, curwin->w_cursor.col, -count); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1196 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1197 return OK; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1198 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1199 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1200 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1201 * Copy the indent from ptr to the current line (and fill to size) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1202 * Leaves the cursor on the first non-blank in the line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1203 * Returns TRUE if the line was changed. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1204 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1205 static int |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1206 copy_indent(int size, char_u *src) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1207 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1208 char_u *p = NULL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1209 char_u *line = NULL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1210 char_u *s; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1211 int todo; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1212 int ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1213 int line_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1214 int tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1215 int ind_done; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1216 int round; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1217 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1218 int ind_col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1219 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1220 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1221 // Round 1: compute the number of characters needed for the indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1222 // Round 2: copy the characters. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1223 for (round = 1; round <= 2; ++round) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1224 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1225 todo = size; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1226 ind_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1227 ind_done = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1228 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1229 ind_col = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1230 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1231 s = src; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1232 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1233 // Count/copy the usable portion of the source line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1234 while (todo > 0 && VIM_ISWHITE(*s)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1235 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1236 if (*s == TAB) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1237 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1238 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1239 tab_pad = tabstop_padding(ind_done, curbuf->b_p_ts, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1240 curbuf->b_p_vts_array); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1241 #else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1242 tab_pad = (int)curbuf->b_p_ts |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1243 - (ind_done % (int)curbuf->b_p_ts); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1244 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1245 // Stop if this tab will overshoot the target |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1246 if (todo < tab_pad) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1247 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1248 todo -= tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1249 ind_done += tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1250 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1251 ind_col += tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1252 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1253 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1254 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1255 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1256 --todo; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1257 ++ind_done; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1258 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1259 ++ind_col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1260 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1261 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1262 ++ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1263 if (p != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1264 *p++ = *s; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1265 ++s; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1266 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1267 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1268 // Fill to next tabstop with a tab, if possible |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1269 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1270 tab_pad = tabstop_padding(ind_done, curbuf->b_p_ts, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1271 curbuf->b_p_vts_array); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1272 #else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1273 tab_pad = (int)curbuf->b_p_ts - (ind_done % (int)curbuf->b_p_ts); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1274 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1275 if (todo >= tab_pad && !curbuf->b_p_et) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1276 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1277 todo -= tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1278 ++ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1279 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1280 ind_col += tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1281 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1282 if (p != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1283 *p++ = TAB; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1284 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1285 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1286 // Add tabs required for indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1287 if (!curbuf->b_p_et) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1288 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1289 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1290 for (;;) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1291 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1292 tab_pad = tabstop_padding(ind_col, curbuf->b_p_ts, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1293 curbuf->b_p_vts_array); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1294 if (todo < tab_pad) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1295 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1296 todo -= tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1297 ++ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1298 ind_col += tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1299 if (p != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1300 *p++ = TAB; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1301 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1302 #else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1303 while (todo >= (int)curbuf->b_p_ts) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1304 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1305 todo -= (int)curbuf->b_p_ts; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1306 ++ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1307 if (p != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1308 *p++ = TAB; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1309 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1310 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1311 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1312 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1313 // Count/add spaces required for indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1314 while (todo > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1315 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1316 --todo; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1317 ++ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1318 if (p != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1319 *p++ = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1320 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1321 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1322 if (p == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1323 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1324 // Allocate memory for the result: the copied indent, new indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1325 // and the rest of the line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1326 line_len = (int)STRLEN(ml_get_curline()) + 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1327 line = alloc(ind_len + line_len); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1328 if (line == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1329 return FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1330 p = line; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1331 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1332 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1333 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1334 // Append the original line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1335 mch_memmove(p, ml_get_curline(), (size_t)line_len); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1336 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1337 // Replace the line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1338 ml_replace(curwin->w_cursor.lnum, line, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1339 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1340 // Put the cursor after the indent. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1341 curwin->w_cursor.col = ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1342 return TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1343 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1344 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1345 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1346 * open_line: Add a new line below or above the current line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1347 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1348 * For VREPLACE mode, we only add a new line when we get to the end of the |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1349 * file, otherwise we just start replacing the next line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1350 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1351 * Caller must take care of undo. Since VREPLACE may affect any number of |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1352 * lines however, it may call u_save_cursor() again when starting to change a |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1353 * new line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1354 * "flags": OPENLINE_DELSPACES delete spaces after cursor |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1355 * OPENLINE_DO_COM format comments |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1356 * OPENLINE_KEEPTRAIL keep trailing spaces |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1357 * OPENLINE_MARKFIX adjust mark positions after the line break |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1358 * OPENLINE_COM_LIST format comments with list or 2nd line indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1359 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1360 * "second_line_indent": indent for after ^^D in Insert mode or if flag |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1361 * OPENLINE_COM_LIST |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1362 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1363 * Return OK for success, FAIL for failure |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1364 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1365 int |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1366 open_line( |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1367 int dir, // FORWARD or BACKWARD |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1368 int flags, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1369 int second_line_indent) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1370 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1371 char_u *saved_line; // copy of the original line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1372 char_u *next_line = NULL; // copy of the next line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1373 char_u *p_extra = NULL; // what goes to next line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1374 int less_cols = 0; // less columns for mark in new line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1375 int less_cols_off = 0; // columns to skip for mark adjust |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1376 pos_T old_cursor; // old cursor position |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1377 int newcol = 0; // new cursor column |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1378 int newindent = 0; // auto-indent of the new line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1379 int n; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1380 int trunc_line = FALSE; // truncate current line afterwards |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1381 int retval = FAIL; // return value |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1382 #ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1383 int extra_len = 0; // length of p_extra string |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1384 int lead_len; // length of comment leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1385 char_u *lead_flags; // position in 'comments' for comment leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1386 char_u *leader = NULL; // copy of comment leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1387 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1388 char_u *allocated = NULL; // allocated memory |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1389 char_u *p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1390 int saved_char = NUL; // init for GCC |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1391 #if defined(FEAT_SMARTINDENT) || defined(FEAT_COMMENTS) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1392 pos_T *pos; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1393 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1394 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1395 int do_si = (!p_paste && curbuf->b_p_si |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1396 # ifdef FEAT_CINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1397 && !curbuf->b_p_cin |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1398 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1399 # ifdef FEAT_EVAL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1400 && *curbuf->b_p_inde == NUL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1401 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1402 ); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1403 int no_si = FALSE; // reset did_si afterwards |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1404 int first_char = NUL; // init for GCC |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1405 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1406 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1407 int vreplace_mode; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1408 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1409 int did_append; // appended a new line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1410 int saved_pi = curbuf->b_p_pi; // copy of preserveindent setting |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1411 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1412 // make a copy of the current line so we can mess with it |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1413 saved_line = vim_strsave(ml_get_curline()); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1414 if (saved_line == NULL) /* out of memory! */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1415 return FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1416 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1417 if (State & VREPLACE_FLAG) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1418 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1419 // With VREPLACE we make a copy of the next line, which we will be |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1420 // starting to replace. First make the new line empty and let vim play |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1421 // with the indenting and comment leader to its heart's content. Then |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1422 // we grab what it ended up putting on the new line, put back the |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1423 // original line, and call ins_char() to put each new character onto |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1424 // the line, replacing what was there before and pushing the right |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1425 // stuff onto the replace stack. -- webb. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1426 if (curwin->w_cursor.lnum < orig_line_count) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1427 next_line = vim_strsave(ml_get(curwin->w_cursor.lnum + 1)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1428 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1429 next_line = vim_strsave((char_u *)""); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1430 if (next_line == NULL) // out of memory! |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1431 goto theend; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1432 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1433 // In VREPLACE mode, a NL replaces the rest of the line, and starts |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1434 // replacing the next line, so push all of the characters left on the |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1435 // line onto the replace stack. We'll push any other characters that |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1436 // might be replaced at the start of the next line (due to autoindent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1437 // etc) a bit later. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1438 replace_push(NUL); // Call twice because BS over NL expects it |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1439 replace_push(NUL); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1440 p = saved_line + curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1441 while (*p != NUL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1442 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1443 if (has_mbyte) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1444 p += replace_push_mb(p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1445 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1446 replace_push(*p++); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1447 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1448 saved_line[curwin->w_cursor.col] = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1449 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1450 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1451 if ((State & INSERT) && !(State & VREPLACE_FLAG)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1452 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1453 p_extra = saved_line + curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1454 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1455 if (do_si) // need first char after new line break |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1456 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1457 p = skipwhite(p_extra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1458 first_char = *p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1459 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1460 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1461 #ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1462 extra_len = (int)STRLEN(p_extra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1463 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1464 saved_char = *p_extra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1465 *p_extra = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1466 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1467 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1468 u_clearline(); // cannot do "U" command when adding lines |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1469 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1470 did_si = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1471 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1472 ai_col = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1473 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1474 // If we just did an auto-indent, then we didn't type anything on |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1475 // the prior line, and it should be truncated. Do this even if 'ai' is not |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1476 // set because automatically inserting a comment leader also sets did_ai. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1477 if (dir == FORWARD && did_ai) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1478 trunc_line = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1479 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1480 // If 'autoindent' and/or 'smartindent' is set, try to figure out what |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1481 // indent to use for the new line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1482 if (curbuf->b_p_ai |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1483 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1484 || do_si |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1485 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1486 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1487 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1488 // count white space on current line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1489 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1490 newindent = get_indent_str_vtab(saved_line, curbuf->b_p_ts, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1491 curbuf->b_p_vts_array, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1492 #else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1493 newindent = get_indent_str(saved_line, (int)curbuf->b_p_ts, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1494 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1495 if (newindent == 0 && !(flags & OPENLINE_COM_LIST)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1496 newindent = second_line_indent; // for ^^D command in insert mode |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1497 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1498 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1499 // Do smart indenting. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1500 // In insert/replace mode (only when dir == FORWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1501 // we may move some text to the next line. If it starts with '{' |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1502 // don't add an indent. Fixes inserting a NL before '{' in line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1503 // "if (condition) {" |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1504 if (!trunc_line && do_si && *saved_line != NUL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1505 && (p_extra == NULL || first_char != '{')) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1506 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1507 char_u *ptr; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1508 char_u last_char; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1509 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1510 old_cursor = curwin->w_cursor; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1511 ptr = saved_line; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1512 # ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1513 if (flags & OPENLINE_DO_COM) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1514 lead_len = get_leader_len(ptr, NULL, FALSE, TRUE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1515 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1516 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1517 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1518 if (dir == FORWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1519 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1520 // Skip preprocessor directives, unless they are |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1521 // recognised as comments. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1522 if ( |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1523 # ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1524 lead_len == 0 && |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1525 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1526 ptr[0] == '#') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1527 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1528 while (ptr[0] == '#' && curwin->w_cursor.lnum > 1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1529 ptr = ml_get(--curwin->w_cursor.lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1530 newindent = get_indent(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1531 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1532 # ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1533 if (flags & OPENLINE_DO_COM) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1534 lead_len = get_leader_len(ptr, NULL, FALSE, TRUE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1535 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1536 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1537 if (lead_len > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1538 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1539 // This case gets the following right: |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1540 // /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1541 // * A comment (read '\' as '/'). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1542 // */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1543 // #define IN_THE_WAY |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1544 // This should line up here; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1545 p = skipwhite(ptr); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1546 if (p[0] == '/' && p[1] == '*') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1547 p++; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1548 if (p[0] == '*') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1549 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1550 for (p++; *p; p++) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1551 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1552 if (p[0] == '/' && p[-1] == '*') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1553 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1554 // End of C comment, indent should line up |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1555 // with the line containing the start of |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1556 // the comment |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1557 curwin->w_cursor.col = (colnr_T)(p - ptr); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1558 if ((pos = findmatch(NULL, NUL)) != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1559 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1560 curwin->w_cursor.lnum = pos->lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1561 newindent = get_indent(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1562 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1563 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1564 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1565 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1566 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1567 else // Not a comment line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1568 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1569 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1570 // Find last non-blank in line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1571 p = ptr + STRLEN(ptr) - 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1572 while (p > ptr && VIM_ISWHITE(*p)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1573 --p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1574 last_char = *p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1575 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1576 // find the character just before the '{' or ';' |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1577 if (last_char == '{' || last_char == ';') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1578 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1579 if (p > ptr) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1580 --p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1581 while (p > ptr && VIM_ISWHITE(*p)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1582 --p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1583 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1584 // Try to catch lines that are split over multiple |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1585 // lines. eg: |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1586 // if (condition && |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1587 // condition) { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1588 // Should line up here! |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1589 // } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1590 if (*p == ')') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1591 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1592 curwin->w_cursor.col = (colnr_T)(p - ptr); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1593 if ((pos = findmatch(NULL, '(')) != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1594 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1595 curwin->w_cursor.lnum = pos->lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1596 newindent = get_indent(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1597 ptr = ml_get_curline(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1598 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1599 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1600 // If last character is '{' do indent, without |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1601 // checking for "if" and the like. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1602 if (last_char == '{') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1603 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1604 did_si = TRUE; // do indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1605 no_si = TRUE; // don't delete it when '{' typed |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1606 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1607 // Look for "if" and the like, use 'cinwords'. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1608 // Don't do this if the previous line ended in ';' or |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1609 // '}'. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1610 else if (last_char != ';' && last_char != '}' |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1611 && cin_is_cinword(ptr)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1612 did_si = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1613 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1614 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1615 else // dir == BACKWARD |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1616 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1617 // Skip preprocessor directives, unless they are |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1618 // recognised as comments. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1619 if ( |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1620 # ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1621 lead_len == 0 && |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1622 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1623 ptr[0] == '#') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1624 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1625 int was_backslashed = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1626 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1627 while ((ptr[0] == '#' || was_backslashed) && |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1628 curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1629 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1630 if (*ptr && ptr[STRLEN(ptr) - 1] == '\\') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1631 was_backslashed = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1632 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1633 was_backslashed = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1634 ptr = ml_get(++curwin->w_cursor.lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1635 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1636 if (was_backslashed) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1637 newindent = 0; // Got to end of file |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1638 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1639 newindent = get_indent(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1640 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1641 p = skipwhite(ptr); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1642 if (*p == '}') // if line starts with '}': do indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1643 did_si = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1644 else // can delete indent when '{' typed |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1645 can_si_back = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1646 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1647 curwin->w_cursor = old_cursor; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1648 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1649 if (do_si) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1650 can_si = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1651 #endif // FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1652 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1653 did_ai = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1654 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1655 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1656 #ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1657 // Find out if the current line starts with a comment leader. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1658 // This may then be inserted in front of the new line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1659 end_comment_pending = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1660 if (flags & OPENLINE_DO_COM) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1661 lead_len = get_leader_len(saved_line, &lead_flags, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1662 dir == BACKWARD, TRUE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1663 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1664 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1665 if (lead_len > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1666 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1667 char_u *lead_repl = NULL; // replaces comment leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1668 int lead_repl_len = 0; // length of *lead_repl |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1669 char_u lead_middle[COM_MAX_LEN]; // middle-comment string |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1670 char_u lead_end[COM_MAX_LEN]; // end-comment string |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1671 char_u *comment_end = NULL; // where lead_end has been found |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1672 int extra_space = FALSE; // append extra space |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1673 int current_flag; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1674 int require_blank = FALSE; // requires blank after middle |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1675 char_u *p2; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1676 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1677 // If the comment leader has the start, middle or end flag, it may not |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1678 // be used or may be replaced with the middle leader. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1679 for (p = lead_flags; *p && *p != ':'; ++p) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1680 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1681 if (*p == COM_BLANK) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1682 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1683 require_blank = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1684 continue; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1685 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1686 if (*p == COM_START || *p == COM_MIDDLE) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1687 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1688 current_flag = *p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1689 if (*p == COM_START) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1690 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1691 // Doing "O" on a start of comment does not insert leader. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1692 if (dir == BACKWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1693 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1694 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1695 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1696 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1697 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1698 // find start of middle part |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1699 (void)copy_option_part(&p, lead_middle, COM_MAX_LEN, ","); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1700 require_blank = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1701 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1702 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1703 // Isolate the strings of the middle and end leader. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1704 while (*p && p[-1] != ':') /* find end of middle flags */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1705 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1706 if (*p == COM_BLANK) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1707 require_blank = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1708 ++p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1709 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1710 (void)copy_option_part(&p, lead_middle, COM_MAX_LEN, ","); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1711 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1712 while (*p && p[-1] != ':') // find end of end flags |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1713 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1714 // Check whether we allow automatic ending of comments |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1715 if (*p == COM_AUTO_END) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1716 end_comment_pending = -1; // means we want to set it |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1717 ++p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1718 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1719 n = copy_option_part(&p, lead_end, COM_MAX_LEN, ","); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1720 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1721 if (end_comment_pending == -1) // we can set it now |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1722 end_comment_pending = lead_end[n - 1]; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1723 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1724 // If the end of the comment is in the same line, don't use |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1725 // the comment leader. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1726 if (dir == FORWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1727 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1728 for (p = saved_line + lead_len; *p; ++p) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1729 if (STRNCMP(p, lead_end, n) == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1730 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1731 comment_end = p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1732 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1733 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1734 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1735 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1736 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1737 // Doing "o" on a start of comment inserts the middle leader. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1738 if (lead_len > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1739 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1740 if (current_flag == COM_START) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1741 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1742 lead_repl = lead_middle; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1743 lead_repl_len = (int)STRLEN(lead_middle); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1744 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1745 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1746 // If we have hit RETURN immediately after the start |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1747 // comment leader, then put a space after the middle |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1748 // comment leader on the next line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1749 if (!VIM_ISWHITE(saved_line[lead_len - 1]) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1750 && ((p_extra != NULL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1751 && (int)curwin->w_cursor.col == lead_len) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1752 || (p_extra == NULL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1753 && saved_line[lead_len] == NUL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1754 || require_blank)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1755 extra_space = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1756 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1757 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1758 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1759 if (*p == COM_END) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1760 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1761 // Doing "o" on the end of a comment does not insert leader. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1762 // Remember where the end is, might want to use it to find the |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1763 // start (for C-comments). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1764 if (dir == FORWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1765 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1766 comment_end = skipwhite(saved_line); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1767 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1768 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1769 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1770 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1771 // Doing "O" on the end of a comment inserts the middle leader. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1772 // Find the string for the middle leader, searching backwards. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1773 while (p > curbuf->b_p_com && *p != ',') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1774 --p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1775 for (lead_repl = p; lead_repl > curbuf->b_p_com |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1776 && lead_repl[-1] != ':'; --lead_repl) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1777 ; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1778 lead_repl_len = (int)(p - lead_repl); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1779 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1780 // We can probably always add an extra space when doing "O" on |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1781 // the comment-end |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1782 extra_space = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1783 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1784 // Check whether we allow automatic ending of comments |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1785 for (p2 = p; *p2 && *p2 != ':'; p2++) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1786 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1787 if (*p2 == COM_AUTO_END) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1788 end_comment_pending = -1; // means we want to set it |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1789 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1790 if (end_comment_pending == -1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1791 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1792 // Find last character in end-comment string |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1793 while (*p2 && *p2 != ',') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1794 p2++; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1795 end_comment_pending = p2[-1]; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1796 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1797 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1798 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1799 if (*p == COM_FIRST) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1800 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1801 // Comment leader for first line only: Don't repeat leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1802 // when using "O", blank out leader when using "o". |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1803 if (dir == BACKWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1804 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1805 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1806 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1807 lead_repl = (char_u *)""; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1808 lead_repl_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1809 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1810 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1811 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1812 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1813 if (lead_len) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1814 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1815 // allocate buffer (may concatenate p_extra later) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1816 leader = alloc(lead_len + lead_repl_len + extra_space + extra_len |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1817 + (second_line_indent > 0 ? second_line_indent : 0) + 1); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1818 allocated = leader; // remember to free it later |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1819 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1820 if (leader == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1821 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1822 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1823 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1824 vim_strncpy(leader, saved_line, lead_len); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1825 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1826 // Replace leader with lead_repl, right or left adjusted |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1827 if (lead_repl != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1828 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1829 int c = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1830 int off = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1831 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1832 for (p = lead_flags; *p != NUL && *p != ':'; ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1833 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1834 if (*p == COM_RIGHT || *p == COM_LEFT) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1835 c = *p++; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1836 else if (VIM_ISDIGIT(*p) || *p == '-') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1837 off = getdigits(&p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1838 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1839 ++p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1840 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1841 if (c == COM_RIGHT) // right adjusted leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1842 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1843 // find last non-white in the leader to line up with |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1844 for (p = leader + lead_len - 1; p > leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1845 && VIM_ISWHITE(*p); --p) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1846 ; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1847 ++p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1848 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1849 // Compute the length of the replaced characters in |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1850 // screen characters, not bytes. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1851 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1852 int repl_size = vim_strnsize(lead_repl, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1853 lead_repl_len); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1854 int old_size = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1855 char_u *endp = p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1856 int l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1857 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1858 while (old_size < repl_size && p > leader) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1859 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1860 MB_PTR_BACK(leader, p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1861 old_size += ptr2cells(p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1862 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1863 l = lead_repl_len - (int)(endp - p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1864 if (l != 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1865 mch_memmove(endp + l, endp, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1866 (size_t)((leader + lead_len) - endp)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1867 lead_len += l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1868 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1869 mch_memmove(p, lead_repl, (size_t)lead_repl_len); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1870 if (p + lead_repl_len > leader + lead_len) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1871 p[lead_repl_len] = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1872 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1873 // blank-out any other chars from the old leader. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1874 while (--p >= leader) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1875 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1876 int l = mb_head_off(leader, p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1877 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1878 if (l > 1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1879 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1880 p -= l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1881 if (ptr2cells(p) > 1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1882 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1883 p[1] = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1884 --l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1885 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1886 mch_memmove(p + 1, p + l + 1, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1887 (size_t)((leader + lead_len) - (p + l + 1))); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1888 lead_len -= l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1889 *p = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1890 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1891 else if (!VIM_ISWHITE(*p)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1892 *p = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1893 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1894 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1895 else // left adjusted leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1896 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1897 p = skipwhite(leader); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1898 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1899 // Compute the length of the replaced characters in |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1900 // screen characters, not bytes. Move the part that is |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1901 // not to be overwritten. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1902 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1903 int repl_size = vim_strnsize(lead_repl, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1904 lead_repl_len); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1905 int i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1906 int l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1907 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1908 for (i = 0; i < lead_len && p[i] != NUL; i += l) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1909 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1910 l = (*mb_ptr2len)(p + i); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1911 if (vim_strnsize(p, i + l) > repl_size) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1912 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1913 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1914 if (i != lead_repl_len) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1915 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1916 mch_memmove(p + lead_repl_len, p + i, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1917 (size_t)(lead_len - i - (p - leader))); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1918 lead_len += lead_repl_len - i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1919 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1920 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1921 mch_memmove(p, lead_repl, (size_t)lead_repl_len); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1922 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1923 // Replace any remaining non-white chars in the old |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1924 // leader by spaces. Keep Tabs, the indent must |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1925 // remain the same. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1926 for (p += lead_repl_len; p < leader + lead_len; ++p) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1927 if (!VIM_ISWHITE(*p)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1928 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1929 // Don't put a space before a TAB. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1930 if (p + 1 < leader + lead_len && p[1] == TAB) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1931 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1932 --lead_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1933 mch_memmove(p, p + 1, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1934 (leader + lead_len) - p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1935 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1936 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1937 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1938 int l = (*mb_ptr2len)(p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1939 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1940 if (l > 1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1941 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1942 if (ptr2cells(p) > 1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1943 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1944 // Replace a double-wide char with |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1945 // two spaces |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1946 --l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1947 *p++ = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1948 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1949 mch_memmove(p + 1, p + l, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1950 (leader + lead_len) - p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1951 lead_len -= l - 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1952 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1953 *p = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1954 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1955 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1956 *p = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1957 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1958 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1959 // Recompute the indent, it may have changed. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1960 if (curbuf->b_p_ai |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1961 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1962 || do_si |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1963 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1964 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1965 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1966 newindent = get_indent_str_vtab(leader, curbuf->b_p_ts, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1967 curbuf->b_p_vts_array, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1968 #else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1969 newindent = get_indent_str(leader, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1970 (int)curbuf->b_p_ts, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1971 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1972 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1973 // Add the indent offset |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1974 if (newindent + off < 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1975 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1976 off = -newindent; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1977 newindent = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1978 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1979 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1980 newindent += off; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1981 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1982 // Correct trailing spaces for the shift, so that |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1983 // alignment remains equal. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1984 while (off > 0 && lead_len > 0 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1985 && leader[lead_len - 1] == ' ') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1986 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1987 // Don't do it when there is a tab before the space |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1988 if (vim_strchr(skipwhite(leader), '\t') != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1989 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1990 --lead_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1991 --off; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1992 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1993 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1994 // If the leader ends in white space, don't add an |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1995 // extra space |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1996 if (lead_len > 0 && VIM_ISWHITE(leader[lead_len - 1])) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1997 extra_space = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1998 leader[lead_len] = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1999 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2000 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2001 if (extra_space) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2002 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2003 leader[lead_len++] = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2004 leader[lead_len] = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2005 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2006 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2007 newcol = lead_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2008 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2009 // if a new indent will be set below, remove the indent that |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2010 // is in the comment leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2011 if (newindent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2012 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2013 || did_si |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2014 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2015 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2016 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2017 while (lead_len && VIM_ISWHITE(*leader)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2018 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2019 --lead_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2020 --newcol; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2021 ++leader; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2022 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2023 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2024 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2025 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2026 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2027 did_si = can_si = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2028 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2029 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2030 else if (comment_end != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2031 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2032 // We have finished a comment, so we don't use the leader. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2033 // If this was a C-comment and 'ai' or 'si' is set do a normal |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2034 // indent to align with the line containing the start of the |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2035 // comment. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2036 if (comment_end[0] == '*' && comment_end[1] == '/' && |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2037 (curbuf->b_p_ai |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2038 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2039 || do_si |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2040 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2041 )) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2042 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2043 old_cursor = curwin->w_cursor; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2044 curwin->w_cursor.col = (colnr_T)(comment_end - saved_line); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2045 if ((pos = findmatch(NULL, NUL)) != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2046 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2047 curwin->w_cursor.lnum = pos->lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2048 newindent = get_indent(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2049 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2050 curwin->w_cursor = old_cursor; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2051 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2052 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2053 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2054 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2055 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2056 // (State == INSERT || State == REPLACE), only when dir == FORWARD |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2057 if (p_extra != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2058 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2059 *p_extra = saved_char; // restore char that NUL replaced |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2060 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2061 // When 'ai' set or "flags" has OPENLINE_DELSPACES, skip to the first |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2062 // non-blank. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2063 // |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2064 // When in REPLACE mode, put the deleted blanks on the replace stack, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2065 // preceded by a NUL, so they can be put back when a BS is entered. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2066 if (REPLACE_NORMAL(State)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2067 replace_push(NUL); /* end of extra blanks */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2068 if (curbuf->b_p_ai || (flags & OPENLINE_DELSPACES)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2069 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2070 while ((*p_extra == ' ' || *p_extra == '\t') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2071 && (!enc_utf8 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2072 || !utf_iscomposing(utf_ptr2char(p_extra + 1)))) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2073 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2074 if (REPLACE_NORMAL(State)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2075 replace_push(*p_extra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2076 ++p_extra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2077 ++less_cols_off; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2078 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2079 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2080 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2081 // columns for marks adjusted for removed columns |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2082 less_cols = (int)(p_extra - saved_line); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2083 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2084 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2085 if (p_extra == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2086 p_extra = (char_u *)""; // append empty line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2087 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2088 #ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2089 // concatenate leader and p_extra, if there is a leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2090 if (lead_len) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2091 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2092 if (flags & OPENLINE_COM_LIST && second_line_indent > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2093 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2094 int i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2095 int padding = second_line_indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2096 - (newindent + (int)STRLEN(leader)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2097 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2098 // Here whitespace is inserted after the comment char. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2099 // Below, set_indent(newindent, SIN_INSERT) will insert the |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2100 // whitespace needed before the comment char. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2101 for (i = 0; i < padding; i++) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2102 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2103 STRCAT(leader, " "); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2104 less_cols--; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2105 newcol++; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2106 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2107 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2108 STRCAT(leader, p_extra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2109 p_extra = leader; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2110 did_ai = TRUE; // So truncating blanks works with comments |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2111 less_cols -= lead_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2112 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2113 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2114 end_comment_pending = NUL; // turns out there was no leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2115 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2116 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2117 old_cursor = curwin->w_cursor; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2118 if (dir == BACKWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2119 --curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2120 if (!(State & VREPLACE_FLAG) || old_cursor.lnum >= orig_line_count) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2121 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2122 if (ml_append(curwin->w_cursor.lnum, p_extra, (colnr_T)0, FALSE) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2123 == FAIL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2124 goto theend; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2125 // Postpone calling changed_lines(), because it would mess up folding |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2126 // with markers. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2127 // Skip mark_adjust when adding a line after the last one, there can't |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2128 // be marks there. But still needed in diff mode. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2129 if (curwin->w_cursor.lnum + 1 < curbuf->b_ml.ml_line_count |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2130 #ifdef FEAT_DIFF |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2131 || curwin->w_p_diff |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2132 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2133 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2134 mark_adjust(curwin->w_cursor.lnum + 1, (linenr_T)MAXLNUM, 1L, 0L); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2135 did_append = TRUE; |
16662
1fc9cd08cf3c
patch 8.1.1333: text properties don't always move after changes
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
2136 #ifdef FEAT_TEXT_PROP |
1fc9cd08cf3c
patch 8.1.1333: text properties don't always move after changes
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
2137 if ((State & INSERT) && !(State & VREPLACE_FLAG)) |
1fc9cd08cf3c
patch 8.1.1333: text properties don't always move after changes
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
2138 // properties after the split move to the next line |
1fc9cd08cf3c
patch 8.1.1333: text properties don't always move after changes
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
2139 adjust_props_for_split(curwin->w_cursor.lnum, curwin->w_cursor.lnum, |
1fc9cd08cf3c
patch 8.1.1333: text properties don't always move after changes
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
2140 curwin->w_cursor.col + 1, 0); |
1fc9cd08cf3c
patch 8.1.1333: text properties don't always move after changes
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
2141 #endif |
16631
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2142 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2143 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2144 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2145 // In VREPLACE mode we are starting to replace the next line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2146 curwin->w_cursor.lnum++; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2147 if (curwin->w_cursor.lnum >= Insstart.lnum + vr_lines_changed) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2148 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2149 // In case we NL to a new line, BS to the previous one, and NL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2150 // again, we don't want to save the new line for undo twice. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2151 (void)u_save_cursor(); /* errors are ignored! */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2152 vr_lines_changed++; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2153 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2154 ml_replace(curwin->w_cursor.lnum, p_extra, TRUE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2155 changed_bytes(curwin->w_cursor.lnum, 0); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2156 curwin->w_cursor.lnum--; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2157 did_append = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2158 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2159 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2160 if (newindent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2161 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2162 || did_si |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2163 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2164 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2165 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2166 ++curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2167 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2168 if (did_si) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2169 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2170 int sw = (int)get_sw_value(curbuf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2171 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2172 if (p_sr) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2173 newindent -= newindent % sw; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2174 newindent += sw; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2175 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2176 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2177 // Copy the indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2178 if (curbuf->b_p_ci) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2179 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2180 (void)copy_indent(newindent, saved_line); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2181 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2182 // Set the 'preserveindent' option so that any further screwing |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2183 // with the line doesn't entirely destroy our efforts to preserve |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2184 // it. It gets restored at the function end. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2185 curbuf->b_p_pi = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2186 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2187 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2188 (void)set_indent(newindent, SIN_INSERT); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2189 less_cols -= curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2190 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2191 ai_col = curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2192 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2193 // In REPLACE mode, for each character in the new indent, there must |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2194 // be a NUL on the replace stack, for when it is deleted with BS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2195 if (REPLACE_NORMAL(State)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2196 for (n = 0; n < (int)curwin->w_cursor.col; ++n) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2197 replace_push(NUL); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2198 newcol += curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2199 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2200 if (no_si) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2201 did_si = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2202 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2203 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2204 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2205 #ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2206 // In REPLACE mode, for each character in the extra leader, there must be |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2207 // a NUL on the replace stack, for when it is deleted with BS. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2208 if (REPLACE_NORMAL(State)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2209 while (lead_len-- > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2210 replace_push(NUL); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2211 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2212 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2213 curwin->w_cursor = old_cursor; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2214 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2215 if (dir == FORWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2216 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2217 if (trunc_line || (State & INSERT)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2218 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2219 // truncate current line at cursor |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2220 saved_line[curwin->w_cursor.col] = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2221 // Remove trailing white space, unless OPENLINE_KEEPTRAIL used. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2222 if (trunc_line && !(flags & OPENLINE_KEEPTRAIL)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2223 truncate_spaces(saved_line); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2224 ml_replace(curwin->w_cursor.lnum, saved_line, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2225 saved_line = NULL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2226 if (did_append) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2227 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2228 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2229 curwin->w_cursor.lnum + 1, 1L); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2230 did_append = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2231 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2232 // Move marks after the line break to the new line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2233 if (flags & OPENLINE_MARKFIX) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2234 mark_col_adjust(curwin->w_cursor.lnum, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2235 curwin->w_cursor.col + less_cols_off, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2236 1L, (long)-less_cols, 0); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2237 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2238 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2239 changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2240 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2241 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2242 // Put the cursor on the new line. Careful: the scrollup() above may |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2243 // have moved w_cursor, we must use old_cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2244 curwin->w_cursor.lnum = old_cursor.lnum + 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2245 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2246 if (did_append) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2247 changed_lines(curwin->w_cursor.lnum, 0, curwin->w_cursor.lnum, 1L); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2248 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2249 curwin->w_cursor.col = newcol; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2250 curwin->w_cursor.coladd = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2251 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2252 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2253 // In VREPLACE mode, we are handling the replace stack ourselves, so stop |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2254 // fixthisline() from doing it (via change_indent()) by telling it we're in |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2255 // normal INSERT mode. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2256 if (State & VREPLACE_FLAG) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2257 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2258 vreplace_mode = State; // So we know to put things right later |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2259 State = INSERT; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2260 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2261 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2262 vreplace_mode = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2263 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2264 #ifdef FEAT_LISP |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2265 // May do lisp indenting. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2266 if (!p_paste |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2267 # ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2268 && leader == NULL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2269 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2270 && curbuf->b_p_lisp |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2271 && curbuf->b_p_ai) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2272 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2273 fixthisline(get_lisp_indent); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2274 ai_col = (colnr_T)getwhitecols_curline(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2275 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2276 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2277 #ifdef FEAT_CINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2278 // May do indenting after opening a new line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2279 if (!p_paste |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2280 && (curbuf->b_p_cin |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2281 # ifdef FEAT_EVAL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2282 || *curbuf->b_p_inde != NUL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2283 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2284 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2285 && in_cinkeys(dir == FORWARD |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2286 ? KEY_OPEN_FORW |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2287 : KEY_OPEN_BACK, ' ', linewhite(curwin->w_cursor.lnum))) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2288 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2289 do_c_expr_indent(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2290 ai_col = (colnr_T)getwhitecols_curline(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2291 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2292 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2293 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2294 if (vreplace_mode != 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2295 State = vreplace_mode; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2296 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2297 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2298 // Finally, VREPLACE gets the stuff on the new line, then puts back the |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2299 // original line, and inserts the new stuff char by char, pushing old stuff |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2300 // onto the replace stack (via ins_char()). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2301 if (State & VREPLACE_FLAG) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2302 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2303 // Put new line in p_extra |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2304 p_extra = vim_strsave(ml_get_curline()); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2305 if (p_extra == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2306 goto theend; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2307 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2308 // Put back original line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2309 ml_replace(curwin->w_cursor.lnum, next_line, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2310 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2311 // Insert new stuff into line again |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2312 curwin->w_cursor.col = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2313 curwin->w_cursor.coladd = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2314 ins_bytes(p_extra); // will call changed_bytes() |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2315 vim_free(p_extra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2316 next_line = NULL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2317 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2318 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2319 retval = OK; // success! |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2320 theend: |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2321 curbuf->b_p_pi = saved_pi; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2322 vim_free(saved_line); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2323 vim_free(next_line); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2324 vim_free(allocated); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2325 return retval; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2326 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2327 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2328 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2329 * Delete from cursor to end of line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2330 * Caller must have prepared for undo. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2331 * If "fixpos" is TRUE fix the cursor position when done. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2332 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2333 * Return FAIL for failure, OK otherwise. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2334 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2335 int |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2336 truncate_line(int fixpos) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2337 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2338 char_u *newp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2339 linenr_T lnum = curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2340 colnr_T col = curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2341 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2342 if (col == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2343 newp = vim_strsave((char_u *)""); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2344 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2345 newp = vim_strnsave(ml_get(lnum), col); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2346 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2347 if (newp == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2348 return FAIL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2349 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2350 ml_replace(lnum, newp, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2351 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2352 // mark the buffer as changed and prepare for displaying |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2353 changed_bytes(lnum, curwin->w_cursor.col); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2354 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2355 // If "fixpos" is TRUE we don't want to end up positioned at the NUL. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2356 if (fixpos && curwin->w_cursor.col > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2357 --curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2358 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2359 return OK; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2360 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2361 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2362 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2363 * Delete "nlines" lines at the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2364 * Saves the lines for undo first if "undo" is TRUE. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2365 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2366 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2367 del_lines(long nlines, int undo) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2368 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2369 long n; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2370 linenr_T first = curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2371 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2372 if (nlines <= 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2373 return; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2374 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2375 // save the deleted lines for undo |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2376 if (undo && u_savedel(first, nlines) == FAIL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2377 return; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2378 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2379 for (n = 0; n < nlines; ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2380 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2381 if (curbuf->b_ml.ml_flags & ML_EMPTY) // nothing to delete |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2382 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2383 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2384 ml_delete(first, TRUE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2385 ++n; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2386 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2387 // If we delete the last line in the file, stop |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2388 if (first > curbuf->b_ml.ml_line_count) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2389 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2390 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2391 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2392 // Correct the cursor position before calling deleted_lines_mark(), it may |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2393 // trigger a callback to display the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2394 curwin->w_cursor.col = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2395 check_cursor_lnum(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2396 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2397 // adjust marks, mark the buffer as changed and prepare for displaying |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2398 deleted_lines_mark(first, n); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2399 } |