vim: src/change.c annotate

annotate src/change.c @ 16774:0cc3f459237b v8.1.1389

patch 8.1.1389: changes are not flushed when end and start overlap commit https://github.com/vim/vim/commit/7b31a181c84ec6b9050892e80f3132907569f8d8 Author: Bram Moolenaar <Bram@vim.org> Date: Fri May 24 21:39:27 2019 +0200 patch 8.1.1389: changes are not flushed when end and start overlap Problem: Changes are not flushed when end and start overlap. (Paul Jolly) Solution: When end of a previous changes overlaps with start of a new change, first flush listeners.

author	Bram Moolenaar <Bram@vim.org>
date	Fri, 24 May 2019 21:45:05 +0200
parents	695d9ef00b03
children	ce04ebdf26b8

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

Mercurial > vim

annotate src/change.c @ 16774:0cc3f459237b v8.1.1389