Mercurial > vim

annotate src/change.c @ 29234:96ff6c230a66 v8.2.5136

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.5136: debugger test fails when run with valgrind Commit: https://github.com/vim/vim/commit/e366ed4f2c6fa8cb663f1b9599b39d57ddbd8a2a Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jun 19 20:13:56 2022 +0100 patch 8.2.5136: debugger test fails when run with valgrind Problem: Debugger test fails when run with valgrind. Solution: Wait longer when using valgrind.
author Bram Moolenaar <Bram@vim.org>
date Sun, 19 Jun 2022 21:15:03 +0200
parents a2710736125a
children fba9e366ced4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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();
18642
bbea1f108187 patch 8.1.2313: debugging where a delay comes from is not easy
Bram Moolenaar <Bram@vim.org>
parents: 18440
diff changeset
61 ui_delay(1002L, TRUE); // give the user time to think about it
16631
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.
22742
f7f2d73ff85e patch 8.2.1919: assert_fails() setting emsg_silent changes normal execution
Bram Moolenaar <Bram@vim.org>
parents: 22699
diff changeset
118 if (need_wait_return && emsg_silent == 0 && !in_assert_fails)
16631
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();
18642
bbea1f108187 patch 8.1.2313: debugging where a delay comes from is not easy
Bram Moolenaar <Bram@vim.org>
parents: 18440
diff changeset
121 ui_delay(2002L, TRUE);
16631
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 need_maketitle = TRUE; // set window title later
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
150 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
151
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
152 #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
153 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
154
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 /*
17423
ae11ab022b02 patch 8.1.1710: Coverity found dead code
Bram Moolenaar <Bram@vim.org>
parents: 17352
diff changeset
156 * Check if the change at "lnum" is above or overlaps with an existing
ae11ab022b02 patch 8.1.1710: Coverity found dead code
Bram Moolenaar <Bram@vim.org>
parents: 17352
diff changeset
157 * change. If above then flush changes and invoke listeners.
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
158 */
27706
17cd22b7151b patch 8.2.4379: an empty change is reported to a listener
Bram Moolenaar <Bram@vim.org>
parents: 27521
diff changeset
159 static void
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
160 check_recorded_changes(
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
161 buf_T *buf,
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
162 linenr_T lnum,
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
163 linenr_T lnume,
17423
ae11ab022b02 patch 8.1.1710: Coverity found dead code
Bram Moolenaar <Bram@vim.org>
parents: 17352
diff changeset
164 long xtra)
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
165 {
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
166 if (buf->b_recorded_changes != NULL && xtra != 0)
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
167 {
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
168 listitem_T *li;
16774
0cc3f459237b patch 8.1.1389: changes are not flushed when end and start overlap
Bram Moolenaar <Bram@vim.org>
parents: 16768
diff changeset
169 linenr_T prev_lnum;
0cc3f459237b patch 8.1.1389: changes are not flushed when end and start overlap
Bram Moolenaar <Bram@vim.org>
parents: 16768
diff changeset
170 linenr_T prev_lnume;
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
171
19888
435726a03481 patch 8.2.0500: using the same loop in many places
Bram Moolenaar <Bram@vim.org>
parents: 19534
diff changeset
172 FOR_ALL_LIST_ITEMS(buf->b_recorded_changes, li)
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
173 {
16774
0cc3f459237b patch 8.1.1389: changes are not flushed when end and start overlap
Bram Moolenaar <Bram@vim.org>
parents: 16768
diff changeset
174 prev_lnum = (linenr_T)dict_get_number(
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
175 li->li_tv.vval.v_dict, (char_u *)"lnum");
16774
0cc3f459237b patch 8.1.1389: changes are not flushed when end and start overlap
Bram Moolenaar <Bram@vim.org>
parents: 16768
diff changeset
176 prev_lnume = (linenr_T)dict_get_number(
0cc3f459237b patch 8.1.1389: changes are not flushed when end and start overlap
Bram Moolenaar <Bram@vim.org>
parents: 16768
diff changeset
177 li->li_tv.vval.v_dict, (char_u *)"end");
17423
ae11ab022b02 patch 8.1.1710: Coverity found dead code
Bram Moolenaar <Bram@vim.org>
parents: 17352
diff changeset
178 if (prev_lnum >= lnum || prev_lnum > lnume || prev_lnume >= lnum)
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
179 {
17423
ae11ab022b02 patch 8.1.1710: Coverity found dead code
Bram Moolenaar <Bram@vim.org>
parents: 17352
diff changeset
180 // the current change is going to make the line number in
ae11ab022b02 patch 8.1.1710: Coverity found dead code
Bram Moolenaar <Bram@vim.org>
parents: 17352
diff changeset
181 // the older change invalid, flush now
ae11ab022b02 patch 8.1.1710: Coverity found dead code
Bram Moolenaar <Bram@vim.org>
parents: 17352
diff changeset
182 invoke_listeners(curbuf);
ae11ab022b02 patch 8.1.1710: Coverity found dead code
Bram Moolenaar <Bram@vim.org>
parents: 17352
diff changeset
183 break;
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
184 }
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
185 }
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
186 }
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
187 }
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
188
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
189 /*
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
190 * Record a change for listeners added with listener_add().
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
191 * Always for the current buffer.
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
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 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
194 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
195 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
196 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
197 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
198 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
199 {
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 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
201
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 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
203 return;
16660
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
204
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
205 // If the new change is going to change the line numbers in already listed
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
206 // changes, then flush.
27706
17cd22b7151b patch 8.2.4379: an empty change is reported to a listener
Bram Moolenaar <Bram@vim.org>
parents: 27521
diff changeset
207 check_recorded_changes(curbuf, lnum, lnume, xtra);
16660
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
208
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
209 if (curbuf->b_recorded_changes == NULL)
16636
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
210 {
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
211 curbuf->b_recorded_changes = list_alloc();
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
212 if (curbuf->b_recorded_changes == NULL) // out of memory
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
213 return;
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
214 ++curbuf->b_recorded_changes->lv_refcount;
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
215 curbuf->b_recorded_changes->lv_lock = VAR_FIXED;
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
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
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 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
219 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
220 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
221 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
222 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
223 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
224 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
225
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
226 list_append_dict(curbuf->b_recorded_changes, dict);
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
227 }
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 /*
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 * 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
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 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
233 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
234 {
16872
a836d122231a patch 8.1.1437: code to handle callbacks is duplicated
Bram Moolenaar <Bram@vim.org>
parents: 16835
diff changeset
235 callback_T callback;
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
236 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
237 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
238
25356
1cde96e768e4 patch 8.2.3215: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents: 25246
diff changeset
239 if (in_vim9script() && check_for_opt_buffer_arg(argvars, 1) == FAIL)
1cde96e768e4 patch 8.2.3215: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents: 25246
diff changeset
240 return;
1cde96e768e4 patch 8.2.3215: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents: 25246
diff changeset
241
16872
a836d122231a patch 8.1.1437: code to handle callbacks is duplicated
Bram Moolenaar <Bram@vim.org>
parents: 16835
diff changeset
242 callback = get_callback(&argvars[0]);
a836d122231a patch 8.1.1437: code to handle callbacks is duplicated
Bram Moolenaar <Bram@vim.org>
parents: 16835
diff changeset
243 if (callback.cb_name == NULL)
16636
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
244 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
245
16638
4790302965fc patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents: 16636
diff changeset
246 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
247 {
4790302965fc patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents: 16636
diff changeset
248 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
249 if (buf == NULL)
16872
a836d122231a patch 8.1.1437: code to handle callbacks is duplicated
Bram Moolenaar <Bram@vim.org>
parents: 16835
diff changeset
250 {
a836d122231a patch 8.1.1437: code to handle callbacks is duplicated
Bram Moolenaar <Bram@vim.org>
parents: 16835
diff changeset
251 free_callback(&callback);
16638
4790302965fc patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents: 16636
diff changeset
252 return;
16872
a836d122231a patch 8.1.1437: code to handle callbacks is duplicated
Bram Moolenaar <Bram@vim.org>
parents: 16835
diff changeset
253 }
16638
4790302965fc patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents: 16636
diff changeset
254 }
4790302965fc patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents: 16636
diff changeset
255
16825
ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents: 16774
diff changeset
256 lnr = ALLOC_CLEAR_ONE(listener_T);
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
257 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
258 {
16872
a836d122231a patch 8.1.1437: code to handle callbacks is duplicated
Bram Moolenaar <Bram@vim.org>
parents: 16835
diff changeset
259 free_callback(&callback);
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
260 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
261 }
16638
4790302965fc patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents: 16636
diff changeset
262 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
263 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
264
16872
a836d122231a patch 8.1.1437: code to handle callbacks is duplicated
Bram Moolenaar <Bram@vim.org>
parents: 16835
diff changeset
265 set_callback(&lnr->lr_callback, &callback);
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
266
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
267 lnr->lr_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
268 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
269 }
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
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 /*
16660
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
272 * listener_flush() function
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
273 */
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
274 void
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
275 f_listener_flush(typval_T *argvars, typval_T *rettv UNUSED)
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
276 {
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
277 buf_T *buf = curbuf;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
278
25384
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents: 25380
diff changeset
279 if (in_vim9script() && check_for_opt_buffer_arg(argvars, 0) == FAIL)
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents: 25380
diff changeset
280 return;
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents: 25380
diff changeset
281
16660
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
282 if (argvars[0].v_type != VAR_UNKNOWN)
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
283 {
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
284 buf = get_buf_arg(&argvars[0]);
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
285 if (buf == NULL)
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
286 return;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
287 }
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
288 invoke_listeners(buf);
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
289 }
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
290
25782
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
291
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
292 static void
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
293 remove_listener(buf_T *buf, listener_T *lnr, listener_T *prev)
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
294 {
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
295 if (prev != NULL)
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
296 prev->lr_next = lnr->lr_next;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
297 else
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
298 buf->b_listener = lnr->lr_next;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
299 free_callback(&lnr->lr_callback);
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
300 vim_free(lnr);
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
301 }
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
302
16660
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
303 /*
16636
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
304 * 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
305 */
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
306 void
17352
b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove()
Bram Moolenaar <Bram@vim.org>
parents: 16996
diff changeset
307 f_listener_remove(typval_T *argvars, typval_T *rettv)
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
308 {
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
309 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
310 listener_T *next;
17352
b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove()
Bram Moolenaar <Bram@vim.org>
parents: 16996
diff changeset
311 listener_T *prev;
25384
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents: 25380
diff changeset
312 int id;
16638
4790302965fc patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents: 16636
diff changeset
313 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
314
25384
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents: 25380
diff changeset
315 if (in_vim9script() && check_for_number_arg(argvars, 0) == FAIL)
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents: 25380
diff changeset
316 return;
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents: 25380
diff changeset
317
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents: 25380
diff changeset
318 id = tv_get_number(argvars);
18225
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
319 FOR_ALL_BUFFERS(buf)
17352
b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove()
Bram Moolenaar <Bram@vim.org>
parents: 16996
diff changeset
320 {
b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove()
Bram Moolenaar <Bram@vim.org>
parents: 16996
diff changeset
321 prev = NULL;
16638
4790302965fc patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents: 16636
diff changeset
322 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
323 {
16638
4790302965fc patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents: 16636
diff changeset
324 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
325 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
326 {
29014
45c182c4f7e9 patch 8.2.5029: "textlock" is always zero
Bram Moolenaar <Bram@vim.org>
parents: 28972
diff changeset
327 if (textlock > 0)
25782
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
328 {
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
329 // in invoke_listeners(), clear ID and delete later
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
330 lnr->lr_id = 0;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
331 return;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
332 }
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
333 remove_listener(buf, lnr, prev);
17352
b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove()
Bram Moolenaar <Bram@vim.org>
parents: 16996
diff changeset
334 rettv->vval.v_number = 1;
b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove()
Bram Moolenaar <Bram@vim.org>
parents: 16996
diff changeset
335 return;
16638
4790302965fc patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents: 16636
diff changeset
336 }
4790302965fc patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents: 16636
diff changeset
337 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
338 }
17352
b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove()
Bram Moolenaar <Bram@vim.org>
parents: 16996
diff changeset
339 }
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
340 }
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
341
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
342 /*
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
343 * Called before inserting a line above "lnum"/"lnum3" or deleting line "lnum"
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
344 * to "lnume".
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
345 */
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
346 void
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
347 may_invoke_listeners(buf_T *buf, linenr_T lnum, linenr_T lnume, int added)
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
348 {
17423
ae11ab022b02 patch 8.1.1710: Coverity found dead code
Bram Moolenaar <Bram@vim.org>
parents: 17352
diff changeset
349 check_recorded_changes(buf, lnum, lnume, added);
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
350 }
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
351
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
352 /*
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
353 * 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
354 * 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
355 */
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
356 void
16660
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
357 invoke_listeners(buf_T *buf)
16636
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
358 {
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
359 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
360 typval_T rettv;
16660
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
361 typval_T argv[6];
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
362 listitem_T *li;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
363 linenr_T start = MAXLNUM;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
364 linenr_T end = 0;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
365 linenr_T added = 0;
16835
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
366 int save_updating_screen = updating_screen;
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
367 static int recursive = FALSE;
25782
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
368 listener_T *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
369
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
370 if (buf->b_recorded_changes == NULL // nothing changed
16835
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
371 || buf->b_listener == NULL // no listeners
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
372 || recursive) // already busy
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
373 return;
16835
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
374 recursive = TRUE;
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
375
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
376 // Block messages on channels from being handled, so that they don't make
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
377 // text changes here.
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
378 ++updating_screen;
16660
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
379
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
380 argv[0].v_type = VAR_NUMBER;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
381 argv[0].vval.v_number = buf->b_fnum; // a:bufnr
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
382
19888
435726a03481 patch 8.2.0500: using the same loop in many places
Bram Moolenaar <Bram@vim.org>
parents: 19534
diff changeset
383 FOR_ALL_LIST_ITEMS(buf->b_recorded_changes, li)
16660
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
384 {
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
385 varnumber_T lnum;
16636
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
386
16660
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
387 lnum = dict_get_number(li->li_tv.vval.v_dict, (char_u *)"lnum");
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
388 if (start > lnum)
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
389 start = lnum;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
390 lnum = dict_get_number(li->li_tv.vval.v_dict, (char_u *)"end");
18434
5da355d15b88 patch 8.1.2211: listener callback "added" argument is not the total
Bram Moolenaar <Bram@vim.org>
parents: 18265
diff changeset
391 if (end < lnum)
16660
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
392 end = lnum;
18434
5da355d15b88 patch 8.1.2211: listener callback "added" argument is not the total
Bram Moolenaar <Bram@vim.org>
parents: 18265
diff changeset
393 added += dict_get_number(li->li_tv.vval.v_dict, (char_u *)"added");
16660
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
394 }
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
395 argv[1].v_type = VAR_NUMBER;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
396 argv[1].vval.v_number = start;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
397 argv[2].v_type = VAR_NUMBER;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
398 argv[2].vval.v_number = end;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
399 argv[3].v_type = VAR_NUMBER;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
400 argv[3].vval.v_number = added;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
401
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
402 argv[4].v_type = VAR_LIST;
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
403 argv[4].vval.v_list = buf->b_recorded_changes;
29014
45c182c4f7e9 patch 8.2.5029: "textlock" is always zero
Bram Moolenaar <Bram@vim.org>
parents: 28972
diff changeset
404 ++textlock;
16660
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
405
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents: 16638
diff changeset
406 for (lnr = buf->b_listener; lnr != NULL; lnr = lnr->lr_next)
16636
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
407 {
17606
ff097edaae89 patch 8.1.1800: function call functions have too many arguments
Bram Moolenaar <Bram@vim.org>
parents: 17423
diff changeset
408 call_callback(&lnr->lr_callback, -1, &rettv, 5, argv);
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
409 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
410 }
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer
Bram Moolenaar <Bram@vim.org>
parents: 16631
diff changeset
411
25782
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
412 // If f_listener_remove() was called may have to remove a listener now.
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
413 for (lnr = buf->b_listener; lnr != NULL; lnr = next)
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
414 {
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
415 listener_T *prev = NULL;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
416
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
417 next = lnr->lr_next;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
418 if (lnr->lr_id == 0)
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
419 remove_listener(buf, lnr, prev);
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
420 else
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
421 prev = lnr;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
422 }
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback
Bram Moolenaar <Bram@vim.org>
parents: 25384
diff changeset
423
29014
45c182c4f7e9 patch 8.2.5029: "textlock" is always zero
Bram Moolenaar <Bram@vim.org>
parents: 28972
diff changeset
424 --textlock;
16666
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
425 list_unref(buf->b_recorded_changes);
978bcd70883d patch 8.1.1335: listener callback is called after inserting text
Bram Moolenaar <Bram@vim.org>
parents: 16662
diff changeset
426 buf->b_recorded_changes = NULL;
16835
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
427
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
428 if (save_updating_screen)
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
429 updating_screen = TRUE;
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
430 else
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
431 after_updating_screen(TRUE);
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents: 16825
diff changeset
432 recursive = FALSE;
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
433 }
18225
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
434
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
435 /*
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
436 * Remove all listeners associated with "buf".
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
437 */
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
438 void
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
439 remove_listeners(buf_T *buf)
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
440 {
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
441 listener_T *lnr;
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
442 listener_T *next;
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
443
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
444 for (lnr = buf->b_listener; lnr != NULL; lnr = next)
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
445 {
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
446 next = lnr->lr_next;
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
447 free_callback(&lnr->lr_callback);
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
448 vim_free(lnr);
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
449 }
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
450 buf->b_listener = NULL;
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan
Bram Moolenaar <Bram@vim.org>
parents: 18203
diff changeset
451 }
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
452 #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
453
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
454 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
455 * 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
456 * See changed_lines() for the arguments.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
457 * 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
458 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
459 static void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
460 changed_common(
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
461 linenr_T lnum,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
462 colnr_T col,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
463 linenr_T lnume,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
464 long xtra)
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 win_T *wp;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
467 tabpage_T *tp;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
468 int i;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
469 int cols;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
470 pos_T *p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
471 int add;
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 // mark the buffer as modified
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
474 changed();
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
475
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
476 #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
477 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
478 #endif
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
479 #ifdef FEAT_DIFF
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
480 if (curwin->w_p_diff && diff_internal())
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
481 curtab->tp_diff_update = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
482 #endif
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 // set the '. mark
22699
e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod
Bram Moolenaar <Bram@vim.org>
parents: 22282
diff changeset
485 if ((cmdmod.cmod_flags & CMOD_KEEPJUMPS) == 0)
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
486 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
487 curbuf->b_last_change.lnum = lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
488 curbuf->b_last_change.col = col;
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 // 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
491 // don't have an entry yet.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
492 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
493 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
494 if (curbuf->b_changelistlen == 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
495 add = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
496 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
497 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
498 // 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
499 // 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
500 // creating many entries for typing "xxxxx".
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
501 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
502 if (p->lnum != lnum)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
503 add = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
504 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
505 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
506 cols = comp_textwidth(FALSE);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
507 if (cols == 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
508 cols = 79;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
509 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
510 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
511 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
512 if (add)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
513 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
514 // 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
515 // 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
516 // position in the changelist.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
517 curbuf->b_new_change = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
518
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
519 if (curbuf->b_changelistlen == JUMPLISTSIZE)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
520 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
521 // changelist is full: remove oldest entry
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
522 curbuf->b_changelistlen = JUMPLISTSIZE - 1;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
523 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
524 sizeof(pos_T) * (JUMPLISTSIZE - 1));
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
525 FOR_ALL_TAB_WINDOWS(tp, wp)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
526 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
527 // 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
528 // this buffer.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
529 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
530 --wp->w_changelistidx;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
531 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
532 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
533 FOR_ALL_TAB_WINDOWS(tp, wp)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
534 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
535 // 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
536 // 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
537 if (wp->w_buffer == curbuf
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
538 && wp->w_changelistidx == curbuf->b_changelistlen)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
539 ++wp->w_changelistidx;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
540 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
541 ++curbuf->b_changelistlen;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
542 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
543 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
544 curbuf->b_changelist[curbuf->b_changelistlen - 1] =
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
545 curbuf->b_last_change;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
546 // 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
547 // takes you back to it.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
548 curwin->w_changelistidx = curbuf->b_changelistlen;
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
28893
aa44d5842d6c patch 8.2.4969: changing text in Visual mode may cause invalid memory access
Bram Moolenaar <Bram@vim.org>
parents: 28865
diff changeset
551 if (VIsual_active)
aa44d5842d6c patch 8.2.4969: changing text in Visual mode may cause invalid memory access
Bram Moolenaar <Bram@vim.org>
parents: 28865
diff changeset
552 check_visual_pos();
aa44d5842d6c patch 8.2.4969: changing text in Visual mode may cause invalid memory access
Bram Moolenaar <Bram@vim.org>
parents: 28865
diff changeset
553
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
554 FOR_ALL_TAB_WINDOWS(tp, wp)
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 if (wp->w_buffer == curbuf)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
557 {
27758
5a8258fde1d9 patch 8.2.4405: compiler warning for unused variable without +folding
Bram Moolenaar <Bram@vim.org>
parents: 27754
diff changeset
558 #ifdef FEAT_FOLDING
27754
1f37e5082343 patch 8.2.4403: ml_get error with nested folds and deleting lines
Bram Moolenaar <Bram@vim.org>
parents: 27706
diff changeset
559 linenr_T last = lnume + xtra - 1; // last line after the change
27758
5a8258fde1d9 patch 8.2.4405: compiler warning for unused variable without +folding
Bram Moolenaar <Bram@vim.org>
parents: 27754
diff changeset
560 #endif
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
561 // Mark this window to be redrawn later.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
562 if (wp->w_redr_type < VALID)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
563 wp->w_redr_type = VALID;
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 // 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
566 // values for the cursor.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
567 #ifdef FEAT_FOLDING
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
568 // 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
569 // a following operator might work on the whole fold: ">>dd".
27754
1f37e5082343 patch 8.2.4403: ml_get error with nested folds and deleting lines
Bram Moolenaar <Bram@vim.org>
parents: 27706
diff changeset
570 foldUpdate(wp, lnum, last);
16631
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 // 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
573 // 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
574 // might be displayed differently.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
575 // 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
576 // inserting lines just above a closed fold.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
577 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
578 if (wp->w_cursor.lnum == lnum)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
579 wp->w_cline_folded = i;
27754
1f37e5082343 patch 8.2.4403: ml_get error with nested folds and deleting lines
Bram Moolenaar <Bram@vim.org>
parents: 27706
diff changeset
580 i = hasFoldingWin(wp, last, NULL, &last, FALSE, NULL);
1f37e5082343 patch 8.2.4403: ml_get error with nested folds and deleting lines
Bram Moolenaar <Bram@vim.org>
parents: 27706
diff changeset
581 if (wp->w_cursor.lnum == last)
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
582 wp->w_cline_folded = i;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
583
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
584 // 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
585 // 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
586 if (wp->w_cursor.lnum <= lnum)
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 i = find_wl_entry(wp, lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
589 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
590 changed_line_abv_curs_win(wp);
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 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
593 if (wp->w_cursor.lnum > lnum)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
594 changed_line_abv_curs_win(wp);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
595 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
596 changed_cline_bef_curs_win(wp);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
597 if (wp->w_botline >= lnum)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
598 {
25246
5932642234e1 patch 8.2.3159: cursor displayed in wrong position after deleting line
Bram Moolenaar <Bram@vim.org>
parents: 24643
diff changeset
599 if (xtra < 0)
5932642234e1 patch 8.2.3159: cursor displayed in wrong position after deleting line
Bram Moolenaar <Bram@vim.org>
parents: 24643
diff changeset
600 invalidate_botline_win(wp);
5932642234e1 patch 8.2.3159: cursor displayed in wrong position after deleting line
Bram Moolenaar <Bram@vim.org>
parents: 24643
diff changeset
601 else
5932642234e1 patch 8.2.3159: cursor displayed in wrong position after deleting line
Bram Moolenaar <Bram@vim.org>
parents: 24643
diff changeset
602 // Assume that botline doesn't change (inserted lines make
5932642234e1 patch 8.2.3159: cursor displayed in wrong position after deleting line
Bram Moolenaar <Bram@vim.org>
parents: 24643
diff changeset
603 // other lines scroll down below botline).
5932642234e1 patch 8.2.3159: cursor displayed in wrong position after deleting line
Bram Moolenaar <Bram@vim.org>
parents: 24643
diff changeset
604 approximate_botline_win(wp);
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
605 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
606
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
607 // 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
608 // 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
609 // 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
610 // after the change.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
611 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
612 if (wp->w_lines[i].wl_valid)
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 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
615 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
616 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
617 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
618 // line included in change
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
619 wp->w_lines[i].wl_valid = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
620 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
621 else if (xtra != 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
622 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
623 // line below change
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
624 wp->w_lines[i].wl_lnum += xtra;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
625 #ifdef FEAT_FOLDING
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
626 wp->w_lines[i].wl_lastlnum += xtra;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
627 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
628 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
629 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
630 #ifdef FEAT_FOLDING
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
631 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
632 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
633 // 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
634 // may need to be redrawn
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
635 wp->w_lines[i].wl_valid = FALSE;
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 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
638 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
639
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
640 #ifdef FEAT_FOLDING
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
641 // 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
642 // 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
643 if (hasAnyFolding(wp))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
644 set_topline(wp, wp->w_topline);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
645 #endif
28363
a9a56b567709 patch 8.2.4707: redrawing could be a bit more efficient
Bram Moolenaar <Bram@vim.org>
parents: 28236
diff changeset
646 // If lines have been added or removed, relative numbering always
a9a56b567709 patch 8.2.4707: redrawing could be a bit more efficient
Bram Moolenaar <Bram@vim.org>
parents: 28236
diff changeset
647 // requires a redraw.
28236
3f6c0a5c99bb patch 8.2.4644: redrawing too often when 'relativenumber' is set
Bram Moolenaar <Bram@vim.org>
parents: 27758
diff changeset
648 if (wp->w_p_rnu && xtra != 0)
28363
a9a56b567709 patch 8.2.4707: redrawing could be a bit more efficient
Bram Moolenaar <Bram@vim.org>
parents: 28236
diff changeset
649 {
a9a56b567709 patch 8.2.4707: redrawing could be a bit more efficient
Bram Moolenaar <Bram@vim.org>
parents: 28236
diff changeset
650 wp->w_last_cursor_lnum_rnu = 0;
a9a56b567709 patch 8.2.4707: redrawing could be a bit more efficient
Bram Moolenaar <Bram@vim.org>
parents: 28236
diff changeset
651 redraw_win_later(wp, VALID);
a9a56b567709 patch 8.2.4707: redrawing could be a bit more efficient
Bram Moolenaar <Bram@vim.org>
parents: 28236
diff changeset
652 }
17859
06e655ce1938 patch 8.1.1926: cursorline not redrawn when putting a line above the cursor
Bram Moolenaar <Bram@vim.org>
parents: 17809
diff changeset
653 #ifdef FEAT_SYN_HL
18440
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set
Bram Moolenaar <Bram@vim.org>
parents: 18434
diff changeset
654 // Cursor line highlighting probably need to be updated with
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set
Bram Moolenaar <Bram@vim.org>
parents: 18434
diff changeset
655 // "VALID" if it's below the change.
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set
Bram Moolenaar <Bram@vim.org>
parents: 18434
diff changeset
656 // If the cursor line is inside the change we need to redraw more.
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set
Bram Moolenaar <Bram@vim.org>
parents: 18434
diff changeset
657 if (wp->w_p_cul)
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set
Bram Moolenaar <Bram@vim.org>
parents: 18434
diff changeset
658 {
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set
Bram Moolenaar <Bram@vim.org>
parents: 18434
diff changeset
659 if (xtra == 0)
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set
Bram Moolenaar <Bram@vim.org>
parents: 18434
diff changeset
660 redraw_win_later(wp, VALID);
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set
Bram Moolenaar <Bram@vim.org>
parents: 18434
diff changeset
661 else if (lnum <= wp->w_last_cursorline)
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set
Bram Moolenaar <Bram@vim.org>
parents: 18434
diff changeset
662 redraw_win_later(wp, SOME_VALID);
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set
Bram Moolenaar <Bram@vim.org>
parents: 18434
diff changeset
663 }
17859
06e655ce1938 patch 8.1.1926: cursorline not redrawn when putting a line above the cursor
Bram Moolenaar <Bram@vim.org>
parents: 17809
diff changeset
664 #endif
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
665 }
29050
a2710736125a patch 8.2.5047: CurSearch highlight is often wrong
Bram Moolenaar <Bram@vim.org>
parents: 29014
diff changeset
666 #ifdef FEAT_SEARCH_EXTRA
a2710736125a patch 8.2.5047: CurSearch highlight is often wrong
Bram Moolenaar <Bram@vim.org>
parents: 29014
diff changeset
667 if (wp == curwin && xtra != 0 && search_hl_has_cursor_lnum >= lnum)
a2710736125a patch 8.2.5047: CurSearch highlight is often wrong
Bram Moolenaar <Bram@vim.org>
parents: 29014
diff changeset
668 search_hl_has_cursor_lnum += xtra;
a2710736125a patch 8.2.5047: CurSearch highlight is often wrong
Bram Moolenaar <Bram@vim.org>
parents: 29014
diff changeset
669 #endif
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
670 }
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 // 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
673 // 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
674 if (must_redraw < VALID)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
675 must_redraw = VALID;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
676
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
677 // 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
678 if (lnum <= curwin->w_cursor.lnum
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
679 && 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
680 last_cursormoved.lnum = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
681 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
682
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
683 static void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
684 changedOneline(buf_T *buf, linenr_T lnum)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
685 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
686 if (buf->b_mod_set)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
687 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
688 // 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
689 if (lnum < buf->b_mod_top)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
690 buf->b_mod_top = lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
691 else if (lnum >= buf->b_mod_bot)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
692 buf->b_mod_bot = lnum + 1;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
693 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
694 else
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 // 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
697 buf->b_mod_set = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
698 buf->b_mod_top = lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
699 buf->b_mod_bot = lnum + 1;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
700 buf->b_mod_xlines = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
701 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
702 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
703
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
704 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
705 * 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
706 * - 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
707 * - marks the buffer changed by calling changed()
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
708 * - invalidates cached values
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
709 * 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
710 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
711 void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
712 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
713 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
714 changedOneline(curbuf, lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
715 changed_common(lnum, col, lnum + 1, 0L);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
716
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
717 #ifdef FEAT_DIFF
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
718 // 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
719 if (curwin->w_p_diff)
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 win_T *wp;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
722 linenr_T wlnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
723
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
724 FOR_ALL_WINDOWS(wp)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
725 if (wp->w_p_diff && wp != curwin)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
726 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
727 redraw_win_later(wp, VALID);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
728 wlnum = diff_lnum_win(lnum, wp);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
729 if (wlnum > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
730 changedOneline(wp->w_buffer, wlnum);
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 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
733 #endif
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
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
736 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
737 * 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
738 * When "added" is negative text was deleted.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
739 */
22282
5adb97bf0b32 patch 8.2.1690: text properties not adjusted for "I" in Visual block mode
Bram Moolenaar <Bram@vim.org>
parents: 20599
diff changeset
740 void
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
741 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
742 {
18763
49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents: 18757
diff changeset
743 #ifdef FEAT_PROP_POPUP
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
744 if (curbuf->b_has_textprop && added != 0)
16714
ba592f30c082 patch 8.1.1359: text property wrong after :substitute with backslash
Bram Moolenaar <Bram@vim.org>
parents: 16698
diff changeset
745 adjust_prop_columns(lnum, col, added, 0);
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
746 #endif
16662
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes
Bram Moolenaar <Bram@vim.org>
parents: 16660
diff changeset
747
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes
Bram Moolenaar <Bram@vim.org>
parents: 16660
diff changeset
748 changed_bytes(lnum, col);
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
749 }
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 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
752 * 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
753 * 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
754 * 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
755 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
756 void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
757 appended_lines(linenr_T lnum, long count)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
758 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
759 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
760 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
761
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 * Like appended_lines(), but adjust marks first.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
764 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
765 void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
766 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
767 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
768 // 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
769 // 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
770 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
771 #ifdef FEAT_DIFF
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
772 || curwin->w_p_diff
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
773 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
774 )
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
775 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
776 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
777 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
778
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
779 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
780 * 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
781 * 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
782 * 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
783 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
784 void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
785 deleted_lines(linenr_T lnum, long count)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
786 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
787 changed_lines(lnum, 0, lnum + count, -count);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
788 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
789
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 * Like deleted_lines(), but adjust marks first.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
792 * 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
793 * be triggered to display the cursor.
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 void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
796 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
797 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
798 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
799 changed_lines(lnum, 0, lnum + count, -count);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
800 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
801
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 * 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
804 */
24643
09e64e81c473 patch 8.2.2860: adding a text property causes the whole window to be redawn
Bram Moolenaar <Bram@vim.org>
parents: 22742
diff changeset
805 void
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
806 changed_lines_buf(
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
807 buf_T *buf,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
808 linenr_T lnum, // first line with change
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
809 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
810 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
811 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
812 if (buf->b_mod_set)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
813 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
814 // 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
815 if (lnum < buf->b_mod_top)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
816 buf->b_mod_top = lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
817 if (lnum < buf->b_mod_bot)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
818 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
819 // adjust old bot position for xtra lines
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
820 buf->b_mod_bot += xtra;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
821 if (buf->b_mod_bot < lnum)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
822 buf->b_mod_bot = lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
823 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
824 if (lnume + xtra > buf->b_mod_bot)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
825 buf->b_mod_bot = lnume + xtra;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
826 buf->b_mod_xlines += xtra;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
827 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
828 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
829 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
830 // set the area that must be redisplayed
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
831 buf->b_mod_set = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
832 buf->b_mod_top = lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
833 buf->b_mod_bot = lnume + xtra;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
834 buf->b_mod_xlines = xtra;
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 }
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 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
839 * Changed lines for the current buffer.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
840 * 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
841 * - mark the buffer changed by calling changed()
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
842 * - 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
843 * - invalidate cached values
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
844 * "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
845 * below the changed lines (BEFORE the change).
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
846 * 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
847 * 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
848 * 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
849 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
850 void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
851 changed_lines(
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
852 linenr_T lnum, // first line with change
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
853 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
854 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
855 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
856 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
857 changed_lines_buf(curbuf, lnum, lnume, xtra);
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 #ifdef FEAT_DIFF
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
860 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
861 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
862 // 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
863 // 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
864 // displaying.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
865 win_T *wp;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
866 linenr_T wlnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
867
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
868 FOR_ALL_WINDOWS(wp)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
869 if (wp->w_p_diff && wp != curwin)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
870 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
871 redraw_win_later(wp, VALID);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
872 wlnum = diff_lnum_win(lnum, wp);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
873 if (wlnum > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
874 changed_lines_buf(wp->w_buffer, wlnum,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
875 lnume - lnum + wlnum, 0L);
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 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
878 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
879
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
880 changed_common(lnum, col, lnume, xtra);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
881 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
882
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
883 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
884 * 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
885 * When "ff" is TRUE also reset 'fileformat'.
16996
d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed
Bram Moolenaar <Bram@vim.org>
parents: 16972
diff changeset
886 * When "always_inc_changedtick" is TRUE b:changedtick is incremented also when
d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed
Bram Moolenaar <Bram@vim.org>
parents: 16972
diff changeset
887 * the changed flag was off.
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
888 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
889 void
16996
d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed
Bram Moolenaar <Bram@vim.org>
parents: 16972
diff changeset
890 unchanged(buf_T *buf, int ff, int always_inc_changedtick)
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
891 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
892 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
893 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
894 buf->b_changed = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
895 ml_setflags(buf);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
896 if (ff)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
897 save_file_ff(buf);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
898 check_status(buf);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
899 redraw_tabline = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
900 need_maketitle = TRUE; // set window title later
16996
d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed
Bram Moolenaar <Bram@vim.org>
parents: 16972
diff changeset
901 ++CHANGEDTICK(buf);
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
902 }
16996
d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed
Bram Moolenaar <Bram@vim.org>
parents: 16972
diff changeset
903 else if (always_inc_changedtick)
d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed
Bram Moolenaar <Bram@vim.org>
parents: 16972
diff changeset
904 ++CHANGEDTICK(buf);
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
905 #ifdef FEAT_NETBEANS_INTG
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
906 netbeans_unmodified(buf);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
907 #endif
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 /*
18679
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
911 * Save the current values of 'fileformat' and 'fileencoding', so that we know
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
912 * the file must be considered changed when the value is different.
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
913 */
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
914 void
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
915 save_file_ff(buf_T *buf)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
916 {
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
917 buf->b_start_ffc = *buf->b_p_ff;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
918 buf->b_start_eol = buf->b_p_eol;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
919 buf->b_start_bomb = buf->b_p_bomb;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
920
18757
c469e1930456 patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18679
diff changeset
921 // Only use free/alloc when necessary, they take time.
18679
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
922 if (buf->b_start_fenc == NULL
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
923 || STRCMP(buf->b_start_fenc, buf->b_p_fenc) != 0)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
924 {
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
925 vim_free(buf->b_start_fenc);
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
926 buf->b_start_fenc = vim_strsave(buf->b_p_fenc);
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
927 }
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
928 }
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
929
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
930 /*
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
931 * Return TRUE if 'fileformat' and/or 'fileencoding' has a different value
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
932 * from when editing started (save_file_ff() called).
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
933 * Also when 'endofline' was changed and 'binary' is set, or when 'bomb' was
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
934 * changed and 'binary' is not set.
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
935 * Also when 'endofline' was changed and 'fixeol' is not set.
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
936 * When "ignore_empty" is true don't consider a new, empty buffer to be
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
937 * changed.
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
938 */
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
939 int
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
940 file_ff_differs(buf_T *buf, int ignore_empty)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
941 {
18757
c469e1930456 patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18679
diff changeset
942 // In a buffer that was never loaded the options are not valid.
18679
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
943 if (buf->b_flags & BF_NEVERLOADED)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
944 return FALSE;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
945 if (ignore_empty
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
946 && (buf->b_flags & BF_NEW)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
947 && buf->b_ml.ml_line_count == 1
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
948 && *ml_get_buf(buf, (linenr_T)1, FALSE) == NUL)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
949 return FALSE;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
950 if (buf->b_start_ffc != *buf->b_p_ff)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
951 return TRUE;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
952 if ((buf->b_p_bin || !buf->b_p_fixeol) && buf->b_start_eol != buf->b_p_eol)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
953 return TRUE;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
954 if (!buf->b_p_bin && buf->b_start_bomb != buf->b_p_bomb)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
955 return TRUE;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
956 if (buf->b_start_fenc == NULL)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
957 return (*buf->b_p_fenc != NUL);
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
958 return (STRCMP(buf->b_start_fenc, buf->b_p_fenc) != 0);
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
959 }
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
960
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big
Bram Moolenaar <Bram@vim.org>
parents: 18642
diff changeset
961 /*
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
962 * 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
963 * Handles Replace mode and multi-byte characters.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
964 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
965 void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
966 ins_bytes(char_u *p)
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 ins_bytes_len(p, (int)STRLEN(p));
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
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
971 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
972 * 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
973 * Handles Replace mode and multi-byte characters.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
974 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
975 void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
976 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
977 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
978 int i;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
979 int n;
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 if (has_mbyte)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
982 for (i = 0; i < len; i += n)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
983 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
984 if (enc_utf8)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
985 // avoid reading past p[len]
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
986 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
987 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
988 n = (*mb_ptr2len)(p + i);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
989 ins_char_bytes(p + i, n);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
990 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
991 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
992 for (i = 0; i < len; ++i)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
993 ins_char(p[i]);
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
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
996 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
997 * Insert or replace a single character at the cursor position.
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
998 * When in MODE_REPLACE or MODE_VREPLACE state, replace any existing character.
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
999 * Caller must have prepared for undo.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1000 * 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
1001 * convert bytes to a character.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1002 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1003 void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1004 ins_char(int c)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1005 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1006 char_u buf[MB_MAXBYTES + 1];
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1007 int n = (*mb_char2bytes)(c, buf);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1008
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1009 // 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
1010 // Happens for CTRL-Vu9900.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1011 if (buf[0] == 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1012 buf[0] = '\n';
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1013
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1014 ins_char_bytes(buf, n);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1015 }
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 void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1018 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
1019 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1020 int c = buf[0];
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1021 int newlen; // nr of bytes inserted
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1022 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
1023 char_u *p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1024 char_u *newp;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1025 char_u *oldp;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1026 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
1027 colnr_T col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1028 linenr_T lnum = curwin->w_cursor.lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1029 int i;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1030
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1031 // Break tabs if needed.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1032 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
1033 coladvance_force(getviscol());
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1034
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1035 col = curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1036 oldp = ml_get(lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1037 linelen = (int)STRLEN(oldp) + 1;
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 // 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
1040 oldlen = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1041 newlen = charlen;
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 if (State & REPLACE_FLAG)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1044 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1045 if (State & VREPLACE_FLAG)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1046 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1047 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
1048 colnr_T vcol;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1049 int old_list;
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 // 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
1052 // 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
1053 // 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
1054 old_list = curwin->w_p_list;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1055 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
1056 curwin->w_p_list = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1057
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1058 // 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
1059 // 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
1060 // 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
1061 // 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
1062 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
1063 new_vcol = vcol + chartabsize(buf, vcol);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1064 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
1065 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1066 vcol += chartabsize(oldp + col + oldlen, vcol);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1067 // 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
1068 // position.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1069 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
1070 break;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1071 oldlen += (*mb_ptr2len)(oldp + col + oldlen);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1072 // Deleted a bit too much, insert spaces.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1073 if (vcol > new_vcol)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1074 newlen += vcol - new_vcol;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1075 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1076 curwin->w_p_list = old_list;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1077 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1078 else if (oldp[col] != NUL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1079 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1080 // normal replace
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1081 oldlen = (*mb_ptr2len)(oldp + col);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1082 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1083
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1084
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1085 // 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
1086 // 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
1087 // 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
1088 // 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
1089 replace_push(NUL);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1090 for (i = 0; i < oldlen; ++i)
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 if (has_mbyte)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1093 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
1094 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1095 replace_push(oldp[col + i]);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1096 }
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
16764
ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents: 16714
diff changeset
1099 newp = alloc(linelen + newlen - oldlen);
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1100 if (newp == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1101 return;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1102
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1103 // Copy bytes before the cursor.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1104 if (col > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1105 mch_memmove(newp, oldp, (size_t)col);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1106
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1107 // Copy bytes after the changed character(s).
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1108 p = newp + col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1109 if (linelen > col + oldlen)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1110 mch_memmove(p + newlen, oldp + col + oldlen,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1111 (size_t)(linelen - col - oldlen));
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 // Insert or overwrite the new character.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1114 mch_memmove(p, buf, charlen);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1115 i = charlen;
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 // Fill with spaces when necessary.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1118 while (i < newlen)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1119 p[i++] = ' ';
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1120
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1121 // Replace the line in the buffer.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1122 ml_replace(lnum, newp, FALSE);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1123
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1124 // mark the buffer as changed and prepare for displaying
28931
b57caac54649 patch 8.2.4988: textprop in wrong position when replacing multi-byte chars
Bram Moolenaar <Bram@vim.org>
parents: 28893
diff changeset
1125 changed_bytes(lnum, col);
b57caac54649 patch 8.2.4988: textprop in wrong position when replacing multi-byte chars
Bram Moolenaar <Bram@vim.org>
parents: 28893
diff changeset
1126 #ifdef FEAT_PROP_POPUP
b57caac54649 patch 8.2.4988: textprop in wrong position when replacing multi-byte chars
Bram Moolenaar <Bram@vim.org>
parents: 28893
diff changeset
1127 if (curbuf->b_has_textprop && newlen != oldlen)
b57caac54649 patch 8.2.4988: textprop in wrong position when replacing multi-byte chars
Bram Moolenaar <Bram@vim.org>
parents: 28893
diff changeset
1128 adjust_prop_columns(lnum, col, newlen - oldlen,
b57caac54649 patch 8.2.4988: textprop in wrong position when replacing multi-byte chars
Bram Moolenaar <Bram@vim.org>
parents: 28893
diff changeset
1129 State & REPLACE_FLAG ? APC_SUBSTITUTE : 0);
b57caac54649 patch 8.2.4988: textprop in wrong position when replacing multi-byte chars
Bram Moolenaar <Bram@vim.org>
parents: 28893
diff changeset
1130 #endif
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1131
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1132 // 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
1133 // show the match for right parens and braces.
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
1134 if (p_sm && (State & MODE_INSERT)
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1135 && msg_silent == 0
17809
59f8948b7590 patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents: 17789
diff changeset
1136 && !ins_compl_active())
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1137 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1138 if (has_mbyte)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1139 showmatch(mb_ptr2char(buf));
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1140 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1141 showmatch(c);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1142 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1143
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1144 #ifdef FEAT_RIGHTLEFT
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1145 if (!p_ri || (State & REPLACE_FLAG))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1146 #endif
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 // Normal insert: move cursor right
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1149 curwin->w_cursor.col += charlen;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1150 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1151
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1152 // 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
1153 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1154
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1155 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1156 * Insert a string at the cursor position.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1157 * Note: Does NOT handle Replace mode.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1158 * Caller must have prepared for undo.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1159 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1160 void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1161 ins_str(char_u *s)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1162 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1163 char_u *oldp, *newp;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1164 int newlen = (int)STRLEN(s);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1165 int oldlen;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1166 colnr_T col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1167 linenr_T lnum = curwin->w_cursor.lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1168
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1169 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
1170 coladvance_force(getviscol());
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1171
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1172 col = curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1173 oldp = ml_get(lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1174 oldlen = (int)STRLEN(oldp);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1175
16764
ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents: 16714
diff changeset
1176 newp = alloc(oldlen + newlen + 1);
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1177 if (newp == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1178 return;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1179 if (col > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1180 mch_memmove(newp, oldp, (size_t)col);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1181 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
1182 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
1183 ml_replace(lnum, newp, FALSE);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1184 inserted_bytes(lnum, col, newlen);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1185 curwin->w_cursor.col += newlen;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1186 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1187
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 * Delete one character under the cursor.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1190 * 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
1191 * Caller must have prepared for undo.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1192 *
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1193 * return FAIL for failure, OK otherwise
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1194 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1195 int
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1196 del_char(int fixpos)
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 if (has_mbyte)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1199 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1200 // 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
1201 mb_adjust_cursor();
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1202 if (*ml_get_cursor() == NUL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1203 return FAIL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1204 return del_chars(1L, fixpos);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1205 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1206 return del_bytes(1L, fixpos, TRUE);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1207 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1208
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1209 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1210 * 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
1211 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1212 int
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1213 del_chars(long count, int fixpos)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1214 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1215 long bytes = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1216 long i;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1217 char_u *p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1218 int l;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1219
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1220 p = ml_get_cursor();
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1221 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
1222 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1223 l = (*mb_ptr2len)(p);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1224 bytes += l;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1225 p += l;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1226 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1227 return del_bytes(bytes, fixpos, TRUE);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1228 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1229
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1230 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1231 * Delete "count" bytes under the cursor.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1232 * 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
1233 * Caller must have prepared for undo.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1234 *
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1235 * Return FAIL for failure, OK otherwise.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1236 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1237 int
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1238 del_bytes(
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1239 long count,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1240 int fixpos_arg,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1241 int use_delcombine UNUSED) // 'delcombine' option applies
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1242 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1243 char_u *oldp, *newp;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1244 colnr_T oldlen;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1245 colnr_T newlen;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1246 linenr_T lnum = curwin->w_cursor.lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1247 colnr_T col = curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1248 int alloc_newp;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1249 long movelen;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1250 int fixpos = fixpos_arg;
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 oldp = ml_get(lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1253 oldlen = (int)STRLEN(oldp);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1254
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1255 // 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
1256 if (col >= oldlen)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1257 return FAIL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1258
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1259 // 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
1260 if (count == 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1261 return OK;
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 // 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
1264 if (count < 1)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1265 {
26897
d02d40f0261c patch 8.2.3977: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents: 26811
diff changeset
1266 siemsg(e_invalid_count_for_del_bytes_nr, count);
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1267 return FAIL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1268 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1269
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1270 // 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
1271 // delete the last combining character.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1272 if (p_deco && use_delcombine && enc_utf8
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1273 && utfc_ptr2len(oldp + col) >= count)
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 int cc[MAX_MCO];
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1276 int n;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1277
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1278 (void)utfc_ptr2char(oldp + col, cc);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1279 if (cc[0] != NUL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1280 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1281 // 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
1282 n = col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1283 do
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1284 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1285 col = n;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1286 count = utf_ptr2len(oldp + n);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1287 n += count;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1288 } while (UTF_COMPOSINGLIKE(oldp + col, oldp + n));
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1289 fixpos = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1290 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1291 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1292
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1293 // When count is too big, reduce it.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1294 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
1295 if (movelen <= 1)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1296 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1297 // 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
1298 // 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
1299 // 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
1300 if (col > 0 && fixpos && restart_edit == 0
25380
ac88cd21ae88 patch 8.2.3227: 'virtualedit' can only be set globally
Bram Moolenaar <Bram@vim.org>
parents: 25356
diff changeset
1301 && (get_ve_flags() & VE_ONEMORE) == 0)
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1302 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1303 --curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1304 curwin->w_cursor.coladd = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1305 if (has_mbyte)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1306 curwin->w_cursor.col -=
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1307 (*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
1308 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1309 count = oldlen - col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1310 movelen = 1;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1311 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1312 newlen = oldlen - count;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1313
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1314 // 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
1315 // 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
1316 // 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
1317 // 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
1318 // care of notifying Netbeans.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1319 #ifdef FEAT_NETBEANS_INTG
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1320 if (netbeans_active())
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1321 alloc_newp = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1322 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1323 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1324 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
1325 if (!alloc_newp)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1326 newp = oldp; // use same allocated memory
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1327 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1328 { // need to allocate a new line
16764
ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents: 16714
diff changeset
1329 newp = alloc(newlen + 1);
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1330 if (newp == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1331 return FAIL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1332 mch_memmove(newp, oldp, (size_t)col);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1333 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1334 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
1335 if (alloc_newp)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1336 ml_replace(lnum, newp, FALSE);
18763
49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents: 18757
diff changeset
1337 #ifdef FEAT_PROP_POPUP
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1338 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1339 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1340 // Also move any following text properties.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1341 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
1342 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
1343 (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
1344 curbuf->b_ml.ml_line_len -= count;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1345 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1346 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1347
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1348 // mark the buffer as changed and prepare for displaying
19534
36ec10251b2b patch 8.2.0324: text property not updated correctly when inserting/deleting
Bram Moolenaar <Bram@vim.org>
parents: 19027
diff changeset
1349 inserted_bytes(lnum, col, -count);
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1350
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1351 return OK;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1352 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1353
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 * 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
1356 *
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
1357 * For MODE_VREPLACE state, we only add a new line when we get to the end of
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
1358 * the file, otherwise we just start replacing the next line.
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1359 *
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
1360 * Caller must take care of undo. Since MODE_VREPLACE may affect any number of
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1361 * 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
1362 * new line.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1363 * "flags": OPENLINE_DELSPACES delete spaces after cursor
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1364 * OPENLINE_DO_COM format comments
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1365 * OPENLINE_KEEPTRAIL keep trailing spaces
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1366 * 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
1367 * 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
1368 *
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1369 * "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
1370 * OPENLINE_COM_LIST
26516
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1371 * "did_do_comment" is set to TRUE when intentionally putting the comment
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1372 * leader in fromt of the new line.
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1373 *
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1374 * Return OK for success, FAIL for failure
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1375 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1376 int
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1377 open_line(
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1378 int dir, // FORWARD or BACKWARD
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1379 int flags,
26516
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1380 int second_line_indent,
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1381 int *did_do_comment UNUSED)
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1382 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1383 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
1384 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
1385 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
1386 int less_cols = 0; // less columns for mark in new line
28865
a04815de0bd3 patch 8.2.4955: text property in wrong position after auto-indent
Bram Moolenaar <Bram@vim.org>
parents: 28856
diff changeset
1387 int less_cols_off = 0; // columns to skip for mark and
a04815de0bd3 patch 8.2.4955: text property in wrong position after auto-indent
Bram Moolenaar <Bram@vim.org>
parents: 28856
diff changeset
1388 // textprop adjustment
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1389 pos_T old_cursor; // old cursor position
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1390 int newcol = 0; // new cursor column
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1391 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
1392 int n;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1393 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
1394 int retval = FAIL; // return value
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1395 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
1396 int lead_len; // length of comment leader
26516
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1397 int comment_start = 0; // start index of the comment leader
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1398 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
1399 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
1400 char_u *allocated = NULL; // allocated memory
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1401 char_u *p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1402 int saved_char = NUL; // init for GCC
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1403 pos_T *pos;
26524
c37950e3d740 patch 8.2.3791: build error with +cindent but without +smartindent
Bram Moolenaar <Bram@vim.org>
parents: 26516
diff changeset
1404 int do_cindent;
28856
948877671c54 patch 8.2.4951: smart indenting done when not enabled
Bram Moolenaar <Bram@vim.org>
parents: 28841
diff changeset
1405 int do_si = may_do_si();
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1406 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
1407 int first_char = NUL; // init for GCC
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1408 int vreplace_mode;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1409 int did_append; // appended a new line
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1410 int saved_pi = curbuf->b_p_pi; // copy of preserveindent setting
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1411
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1412 // make a copy of the current line so we can mess with it
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1413 saved_line = vim_strsave(ml_get_curline());
18757
c469e1930456 patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18679
diff changeset
1414 if (saved_line == NULL) // out of memory!
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1415 return FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1416
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1417 if (State & VREPLACE_FLAG)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1418 {
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
1419 // With MODE_VREPLACE we make a copy of the next line, which we will be
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1420 // starting to replace. First make the new line empty and let vim play
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1421 // with the indenting and comment leader to its heart's content. Then
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1422 // we grab what it ended up putting on the new line, put back the
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1423 // original line, and call ins_char() to put each new character onto
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1424 // the line, replacing what was there before and pushing the right
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1425 // stuff onto the replace stack. -- webb.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1426 if (curwin->w_cursor.lnum < orig_line_count)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1427 next_line = vim_strsave(ml_get(curwin->w_cursor.lnum + 1));
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1428 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1429 next_line = vim_strsave((char_u *)"");
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1430 if (next_line == NULL) // out of memory!
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1431 goto theend;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1432
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
1433 // In MODE_VREPLACE state, a NL replaces the rest of the line, and
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
1434 // starts replacing the next line, so push all of the characters left
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
1435 // on the line onto the replace stack. We'll push any other characters
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
1436 // that might be replaced at the start of the next line (due to
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
1437 // autoindent etc) a bit later.
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1438 replace_push(NUL); // Call twice because BS over NL expects it
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1439 replace_push(NUL);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1440 p = saved_line + curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1441 while (*p != NUL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1442 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1443 if (has_mbyte)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1444 p += replace_push_mb(p);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1445 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1446 replace_push(*p++);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1447 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1448 saved_line[curwin->w_cursor.col] = NUL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1449 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1450
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
1451 if ((State & MODE_INSERT) && (State & VREPLACE_FLAG) == 0)
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1452 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1453 p_extra = saved_line + curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1454 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
1455 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1456 p = skipwhite(p_extra);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1457 first_char = *p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1458 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1459 extra_len = (int)STRLEN(p_extra);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1460 saved_char = *p_extra;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1461 *p_extra = NUL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1462 }
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 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
1465 did_si = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1466 ai_col = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1467
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1468 // 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
1469 // 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
1470 // 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
1471 if (dir == FORWARD && did_ai)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1472 trunc_line = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1473
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1474 // If '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
1475 // indent to use for the new line.
28942
6cdf55afaae9 patch 8.2.4993: smart/C/lisp indenting is optional
Bram Moolenaar <Bram@vim.org>
parents: 28931
diff changeset
1476 if (curbuf->b_p_ai || do_si)
16631
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 // count white space on current line
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1479 #ifdef FEAT_VARTABS
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1480 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
1481 curbuf->b_p_vts_array, FALSE);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1482 #else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1483 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
1484 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1485 if (newindent == 0 && !(flags & OPENLINE_COM_LIST))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1486 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
1487
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1488 // Do smart indenting.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1489 // 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
1490 // 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
1491 // 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
1492 // "if (condition) {"
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1493 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
1494 && (p_extra == NULL || first_char != '{'))
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 char_u *ptr;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1497 char_u last_char;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1498
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1499 old_cursor = curwin->w_cursor;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1500 ptr = saved_line;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1501 if (flags & OPENLINE_DO_COM)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1502 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
1503 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1504 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1505 if (dir == FORWARD)
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 // Skip preprocessor directives, unless they are
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1508 // recognised as comments.
18203
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 18068
diff changeset
1509 if ( lead_len == 0 && ptr[0] == '#')
16631
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 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
1512 ptr = ml_get(--curwin->w_cursor.lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1513 newindent = get_indent();
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1514 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1515 if (flags & OPENLINE_DO_COM)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1516 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
1517 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1518 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1519 if (lead_len > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1520 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1521 // This case gets the following right:
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1522 // /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1523 // * A comment (read '\' as '/').
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1524 // */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1525 // #define IN_THE_WAY
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1526 // This should line up here;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1527 p = skipwhite(ptr);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1528 if (p[0] == '/' && p[1] == '*')
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1529 p++;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1530 if (p[0] == '*')
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1531 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1532 for (p++; *p; p++)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1533 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1534 if (p[0] == '/' && p[-1] == '*')
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1535 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1536 // 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
1537 // with the line containing the start of
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1538 // the comment
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1539 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
1540 if ((pos = findmatch(NULL, NUL)) != NULL)
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 curwin->w_cursor.lnum = pos->lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1543 newindent = get_indent();
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1544 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1545 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1546 }
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 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1549 else // Not a comment line
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1550 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1551 // Find last non-blank in line
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1552 p = ptr + STRLEN(ptr) - 1;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1553 while (p > ptr && VIM_ISWHITE(*p))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1554 --p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1555 last_char = *p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1556
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1557 // find the character just before the '{' or ';'
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1558 if (last_char == '{' || last_char == ';')
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1559 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1560 if (p > ptr)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1561 --p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1562 while (p > ptr && VIM_ISWHITE(*p))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1563 --p;
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 // 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
1566 // lines. eg:
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1567 // if (condition &&
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1568 // condition) {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1569 // Should line up here!
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1570 // }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1571 if (*p == ')')
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1572 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1573 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
1574 if ((pos = findmatch(NULL, '(')) != NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1575 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1576 curwin->w_cursor.lnum = pos->lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1577 newindent = get_indent();
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1578 ptr = ml_get_curline();
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1579 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1580 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1581 // If last character is '{' do indent, without
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1582 // checking for "if" and the like.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1583 if (last_char == '{')
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1584 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1585 did_si = TRUE; // do indent
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1586 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
1587 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1588 // 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
1589 // 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
1590 // '}'.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1591 else if (last_char != ';' && last_char != '}'
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1592 && cin_is_cinword(ptr))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1593 did_si = TRUE;
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 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1596 else // dir == BACKWARD
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 // Skip preprocessor directives, unless they are
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1599 // recognised as comments.
18203
e0ec4cd7a865 patch 8.1.2096: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 18068
diff changeset
1600 if (lead_len == 0 && ptr[0] == '#')
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1601 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1602 int was_backslashed = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1603
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1604 while ((ptr[0] == '#' || was_backslashed) &&
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1605 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
1606 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1607 if (*ptr && ptr[STRLEN(ptr) - 1] == '\\')
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1608 was_backslashed = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1609 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1610 was_backslashed = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1611 ptr = ml_get(++curwin->w_cursor.lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1612 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1613 if (was_backslashed)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1614 newindent = 0; // Got to end of file
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1615 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1616 newindent = get_indent();
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 p = skipwhite(ptr);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1619 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
1620 did_si = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1621 else // can delete indent when '{' typed
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1622 can_si_back = TRUE;
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 curwin->w_cursor = old_cursor;
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 if (do_si)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1627 can_si = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1628
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1629 did_ai = TRUE;
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
26516
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1632 // May do indenting after opening a new line.
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1633 do_cindent = !p_paste && (curbuf->b_p_cin
28942
6cdf55afaae9 patch 8.2.4993: smart/C/lisp indenting is optional
Bram Moolenaar <Bram@vim.org>
parents: 28931
diff changeset
1634 #ifdef FEAT_EVAL
26516
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1635 || *curbuf->b_p_inde != NUL
28942
6cdf55afaae9 patch 8.2.4993: smart/C/lisp indenting is optional
Bram Moolenaar <Bram@vim.org>
parents: 28931
diff changeset
1636 #endif
26516
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1637 )
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1638 && in_cinkeys(dir == FORWARD
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1639 ? KEY_OPEN_FORW
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1640 : KEY_OPEN_BACK, ' ', linewhite(curwin->w_cursor.lnum));
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1641
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1642 // 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
1643 // 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
1644 end_comment_pending = NUL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1645 if (flags & OPENLINE_DO_COM)
26516
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1646 {
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1647 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
1648 dir == BACKWARD, TRUE);
28765
38698deeda58 patch 8.2.4907: some users do not want a line comment always inserted
Bram Moolenaar <Bram@vim.org>
parents: 28425
diff changeset
1649 if (lead_len == 0 && curbuf->b_p_cin && do_cindent && dir == FORWARD
28972
864fa5276e78 patch 8.2.5008: when 'formatoptions' contains "/" wrongly wrapping comment
Bram Moolenaar <Bram@vim.org>
parents: 28942
diff changeset
1650 && (!has_format_option(FO_NO_OPEN_COMS)
864fa5276e78 patch 8.2.5008: when 'formatoptions' contains "/" wrongly wrapping comment
Bram Moolenaar <Bram@vim.org>
parents: 28942
diff changeset
1651 || (flags & OPENLINE_FORMAT)))
26516
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1652 {
26811
f0fdd992cfb9 patch 8.2.3934: repeating line comment is undesired for "O" command
Bram Moolenaar <Bram@vim.org>
parents: 26532
diff changeset
1653 // Check for a line comment after code.
26516
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1654 comment_start = check_linecomment(saved_line);
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1655 if (comment_start != MAXCOL)
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1656 {
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1657 lead_len = get_leader_len(saved_line + comment_start,
26811
f0fdd992cfb9 patch 8.2.3934: repeating line comment is undesired for "O" command
Bram Moolenaar <Bram@vim.org>
parents: 26532
diff changeset
1658 &lead_flags, FALSE, TRUE);
26516
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1659 if (lead_len != 0)
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1660 {
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1661 lead_len += comment_start;
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1662 if (did_do_comment != NULL)
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1663 *did_do_comment = TRUE;
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1664 }
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1665 }
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1666 }
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1667 }
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1668 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1669 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1670 if (lead_len > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1671 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1672 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
1673 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
1674 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
1675 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
1676 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
1677 int extra_space = FALSE; // append extra space
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1678 int current_flag;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1679 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
1680 char_u *p2;
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 // 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
1683 // 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
1684 for (p = lead_flags; *p && *p != ':'; ++p)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1685 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1686 if (*p == COM_BLANK)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1687 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1688 require_blank = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1689 continue;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1690 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1691 if (*p == COM_START || *p == COM_MIDDLE)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1692 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1693 current_flag = *p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1694 if (*p == COM_START)
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 // 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
1697 if (dir == BACKWARD)
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 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1700 break;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1701 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1702
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1703 // find start of middle part
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1704 (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
1705 require_blank = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1706 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1707
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1708 // Isolate the strings of the middle and end leader.
18757
c469e1930456 patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18679
diff changeset
1709 while (*p && p[-1] != ':') // find end of middle flags
16631
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_BLANK)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1712 require_blank = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1713 ++p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1714 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1715 (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
1716
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1717 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
1718 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1719 // 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
1720 if (*p == COM_AUTO_END)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1721 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
1722 ++p;
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 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
1725
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1726 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
1727 end_comment_pending = lead_end[n - 1];
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1728
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1729 // 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
1730 // the comment leader.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1731 if (dir == FORWARD)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1732 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1733 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
1734 if (STRNCMP(p, lead_end, n) == 0)
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 comment_end = p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1737 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1738 break;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1739 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1740 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1741
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1742 // 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
1743 if (lead_len > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1744 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1745 if (current_flag == COM_START)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1746 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1747 lead_repl = lead_middle;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1748 lead_repl_len = (int)STRLEN(lead_middle);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1749 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1750
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1751 // 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
1752 // 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
1753 // comment leader on the next line.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1754 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
1755 && ((p_extra != NULL
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1756 && (int)curwin->w_cursor.col == lead_len)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1757 || (p_extra == NULL
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1758 && saved_line[lead_len] == NUL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1759 || require_blank))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1760 extra_space = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1761 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1762 break;
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 if (*p == COM_END)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1765 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1766 // 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
1767 // 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
1768 // start (for C-comments).
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1769 if (dir == FORWARD)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1770 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1771 comment_end = skipwhite(saved_line);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1772 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1773 break;
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
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1776 // 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
1777 // 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
1778 while (p > curbuf->b_p_com && *p != ',')
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1779 --p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1780 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
1781 && lead_repl[-1] != ':'; --lead_repl)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1782 ;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1783 lead_repl_len = (int)(p - lead_repl);
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 // 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
1786 // the comment-end
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1787 extra_space = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1788
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1789 // 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
1790 for (p2 = p; *p2 && *p2 != ':'; p2++)
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 if (*p2 == COM_AUTO_END)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1793 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
1794 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1795 if (end_comment_pending == -1)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1796 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1797 // Find last character in end-comment string
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1798 while (*p2 && *p2 != ',')
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1799 p2++;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1800 end_comment_pending = p2[-1];
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1801 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1802 break;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1803 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1804 if (*p == COM_FIRST)
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 // 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
1807 // 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
1808 if (dir == BACKWARD)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1809 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1810 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1811 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1812 lead_repl = (char_u *)"";
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1813 lead_repl_len = 0;
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 break;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1816 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1817 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1818 if (lead_len)
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 // allocate buffer (may concatenate p_extra later)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1821 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
1822 + (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
1823 allocated = leader; // remember to free it later
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1824
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1825 if (leader == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1826 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1827 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1828 {
26516
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1829 int li;
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1830
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1831 vim_strncpy(leader, saved_line, lead_len);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1832
26516
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1833 // TODO: handle multi-byte and double width chars
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1834 for (li = 0; li < comment_start; ++li)
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1835 if (!VIM_ISWHITE(leader[li]))
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1836 leader[li] = ' ';
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
1837
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1838 // 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
1839 if (lead_repl != NULL)
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 int c = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1842 int off = 0;
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 for (p = lead_flags; *p != NUL && *p != ':'; )
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1845 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1846 if (*p == COM_RIGHT || *p == COM_LEFT)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1847 c = *p++;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1848 else if (VIM_ISDIGIT(*p) || *p == '-')
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1849 off = getdigits(&p);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1850 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1851 ++p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1852 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1853 if (c == COM_RIGHT) // right adjusted leader
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1854 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1855 // 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
1856 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
1857 && VIM_ISWHITE(*p); --p)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1858 ;
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 // 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
1862 // screen characters, not bytes.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1863 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1864 int repl_size = vim_strnsize(lead_repl,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1865 lead_repl_len);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1866 int old_size = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1867 char_u *endp = p;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1868 int l;
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 while (old_size < repl_size && p > leader)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1871 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1872 MB_PTR_BACK(leader, p);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1873 old_size += ptr2cells(p);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1874 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1875 l = lead_repl_len - (int)(endp - p);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1876 if (l != 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1877 mch_memmove(endp + l, endp,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1878 (size_t)((leader + lead_len) - endp));
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1879 lead_len += l;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1880 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1881 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
1882 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
1883 p[lead_repl_len] = NUL;
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 // 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
1886 while (--p >= leader)
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 int l = mb_head_off(leader, p);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1889
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1890 if (l > 1)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1891 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1892 p -= l;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1893 if (ptr2cells(p) > 1)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1894 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1895 p[1] = ' ';
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1896 --l;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1897 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1898 mch_memmove(p + 1, p + l + 1,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1899 (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
1900 lead_len -= l;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1901 *p = ' ';
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1902 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1903 else if (!VIM_ISWHITE(*p))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1904 *p = ' ';
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 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1907 else // left adjusted leader
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1908 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1909 p = skipwhite(leader);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1910
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1911 // 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
1912 // 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
1913 // not to be overwritten.
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 int repl_size = vim_strnsize(lead_repl,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1916 lead_repl_len);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1917 int i;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1918 int l;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1919
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1920 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
1921 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1922 l = (*mb_ptr2len)(p + i);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1923 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
1924 break;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1925 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1926 if (i != lead_repl_len)
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 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
1929 (size_t)(lead_len - i - (p - leader)));
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1930 lead_len += lead_repl_len - i;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1931 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1932 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1933 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
1934
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1935 // 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
1936 // 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
1937 // remain the same.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1938 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
1939 if (!VIM_ISWHITE(*p))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1940 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1941 // 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
1942 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
1943 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1944 --lead_len;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1945 mch_memmove(p, p + 1,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1946 (leader + lead_len) - p);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1947 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1948 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1949 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1950 int l = (*mb_ptr2len)(p);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1951
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1952 if (l > 1)
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 if (ptr2cells(p) > 1)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1955 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1956 // Replace a double-wide char with
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1957 // two spaces
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1958 --l;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1959 *p++ = ' ';
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1960 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1961 mch_memmove(p + 1, p + l,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1962 (leader + lead_len) - p);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1963 lead_len -= l - 1;
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 *p = ' ';
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1966 }
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 *p = NUL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1969 }
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 // Recompute the indent, it may have changed.
28942
6cdf55afaae9 patch 8.2.4993: smart/C/lisp indenting is optional
Bram Moolenaar <Bram@vim.org>
parents: 28931
diff changeset
1972 if (curbuf->b_p_ai || do_si)
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1973 #ifdef FEAT_VARTABS
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1974 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
1975 curbuf->b_p_vts_array, FALSE);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1976 #else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1977 newindent = get_indent_str(leader,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1978 (int)curbuf->b_p_ts, FALSE);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1979 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1980
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1981 // Add the indent offset
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1982 if (newindent + off < 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1983 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1984 off = -newindent;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1985 newindent = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1986 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1987 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1988 newindent += off;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1989
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1990 // 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
1991 // alignment remains equal.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1992 while (off > 0 && lead_len > 0
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1993 && leader[lead_len - 1] == ' ')
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1994 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1995 // 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
1996 if (vim_strchr(skipwhite(leader), '\t') != NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1997 break;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1998 --lead_len;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1999 --off;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2000 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2001
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2002 // 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
2003 // extra space
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2004 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
2005 extra_space = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2006 leader[lead_len] = NUL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2007 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2008
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2009 if (extra_space)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2010 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2011 leader[lead_len++] = ' ';
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2012 leader[lead_len] = NUL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2013 }
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 newcol = lead_len;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2016
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2017 // 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
2018 // is in the comment leader
28942
6cdf55afaae9 patch 8.2.4993: smart/C/lisp indenting is optional
Bram Moolenaar <Bram@vim.org>
parents: 28931
diff changeset
2019 if (newindent || did_si)
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2020 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2021 while (lead_len && VIM_ISWHITE(*leader))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2022 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2023 --lead_len;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2024 --newcol;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2025 ++leader;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2026 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2027 }
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 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2030 did_si = can_si = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2031 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2032 else if (comment_end != NULL)
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 // 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
2035 // 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
2036 // 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
2037 // comment.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2038 if (comment_end[0] == '*' && comment_end[1] == '/' &&
28942
6cdf55afaae9 patch 8.2.4993: smart/C/lisp indenting is optional
Bram Moolenaar <Bram@vim.org>
parents: 28931
diff changeset
2039 (curbuf->b_p_ai || do_si))
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2040 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2041 old_cursor = curwin->w_cursor;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2042 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
2043 if ((pos = findmatch(NULL, NUL)) != NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2044 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2045 curwin->w_cursor.lnum = pos->lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2046 newindent = get_indent();
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2047 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2048 curwin->w_cursor = old_cursor;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2049 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2050 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2051 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2052
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2053 // (State == MODE_INSERT || State == MODE_REPLACE), only when dir == FORWARD
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2054 if (p_extra != NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2055 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2056 *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
2057
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2058 // 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
2059 // non-blank.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2060 //
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2061 // When in MODE_REPLACE state, put the deleted blanks on the replace
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2062 // stack, preceded by a NUL, so they can be put back when a BS is
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2063 // entered.
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2064 if (REPLACE_NORMAL(State))
18757
c469e1930456 patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18679
diff changeset
2065 replace_push(NUL); // end of extra blanks
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2066 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
2067 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2068 while ((*p_extra == ' ' || *p_extra == '\t')
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2069 && (!enc_utf8
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2070 || !utf_iscomposing(utf_ptr2char(p_extra + 1))))
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 if (REPLACE_NORMAL(State))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2073 replace_push(*p_extra);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2074 ++p_extra;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2075 ++less_cols_off;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2076 }
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
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2079 // columns for marks adjusted for removed columns
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2080 less_cols = (int)(p_extra - saved_line);
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
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2083 if (p_extra == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2084 p_extra = (char_u *)""; // append empty line
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 // 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
2087 if (lead_len)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2088 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2089 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
2090 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2091 int i;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2092 int padding = second_line_indent
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2093 - (newindent + (int)STRLEN(leader));
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2094
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2095 // 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
2096 // 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
2097 // whitespace needed before the comment char.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2098 for (i = 0; i < padding; i++)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2099 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2100 STRCAT(leader, " ");
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2101 less_cols--;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2102 newcol++;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2103 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2104 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2105 STRCAT(leader, p_extra);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2106 p_extra = leader;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2107 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
2108 less_cols -= lead_len;
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 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2111 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
2112
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2113 old_cursor = curwin->w_cursor;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2114 if (dir == BACKWARD)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2115 --curwin->w_cursor.lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2116 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
2117 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2118 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
2119 == FAIL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2120 goto theend;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2121 // 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
2122 // with markers.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2123 // 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
2124 // 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
2125 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
2126 #ifdef FEAT_DIFF
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2127 || curwin->w_p_diff
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2128 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2129 )
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2130 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
2131 did_append = TRUE;
18763
49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents: 18757
diff changeset
2132 #ifdef FEAT_PROP_POPUP
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2133 if ((State & MODE_INSERT) && (State & VREPLACE_FLAG) == 0)
28865
a04815de0bd3 patch 8.2.4955: text property in wrong position after auto-indent
Bram Moolenaar <Bram@vim.org>
parents: 28856
diff changeset
2134 // Properties after the split move to the next line.
16662
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes
Bram Moolenaar <Bram@vim.org>
parents: 16660
diff changeset
2135 adjust_props_for_split(curwin->w_cursor.lnum, curwin->w_cursor.lnum,
28865
a04815de0bd3 patch 8.2.4955: text property in wrong position after auto-indent
Bram Moolenaar <Bram@vim.org>
parents: 28856
diff changeset
2136 curwin->w_cursor.col + 1, 0);
16662
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes
Bram Moolenaar <Bram@vim.org>
parents: 16660
diff changeset
2137 #endif
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2138 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2139 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2140 {
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2141 // In MODE_VREPLACE state we are starting to replace the next line.
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2142 curwin->w_cursor.lnum++;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2143 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
2144 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2145 // 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
2146 // again, we don't want to save the new line for undo twice.
18757
c469e1930456 patch 8.1.2368: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 18679
diff changeset
2147 (void)u_save_cursor(); // errors are ignored!
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2148 vr_lines_changed++;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2149 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2150 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
2151 changed_bytes(curwin->w_cursor.lnum, 0);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2152 curwin->w_cursor.lnum--;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2153 did_append = FALSE;
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
28942
6cdf55afaae9 patch 8.2.4993: smart/C/lisp indenting is optional
Bram Moolenaar <Bram@vim.org>
parents: 28931
diff changeset
2156 if (newindent || did_si)
16631
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 ++curwin->w_cursor.lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2159 if (did_si)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2160 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2161 int sw = (int)get_sw_value(curbuf);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2162
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2163 if (p_sr)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2164 newindent -= newindent % sw;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2165 newindent += sw;
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 // Copy the indent
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2168 if (curbuf->b_p_ci)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2169 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2170 (void)copy_indent(newindent, saved_line);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2171
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2172 // 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
2173 // 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
2174 // 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
2175 curbuf->b_p_pi = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2176 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2177 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2178 (void)set_indent(newindent, SIN_INSERT);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2179 less_cols -= curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2180
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2181 ai_col = curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2182
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2183 // In MODE_REPLACE state, for each character in the new indent, there
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2184 // must be a NUL on the replace stack, for when it is deleted with BS
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2185 if (REPLACE_NORMAL(State))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2186 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
2187 replace_push(NUL);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2188 newcol += curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2189 if (no_si)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2190 did_si = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2191 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2192
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2193 // In MODE_REPLACE state, for each character in the extra leader, there
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2194 // must be a NUL on the replace stack, for when it is deleted with BS.
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2195 if (REPLACE_NORMAL(State))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2196 while (lead_len-- > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2197 replace_push(NUL);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2198
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2199 curwin->w_cursor = old_cursor;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2200
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2201 if (dir == FORWARD)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2202 {
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2203 if (trunc_line || (State & MODE_INSERT))
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2204 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2205 // truncate current line at cursor
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2206 saved_line[curwin->w_cursor.col] = NUL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2207 // 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
2208 if (trunc_line && !(flags & OPENLINE_KEEPTRAIL))
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2209 truncate_spaces(saved_line);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2210 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
2211 saved_line = NULL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2212 if (did_append)
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 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
2215 curwin->w_cursor.lnum + 1, 1L);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2216 did_append = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2217
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2218 // 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
2219 if (flags & OPENLINE_MARKFIX)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2220 mark_col_adjust(curwin->w_cursor.lnum,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2221 curwin->w_cursor.col + less_cols_off,
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2222 1L, (long)-less_cols, 0);
28865
a04815de0bd3 patch 8.2.4955: text property in wrong position after auto-indent
Bram Moolenaar <Bram@vim.org>
parents: 28856
diff changeset
2223 #ifdef FEAT_PROP_POPUP
a04815de0bd3 patch 8.2.4955: text property in wrong position after auto-indent
Bram Moolenaar <Bram@vim.org>
parents: 28856
diff changeset
2224 // Keep into account the deleted blanks on the new line.
a04815de0bd3 patch 8.2.4955: text property in wrong position after auto-indent
Bram Moolenaar <Bram@vim.org>
parents: 28856
diff changeset
2225 if (curbuf->b_has_textprop && less_cols_off != 0)
a04815de0bd3 patch 8.2.4955: text property in wrong position after auto-indent
Bram Moolenaar <Bram@vim.org>
parents: 28856
diff changeset
2226 adjust_prop_columns(curwin->w_cursor.lnum + 1, 0,
a04815de0bd3 patch 8.2.4955: text property in wrong position after auto-indent
Bram Moolenaar <Bram@vim.org>
parents: 28856
diff changeset
2227 -less_cols_off, 0);
a04815de0bd3 patch 8.2.4955: text property in wrong position after auto-indent
Bram Moolenaar <Bram@vim.org>
parents: 28856
diff changeset
2228 #endif
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2229 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2230 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2231 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
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 // 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
2235 // 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
2236 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
2237 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2238 if (did_append)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2239 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
2240
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2241 curwin->w_cursor.col = newcol;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2242 curwin->w_cursor.coladd = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2243
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2244 // In MODE_VREPLACE state, we are handling the replace stack ourselves, so
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2245 // stop fixthisline() from doing it (via change_indent()) by telling it
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2246 // we're in normal MODE_INSERT state.
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2247 if (State & VREPLACE_FLAG)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2248 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2249 vreplace_mode = State; // So we know to put things right later
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2250 State = MODE_INSERT;
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2251 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2252 else
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2253 vreplace_mode = 0;
28942
6cdf55afaae9 patch 8.2.4993: smart/C/lisp indenting is optional
Bram Moolenaar <Bram@vim.org>
parents: 28931
diff changeset
2254
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2255 // May do lisp indenting.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2256 if (!p_paste
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2257 && leader == NULL
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2258 && curbuf->b_p_lisp
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2259 && curbuf->b_p_ai)
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 fixthisline(get_lisp_indent);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2262 ai_col = (colnr_T)getwhitecols_curline();
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2263 }
28942
6cdf55afaae9 patch 8.2.4993: smart/C/lisp indenting is optional
Bram Moolenaar <Bram@vim.org>
parents: 28931
diff changeset
2264
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2265 // May do indenting after opening a new line.
26516
9596c652420b patch 8.2.3787: no proper formatting of a C line comment after a statement
Bram Moolenaar <Bram@vim.org>
parents: 26336
diff changeset
2266 if (do_cindent)
16631
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 do_c_expr_indent();
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2269 ai_col = (colnr_T)getwhitecols_curline();
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2270 }
28942
6cdf55afaae9 patch 8.2.4993: smart/C/lisp indenting is optional
Bram Moolenaar <Bram@vim.org>
parents: 28931
diff changeset
2271
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2272 if (vreplace_mode != 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2273 State = vreplace_mode;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2274
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2275 // Finally, MODE_VREPLACE gets the stuff on the new line, then puts back
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2276 // the original line, and inserts the new stuff char by char, pushing old
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28765
diff changeset
2277 // stuff onto the replace stack (via ins_char()).
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2278 if (State & VREPLACE_FLAG)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2279 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2280 // Put new line in p_extra
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2281 p_extra = vim_strsave(ml_get_curline());
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2282 if (p_extra == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2283 goto theend;
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 // Put back original line
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2286 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
2287
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2288 // Insert new stuff into line again
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2289 curwin->w_cursor.col = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2290 curwin->w_cursor.coladd = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2291 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
2292 vim_free(p_extra);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2293 next_line = NULL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2294 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2295
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2296 retval = OK; // success!
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2297 theend:
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2298 curbuf->b_p_pi = saved_pi;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2299 vim_free(saved_line);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2300 vim_free(next_line);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2301 vim_free(allocated);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2302 return retval;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2303 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2304
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2305 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2306 * Delete from cursor to end of line.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2307 * Caller must have prepared for undo.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2308 * 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
2309 *
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2310 * Return FAIL for failure, OK otherwise.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2311 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2312 int
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2313 truncate_line(int fixpos)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2314 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2315 char_u *newp;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2316 linenr_T lnum = curwin->w_cursor.lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2317 colnr_T col = curwin->w_cursor.col;
28841
77a00aa3e215 patch 8.2.4944: text properties are wrong after "cc"
Bram Moolenaar <Bram@vim.org>
parents: 28773
diff changeset
2318 char_u *old_line;
77a00aa3e215 patch 8.2.4944: text properties are wrong after "cc"
Bram Moolenaar <Bram@vim.org>
parents: 28773
diff changeset
2319 int deleted;
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2320
28841
77a00aa3e215 patch 8.2.4944: text properties are wrong after "cc"
Bram Moolenaar <Bram@vim.org>
parents: 28773
diff changeset
2321 old_line = ml_get(lnum);
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2322 if (col == 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2323 newp = vim_strsave((char_u *)"");
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2324 else
28841
77a00aa3e215 patch 8.2.4944: text properties are wrong after "cc"
Bram Moolenaar <Bram@vim.org>
parents: 28773
diff changeset
2325 newp = vim_strnsave(old_line, col);
77a00aa3e215 patch 8.2.4944: text properties are wrong after "cc"
Bram Moolenaar <Bram@vim.org>
parents: 28773
diff changeset
2326 deleted = (int)STRLEN(old_line) - col;
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2327
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2328 if (newp == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2329 return FAIL;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2330
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2331 ml_replace(lnum, newp, FALSE);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2332
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2333 // mark the buffer as changed and prepare for displaying
28841
77a00aa3e215 patch 8.2.4944: text properties are wrong after "cc"
Bram Moolenaar <Bram@vim.org>
parents: 28773
diff changeset
2334 inserted_bytes(lnum, curwin->w_cursor.col, -deleted);
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2335
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2336 // 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
2337 if (fixpos && curwin->w_cursor.col > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2338 --curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2339
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2340 return OK;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2341 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2342
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2343 /*
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2344 * Delete "nlines" lines at the cursor.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2345 * 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
2346 */
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2347 void
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2348 del_lines(long nlines, int undo)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2349 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2350 long n;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2351 linenr_T first = curwin->w_cursor.lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2352
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2353 if (nlines <= 0)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2354 return;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2355
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2356 // save the deleted lines for undo
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2357 if (undo && u_savedel(first, nlines) == FAIL)
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2358 return;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2359
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2360 for (n = 0; n < nlines; )
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2361 {
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2362 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
2363 break;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2364
20599
d571231175b4 patch 8.2.0853: ml_delete() often called with FALSE argument
Bram Moolenaar <Bram@vim.org>
parents: 20229
diff changeset
2365 ml_delete_flags(first, ML_DEL_MESSAGE);
16631
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2366 ++n;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2367
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2368 // 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
2369 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
2370 break;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2371 }
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2372
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2373 // 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
2374 // trigger a callback to display the cursor.
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2375 curwin->w_cursor.col = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2376 check_cursor_lnum();
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2377
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2378 // 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
2379 deleted_lines_mark(first, n);
7217a9c5adb3 Add missing files from patch 8.1.1318
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2380 }