Mercurial > vim
annotate src/change.c @ 16644:ac77266f55cb v8.1.1324
patch 8.1.1324: stray comma in VMS makefile
commit https://github.com/vim/vim/commit/b73fbc76c6fc446da90dd2cdac620155e37e5514
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat May 11 21:50:07 2019 +0200
patch 8.1.1324: stray comma in VMS makefile
Problem: Stray comma in VMS makefile.
Solution: Remove the comma. (Naruhiko Nishino, closes https://github.com/vim/vim/issues/4368)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 11 May 2019 22:00:06 +0200 |
parents | 4790302965fc |
children | 04c2614af21c |
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; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
172 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
|
173 { |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
174 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
|
175 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
|
176 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
|
177 ++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
|
178 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
|
179 } |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
180 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
181 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
|
182 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
|
183 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
|
184 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
|
185 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
|
186 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
|
187 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
|
188 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
189 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
|
190 } |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
191 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
192 /* |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
193 * 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
|
194 */ |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
195 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
|
196 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
|
197 { |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
198 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
|
199 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
|
200 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
|
201 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
|
202 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
203 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
|
204 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
|
205 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
|
206 |
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
207 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
|
208 { |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
209 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
|
210 if (buf == NULL) |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
211 return; |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
212 } |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
213 |
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
|
214 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
|
215 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
|
216 { |
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 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
|
218 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
|
219 } |
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
220 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
|
221 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
|
222 |
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 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
|
224 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
|
225 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
|
226 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
|
227 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
|
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 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
|
230 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
|
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 /* |
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 * 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
|
235 */ |
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 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
|
237 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
|
238 { |
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 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
|
240 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
|
241 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
|
242 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
|
243 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
|
244 |
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
245 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
|
246 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
|
247 { |
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
248 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
|
249 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
|
250 { |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
251 if (prev != NULL) |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
252 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
|
253 else |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
254 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
|
255 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
|
256 vim_free(lnr); |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
257 } |
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16636
diff
changeset
|
258 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
|
259 } |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
260 } |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
261 |
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 * 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
|
264 * 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
|
265 */ |
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 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
|
267 invoke_listeners(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
|
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 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
|
270 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
|
271 int dummy; |
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 typval_T argv[2]; |
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 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
274 if (recorded_changes == NULL) // nothing changed |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
275 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
|
276 argv[0].v_type = VAR_LIST; |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
277 argv[0].vval.v_list = 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
|
278 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
279 for (lnr = curbuf->b_listener; lnr != NULL; lnr = lnr->lr_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
|
280 { |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
281 call_func(lnr->lr_callback, -1, &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
|
282 1, argv, NULL, 0L, 0L, &dummy, TRUE, lnr->lr_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
|
283 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
|
284 } |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
285 |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
286 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
|
287 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
|
288 } |
0daf9eca3541
patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents:
16631
diff
changeset
|
289 #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
|
290 |
16631
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
291 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
292 * 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
|
293 * See changed_lines() for the arguments. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
294 * 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
|
295 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
296 static void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
297 changed_common( |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
298 linenr_T lnum, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
299 colnr_T col, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
300 linenr_T lnume, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
301 long xtra) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
302 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
303 win_T *wp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
304 tabpage_T *tp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
305 int i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
306 #ifdef FEAT_JUMPLIST |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
307 int cols; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
308 pos_T *p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
309 int add; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
310 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
311 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
312 // mark the buffer as modified |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
313 changed(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
314 |
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
|
315 #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
|
316 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
|
317 #endif |
16631
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
318 #ifdef FEAT_DIFF |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
319 if (curwin->w_p_diff && diff_internal()) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
320 curtab->tp_diff_update = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
321 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
322 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
323 // set the '. mark |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
324 if (!cmdmod.keepjumps) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
325 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
326 curbuf->b_last_change.lnum = lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
327 curbuf->b_last_change.col = col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
328 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
329 #ifdef FEAT_JUMPLIST |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
330 // 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
|
331 // don't have an entry yet. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
332 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
|
333 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
334 if (curbuf->b_changelistlen == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
335 add = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
336 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
337 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
338 // 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
|
339 // 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
|
340 // creating many entries for typing "xxxxx". |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
341 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
|
342 if (p->lnum != lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
343 add = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
344 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
345 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
346 cols = comp_textwidth(FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
347 if (cols == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
348 cols = 79; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
349 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
|
350 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
351 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
352 if (add) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
353 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
354 // 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
|
355 // 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
|
356 // position in the changelist. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
357 curbuf->b_new_change = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
358 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
359 if (curbuf->b_changelistlen == JUMPLISTSIZE) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
360 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
361 // changelist is full: remove oldest entry |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
362 curbuf->b_changelistlen = JUMPLISTSIZE - 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
363 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
|
364 sizeof(pos_T) * (JUMPLISTSIZE - 1)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
365 FOR_ALL_TAB_WINDOWS(tp, wp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
366 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
367 // 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
|
368 // this buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
369 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
|
370 --wp->w_changelistidx; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
371 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
372 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
373 FOR_ALL_TAB_WINDOWS(tp, wp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
374 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
375 // 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
|
376 // 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
|
377 if (wp->w_buffer == curbuf |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
378 && wp->w_changelistidx == curbuf->b_changelistlen) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
379 ++wp->w_changelistidx; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
380 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
381 ++curbuf->b_changelistlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
382 } |
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 curbuf->b_changelist[curbuf->b_changelistlen - 1] = |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
385 curbuf->b_last_change; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
386 // 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
|
387 // takes you back to it. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
388 curwin->w_changelistidx = curbuf->b_changelistlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
389 #endif |
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 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
392 FOR_ALL_TAB_WINDOWS(tp, wp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
393 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
394 if (wp->w_buffer == curbuf) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
395 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
396 // Mark this window to be redrawn later. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
397 if (wp->w_redr_type < VALID) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
398 wp->w_redr_type = VALID; |
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 // 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
|
401 // values for the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
402 #ifdef FEAT_FOLDING |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
403 // 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
|
404 // 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
|
405 foldUpdate(wp, lnum, lnume + xtra - 1); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
406 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
407 // 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
|
408 // 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
|
409 // might be displayed differently. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
410 // 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
|
411 // inserting lines just above a closed fold. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
412 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
|
413 if (wp->w_cursor.lnum == lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
414 wp->w_cline_folded = i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
415 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
|
416 if (wp->w_cursor.lnum == lnume) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
417 wp->w_cline_folded = i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
418 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
419 // 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
|
420 // 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
|
421 if (wp->w_cursor.lnum <= lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
422 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
423 i = find_wl_entry(wp, lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
424 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
|
425 changed_line_abv_curs_win(wp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
426 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
427 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
428 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
429 if (wp->w_cursor.lnum > lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
430 changed_line_abv_curs_win(wp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
431 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
|
432 changed_cline_bef_curs_win(wp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
433 if (wp->w_botline >= lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
434 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
435 // 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
|
436 // other lines scroll down below botline). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
437 approximate_botline_win(wp); |
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 // 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
|
441 // 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
|
442 // 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
|
443 // after the change. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
444 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
|
445 if (wp->w_lines[i].wl_valid) |
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 (wp->w_lines[i].wl_lnum >= lnum) |
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 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
|
450 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
451 // line included in change |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
452 wp->w_lines[i].wl_valid = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
453 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
454 else if (xtra != 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
455 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
456 // line below change |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
457 wp->w_lines[i].wl_lnum += xtra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
458 #ifdef FEAT_FOLDING |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
459 wp->w_lines[i].wl_lastlnum += xtra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
460 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
461 } |
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 #ifdef FEAT_FOLDING |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
464 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
|
465 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
466 // 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
|
467 // may need to be redrawn |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
468 wp->w_lines[i].wl_valid = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
469 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
470 #endif |
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 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
473 #ifdef FEAT_FOLDING |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
474 // 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
|
475 // 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
|
476 if (hasAnyFolding(wp)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
477 set_topline(wp, wp->w_topline); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
478 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
479 // relative numbering may require updating more |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
480 if (wp->w_p_rnu) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
481 redraw_win_later(wp, SOME_VALID); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
482 } |
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 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
485 // 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
|
486 // 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
|
487 if (must_redraw < VALID) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
488 must_redraw = VALID; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
489 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
490 // 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
|
491 if (lnum <= curwin->w_cursor.lnum |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
492 && 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
|
493 last_cursormoved.lnum = 0; |
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 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
496 static void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
497 changedOneline(buf_T *buf, linenr_T lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
498 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
499 if (buf->b_mod_set) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
500 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
501 // 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
|
502 if (lnum < buf->b_mod_top) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
503 buf->b_mod_top = lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
504 else if (lnum >= buf->b_mod_bot) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
505 buf->b_mod_bot = lnum + 1; |
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 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
508 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
509 // 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
|
510 buf->b_mod_set = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
511 buf->b_mod_top = lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
512 buf->b_mod_bot = lnum + 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
513 buf->b_mod_xlines = 0; |
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 } |
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 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
518 * 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
|
519 * - 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
|
520 * - marks the buffer changed by calling changed() |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
521 * - invalidates cached values |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
522 * 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
|
523 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
524 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
525 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
|
526 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
527 changedOneline(curbuf, lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
528 changed_common(lnum, col, lnum + 1, 0L); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
529 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
530 #ifdef FEAT_DIFF |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
531 // 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
|
532 if (curwin->w_p_diff) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
533 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
534 win_T *wp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
535 linenr_T wlnum; |
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 FOR_ALL_WINDOWS(wp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
538 if (wp->w_p_diff && wp != curwin) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
539 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
540 redraw_win_later(wp, VALID); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
541 wlnum = diff_lnum_win(lnum, wp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
542 if (wlnum > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
543 changedOneline(wp->w_buffer, wlnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
544 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
545 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
546 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
547 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
548 |
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 * 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
|
551 * When "added" is negative text was deleted. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
552 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
553 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
554 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
|
555 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
556 changed_bytes(lnum, col); |
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 #ifdef FEAT_TEXT_PROP |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
559 if (curbuf->b_has_textprop && added != 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
560 adjust_prop_columns(lnum, col, added); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
561 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
562 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
563 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
564 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
565 * 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
|
566 * 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
|
567 * 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
|
568 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
569 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
570 appended_lines(linenr_T lnum, long count) |
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 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
|
573 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
574 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
575 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
576 * Like appended_lines(), but adjust marks first. |
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 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
579 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
|
580 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
581 // 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
|
582 // 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
|
583 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
|
584 #ifdef FEAT_DIFF |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
585 || curwin->w_p_diff |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
586 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
587 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
588 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
|
589 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
|
590 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
591 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
592 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
593 * 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
|
594 * 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
|
595 * 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
|
596 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
597 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
598 deleted_lines(linenr_T lnum, long count) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
599 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
600 changed_lines(lnum, 0, lnum + count, -count); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
601 } |
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 * Like deleted_lines(), but adjust marks first. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
605 * 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
|
606 * be triggered to display the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
607 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
608 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
609 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
|
610 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
611 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
|
612 changed_lines(lnum, 0, lnum + count, -count); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
613 } |
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 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
616 * 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
|
617 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
618 static void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
619 changed_lines_buf( |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
620 buf_T *buf, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
621 linenr_T lnum, // first line with change |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
622 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
|
623 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
|
624 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
625 if (buf->b_mod_set) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
626 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
627 // 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
|
628 if (lnum < buf->b_mod_top) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
629 buf->b_mod_top = lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
630 if (lnum < buf->b_mod_bot) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
631 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
632 // adjust old bot position for xtra lines |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
633 buf->b_mod_bot += xtra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
634 if (buf->b_mod_bot < lnum) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
635 buf->b_mod_bot = lnum; |
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 if (lnume + xtra > buf->b_mod_bot) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
638 buf->b_mod_bot = lnume + xtra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
639 buf->b_mod_xlines += xtra; |
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 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
642 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
643 // set the area that must be redisplayed |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
644 buf->b_mod_set = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
645 buf->b_mod_top = lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
646 buf->b_mod_bot = lnume + xtra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
647 buf->b_mod_xlines = xtra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
648 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
649 } |
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 * Changed lines for the current buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
653 * 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
|
654 * - mark the buffer changed by calling changed() |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
655 * - 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
|
656 * - invalidate cached values |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
657 * "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
|
658 * below the changed lines (BEFORE the change). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
659 * 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
|
660 * 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
|
661 * 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
|
662 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
663 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
664 changed_lines( |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
665 linenr_T lnum, // first line with change |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
666 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
|
667 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
|
668 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
|
669 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
670 changed_lines_buf(curbuf, lnum, lnume, xtra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
671 |
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 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
|
674 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
675 // 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
|
676 // 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
|
677 // displaying. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
678 win_T *wp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
679 linenr_T wlnum; |
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 FOR_ALL_WINDOWS(wp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
682 if (wp->w_p_diff && wp != curwin) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
683 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
684 redraw_win_later(wp, VALID); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
685 wlnum = diff_lnum_win(lnum, wp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
686 if (wlnum > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
687 changed_lines_buf(wp->w_buffer, wlnum, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
688 lnume - lnum + wlnum, 0L); |
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 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
692 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
693 changed_common(lnum, col, lnume, xtra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
694 } |
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 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
697 * 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
|
698 * When "ff" is TRUE also reset 'fileformat'. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
699 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
700 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
701 unchanged(buf_T *buf, int ff) |
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 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
|
704 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
705 buf->b_changed = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
706 ml_setflags(buf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
707 if (ff) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
708 save_file_ff(buf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
709 check_status(buf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
710 redraw_tabline = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
711 #ifdef FEAT_TITLE |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
712 need_maketitle = TRUE; // set window title later |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
713 #endif |
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 ++CHANGEDTICK(buf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
716 #ifdef FEAT_NETBEANS_INTG |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
717 netbeans_unmodified(buf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
718 #endif |
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 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
721 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
722 * 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
|
723 * Handles Replace mode and multi-byte characters. |
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 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
726 ins_bytes(char_u *p) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
727 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
728 ins_bytes_len(p, (int)STRLEN(p)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
729 } |
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 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
732 * 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
|
733 * Handles Replace mode and multi-byte characters. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
734 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
735 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
736 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
|
737 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
738 int i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
739 int n; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
740 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
741 if (has_mbyte) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
742 for (i = 0; i < len; i += n) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
743 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
744 if (enc_utf8) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
745 // avoid reading past p[len] |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
746 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
|
747 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
748 n = (*mb_ptr2len)(p + i); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
749 ins_char_bytes(p + i, n); |
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 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
752 for (i = 0; i < len; ++i) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
753 ins_char(p[i]); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
754 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
755 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
756 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
757 * 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
|
758 * 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
|
759 * Caller must have prepared for undo. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
760 * 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
|
761 * convert bytes to a character. |
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 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
764 ins_char(int c) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
765 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
766 char_u buf[MB_MAXBYTES + 1]; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
767 int n = (*mb_char2bytes)(c, buf); |
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 // 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
|
770 // Happens for CTRL-Vu9900. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
771 if (buf[0] == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
772 buf[0] = '\n'; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
773 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
774 ins_char_bytes(buf, n); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
775 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
776 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
777 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
778 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
|
779 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
780 int c = buf[0]; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
781 int newlen; // nr of bytes inserted |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
782 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
|
783 char_u *p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
784 char_u *newp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
785 char_u *oldp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
786 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
|
787 colnr_T col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
788 linenr_T lnum = curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
789 int i; |
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 // Break tabs if needed. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
792 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
|
793 coladvance_force(getviscol()); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
794 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
795 col = curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
796 oldp = ml_get(lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
797 linelen = (int)STRLEN(oldp) + 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
798 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
799 // 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
|
800 oldlen = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
801 newlen = charlen; |
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 if (State & REPLACE_FLAG) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
804 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
805 if (State & VREPLACE_FLAG) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
806 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
807 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
|
808 colnr_T vcol; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
809 int old_list; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
810 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
811 // 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
|
812 // 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
|
813 // 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
|
814 old_list = curwin->w_p_list; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
815 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
|
816 curwin->w_p_list = FALSE; |
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 // 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
|
819 // 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
|
820 // 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
|
821 // 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
|
822 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
|
823 new_vcol = vcol + chartabsize(buf, vcol); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
824 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
|
825 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
826 vcol += chartabsize(oldp + col + oldlen, vcol); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
827 // 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
|
828 // position. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
829 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
|
830 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
831 oldlen += (*mb_ptr2len)(oldp + col + oldlen); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
832 // Deleted a bit too much, insert spaces. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
833 if (vcol > new_vcol) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
834 newlen += vcol - new_vcol; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
835 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
836 curwin->w_p_list = old_list; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
837 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
838 else if (oldp[col] != NUL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
839 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
840 // normal replace |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
841 oldlen = (*mb_ptr2len)(oldp + col); |
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 // 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
|
846 // 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
|
847 // 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
|
848 // 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
|
849 replace_push(NUL); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
850 for (i = 0; i < oldlen; ++i) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
851 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
852 if (has_mbyte) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
853 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
|
854 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
855 replace_push(oldp[col + i]); |
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 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
858 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
859 newp = alloc_check((unsigned)(linelen + newlen - oldlen)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
860 if (newp == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
861 return; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
862 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
863 // Copy bytes before the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
864 if (col > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
865 mch_memmove(newp, oldp, (size_t)col); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
866 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
867 // Copy bytes after the changed character(s). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
868 p = newp + col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
869 if (linelen > col + oldlen) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
870 mch_memmove(p + newlen, oldp + col + oldlen, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
871 (size_t)(linelen - col - oldlen)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
872 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
873 // Insert or overwrite the new character. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
874 mch_memmove(p, buf, charlen); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
875 i = charlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
876 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
877 // Fill with spaces when necessary. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
878 while (i < newlen) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
879 p[i++] = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
880 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
881 // Replace the line in the buffer. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
882 ml_replace(lnum, newp, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
883 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
884 // 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
|
885 inserted_bytes(lnum, col, newlen - oldlen); |
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 // 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
|
888 // 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
|
889 if (p_sm && (State & INSERT) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
890 && msg_silent == 0 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
891 #ifdef FEAT_INS_EXPAND |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
892 && !ins_compl_active() |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
893 #endif |
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 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
896 if (has_mbyte) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
897 showmatch(mb_ptr2char(buf)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
898 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
899 showmatch(c); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
900 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
901 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
902 #ifdef FEAT_RIGHTLEFT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
903 if (!p_ri || (State & REPLACE_FLAG)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
904 #endif |
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 // Normal insert: move cursor right |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
907 curwin->w_cursor.col += charlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
908 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
909 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
910 // 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
|
911 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
912 |
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 * Insert a string at the cursor position. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
915 * Note: Does NOT handle Replace mode. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
916 * Caller must have prepared for undo. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
917 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
918 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
919 ins_str(char_u *s) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
920 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
921 char_u *oldp, *newp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
922 int newlen = (int)STRLEN(s); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
923 int oldlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
924 colnr_T col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
925 linenr_T lnum = curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
926 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
927 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
|
928 coladvance_force(getviscol()); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
929 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
930 col = curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
931 oldp = ml_get(lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
932 oldlen = (int)STRLEN(oldp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
933 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
934 newp = alloc_check((unsigned)(oldlen + newlen + 1)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
935 if (newp == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
936 return; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
937 if (col > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
938 mch_memmove(newp, oldp, (size_t)col); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
939 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
|
940 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
|
941 ml_replace(lnum, newp, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
942 inserted_bytes(lnum, col, newlen); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
943 curwin->w_cursor.col += newlen; |
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 * Delete one character under the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
948 * 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
|
949 * Caller must have prepared for undo. |
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 * return FAIL for failure, OK otherwise |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
952 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
953 int |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
954 del_char(int fixpos) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
955 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
956 if (has_mbyte) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
957 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
958 // 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
|
959 mb_adjust_cursor(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
960 if (*ml_get_cursor() == NUL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
961 return FAIL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
962 return del_chars(1L, fixpos); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
963 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
964 return del_bytes(1L, fixpos, TRUE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
965 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
966 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
967 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
968 * 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
|
969 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
970 int |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
971 del_chars(long count, int fixpos) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
972 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
973 long bytes = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
974 long i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
975 char_u *p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
976 int l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
977 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
978 p = ml_get_cursor(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
979 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
|
980 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
981 l = (*mb_ptr2len)(p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
982 bytes += l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
983 p += l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
984 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
985 return del_bytes(bytes, fixpos, TRUE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
986 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
987 |
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 * Delete "count" bytes under the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
990 * 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
|
991 * Caller must have prepared for undo. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
992 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
993 * Return FAIL for failure, OK otherwise. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
994 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
995 int |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
996 del_bytes( |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
997 long count, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
998 int fixpos_arg, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
999 int use_delcombine UNUSED) // 'delcombine' option applies |
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 char_u *oldp, *newp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1002 colnr_T oldlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1003 colnr_T newlen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1004 linenr_T lnum = curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1005 colnr_T col = curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1006 int alloc_newp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1007 long movelen; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1008 int fixpos = fixpos_arg; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1009 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1010 oldp = ml_get(lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1011 oldlen = (int)STRLEN(oldp); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1012 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1013 // 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
|
1014 if (col >= oldlen) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1015 return FAIL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1016 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1017 // 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
|
1018 if (count == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1019 return OK; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1020 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1021 // 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
|
1022 if (count < 1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1023 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1024 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
|
1025 return FAIL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1026 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1027 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1028 // 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
|
1029 // delete the last combining character. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1030 if (p_deco && use_delcombine && enc_utf8 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1031 && utfc_ptr2len(oldp + col) >= count) |
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 int cc[MAX_MCO]; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1034 int n; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1035 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1036 (void)utfc_ptr2char(oldp + col, cc); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1037 if (cc[0] != NUL) |
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 // 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
|
1040 n = col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1041 do |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1042 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1043 col = n; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1044 count = utf_ptr2len(oldp + n); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1045 n += count; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1046 } while (UTF_COMPOSINGLIKE(oldp + col, oldp + n)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1047 fixpos = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1048 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1049 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1050 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1051 // When count is too big, reduce it. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1052 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
|
1053 if (movelen <= 1) |
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 // 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
|
1056 // 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
|
1057 // 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
|
1058 if (col > 0 && fixpos && restart_edit == 0 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1059 && (ve_flags & VE_ONEMORE) == 0) |
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 --curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1062 curwin->w_cursor.coladd = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1063 if (has_mbyte) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1064 curwin->w_cursor.col -= |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1065 (*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
|
1066 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1067 count = oldlen - col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1068 movelen = 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1069 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1070 newlen = oldlen - count; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1071 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1072 // 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
|
1073 // 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
|
1074 // 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
|
1075 // 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
|
1076 // care of notifying Netbeans. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1077 #ifdef FEAT_NETBEANS_INTG |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1078 if (netbeans_active()) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1079 alloc_newp = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1080 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1081 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1082 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
|
1083 if (!alloc_newp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1084 newp = oldp; // use same allocated memory |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1085 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1086 { // need to allocate a new line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1087 newp = alloc((unsigned)(newlen + 1)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1088 if (newp == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1089 return FAIL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1090 mch_memmove(newp, oldp, (size_t)col); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1091 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1092 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
|
1093 if (alloc_newp) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1094 ml_replace(lnum, newp, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1095 #ifdef FEAT_TEXT_PROP |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1096 else |
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 // Also move any following text properties. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1099 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
|
1100 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
|
1101 (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
|
1102 curbuf->b_ml.ml_line_len -= count; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1103 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1104 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1105 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1106 // 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
|
1107 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
|
1108 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1109 return OK; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1110 } |
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 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1113 * 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
|
1114 * 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
|
1115 * Returns TRUE if the line was changed. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1116 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1117 static int |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1118 copy_indent(int size, char_u *src) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1119 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1120 char_u *p = NULL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1121 char_u *line = NULL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1122 char_u *s; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1123 int todo; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1124 int ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1125 int line_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1126 int tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1127 int ind_done; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1128 int round; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1129 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1130 int ind_col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1131 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1132 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1133 // 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
|
1134 // Round 2: copy the characters. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1135 for (round = 1; round <= 2; ++round) |
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 todo = size; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1138 ind_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1139 ind_done = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1140 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1141 ind_col = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1142 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1143 s = src; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1144 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1145 // 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
|
1146 while (todo > 0 && VIM_ISWHITE(*s)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1147 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1148 if (*s == TAB) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1149 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1150 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1151 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
|
1152 curbuf->b_p_vts_array); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1153 #else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1154 tab_pad = (int)curbuf->b_p_ts |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1155 - (ind_done % (int)curbuf->b_p_ts); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1156 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1157 // 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
|
1158 if (todo < tab_pad) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1159 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1160 todo -= tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1161 ind_done += tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1162 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1163 ind_col += tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1164 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1165 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1166 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1167 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1168 --todo; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1169 ++ind_done; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1170 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1171 ++ind_col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1172 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1173 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1174 ++ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1175 if (p != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1176 *p++ = *s; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1177 ++s; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1178 } |
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 // 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
|
1181 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1182 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
|
1183 curbuf->b_p_vts_array); |
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 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
|
1186 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1187 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
|
1188 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1189 todo -= tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1190 ++ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1191 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1192 ind_col += tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1193 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1194 if (p != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1195 *p++ = TAB; |
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 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1198 // Add tabs required for indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1199 if (!curbuf->b_p_et) |
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 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1202 for (;;) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1203 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1204 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
|
1205 curbuf->b_p_vts_array); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1206 if (todo < tab_pad) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1207 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1208 todo -= tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1209 ++ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1210 ind_col += tab_pad; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1211 if (p != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1212 *p++ = TAB; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1213 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1214 #else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1215 while (todo >= (int)curbuf->b_p_ts) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1216 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1217 todo -= (int)curbuf->b_p_ts; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1218 ++ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1219 if (p != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1220 *p++ = TAB; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1221 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1222 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1223 } |
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 // Count/add spaces required for indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1226 while (todo > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1227 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1228 --todo; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1229 ++ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1230 if (p != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1231 *p++ = ' '; |
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 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1234 if (p == NULL) |
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 // 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
|
1237 // and the rest of the line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1238 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
|
1239 line = alloc(ind_len + line_len); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1240 if (line == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1241 return FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1242 p = line; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1243 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1244 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1245 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1246 // Append the original line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1247 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
|
1248 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1249 // Replace the line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1250 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
|
1251 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1252 // Put the cursor after the indent. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1253 curwin->w_cursor.col = ind_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1254 return TRUE; |
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 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1257 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1258 * 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
|
1259 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1260 * 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
|
1261 * 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
|
1262 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1263 * 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
|
1264 * 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
|
1265 * new line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1266 * "flags": OPENLINE_DELSPACES delete spaces after cursor |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1267 * OPENLINE_DO_COM format comments |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1268 * OPENLINE_KEEPTRAIL keep trailing spaces |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1269 * 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
|
1270 * 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
|
1271 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1272 * "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
|
1273 * OPENLINE_COM_LIST |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1274 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1275 * Return OK for success, FAIL for failure |
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 int |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1278 open_line( |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1279 int dir, // FORWARD or BACKWARD |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1280 int flags, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1281 int second_line_indent) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1282 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1283 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
|
1284 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
|
1285 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
|
1286 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
|
1287 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
|
1288 pos_T old_cursor; // old cursor position |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1289 int newcol = 0; // new cursor column |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1290 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
|
1291 int n; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1292 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
|
1293 int retval = FAIL; // return value |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1294 #ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1295 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
|
1296 int lead_len; // length of comment leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1297 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
|
1298 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
|
1299 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1300 char_u *allocated = NULL; // allocated memory |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1301 char_u *p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1302 int saved_char = NUL; // init for GCC |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1303 #if defined(FEAT_SMARTINDENT) || defined(FEAT_COMMENTS) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1304 pos_T *pos; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1305 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1306 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1307 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
|
1308 # ifdef FEAT_CINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1309 && !curbuf->b_p_cin |
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 # ifdef FEAT_EVAL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1312 && *curbuf->b_p_inde == NUL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1313 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1314 ); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1315 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
|
1316 int first_char = NUL; // init for GCC |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1317 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1318 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1319 int vreplace_mode; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1320 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1321 int did_append; // appended a new line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1322 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
|
1323 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1324 // 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
|
1325 saved_line = vim_strsave(ml_get_curline()); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1326 if (saved_line == NULL) /* out of memory! */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1327 return FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1328 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1329 if (State & VREPLACE_FLAG) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1330 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1331 // 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
|
1332 // 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
|
1333 // 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
|
1334 // 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
|
1335 // 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
|
1336 // 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
|
1337 // stuff onto the replace stack. -- webb. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1338 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
|
1339 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
|
1340 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1341 next_line = vim_strsave((char_u *)""); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1342 if (next_line == NULL) // out of memory! |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1343 goto theend; |
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 // 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
|
1346 // 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
|
1347 // 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
|
1348 // 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
|
1349 // etc) a bit later. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1350 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
|
1351 replace_push(NUL); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1352 p = saved_line + curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1353 while (*p != NUL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1354 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1355 if (has_mbyte) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1356 p += replace_push_mb(p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1357 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1358 replace_push(*p++); |
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 saved_line[curwin->w_cursor.col] = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1361 } |
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 if ((State & INSERT) && !(State & VREPLACE_FLAG)) |
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 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
|
1366 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1367 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
|
1368 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1369 p = skipwhite(p_extra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1370 first_char = *p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1371 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1372 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1373 #ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1374 extra_len = (int)STRLEN(p_extra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1375 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1376 saved_char = *p_extra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1377 *p_extra = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1378 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1379 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1380 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
|
1381 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1382 did_si = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1383 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1384 ai_col = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1385 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1386 // 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
|
1387 // 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
|
1388 // 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
|
1389 if (dir == FORWARD && did_ai) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1390 trunc_line = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1391 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1392 // 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
|
1393 // indent to use for the new line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1394 if (curbuf->b_p_ai |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1395 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1396 || do_si |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1397 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1398 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1399 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1400 // count white space on current line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1401 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1402 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
|
1403 curbuf->b_p_vts_array, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1404 #else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1405 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
|
1406 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1407 if (newindent == 0 && !(flags & OPENLINE_COM_LIST)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1408 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
|
1409 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1410 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1411 // Do smart indenting. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1412 // 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
|
1413 // 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
|
1414 // 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
|
1415 // "if (condition) {" |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1416 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
|
1417 && (p_extra == NULL || first_char != '{')) |
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 char_u *ptr; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1420 char_u last_char; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1421 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1422 old_cursor = curwin->w_cursor; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1423 ptr = saved_line; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1424 # ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1425 if (flags & OPENLINE_DO_COM) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1426 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
|
1427 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1428 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1429 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1430 if (dir == FORWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1431 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1432 // Skip preprocessor directives, unless they are |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1433 // recognised as comments. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1434 if ( |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1435 # ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1436 lead_len == 0 && |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1437 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1438 ptr[0] == '#') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1439 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1440 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
|
1441 ptr = ml_get(--curwin->w_cursor.lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1442 newindent = get_indent(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1443 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1444 # ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1445 if (flags & OPENLINE_DO_COM) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1446 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
|
1447 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1448 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1449 if (lead_len > 0) |
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 // This case gets the following right: |
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 // * A comment (read '\' as '/'). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1454 // */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1455 // #define IN_THE_WAY |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1456 // This should line up here; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1457 p = skipwhite(ptr); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1458 if (p[0] == '/' && p[1] == '*') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1459 p++; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1460 if (p[0] == '*') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1461 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1462 for (p++; *p; p++) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1463 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1464 if (p[0] == '/' && p[-1] == '*') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1465 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1466 // 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
|
1467 // with the line containing the start of |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1468 // the comment |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1469 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
|
1470 if ((pos = findmatch(NULL, NUL)) != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1471 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1472 curwin->w_cursor.lnum = pos->lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1473 newindent = get_indent(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1474 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1475 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1476 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1477 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1478 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1479 else // Not a comment line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1480 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1481 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1482 // Find last non-blank in line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1483 p = ptr + STRLEN(ptr) - 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1484 while (p > ptr && VIM_ISWHITE(*p)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1485 --p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1486 last_char = *p; |
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 // find the character just before the '{' or ';' |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1489 if (last_char == '{' || last_char == ';') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1490 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1491 if (p > ptr) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1492 --p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1493 while (p > ptr && VIM_ISWHITE(*p)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1494 --p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1495 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1496 // 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
|
1497 // lines. eg: |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1498 // if (condition && |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1499 // condition) { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1500 // Should line up here! |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1501 // } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1502 if (*p == ')') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1503 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1504 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
|
1505 if ((pos = findmatch(NULL, '(')) != NULL) |
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 curwin->w_cursor.lnum = pos->lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1508 newindent = get_indent(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1509 ptr = ml_get_curline(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1510 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1511 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1512 // If last character is '{' do indent, without |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1513 // checking for "if" and the like. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1514 if (last_char == '{') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1515 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1516 did_si = TRUE; // do indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1517 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
|
1518 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1519 // 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
|
1520 // 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
|
1521 // '}'. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1522 else if (last_char != ';' && last_char != '}' |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1523 && cin_is_cinword(ptr)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1524 did_si = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1525 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1526 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1527 else // dir == BACKWARD |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1528 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1529 // Skip preprocessor directives, unless they are |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1530 // recognised as comments. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1531 if ( |
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 lead_len == 0 && |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1534 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1535 ptr[0] == '#') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1536 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1537 int was_backslashed = FALSE; |
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 while ((ptr[0] == '#' || was_backslashed) && |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1540 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
|
1541 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1542 if (*ptr && ptr[STRLEN(ptr) - 1] == '\\') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1543 was_backslashed = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1544 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1545 was_backslashed = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1546 ptr = ml_get(++curwin->w_cursor.lnum); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1547 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1548 if (was_backslashed) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1549 newindent = 0; // Got to end of file |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1550 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1551 newindent = get_indent(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1552 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1553 p = skipwhite(ptr); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1554 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
|
1555 did_si = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1556 else // can delete indent when '{' typed |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1557 can_si_back = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1558 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1559 curwin->w_cursor = old_cursor; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1560 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1561 if (do_si) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1562 can_si = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1563 #endif // FEAT_SMARTINDENT |
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 did_ai = TRUE; |
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 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1568 #ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1569 // 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
|
1570 // 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
|
1571 end_comment_pending = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1572 if (flags & OPENLINE_DO_COM) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1573 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
|
1574 dir == BACKWARD, TRUE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1575 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1576 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1577 if (lead_len > 0) |
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 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
|
1580 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
|
1581 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
|
1582 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
|
1583 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
|
1584 int extra_space = FALSE; // append extra space |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1585 int current_flag; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1586 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
|
1587 char_u *p2; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1588 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1589 // 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
|
1590 // 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
|
1591 for (p = lead_flags; *p && *p != ':'; ++p) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1592 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1593 if (*p == COM_BLANK) |
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 require_blank = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1596 continue; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1597 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1598 if (*p == COM_START || *p == COM_MIDDLE) |
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 current_flag = *p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1601 if (*p == COM_START) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1602 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1603 // 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
|
1604 if (dir == BACKWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1605 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1606 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1607 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1608 } |
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 // find start of middle part |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1611 (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
|
1612 require_blank = FALSE; |
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 // 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
|
1616 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
|
1617 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1618 if (*p == COM_BLANK) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1619 require_blank = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1620 ++p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1621 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1622 (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
|
1623 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1624 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
|
1625 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1626 // 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
|
1627 if (*p == COM_AUTO_END) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1628 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
|
1629 ++p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1630 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1631 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
|
1632 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1633 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
|
1634 end_comment_pending = lead_end[n - 1]; |
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 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
|
1637 // the comment leader. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1638 if (dir == FORWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1639 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1640 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
|
1641 if (STRNCMP(p, lead_end, n) == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1642 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1643 comment_end = p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1644 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1645 break; |
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 } |
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 // 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
|
1650 if (lead_len > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1651 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1652 if (current_flag == COM_START) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1653 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1654 lead_repl = lead_middle; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1655 lead_repl_len = (int)STRLEN(lead_middle); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1656 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1657 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1658 // 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
|
1659 // 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
|
1660 // comment leader on the next line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1661 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
|
1662 && ((p_extra != NULL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1663 && (int)curwin->w_cursor.col == lead_len) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1664 || (p_extra == NULL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1665 && saved_line[lead_len] == NUL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1666 || require_blank)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1667 extra_space = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1668 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1669 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1670 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1671 if (*p == COM_END) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1672 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1673 // 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
|
1674 // 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
|
1675 // start (for C-comments). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1676 if (dir == FORWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1677 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1678 comment_end = skipwhite(saved_line); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1679 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1680 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1681 } |
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 // 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
|
1684 // 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
|
1685 while (p > curbuf->b_p_com && *p != ',') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1686 --p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1687 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
|
1688 && lead_repl[-1] != ':'; --lead_repl) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1689 ; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1690 lead_repl_len = (int)(p - lead_repl); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1691 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1692 // 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
|
1693 // the comment-end |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1694 extra_space = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1695 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1696 // 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
|
1697 for (p2 = p; *p2 && *p2 != ':'; p2++) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1698 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1699 if (*p2 == COM_AUTO_END) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1700 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
|
1701 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1702 if (end_comment_pending == -1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1703 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1704 // Find last character in end-comment string |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1705 while (*p2 && *p2 != ',') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1706 p2++; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1707 end_comment_pending = p2[-1]; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1708 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1709 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1710 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1711 if (*p == COM_FIRST) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1712 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1713 // 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
|
1714 // 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
|
1715 if (dir == BACKWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1716 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1717 else |
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 lead_repl = (char_u *)""; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1720 lead_repl_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1721 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1722 break; |
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 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1725 if (lead_len) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1726 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1727 // allocate buffer (may concatenate p_extra later) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1728 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
|
1729 + (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
|
1730 allocated = leader; // remember to free it later |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1731 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1732 if (leader == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1733 lead_len = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1734 else |
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 vim_strncpy(leader, saved_line, lead_len); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1737 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1738 // 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
|
1739 if (lead_repl != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1740 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1741 int c = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1742 int off = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1743 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1744 for (p = lead_flags; *p != NUL && *p != ':'; ) |
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 (*p == COM_RIGHT || *p == COM_LEFT) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1747 c = *p++; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1748 else if (VIM_ISDIGIT(*p) || *p == '-') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1749 off = getdigits(&p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1750 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1751 ++p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1752 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1753 if (c == COM_RIGHT) // right adjusted leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1754 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1755 // 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
|
1756 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
|
1757 && VIM_ISWHITE(*p); --p) |
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 ++p; |
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 // 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
|
1762 // screen characters, not bytes. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1763 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1764 int repl_size = vim_strnsize(lead_repl, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1765 lead_repl_len); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1766 int old_size = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1767 char_u *endp = p; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1768 int l; |
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 while (old_size < repl_size && p > leader) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1771 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1772 MB_PTR_BACK(leader, p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1773 old_size += ptr2cells(p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1774 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1775 l = lead_repl_len - (int)(endp - p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1776 if (l != 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1777 mch_memmove(endp + l, endp, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1778 (size_t)((leader + lead_len) - endp)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1779 lead_len += l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1780 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1781 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
|
1782 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
|
1783 p[lead_repl_len] = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1784 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1785 // 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
|
1786 while (--p >= leader) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1787 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1788 int l = mb_head_off(leader, p); |
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 (l > 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 p -= l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1793 if (ptr2cells(p) > 1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1794 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1795 p[1] = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1796 --l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1797 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1798 mch_memmove(p + 1, p + l + 1, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1799 (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
|
1800 lead_len -= l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1801 *p = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1802 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1803 else if (!VIM_ISWHITE(*p)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1804 *p = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1805 } |
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 else // left adjusted leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1808 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1809 p = skipwhite(leader); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1810 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1811 // 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
|
1812 // 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
|
1813 // not to be overwritten. |
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 int repl_size = vim_strnsize(lead_repl, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1816 lead_repl_len); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1817 int i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1818 int l; |
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 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
|
1821 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1822 l = (*mb_ptr2len)(p + i); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1823 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
|
1824 break; |
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 if (i != lead_repl_len) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1827 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1828 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
|
1829 (size_t)(lead_len - i - (p - leader))); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1830 lead_len += lead_repl_len - i; |
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 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1833 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
|
1834 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1835 // 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
|
1836 // 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
|
1837 // remain the same. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1838 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
|
1839 if (!VIM_ISWHITE(*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 // 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
|
1842 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
|
1843 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1844 --lead_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1845 mch_memmove(p, p + 1, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1846 (leader + lead_len) - p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1847 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1848 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1849 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1850 int l = (*mb_ptr2len)(p); |
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 if (l > 1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1853 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1854 if (ptr2cells(p) > 1) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1855 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1856 // Replace a double-wide char with |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1857 // two spaces |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1858 --l; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1859 *p++ = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1860 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1861 mch_memmove(p + 1, p + l, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1862 (leader + lead_len) - p); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1863 lead_len -= l - 1; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1864 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1865 *p = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1866 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1867 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1868 *p = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1869 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1870 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1871 // Recompute the indent, it may have changed. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1872 if (curbuf->b_p_ai |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1873 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1874 || do_si |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1875 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1876 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1877 #ifdef FEAT_VARTABS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1878 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
|
1879 curbuf->b_p_vts_array, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1880 #else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1881 newindent = get_indent_str(leader, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1882 (int)curbuf->b_p_ts, FALSE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1883 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1884 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1885 // Add the indent offset |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1886 if (newindent + off < 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1887 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1888 off = -newindent; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1889 newindent = 0; |
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 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1892 newindent += off; |
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 // 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
|
1895 // alignment remains equal. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1896 while (off > 0 && lead_len > 0 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1897 && leader[lead_len - 1] == ' ') |
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 // 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
|
1900 if (vim_strchr(skipwhite(leader), '\t') != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1901 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1902 --lead_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1903 --off; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1904 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1905 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1906 // 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
|
1907 // extra space |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1908 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
|
1909 extra_space = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1910 leader[lead_len] = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1911 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1912 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1913 if (extra_space) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1914 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1915 leader[lead_len++] = ' '; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1916 leader[lead_len] = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1917 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1918 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1919 newcol = lead_len; |
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 // 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
|
1922 // is in the comment leader |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1923 if (newindent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1924 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1925 || did_si |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1926 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1927 ) |
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 while (lead_len && VIM_ISWHITE(*leader)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1930 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1931 --lead_len; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1932 --newcol; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1933 ++leader; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1934 } |
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 |
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 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1939 did_si = can_si = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1940 #endif |
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 else if (comment_end != NULL) |
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 // 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
|
1945 // 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
|
1946 // 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
|
1947 // comment. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1948 if (comment_end[0] == '*' && comment_end[1] == '/' && |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1949 (curbuf->b_p_ai |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1950 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1951 || do_si |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1952 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1953 )) |
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 old_cursor = curwin->w_cursor; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1956 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
|
1957 if ((pos = findmatch(NULL, NUL)) != NULL) |
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 curwin->w_cursor.lnum = pos->lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1960 newindent = get_indent(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1961 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1962 curwin->w_cursor = old_cursor; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1963 } |
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 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1966 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1967 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1968 // (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
|
1969 if (p_extra != NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1970 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1971 *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
|
1972 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1973 // 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
|
1974 // non-blank. |
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 // 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
|
1977 // 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
|
1978 if (REPLACE_NORMAL(State)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1979 replace_push(NUL); /* end of extra blanks */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1980 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
|
1981 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1982 while ((*p_extra == ' ' || *p_extra == '\t') |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1983 && (!enc_utf8 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1984 || !utf_iscomposing(utf_ptr2char(p_extra + 1)))) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1985 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1986 if (REPLACE_NORMAL(State)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1987 replace_push(*p_extra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1988 ++p_extra; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1989 ++less_cols_off; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1990 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1991 } |
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 // columns for marks adjusted for removed columns |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1994 less_cols = (int)(p_extra - saved_line); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1995 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1996 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1997 if (p_extra == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1998 p_extra = (char_u *)""; // append empty line |
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 #ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2001 // 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
|
2002 if (lead_len) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2003 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2004 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
|
2005 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2006 int i; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2007 int padding = second_line_indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2008 - (newindent + (int)STRLEN(leader)); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2009 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2010 // 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
|
2011 // 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
|
2012 // whitespace needed before the comment char. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2013 for (i = 0; i < padding; i++) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2014 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2015 STRCAT(leader, " "); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2016 less_cols--; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2017 newcol++; |
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 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2020 STRCAT(leader, p_extra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2021 p_extra = leader; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2022 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
|
2023 less_cols -= lead_len; |
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 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2026 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
|
2027 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2028 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2029 old_cursor = curwin->w_cursor; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2030 if (dir == BACKWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2031 --curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2032 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
|
2033 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2034 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
|
2035 == FAIL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2036 goto theend; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2037 // 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
|
2038 // with markers. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2039 // 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
|
2040 // 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
|
2041 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
|
2042 #ifdef FEAT_DIFF |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2043 || curwin->w_p_diff |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2044 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2045 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2046 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
|
2047 did_append = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2048 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2049 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2050 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2051 // 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
|
2052 curwin->w_cursor.lnum++; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2053 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
|
2054 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2055 // 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
|
2056 // 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
|
2057 (void)u_save_cursor(); /* errors are ignored! */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2058 vr_lines_changed++; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2059 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2060 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
|
2061 changed_bytes(curwin->w_cursor.lnum, 0); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2062 curwin->w_cursor.lnum--; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2063 did_append = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2064 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2065 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2066 if (newindent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2067 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2068 || did_si |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2069 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2070 ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2071 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2072 ++curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2073 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2074 if (did_si) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2075 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2076 int sw = (int)get_sw_value(curbuf); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2077 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2078 if (p_sr) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2079 newindent -= newindent % sw; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2080 newindent += sw; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2081 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2082 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2083 // Copy the indent |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2084 if (curbuf->b_p_ci) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2085 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2086 (void)copy_indent(newindent, saved_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 // 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
|
2089 // 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
|
2090 // 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
|
2091 curbuf->b_p_pi = TRUE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2092 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2093 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2094 (void)set_indent(newindent, SIN_INSERT); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2095 less_cols -= curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2096 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2097 ai_col = curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2098 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2099 // 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
|
2100 // 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
|
2101 if (REPLACE_NORMAL(State)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2102 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
|
2103 replace_push(NUL); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2104 newcol += curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2105 #ifdef FEAT_SMARTINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2106 if (no_si) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2107 did_si = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2108 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2109 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2110 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2111 #ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2112 // 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
|
2113 // 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
|
2114 if (REPLACE_NORMAL(State)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2115 while (lead_len-- > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2116 replace_push(NUL); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2117 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2118 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2119 curwin->w_cursor = old_cursor; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2120 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2121 if (dir == FORWARD) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2122 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2123 if (trunc_line || (State & INSERT)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2124 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2125 // truncate current line at cursor |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2126 saved_line[curwin->w_cursor.col] = NUL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2127 // 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
|
2128 if (trunc_line && !(flags & OPENLINE_KEEPTRAIL)) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2129 truncate_spaces(saved_line); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2130 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
|
2131 saved_line = NULL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2132 if (did_append) |
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 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
|
2135 curwin->w_cursor.lnum + 1, 1L); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2136 did_append = FALSE; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2137 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2138 // 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
|
2139 if (flags & OPENLINE_MARKFIX) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2140 mark_col_adjust(curwin->w_cursor.lnum, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2141 curwin->w_cursor.col + less_cols_off, |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2142 1L, (long)-less_cols, 0); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2143 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2144 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2145 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
|
2146 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2147 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2148 // 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
|
2149 // 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
|
2150 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
|
2151 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2152 if (did_append) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2153 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
|
2154 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2155 curwin->w_cursor.col = newcol; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2156 curwin->w_cursor.coladd = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2157 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2158 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2159 // 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
|
2160 // 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
|
2161 // normal INSERT mode. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2162 if (State & VREPLACE_FLAG) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2163 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2164 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
|
2165 State = INSERT; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2166 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2167 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2168 vreplace_mode = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2169 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2170 #ifdef FEAT_LISP |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2171 // May do lisp indenting. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2172 if (!p_paste |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2173 # ifdef FEAT_COMMENTS |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2174 && leader == NULL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2175 # endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2176 && curbuf->b_p_lisp |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2177 && curbuf->b_p_ai) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2178 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2179 fixthisline(get_lisp_indent); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2180 ai_col = (colnr_T)getwhitecols_curline(); |
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 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2183 #ifdef FEAT_CINDENT |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2184 // 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
|
2185 if (!p_paste |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2186 && (curbuf->b_p_cin |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2187 # ifdef FEAT_EVAL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2188 || *curbuf->b_p_inde != NUL |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2189 # endif |
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 && in_cinkeys(dir == FORWARD |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2192 ? KEY_OPEN_FORW |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2193 : 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
|
2194 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2195 do_c_expr_indent(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2196 ai_col = (colnr_T)getwhitecols_curline(); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2197 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2198 #endif |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2199 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2200 if (vreplace_mode != 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2201 State = vreplace_mode; |
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 // 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
|
2205 // 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
|
2206 // onto the replace stack (via ins_char()). |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2207 if (State & VREPLACE_FLAG) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2208 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2209 // Put new line in p_extra |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2210 p_extra = vim_strsave(ml_get_curline()); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2211 if (p_extra == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2212 goto theend; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2213 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2214 // Put back original line |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2215 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
|
2216 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2217 // Insert new stuff into line again |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2218 curwin->w_cursor.col = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2219 curwin->w_cursor.coladd = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2220 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
|
2221 vim_free(p_extra); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2222 next_line = NULL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2223 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2224 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2225 retval = OK; // success! |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2226 theend: |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2227 curbuf->b_p_pi = saved_pi; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2228 vim_free(saved_line); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2229 vim_free(next_line); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2230 vim_free(allocated); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2231 return retval; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2232 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2233 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2234 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2235 * Delete from cursor to end of line. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2236 * Caller must have prepared for undo. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2237 * 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
|
2238 * |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2239 * Return FAIL for failure, OK otherwise. |
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 int |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2242 truncate_line(int fixpos) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2243 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2244 char_u *newp; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2245 linenr_T lnum = curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2246 colnr_T col = curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2247 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2248 if (col == 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2249 newp = vim_strsave((char_u *)""); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2250 else |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2251 newp = vim_strnsave(ml_get(lnum), col); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2252 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2253 if (newp == NULL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2254 return FAIL; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2255 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2256 ml_replace(lnum, newp, FALSE); |
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 // 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
|
2259 changed_bytes(lnum, curwin->w_cursor.col); |
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 // 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
|
2262 if (fixpos && curwin->w_cursor.col > 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2263 --curwin->w_cursor.col; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2264 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2265 return OK; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2266 } |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2267 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2268 /* |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2269 * Delete "nlines" lines at the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2270 * 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
|
2271 */ |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2272 void |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2273 del_lines(long nlines, int undo) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2274 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2275 long n; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2276 linenr_T first = curwin->w_cursor.lnum; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2277 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2278 if (nlines <= 0) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2279 return; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2280 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2281 // save the deleted lines for undo |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2282 if (undo && u_savedel(first, nlines) == FAIL) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2283 return; |
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 for (n = 0; n < nlines; ) |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2286 { |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2287 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
|
2288 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2289 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2290 ml_delete(first, TRUE); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2291 ++n; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2292 |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2293 // 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
|
2294 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
|
2295 break; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2296 } |
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 // 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
|
2299 // trigger a callback to display the cursor. |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2300 curwin->w_cursor.col = 0; |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2301 check_cursor_lnum(); |
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 // 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
|
2304 deleted_lines_mark(first, n); |
7217a9c5adb3
Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2305 } |