vim: src/change.c annotate

annotate src/change.c @ 25895:8e9864b98846 v8.2.3481

patch 8.2.3481: failures when char is unsigned Commit: https://github.com/vim/vim/commit/2e258bd79f403bcccb1336bea70803957a83808f Author: James McCoy <jamessan@jamessan.com> Date: Tue Oct 5 19:44:04 2021 +0100 patch 8.2.3481: failures when char is unsigned Problem: Failures when char is unsigned. Solution: Use int8_T. Make a CI run with unsigned char. (James McCoy, closes #8936)

author	Bram Moolenaar <Bram@vim.org>
date	Tue, 05 Oct 2021 20:45:03 +0200
parents	5ef74c37a9a1
children	a2e6da79274d

rev	line source
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1 /* vi:set ts=8 sts=4 sw=4 noet:
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2 *
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	3 * VIM - Vi IMproved by Bram Moolenaar
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	4 *
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	5 * Do ":help uganda" in Vim to read copying and usage conditions.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	6 * Do ":help credits" in Vim to see a list of people who contributed.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	7 * See README.txt for an overview of the Vim source code.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	8 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	9
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	10 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	11 * change.c: functions related to changing text
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	12 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	13
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	14 #include "vim.h"
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	15
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	16 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	17 * If the file is readonly, give a warning message with the first change.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	18 * Don't do this for autocommands.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	19 * Doesn't use emsg(), because it flushes the macro buffer.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	20 * If we have undone all changes b_changed will be FALSE, but "b_did_warn"
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	21 * will be TRUE.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	22 * "col" is the column for the message; non-zero when in insert mode and
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	23 * 'showmode' is on.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	24 * Careful: may trigger autocommands that reload the buffer.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	25 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	26 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	27 change_warning(int col)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	28 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	29 static char *w_readonly = N_("W10: Warning: Changing a readonly file");
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	30
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	31 if (curbuf->b_did_warn == FALSE
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	32 && curbufIsChanged() == 0
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	33 && !autocmd_busy
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	34 && curbuf->b_p_ro)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	35 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	36 ++curbuf_lock;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	37 apply_autocmds(EVENT_FILECHANGEDRO, NULL, NULL, FALSE, curbuf);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	38 --curbuf_lock;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	39 if (!curbuf->b_p_ro)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	40 return;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	41
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	42 // Do what msg() does, but with a column offset if the warning should
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	43 // be after the mode message.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	44 msg_start();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	45 if (msg_row == Rows - 1)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	46 msg_col = col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	47 msg_source(HL_ATTR(HLF_W));
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	48 msg_puts_attr(_(w_readonly), HL_ATTR(HLF_W) \| MSG_HIST);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	49 #ifdef FEAT_EVAL
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	50 set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_readonly), -1);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	51 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	52 msg_clr_eos();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	53 (void)msg_end();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	54 if (msg_silent == 0 && !silent_mode
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	55 #ifdef FEAT_EVAL
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	56 && time_for_testing != 1
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	57 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	58 )
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	59 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	60 out_flush();
18642 bbea1f108187 patch 8.1.2313: debugging where a delay comes from is not easy Bram Moolenaar <Bram@vim.org> parents: 18440 diff changeset	61 ui_delay(1002L, TRUE); // give the user time to think about it
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	62 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	63 curbuf->b_did_warn = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	64 redraw_cmdline = FALSE; // don't redraw and erase the message
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	65 if (msg_row < Rows - 1)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	66 showmode();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	67 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	68 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	69
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	70 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	71 * Call this function when something in the current buffer is changed.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	72 *
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	73 * Most often called through changed_bytes() and changed_lines(), which also
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	74 * mark the area of the display to be redrawn.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	75 *
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	76 * Careful: may trigger autocommands that reload the buffer.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	77 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	78 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	79 changed(void)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	80 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	81 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	82 if (p_imst == IM_ON_THE_SPOT)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	83 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	84 // The text of the preediting area is inserted, but this doesn't
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	85 // mean a change of the buffer yet. That is delayed until the
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	86 // text is committed. (this means preedit becomes empty)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	87 if (im_is_preediting() && !xim_changed_while_preediting)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	88 return;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	89 xim_changed_while_preediting = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	90 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	91 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	92
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	93 if (!curbuf->b_changed)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	94 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	95 int save_msg_scroll = msg_scroll;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	96
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	97 // Give a warning about changing a read-only file. This may also
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	98 // check-out the file, thus change "curbuf"!
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	99 change_warning(0);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	100
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	101 // Create a swap file if that is wanted.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	102 // Don't do this for "nofile" and "nowrite" buffer types.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	103 if (curbuf->b_may_swap
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	104 #ifdef FEAT_QUICKFIX
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	105 && !bt_dontwrite(curbuf)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	106 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	107 )
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	108 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	109 int save_need_wait_return = need_wait_return;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	110
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	111 need_wait_return = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	112 ml_open_file(curbuf);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	113
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	114 // The ml_open_file() can cause an ATTENTION message.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	115 // Wait two seconds, to make sure the user reads this unexpected
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	116 // message. Since we could be anywhere, call wait_return() now,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	117 // and don't let the emsg() set msg_scroll.
22742 f7f2d73ff85e patch 8.2.1919: assert_fails() setting emsg_silent changes normal execution Bram Moolenaar <Bram@vim.org> parents: 22699 diff changeset	118 if (need_wait_return && emsg_silent == 0 && !in_assert_fails)
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	119 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	120 out_flush();
18642 bbea1f108187 patch 8.1.2313: debugging where a delay comes from is not easy Bram Moolenaar <Bram@vim.org> parents: 18440 diff changeset	121 ui_delay(2002L, TRUE);
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	122 wait_return(TRUE);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	123 msg_scroll = save_msg_scroll;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	124 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	125 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	126 need_wait_return = save_need_wait_return;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	127 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	128 changed_internal();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	129 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	130 ++CHANGEDTICK(curbuf);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	131
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	132 #ifdef FEAT_SEARCH_EXTRA
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	133 // If a pattern is highlighted, the position may now be invalid.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	134 highlight_match = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	135 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	136 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	137
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	138 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	139 * Internal part of changed(), no user interaction.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	140 * Also used for recovery.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	141 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	142 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	143 changed_internal(void)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	144 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	145 curbuf->b_changed = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	146 ml_setflags(curbuf);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	147 check_status(curbuf);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	148 redraw_tabline = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	149 #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 /*
17423 ae11ab022b02 patch 8.1.1710: Coverity found dead code Bram Moolenaar <Bram@vim.org> parents: 17352 diff changeset	158 * Check if the change at "lnum" is above or overlaps with an existing
ae11ab022b02 patch 8.1.1710: Coverity found dead code Bram Moolenaar <Bram@vim.org> parents: 17352 diff changeset	159 * change. If above then flush changes and invoke listeners.
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	160 * 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	161 */
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	162 static int
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	163 check_recorded_changes(
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	164 buf_T *buf,
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	165 linenr_T lnum,
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	166 linenr_T lnume,
17423 ae11ab022b02 patch 8.1.1710: Coverity found dead code Bram Moolenaar <Bram@vim.org> parents: 17352 diff changeset	167 long xtra)
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	168 {
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	169 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	170 {
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	171 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	172 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	173 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	174
19888 435726a03481 patch 8.2.0500: using the same loop in many places Bram Moolenaar <Bram@vim.org> parents: 19534 diff changeset	175 FOR_ALL_LIST_ITEMS(buf->b_recorded_changes, li)
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	176 {
16774 0cc3f459237b patch 8.1.1389: changes are not flushed when end and start overlap Bram Moolenaar <Bram@vim.org> parents: 16768 diff changeset	177 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	178 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	179 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	180 li->li_tv.vval.v_dict, (char_u *)"end");
17423 ae11ab022b02 patch 8.1.1710: Coverity found dead code Bram Moolenaar <Bram@vim.org> parents: 17352 diff changeset	181 if (prev_lnum >= lnum \|\| prev_lnum > lnume \|\| prev_lnume >= lnum)
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	182 {
17423 ae11ab022b02 patch 8.1.1710: Coverity found dead code Bram Moolenaar <Bram@vim.org> parents: 17352 diff changeset	183 // the current change is going to make the line number in
ae11ab022b02 patch 8.1.1710: Coverity found dead code Bram Moolenaar <Bram@vim.org> parents: 17352 diff changeset	184 // the older change invalid, flush now
ae11ab022b02 patch 8.1.1710: Coverity found dead code Bram Moolenaar <Bram@vim.org> parents: 17352 diff changeset	185 invoke_listeners(curbuf);
ae11ab022b02 patch 8.1.1710: Coverity found dead code Bram Moolenaar <Bram@vim.org> parents: 17352 diff changeset	186 break;
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	187 }
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	188 }
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	189 }
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	190 return FALSE;
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
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	193 /*
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	194 * 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	195 * 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	196 */
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	197 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	198 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	199 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	200 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	201 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	202 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	203 {
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	204 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	205
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	206 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	207 return;
16660 04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	208
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	209 // 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	210 // changes, then flush.
17423 ae11ab022b02 patch 8.1.1710: Coverity found dead code Bram Moolenaar <Bram@vim.org> parents: 17352 diff changeset	211 if (check_recorded_changes(curbuf, lnum, lnume, xtra))
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	212 return;
16660 04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	213
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	214 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	215 {
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	216 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	217 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	218 return;
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	219 ++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	220 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	221 }
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	222
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	223 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	224 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	225 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	226 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	227 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	228 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	229 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	230
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	231 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	232 }
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	233
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	234 /*
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 * 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	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 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	238 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	239 {
16872 a836d122231a patch 8.1.1437: code to handle callbacks is duplicated Bram Moolenaar <Bram@vim.org> parents: 16835 diff changeset	240 callback_T callback;
16636 0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	241 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	242 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	243
25356 1cde96e768e4 patch 8.2.3215: Vim9: argument types are not checked at compile time Bram Moolenaar <Bram@vim.org> parents: 25246 diff changeset	244 if (in_vim9script() && check_for_opt_buffer_arg(argvars, 1) == FAIL)
1cde96e768e4 patch 8.2.3215: Vim9: argument types are not checked at compile time Bram Moolenaar <Bram@vim.org> parents: 25246 diff changeset	245 return;
1cde96e768e4 patch 8.2.3215: Vim9: argument types are not checked at compile time Bram Moolenaar <Bram@vim.org> parents: 25246 diff changeset	246
16872 a836d122231a patch 8.1.1437: code to handle callbacks is duplicated Bram Moolenaar <Bram@vim.org> parents: 16835 diff changeset	247 callback = get_callback(&argvars[0]);
a836d122231a patch 8.1.1437: code to handle callbacks is duplicated Bram Moolenaar <Bram@vim.org> parents: 16835 diff changeset	248 if (callback.cb_name == NULL)
16636 0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	249 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	250
16638 4790302965fc patch 8.1.1321: no docs or tests for listener functions Bram Moolenaar <Bram@vim.org> parents: 16636 diff changeset	251 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	252 {
4790302965fc patch 8.1.1321: no docs or tests for listener functions Bram Moolenaar <Bram@vim.org> parents: 16636 diff changeset	253 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	254 if (buf == NULL)
16872 a836d122231a patch 8.1.1437: code to handle callbacks is duplicated Bram Moolenaar <Bram@vim.org> parents: 16835 diff changeset	255 {
a836d122231a patch 8.1.1437: code to handle callbacks is duplicated Bram Moolenaar <Bram@vim.org> parents: 16835 diff changeset	256 free_callback(&callback);
16638 4790302965fc patch 8.1.1321: no docs or tests for listener functions Bram Moolenaar <Bram@vim.org> parents: 16636 diff changeset	257 return;
16872 a836d122231a patch 8.1.1437: code to handle callbacks is duplicated Bram Moolenaar <Bram@vim.org> parents: 16835 diff changeset	258 }
16638 4790302965fc patch 8.1.1321: no docs or tests for listener functions Bram Moolenaar <Bram@vim.org> parents: 16636 diff changeset	259 }
4790302965fc patch 8.1.1321: no docs or tests for listener functions Bram Moolenaar <Bram@vim.org> parents: 16636 diff changeset	260
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16774 diff changeset	261 lnr = ALLOC_CLEAR_ONE(listener_T);
16636 0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	262 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	263 {
16872 a836d122231a patch 8.1.1437: code to handle callbacks is duplicated Bram Moolenaar <Bram@vim.org> parents: 16835 diff changeset	264 free_callback(&callback);
16636 0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	265 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	266 }
16638 4790302965fc patch 8.1.1321: no docs or tests for listener functions Bram Moolenaar <Bram@vim.org> parents: 16636 diff changeset	267 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	268 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	269
16872 a836d122231a patch 8.1.1437: code to handle callbacks is duplicated Bram Moolenaar <Bram@vim.org> parents: 16835 diff changeset	270 set_callback(&lnr->lr_callback, &callback);
16636 0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	271
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	272 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	273 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	274 }
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
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	276 /*
16660 04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	277 * 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	278 */
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	279 void
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	280 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	281 {
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	282 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	283
25384 e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25380 diff changeset	284 if (in_vim9script() && check_for_opt_buffer_arg(argvars, 0) == FAIL)
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25380 diff changeset	285 return;
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25380 diff changeset	286
16660 04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	287 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	288 {
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	289 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	290 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	291 return;
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	292 }
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	293 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	294 }
04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	295
25782 5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	296
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	297 static void
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	298 remove_listener(buf_T buf, listener_T lnr, listener_T *prev)
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	299 {
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	300 if (prev != NULL)
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	301 prev->lr_next = lnr->lr_next;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	302 else
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	303 buf->b_listener = lnr->lr_next;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	304 free_callback(&lnr->lr_callback);
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	305 vim_free(lnr);
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	306 }
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	307
16660 04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	308 /*
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	309 * 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	310 */
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	311 void
17352 b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove() Bram Moolenaar <Bram@vim.org> parents: 16996 diff changeset	312 f_listener_remove(typval_T argvars, typval_T rettv)
16636 0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	313 {
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	314 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	315 listener_T *next;
17352 b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove() Bram Moolenaar <Bram@vim.org> parents: 16996 diff changeset	316 listener_T *prev;
25384 e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25380 diff changeset	317 int id;
16638 4790302965fc patch 8.1.1321: no docs or tests for listener functions Bram Moolenaar <Bram@vim.org> parents: 16636 diff changeset	318 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	319
25384 e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25380 diff changeset	320 if (in_vim9script() && check_for_number_arg(argvars, 0) == FAIL)
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25380 diff changeset	321 return;
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25380 diff changeset	322
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25380 diff changeset	323 id = tv_get_number(argvars);
18225 6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	324 FOR_ALL_BUFFERS(buf)
17352 b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove() Bram Moolenaar <Bram@vim.org> parents: 16996 diff changeset	325 {
b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove() Bram Moolenaar <Bram@vim.org> parents: 16996 diff changeset	326 prev = NULL;
16638 4790302965fc patch 8.1.1321: no docs or tests for listener functions Bram Moolenaar <Bram@vim.org> parents: 16636 diff changeset	327 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	328 {
16638 4790302965fc patch 8.1.1321: no docs or tests for listener functions Bram Moolenaar <Bram@vim.org> parents: 16636 diff changeset	329 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	330 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	331 {
25782 5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	332 if (textwinlock > 0)
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	333 {
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	334 // in invoke_listeners(), clear ID and delete later
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	335 lnr->lr_id = 0;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	336 return;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	337 }
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	338 remove_listener(buf, lnr, prev);
17352 b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove() Bram Moolenaar <Bram@vim.org> parents: 16996 diff changeset	339 rettv->vval.v_number = 1;
b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove() Bram Moolenaar <Bram@vim.org> parents: 16996 diff changeset	340 return;
16638 4790302965fc patch 8.1.1321: no docs or tests for listener functions Bram Moolenaar <Bram@vim.org> parents: 16636 diff changeset	341 }
4790302965fc patch 8.1.1321: no docs or tests for listener functions Bram Moolenaar <Bram@vim.org> parents: 16636 diff changeset	342 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	343 }
17352 b2616a8be8a6 patch 8.1.1675: listener list not correctly updated on listener_remove() Bram Moolenaar <Bram@vim.org> parents: 16996 diff changeset	344 }
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	345 }
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	346
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	347 /*
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	348 * 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	349 * to "lnume".
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	350 */
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	351 void
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	352 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	353 {
17423 ae11ab022b02 patch 8.1.1710: Coverity found dead code Bram Moolenaar <Bram@vim.org> parents: 17352 diff changeset	354 check_recorded_changes(buf, lnum, lnume, added);
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	355 }
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	356
978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	357 /*
16636 0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	358 * 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	359 * 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	360 */
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	361 void
16660 04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	362 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	363 {
0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	364 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	365 typval_T rettv;
16660 04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	366 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	367 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	368 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	369 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	370 linenr_T added = 0;
16835 7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	371 int save_updating_screen = updating_screen;
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	372 static int recursive = FALSE;
25782 5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	373 listener_T *next;
16636 0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	374
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	375 if (buf->b_recorded_changes == NULL // nothing changed
16835 7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	376 \|\| buf->b_listener == NULL // no listeners
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	377 \|\| recursive) // already busy
16636 0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	378 return;
16835 7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	379 recursive = TRUE;
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	380
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	381 // Block messages on channels from being handled, so that they don't make
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	382 // text changes here.
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	383 ++updating_screen;
16660 04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	384
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].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	386 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	387
19888 435726a03481 patch 8.2.0500: using the same loop in many places Bram Moolenaar <Bram@vim.org> parents: 19534 diff changeset	388 FOR_ALL_LIST_ITEMS(buf->b_recorded_changes, li)
16660 04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	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");
18434 5da355d15b88 patch 8.1.2211: listener callback "added" argument is not the total Bram Moolenaar <Bram@vim.org> parents: 18265 diff changeset	396 if (end < lnum)
16660 04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	397 end = lnum;
18434 5da355d15b88 patch 8.1.2211: listener callback "added" argument is not the total Bram Moolenaar <Bram@vim.org> parents: 18265 diff changeset	398 added += dict_get_number(li->li_tv.vval.v_dict, (char_u *)"added");
16660 04c2614af21c patch 8.1.1332: cannot flush listeners without redrawing, mix of changes Bram Moolenaar <Bram@vim.org> parents: 16638 diff changeset	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;
20229 06a1dd50463e patch 8.2.0670: cannot change window when evaluating 'completefunc' Bram Moolenaar <Bram@vim.org> parents: 19888 diff changeset	409 ++textwinlock;
16660 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 {
17606 ff097edaae89 patch 8.1.1800: function call functions have too many arguments Bram Moolenaar <Bram@vim.org> parents: 17423 diff changeset	413 call_callback(&lnr->lr_callback, -1, &rettv, 5, argv);
16636 0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	414 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	415 }
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
25782 5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	417 // If f_listener_remove() was called may have to remove a listener now.
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	418 for (lnr = buf->b_listener; lnr != NULL; lnr = next)
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	419 {
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	420 listener_T *prev = NULL;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	421
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	422 next = lnr->lr_next;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	423 if (lnr->lr_id == 0)
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	424 remove_listener(buf, lnr, prev);
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	425 else
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	426 prev = lnr;
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	427 }
5ef74c37a9a1 patch 8.2.3426: crash when deleting a listener in a listener callback Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	428
20229 06a1dd50463e patch 8.2.0670: cannot change window when evaluating 'completefunc' Bram Moolenaar <Bram@vim.org> parents: 19888 diff changeset	429 --textwinlock;
16666 978bcd70883d patch 8.1.1335: listener callback is called after inserting text Bram Moolenaar <Bram@vim.org> parents: 16662 diff changeset	430 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	431 buf->b_recorded_changes = NULL;
16835 7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	432
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	433 if (save_updating_screen)
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	434 updating_screen = TRUE;
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	435 else
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	436 after_updating_screen(TRUE);
7cade95272c4 patch 8.1.1419: listener callbacks may be called recursively Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	437 recursive = FALSE;
16636 0daf9eca3541 patch 8.1.1320: it is not possible to track changes to a buffer Bram Moolenaar <Bram@vim.org> parents: 16631 diff changeset	438 }
18225 6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	439
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	440 /*
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	441 * Remove all listeners associated with "buf".
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	442 */
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	443 void
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	444 remove_listeners(buf_T *buf)
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	445 {
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	446 listener_T *lnr;
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	447 listener_T *next;
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	448
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	449 for (lnr = buf->b_listener; lnr != NULL; lnr = next)
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	450 {
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	451 next = lnr->lr_next;
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	452 free_callback(&lnr->lr_callback);
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	453 vim_free(lnr);
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	454 }
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	455 buf->b_listener = NULL;
6c3a8312486d patch 8.1.2107: various memory leaks reported by asan Bram Moolenaar <Bram@vim.org> parents: 18203 diff changeset	456 }
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	457 #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	458
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	459 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	460 * 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	461 * See changed_lines() for the arguments.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	462 * 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	463 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	464 static void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	465 changed_common(
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	466 linenr_T lnum,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	467 colnr_T col,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	468 linenr_T lnume,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	469 long xtra)
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 win_T *wp;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	472 tabpage_T *tp;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	473 int i;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	474 #ifdef FEAT_JUMPLIST
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	475 int cols;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	476 pos_T *p;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	477 int add;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	478 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	479
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	480 // mark the buffer as modified
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	481 changed();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	482
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	483 #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	484 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	485 #endif
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	486 #ifdef FEAT_DIFF
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	487 if (curwin->w_p_diff && diff_internal())
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	488 curtab->tp_diff_update = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	489 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	490
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	491 // set the '. mark
22699 e82579016863 patch 8.2.1898: command modifier parsing always uses global cmdmod Bram Moolenaar <Bram@vim.org> parents: 22282 diff changeset	492 if ((cmdmod.cmod_flags & CMOD_KEEPJUMPS) == 0)
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	493 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	494 curbuf->b_last_change.lnum = lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	495 curbuf->b_last_change.col = col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	496
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	497 #ifdef FEAT_JUMPLIST
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	498 // 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	499 // don't have an entry yet.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	500 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	501 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	502 if (curbuf->b_changelistlen == 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	503 add = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	504 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	505 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	506 // 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	507 // 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	508 // creating many entries for typing "xxxxx".
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	509 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	510 if (p->lnum != lnum)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	511 add = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	512 else
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 cols = comp_textwidth(FALSE);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	515 if (cols == 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	516 cols = 79;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	517 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	518 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	519 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	520 if (add)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	521 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	522 // 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	523 // 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	524 // position in the changelist.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	525 curbuf->b_new_change = FALSE;
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 (curbuf->b_changelistlen == JUMPLISTSIZE)
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 // changelist is full: remove oldest entry
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	530 curbuf->b_changelistlen = JUMPLISTSIZE - 1;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	531 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	532 sizeof(pos_T) * (JUMPLISTSIZE - 1));
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	533 FOR_ALL_TAB_WINDOWS(tp, wp)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	534 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	535 // 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	536 // this buffer.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	537 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	538 --wp->w_changelistidx;
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 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	541 FOR_ALL_TAB_WINDOWS(tp, wp)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	542 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	543 // 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	544 // 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	545 if (wp->w_buffer == curbuf
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	546 && wp->w_changelistidx == curbuf->b_changelistlen)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	547 ++wp->w_changelistidx;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	548 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	549 ++curbuf->b_changelistlen;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	550 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	551 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	552 curbuf->b_changelist[curbuf->b_changelistlen - 1] =
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	553 curbuf->b_last_change;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	554 // 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	555 // takes you back to it.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	556 curwin->w_changelistidx = curbuf->b_changelistlen;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	557 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	558 }
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 FOR_ALL_TAB_WINDOWS(tp, wp)
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_buffer == curbuf)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	563 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	564 // Mark this window to be redrawn later.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	565 if (wp->w_redr_type < VALID)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	566 wp->w_redr_type = VALID;
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 // 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	569 // values for the cursor.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	570 #ifdef FEAT_FOLDING
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	571 // 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	572 // 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	573 foldUpdate(wp, lnum, lnume + xtra - 1);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	574
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	575 // 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	576 // 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	577 // might be displayed differently.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	578 // 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	579 // inserting lines just above a closed fold.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	580 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	581 if (wp->w_cursor.lnum == lnum)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	582 wp->w_cline_folded = i;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	583 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	584 if (wp->w_cursor.lnum == lnume)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	585 wp->w_cline_folded = i;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	586
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	587 // If 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	588 // 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	589 if (wp->w_cursor.lnum <= lnum)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	590 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	591 i = find_wl_entry(wp, lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	592 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	593 changed_line_abv_curs_win(wp);
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 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	596 if (wp->w_cursor.lnum > lnum)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	597 changed_line_abv_curs_win(wp);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	598 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	599 changed_cline_bef_curs_win(wp);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	600 if (wp->w_botline >= lnum)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	601 {
25246 5932642234e1 patch 8.2.3159: cursor displayed in wrong position after deleting line Bram Moolenaar <Bram@vim.org> parents: 24643 diff changeset	602 if (xtra < 0)
5932642234e1 patch 8.2.3159: cursor displayed in wrong position after deleting line Bram Moolenaar <Bram@vim.org> parents: 24643 diff changeset	603 invalidate_botline_win(wp);
5932642234e1 patch 8.2.3159: cursor displayed in wrong position after deleting line Bram Moolenaar <Bram@vim.org> parents: 24643 diff changeset	604 else
5932642234e1 patch 8.2.3159: cursor displayed in wrong position after deleting line Bram Moolenaar <Bram@vim.org> parents: 24643 diff changeset	605 // Assume that botline doesn't change (inserted lines make
5932642234e1 patch 8.2.3159: cursor displayed in wrong position after deleting line Bram Moolenaar <Bram@vim.org> parents: 24643 diff changeset	606 // other lines scroll down below botline).
5932642234e1 patch 8.2.3159: cursor displayed in wrong position after deleting line Bram Moolenaar <Bram@vim.org> parents: 24643 diff changeset	607 approximate_botline_win(wp);
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	608 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	609
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	610 // 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	611 // 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	612 // 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	613 // after the change.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	614 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	615 if (wp->w_lines[i].wl_valid)
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 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	618 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	619 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	620 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	621 // line included in change
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	622 wp->w_lines[i].wl_valid = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	623 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	624 else if (xtra != 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	625 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	626 // line below change
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	627 wp->w_lines[i].wl_lnum += xtra;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	628 #ifdef FEAT_FOLDING
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	629 wp->w_lines[i].wl_lastlnum += xtra;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	630 #endif
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 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	633 #ifdef FEAT_FOLDING
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	634 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	635 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	636 // 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	637 // may need to be redrawn
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	638 wp->w_lines[i].wl_valid = FALSE;
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 #endif
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
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	643 #ifdef FEAT_FOLDING
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	644 // 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	645 // 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	646 if (hasAnyFolding(wp))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	647 set_topline(wp, wp->w_topline);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	648 #endif
18440 d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set Bram Moolenaar <Bram@vim.org> parents: 18434 diff changeset	649 // Relative numbering may require updating more.
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set Bram Moolenaar <Bram@vim.org> parents: 18434 diff changeset	650 if (wp->w_p_rnu)
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set Bram Moolenaar <Bram@vim.org> parents: 18434 diff changeset	651 redraw_win_later(wp, SOME_VALID);
17859 06e655ce1938 patch 8.1.1926: cursorline not redrawn when putting a line above the cursor Bram Moolenaar <Bram@vim.org> parents: 17809 diff changeset	652 #ifdef FEAT_SYN_HL
18440 d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set Bram Moolenaar <Bram@vim.org> parents: 18434 diff changeset	653 // Cursor line highlighting probably need to be updated with
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set Bram Moolenaar <Bram@vim.org> parents: 18434 diff changeset	654 // "VALID" if it's below the change.
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set Bram Moolenaar <Bram@vim.org> parents: 18434 diff changeset	655 // If the cursor line is inside the change we need to redraw more.
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set Bram Moolenaar <Bram@vim.org> parents: 18434 diff changeset	656 if (wp->w_p_cul)
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set Bram Moolenaar <Bram@vim.org> parents: 18434 diff changeset	657 {
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set Bram Moolenaar <Bram@vim.org> parents: 18434 diff changeset	658 if (xtra == 0)
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set Bram Moolenaar <Bram@vim.org> parents: 18434 diff changeset	659 redraw_win_later(wp, VALID);
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set Bram Moolenaar <Bram@vim.org> parents: 18434 diff changeset	660 else if (lnum <= wp->w_last_cursorline)
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set Bram Moolenaar <Bram@vim.org> parents: 18434 diff changeset	661 redraw_win_later(wp, SOME_VALID);
d6cb1e706fb7 patch 8.1.2214: too much is redrawn when 'cursorline' is set Bram Moolenaar <Bram@vim.org> parents: 18434 diff changeset	662 }
17859 06e655ce1938 patch 8.1.1926: cursorline not redrawn when putting a line above the cursor Bram Moolenaar <Bram@vim.org> parents: 17809 diff changeset	663 #endif
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	664 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	665 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	666
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	667 // 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	668 // 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	669 if (must_redraw < VALID)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	670 must_redraw = VALID;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	671
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	672 // 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	673 if (lnum <= curwin->w_cursor.lnum
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	674 && 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	675 last_cursormoved.lnum = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	676 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	677
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	678 static void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	679 changedOneline(buf_T *buf, linenr_T lnum)
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 if (buf->b_mod_set)
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 // 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	684 if (lnum < buf->b_mod_top)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	685 buf->b_mod_top = lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	686 else if (lnum >= buf->b_mod_bot)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	687 buf->b_mod_bot = lnum + 1;
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 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	690 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	691 // 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	692 buf->b_mod_set = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	693 buf->b_mod_top = lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	694 buf->b_mod_bot = lnum + 1;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	695 buf->b_mod_xlines = 0;
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
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	699 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	700 * 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	701 * - 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	702 * - marks the buffer changed by calling changed()
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	703 * - invalidates cached values
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	704 * 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	705 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	706 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	707 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	708 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	709 changedOneline(curbuf, lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	710 changed_common(lnum, col, lnum + 1, 0L);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	711
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	712 #ifdef FEAT_DIFF
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	713 // 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	714 if (curwin->w_p_diff)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	715 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	716 win_T *wp;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	717 linenr_T wlnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	718
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	719 FOR_ALL_WINDOWS(wp)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	720 if (wp->w_p_diff && wp != curwin)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	721 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	722 redraw_win_later(wp, VALID);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	723 wlnum = diff_lnum_win(lnum, wp);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	724 if (wlnum > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	725 changedOneline(wp->w_buffer, wlnum);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	726 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	727 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	728 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	729 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	730
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	731 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	732 * 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	733 * When "added" is negative text was deleted.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	734 */
22282 5adb97bf0b32 patch 8.2.1690: text properties not adjusted for "I" in Visual block mode Bram Moolenaar <Bram@vim.org> parents: 20599 diff changeset	735 void
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	736 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	737 {
18763 49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name Bram Moolenaar <Bram@vim.org> parents: 18757 diff changeset	738 #ifdef FEAT_PROP_POPUP
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	739 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	740 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	741 #endif
16662 1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16660 diff changeset	742
1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16660 diff changeset	743 changed_bytes(lnum, col);
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	744 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	745
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 * 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	748 * 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	749 * 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	750 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	751 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	752 appended_lines(linenr_T lnum, long count)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	753 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	754 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	755 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	756
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	757 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	758 * Like appended_lines(), but adjust marks first.
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 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	761 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	762 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	763 // 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	764 // 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	765 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	766 #ifdef FEAT_DIFF
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	767 \|\| curwin->w_p_diff
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	768 #endif
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 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	771 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	772 }
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 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	775 * 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	776 * 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	777 * 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	778 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	779 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	780 deleted_lines(linenr_T lnum, long count)
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 changed_lines(lnum, 0, lnum + count, -count);
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 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	786 * Like deleted_lines(), but adjust marks first.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	787 * 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	788 * be triggered to display the cursor.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	789 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	790 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	791 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	792 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	793 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	794 changed_lines(lnum, 0, lnum + count, -count);
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
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	797 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	798 * 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	799 */
24643 09e64e81c473 patch 8.2.2860: adding a text property causes the whole window to be redawn Bram Moolenaar <Bram@vim.org> parents: 22742 diff changeset	800 void
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	801 changed_lines_buf(
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	802 buf_T *buf,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	803 linenr_T lnum, // first line with change
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	804 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	805 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	806 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	807 if (buf->b_mod_set)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	808 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	809 // 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	810 if (lnum < buf->b_mod_top)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	811 buf->b_mod_top = lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	812 if (lnum < buf->b_mod_bot)
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 // adjust old bot position for xtra lines
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	815 buf->b_mod_bot += xtra;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	816 if (buf->b_mod_bot < lnum)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	817 buf->b_mod_bot = lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	818 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	819 if (lnume + xtra > buf->b_mod_bot)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	820 buf->b_mod_bot = lnume + xtra;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	821 buf->b_mod_xlines += xtra;
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 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	824 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	825 // set the area that must be redisplayed
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	826 buf->b_mod_set = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	827 buf->b_mod_top = lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	828 buf->b_mod_bot = lnume + xtra;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	829 buf->b_mod_xlines = xtra;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	830 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	831 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	832
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	833 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	834 * Changed lines for the current buffer.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	835 * 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	836 * - mark the buffer changed by calling changed()
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	837 * - 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	838 * - invalidate cached values
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	839 * "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	840 * below the changed lines (BEFORE the change).
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	841 * 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	842 * 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	843 * 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	844 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	845 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	846 changed_lines(
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	847 linenr_T lnum, // first line with change
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	848 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	849 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	850 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	851 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	852 changed_lines_buf(curbuf, lnum, lnume, xtra);
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 #ifdef FEAT_DIFF
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	855 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	856 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	857 // 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	858 // 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	859 // displaying.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	860 win_T *wp;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	861 linenr_T wlnum;
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 FOR_ALL_WINDOWS(wp)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	864 if (wp->w_p_diff && wp != curwin)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	865 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	866 redraw_win_later(wp, VALID);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	867 wlnum = diff_lnum_win(lnum, wp);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	868 if (wlnum > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	869 changed_lines_buf(wp->w_buffer, wlnum,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	870 lnume - lnum + wlnum, 0L);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	871 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	872 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	873 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	874
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	875 changed_common(lnum, col, lnume, xtra);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	876 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	877
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	878 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	879 * 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	880 * When "ff" is TRUE also reset 'fileformat'.
16996 d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed Bram Moolenaar <Bram@vim.org> parents: 16972 diff changeset	881 * When "always_inc_changedtick" is TRUE b:changedtick is incremented also when
d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed Bram Moolenaar <Bram@vim.org> parents: 16972 diff changeset	882 * the changed flag was off.
16631 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 void
16996 d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed Bram Moolenaar <Bram@vim.org> parents: 16972 diff changeset	885 unchanged(buf_T *buf, int ff, int always_inc_changedtick)
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	886 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	887 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	888 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	889 buf->b_changed = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	890 ml_setflags(buf);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	891 if (ff)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	892 save_file_ff(buf);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	893 check_status(buf);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	894 redraw_tabline = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	895 #ifdef FEAT_TITLE
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	896 need_maketitle = TRUE; // set window title later
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	897 #endif
16996 d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed Bram Moolenaar <Bram@vim.org> parents: 16972 diff changeset	898 ++CHANGEDTICK(buf);
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	899 }
16996 d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed Bram Moolenaar <Bram@vim.org> parents: 16972 diff changeset	900 else if (always_inc_changedtick)
d5e1e09a829f patch 8.1.1498: ":write" increments b:changedtick even though nothing changed Bram Moolenaar <Bram@vim.org> parents: 16972 diff changeset	901 ++CHANGEDTICK(buf);
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	902 #ifdef FEAT_NETBEANS_INTG
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	903 netbeans_unmodified(buf);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	904 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	905 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	906
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	907 /*
18679 fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	908 * Save the current values of 'fileformat' and 'fileencoding', so that we know
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	909 * the file must be considered changed when the value is different.
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	910 */
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	911 void
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	912 save_file_ff(buf_T *buf)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	913 {
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	914 buf->b_start_ffc = *buf->b_p_ff;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	915 buf->b_start_eol = buf->b_p_eol;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	916 buf->b_start_bomb = buf->b_p_bomb;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	917
18757 c469e1930456 patch 8.1.2368: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18679 diff changeset	918 // Only use free/alloc when necessary, they take time.
18679 fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	919 if (buf->b_start_fenc == NULL
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	920 \|\| STRCMP(buf->b_start_fenc, buf->b_p_fenc) != 0)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	921 {
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	922 vim_free(buf->b_start_fenc);
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	923 buf->b_start_fenc = vim_strsave(buf->b_p_fenc);
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	924 }
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	925 }
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	926
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	927 /*
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	928 * Return TRUE if 'fileformat' and/or 'fileencoding' has a different value
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	929 * from when editing started (save_file_ff() called).
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	930 * Also when 'endofline' was changed and 'binary' is set, or when 'bomb' was
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	931 * changed and 'binary' is not set.
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	932 * Also when 'endofline' was changed and 'fixeol' is not set.
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	933 * When "ignore_empty" is true don't consider a new, empty buffer to be
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	934 * changed.
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	935 */
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	936 int
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	937 file_ff_differs(buf_T *buf, int ignore_empty)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	938 {
18757 c469e1930456 patch 8.1.2368: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18679 diff changeset	939 // In a buffer that was never loaded the options are not valid.
18679 fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	940 if (buf->b_flags & BF_NEVERLOADED)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	941 return FALSE;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	942 if (ignore_empty
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	943 && (buf->b_flags & BF_NEW)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	944 && buf->b_ml.ml_line_count == 1
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	945 && *ml_get_buf(buf, (linenr_T)1, FALSE) == NUL)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	946 return FALSE;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	947 if (buf->b_start_ffc != *buf->b_p_ff)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	948 return TRUE;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	949 if ((buf->b_p_bin \|\| !buf->b_p_fixeol) && buf->b_start_eol != buf->b_p_eol)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	950 return TRUE;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	951 if (!buf->b_p_bin && buf->b_start_bomb != buf->b_p_bomb)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	952 return TRUE;
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	953 if (buf->b_start_fenc == NULL)
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	954 return (*buf->b_p_fenc != NUL);
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	955 return (STRCMP(buf->b_start_fenc, buf->b_p_fenc) != 0);
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	956 }
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	957
fd95d4dbeb37 patch 8.1.2331: the option.c file is still very big Bram Moolenaar <Bram@vim.org> parents: 18642 diff changeset	958 /*
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	959 * 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	960 * Handles Replace mode and multi-byte characters.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	961 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	962 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	963 ins_bytes(char_u *p)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	964 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	965 ins_bytes_len(p, (int)STRLEN(p));
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	966 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	967
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	968 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	969 * 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	970 * Handles Replace mode and multi-byte characters.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	971 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	972 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	973 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	974 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	975 int i;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	976 int n;
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 if (has_mbyte)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	979 for (i = 0; i < len; i += n)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	980 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	981 if (enc_utf8)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	982 // avoid reading past p[len]
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	983 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	984 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	985 n = (*mb_ptr2len)(p + i);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	986 ins_char_bytes(p + i, n);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	987 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	988 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	989 for (i = 0; i < len; ++i)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	990 ins_char(p[i]);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	991 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	992
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	993 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	994 * 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	995 * 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	996 * Caller must have prepared for undo.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	997 * 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	998 * convert bytes to a character.
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 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1001 ins_char(int c)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1002 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1003 char_u buf[MB_MAXBYTES + 1];
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1004 int n = (*mb_char2bytes)(c, buf);
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 // 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	1007 // Happens for CTRL-Vu9900.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1008 if (buf[0] == 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1009 buf[0] = '\n';
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1010
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1011 ins_char_bytes(buf, n);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1012 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1013
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1014 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1015 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	1016 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1017 int c = buf[0];
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1018 int newlen; // nr of bytes inserted
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1019 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	1020 char_u *p;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1021 char_u *newp;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1022 char_u *oldp;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1023 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	1024 colnr_T col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1025 linenr_T lnum = curwin->w_cursor.lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1026 int i;
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 // Break tabs if needed.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1029 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	1030 coladvance_force(getviscol());
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1031
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1032 col = curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1033 oldp = ml_get(lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1034 linelen = (int)STRLEN(oldp) + 1;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1035
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1036 // 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	1037 oldlen = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1038 newlen = charlen;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1039
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1040 if (State & REPLACE_FLAG)
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 if (State & VREPLACE_FLAG)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1043 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1044 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	1045 colnr_T vcol;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1046 int old_list;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1047
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1048 // 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	1049 // 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	1050 // 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	1051 old_list = curwin->w_p_list;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1052 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	1053 curwin->w_p_list = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1054
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1055 // 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	1056 // 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	1057 // 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	1058 // 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	1059 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	1060 new_vcol = vcol + chartabsize(buf, vcol);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1061 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	1062 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1063 vcol += chartabsize(oldp + col + oldlen, vcol);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1064 // 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	1065 // position.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1066 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	1067 break;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1068 oldlen += (*mb_ptr2len)(oldp + col + oldlen);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1069 // Deleted a bit too much, insert spaces.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1070 if (vcol > new_vcol)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1071 newlen += vcol - new_vcol;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1072 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1073 curwin->w_p_list = old_list;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1074 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1075 else if (oldp[col] != NUL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1076 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1077 // normal replace
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1078 oldlen = (*mb_ptr2len)(oldp + col);
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
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1081
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1082 // 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	1083 // 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	1084 // 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	1085 // 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	1086 replace_push(NUL);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1087 for (i = 0; i < oldlen; ++i)
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 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	1091 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1092 replace_push(oldp[col + i]);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1093 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1094 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1095
16764 ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 16714 diff changeset	1096 newp = alloc(linelen + newlen - oldlen);
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1097 if (newp == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1098 return;
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 // Copy bytes before the cursor.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1101 if (col > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1102 mch_memmove(newp, oldp, (size_t)col);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1103
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1104 // Copy bytes after the changed character(s).
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1105 p = newp + col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1106 if (linelen > col + oldlen)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1107 mch_memmove(p + newlen, oldp + col + oldlen,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1108 (size_t)(linelen - col - oldlen));
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1109
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1110 // Insert or overwrite the new character.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1111 mch_memmove(p, buf, charlen);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1112 i = charlen;
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 // Fill with spaces when necessary.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1115 while (i < newlen)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1116 p[i++] = ' ';
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 // Replace the line in the buffer.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1119 ml_replace(lnum, newp, FALSE);
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 // 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	1122 inserted_bytes(lnum, col, newlen - oldlen);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1123
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1124 // 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	1125 // 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	1126 if (p_sm && (State & INSERT)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1127 && msg_silent == 0
17809 59f8948b7590 patch 8.1.1901: the +insert_expand feature is not always available Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	1128 && !ins_compl_active())
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1129 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1130 if (has_mbyte)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1131 showmatch(mb_ptr2char(buf));
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1132 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1133 showmatch(c);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1134 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1135
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1136 #ifdef FEAT_RIGHTLEFT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1137 if (!p_ri \|\| (State & REPLACE_FLAG))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1138 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1139 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1140 // Normal insert: move cursor right
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1141 curwin->w_cursor.col += charlen;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1142 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1143
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1144 // 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	1145 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1146
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1147 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1148 * Insert a string at the cursor position.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1149 * Note: Does NOT handle Replace mode.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1150 * Caller must have prepared for undo.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1151 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1152 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1153 ins_str(char_u *s)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1154 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1155 char_u oldp, newp;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1156 int newlen = (int)STRLEN(s);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1157 int oldlen;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1158 colnr_T col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1159 linenr_T lnum = curwin->w_cursor.lnum;
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 (virtual_active() && curwin->w_cursor.coladd > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1162 coladvance_force(getviscol());
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1163
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1164 col = curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1165 oldp = ml_get(lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1166 oldlen = (int)STRLEN(oldp);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1167
16764 ef00b6bc186b patch 8.1.1384: using "int" for alloc() often results in compiler warnings Bram Moolenaar <Bram@vim.org> parents: 16714 diff changeset	1168 newp = alloc(oldlen + newlen + 1);
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1169 if (newp == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1170 return;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1171 if (col > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1172 mch_memmove(newp, oldp, (size_t)col);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1173 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	1174 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	1175 ml_replace(lnum, newp, FALSE);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1176 inserted_bytes(lnum, col, newlen);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1177 curwin->w_cursor.col += newlen;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1178 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1179
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1180 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1181 * Delete one character under the cursor.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1182 * 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	1183 * Caller must have prepared for undo.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1184 *
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1185 * return FAIL for failure, OK otherwise
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1186 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1187 int
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1188 del_char(int fixpos)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1189 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1190 if (has_mbyte)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1191 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1192 // 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	1193 mb_adjust_cursor();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1194 if (*ml_get_cursor() == NUL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1195 return FAIL;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1196 return del_chars(1L, fixpos);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1197 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1198 return del_bytes(1L, fixpos, TRUE);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1199 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1200
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1201 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1202 * 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	1203 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1204 int
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1205 del_chars(long count, int fixpos)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1206 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1207 long bytes = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1208 long i;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1209 char_u *p;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1210 int l;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1211
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1212 p = ml_get_cursor();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1213 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	1214 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1215 l = (*mb_ptr2len)(p);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1216 bytes += l;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1217 p += l;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1218 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1219 return del_bytes(bytes, fixpos, TRUE);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1220 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1221
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1222 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1223 * Delete "count" bytes under the cursor.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1224 * 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	1225 * Caller must have prepared for undo.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1226 *
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1227 * Return FAIL for failure, OK otherwise.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1228 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1229 int
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1230 del_bytes(
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1231 long count,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1232 int fixpos_arg,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1233 int use_delcombine UNUSED) // 'delcombine' option applies
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1234 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1235 char_u oldp, newp;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1236 colnr_T oldlen;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1237 colnr_T newlen;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1238 linenr_T lnum = curwin->w_cursor.lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1239 colnr_T col = curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1240 int alloc_newp;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1241 long movelen;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1242 int fixpos = fixpos_arg;
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 oldp = ml_get(lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1245 oldlen = (int)STRLEN(oldp);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1246
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1247 // 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	1248 if (col >= oldlen)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1249 return FAIL;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1250
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1251 // 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	1252 if (count == 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1253 return OK;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1254
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1255 // 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	1256 if (count < 1)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1257 {
19027 d72b30bf3a80 patch 8.2.0074: Python 3 unicode test someitmes fails Bram Moolenaar <Bram@vim.org> parents: 18763 diff changeset	1258 siemsg("E292: Invalid count for del_bytes(): %ld", count);
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1259 return FAIL;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1260 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1261
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1262 // 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	1263 // delete the last combining character.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1264 if (p_deco && use_delcombine && enc_utf8
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1265 && utfc_ptr2len(oldp + col) >= count)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1266 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1267 int cc[MAX_MCO];
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1268 int n;
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 (void)utfc_ptr2char(oldp + col, cc);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1271 if (cc[0] != NUL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1272 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1273 // 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	1274 n = col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1275 do
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1276 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1277 col = n;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1278 count = utf_ptr2len(oldp + n);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1279 n += count;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1280 } while (UTF_COMPOSINGLIKE(oldp + col, oldp + n));
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1281 fixpos = 0;
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 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1284
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1285 // When count is too big, reduce it.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1286 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	1287 if (movelen <= 1)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1288 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1289 // 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	1290 // 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	1291 // 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	1292 if (col > 0 && fixpos && restart_edit == 0
25380 ac88cd21ae88 patch 8.2.3227: 'virtualedit' can only be set globally Bram Moolenaar <Bram@vim.org> parents: 25356 diff changeset	1293 && (get_ve_flags() & VE_ONEMORE) == 0)
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1294 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1295 --curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1296 curwin->w_cursor.coladd = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1297 if (has_mbyte)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1298 curwin->w_cursor.col -=
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1299 (*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	1300 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1301 count = oldlen - col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1302 movelen = 1;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1303 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1304 newlen = oldlen - count;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1305
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1306 // 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	1307 // 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	1308 // 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	1309 // 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	1310 // care of notifying Netbeans.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1311 #ifdef FEAT_NETBEANS_INTG
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1312 if (netbeans_active())
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1313 alloc_newp = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1314 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1315 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1316 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	1317 if (!alloc_newp)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1318 newp = oldp; // use same allocated memory
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1319 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1320 { // 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	1321 newp = alloc(newlen + 1);
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1322 if (newp == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1323 return FAIL;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1324 mch_memmove(newp, oldp, (size_t)col);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1325 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1326 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	1327 if (alloc_newp)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1328 ml_replace(lnum, newp, FALSE);
18763 49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name Bram Moolenaar <Bram@vim.org> parents: 18757 diff changeset	1329 #ifdef FEAT_PROP_POPUP
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1330 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1331 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1332 // Also move any following text properties.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1333 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	1334 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	1335 (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	1336 curbuf->b_ml.ml_line_len -= count;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1337 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1338 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1339
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1340 // mark the buffer as changed and prepare for displaying
19534 36ec10251b2b patch 8.2.0324: text property not updated correctly when inserting/deleting Bram Moolenaar <Bram@vim.org> parents: 19027 diff changeset	1341 inserted_bytes(lnum, col, -count);
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1342
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1343 return OK;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1344 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1345
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1346 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1347 * 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	1348 *
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1349 * 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	1350 * 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	1351 *
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1352 * 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	1353 * 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	1354 * new line.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1355 * "flags": OPENLINE_DELSPACES delete spaces after cursor
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1356 * OPENLINE_DO_COM format comments
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1357 * OPENLINE_KEEPTRAIL keep trailing spaces
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1358 * 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	1359 * 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	1360 *
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1361 * "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	1362 * OPENLINE_COM_LIST
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1363 *
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1364 * Return OK for success, FAIL for failure
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 int
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1367 open_line(
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1368 int dir, // FORWARD or BACKWARD
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1369 int flags,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1370 int second_line_indent)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1371 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1372 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	1373 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	1374 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	1375 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	1376 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	1377 pos_T old_cursor; // old cursor position
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1378 int newcol = 0; // new cursor column
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1379 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	1380 int n;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1381 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	1382 int retval = FAIL; // return value
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1383 int extra_len = 0; // length of p_extra string
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1384 int lead_len; // length of comment leader
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1385 char_u *lead_flags; // position in 'comments' for comment leader
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1386 char_u *leader = NULL; // copy of comment leader
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1387 char_u *allocated = NULL; // allocated memory
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1388 char_u *p;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1389 int saved_char = NUL; // init for GCC
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1390 pos_T *pos;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1391 #ifdef FEAT_SMARTINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1392 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	1393 # ifdef FEAT_CINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1394 && !curbuf->b_p_cin
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1395 # endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1396 # ifdef FEAT_EVAL
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1397 && *curbuf->b_p_inde == NUL
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1398 # endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1399 );
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1400 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	1401 int first_char = NUL; // init for GCC
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1402 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1403 #if defined(FEAT_LISP) \|\| defined(FEAT_CINDENT)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1404 int vreplace_mode;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1405 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1406 int did_append; // appended a new line
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1407 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	1408
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1409 // 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	1410 saved_line = vim_strsave(ml_get_curline());
18757 c469e1930456 patch 8.1.2368: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18679 diff changeset	1411 if (saved_line == NULL) // out of memory!
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1412 return FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1413
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1414 if (State & VREPLACE_FLAG)
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 // 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	1417 // 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	1418 // 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	1419 // 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	1420 // 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	1421 // 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	1422 // stuff onto the replace stack. -- webb.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1423 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	1424 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	1425 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1426 next_line = vim_strsave((char_u *)"");
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1427 if (next_line == NULL) // out of memory!
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1428 goto theend;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1429
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1430 // 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	1431 // 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	1432 // 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	1433 // 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	1434 // etc) a bit later.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1435 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	1436 replace_push(NUL);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1437 p = saved_line + curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1438 while (*p != NUL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1439 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1440 if (has_mbyte)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1441 p += replace_push_mb(p);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1442 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1443 replace_push(*p++);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1444 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1445 saved_line[curwin->w_cursor.col] = NUL;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1446 }
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 if ((State & INSERT) && !(State & VREPLACE_FLAG))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1449 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1450 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	1451 #ifdef FEAT_SMARTINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1452 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	1453 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1454 p = skipwhite(p_extra);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1455 first_char = *p;
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 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1458 extra_len = (int)STRLEN(p_extra);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1459 saved_char = *p_extra;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1460 *p_extra = NUL;
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
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1463 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	1464 #ifdef FEAT_SMARTINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1465 did_si = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1466 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1467 ai_col = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1468
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1469 // 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	1470 // 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	1471 // 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	1472 if (dir == FORWARD && did_ai)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1473 trunc_line = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1474
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1475 // 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	1476 // indent to use for the new line.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1477 if (curbuf->b_p_ai
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1478 #ifdef FEAT_SMARTINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1479 \|\| do_si
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1480 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1481 )
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1482 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1483 // count white space on current line
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1484 #ifdef FEAT_VARTABS
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1485 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	1486 curbuf->b_p_vts_array, FALSE);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1487 #else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1488 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	1489 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1490 if (newindent == 0 && !(flags & OPENLINE_COM_LIST))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1491 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	1492
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1493 #ifdef FEAT_SMARTINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1494 // Do smart indenting.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1495 // 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	1496 // 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	1497 // 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	1498 // "if (condition) {"
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1499 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	1500 && (p_extra == NULL \|\| first_char != '{'))
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 char_u *ptr;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1503 char_u last_char;
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 old_cursor = curwin->w_cursor;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1506 ptr = saved_line;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1507 if (flags & OPENLINE_DO_COM)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1508 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	1509 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1510 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1511 if (dir == FORWARD)
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 // Skip preprocessor directives, unless they are
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1514 // recognised as comments.
18203 e0ec4cd7a865 patch 8.1.2096: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 18068 diff changeset	1515 if ( lead_len == 0 && ptr[0] == '#')
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1516 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1517 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	1518 ptr = ml_get(--curwin->w_cursor.lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1519 newindent = get_indent();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1520 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1521 if (flags & OPENLINE_DO_COM)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1522 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	1523 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1524 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1525 if (lead_len > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1526 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1527 // This case gets the following right:
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1528 // /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1529 // * A comment (read '\' as '/').
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1530 // */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1531 // #define IN_THE_WAY
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1532 // This should line up here;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1533 p = skipwhite(ptr);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1534 if (p[0] == '/' && p[1] == '*')
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1535 p++;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1536 if (p[0] == '*')
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1537 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1538 for (p++; *p; p++)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1539 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1540 if (p[0] == '/' && p[-1] == '*')
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1541 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1542 // 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	1543 // with the line containing the start of
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1544 // the comment
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1545 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	1546 if ((pos = findmatch(NULL, NUL)) != NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1547 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1548 curwin->w_cursor.lnum = pos->lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1549 newindent = get_indent();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1550 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1551 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1552 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1553 }
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 else // Not a comment line
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1556 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1557 // Find last non-blank in line
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1558 p = ptr + STRLEN(ptr) - 1;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1559 while (p > ptr && VIM_ISWHITE(*p))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1560 --p;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1561 last_char = *p;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1562
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1563 // find the character just before the '{' or ';'
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1564 if (last_char == '{' \|\| last_char == ';')
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1565 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1566 if (p > ptr)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1567 --p;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1568 while (p > ptr && VIM_ISWHITE(*p))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1569 --p;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1570 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1571 // 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	1572 // lines. eg:
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1573 // if (condition &&
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1574 // condition) {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1575 // Should line up here!
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 if (*p == ')')
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1578 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1579 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	1580 if ((pos = findmatch(NULL, '(')) != NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1581 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1582 curwin->w_cursor.lnum = pos->lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1583 newindent = get_indent();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1584 ptr = ml_get_curline();
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 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1587 // If last character is '{' do indent, without
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1588 // checking for "if" and the like.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1589 if (last_char == '{')
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1590 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1591 did_si = TRUE; // do indent
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1592 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	1593 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1594 // 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	1595 // 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	1596 // '}'.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1597 else if (last_char != ';' && last_char != '}'
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1598 && cin_is_cinword(ptr))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1599 did_si = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1600 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1601 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1602 else // dir == BACKWARD
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1603 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1604 // Skip preprocessor directives, unless they are
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1605 // recognised as comments.
18203 e0ec4cd7a865 patch 8.1.2096: too many #ifdefs Bram Moolenaar <Bram@vim.org> parents: 18068 diff changeset	1606 if (lead_len == 0 && ptr[0] == '#')
16631 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 int was_backslashed = FALSE;
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 while ((ptr[0] == '#' \|\| was_backslashed) &&
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1611 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	1612 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1613 if (*ptr && ptr[STRLEN(ptr) - 1] == '\\')
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1614 was_backslashed = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1615 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1616 was_backslashed = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1617 ptr = ml_get(++curwin->w_cursor.lnum);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1618 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1619 if (was_backslashed)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1620 newindent = 0; // Got to end of file
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1621 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1622 newindent = get_indent();
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 p = skipwhite(ptr);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1625 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	1626 did_si = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1627 else // can delete indent when '{' typed
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1628 can_si_back = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1629 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1630 curwin->w_cursor = old_cursor;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1631 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1632 if (do_si)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1633 can_si = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1634 #endif // FEAT_SMARTINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1635
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1636 did_ai = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1637 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1638
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1639 // 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	1640 // 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	1641 end_comment_pending = NUL;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1642 if (flags & OPENLINE_DO_COM)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1643 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	1644 dir == BACKWARD, TRUE);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1645 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1646 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1647 if (lead_len > 0)
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 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	1650 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	1651 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	1652 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	1653 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	1654 int extra_space = FALSE; // append extra space
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1655 int current_flag;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1656 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	1657 char_u *p2;
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 // 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	1660 // 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	1661 for (p = lead_flags; p && p != ':'; ++p)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1662 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1663 if (*p == COM_BLANK)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1664 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1665 require_blank = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1666 continue;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1667 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1668 if (p == COM_START \|\| p == COM_MIDDLE)
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 current_flag = *p;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1671 if (*p == COM_START)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1672 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1673 // Doing "O" on 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	1674 if (dir == BACKWARD)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1675 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1676 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1677 break;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1678 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1679
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1680 // find start of middle part
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1681 (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	1682 require_blank = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1683 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1684
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1685 // Isolate the strings of the middle and end leader.
18757 c469e1930456 patch 8.1.2368: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18679 diff changeset	1686 while (*p && p[-1] != ':') // find end of middle flags
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1687 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1688 if (*p == COM_BLANK)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1689 require_blank = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1690 ++p;
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 (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	1693
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1694 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	1695 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1696 // Check whether we allow automatic ending of comments
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1697 if (*p == COM_AUTO_END)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1698 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	1699 ++p;
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 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	1702
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1703 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	1704 end_comment_pending = lead_end[n - 1];
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1705
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1706 // If 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	1707 // the comment leader.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1708 if (dir == FORWARD)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1709 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1710 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	1711 if (STRNCMP(p, lead_end, n) == 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1712 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1713 comment_end = p;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1714 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1715 break;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1716 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1717 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1718
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1719 // 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	1720 if (lead_len > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1721 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1722 if (current_flag == COM_START)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1723 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1724 lead_repl = lead_middle;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1725 lead_repl_len = (int)STRLEN(lead_middle);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1726 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1727
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1728 // 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	1729 // 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	1730 // comment leader on the next line.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1731 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	1732 && ((p_extra != NULL
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1733 && (int)curwin->w_cursor.col == lead_len)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1734 \|\| (p_extra == NULL
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1735 && saved_line[lead_len] == NUL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1736 \|\| require_blank))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1737 extra_space = TRUE;
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 break;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1740 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1741 if (*p == COM_END)
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 // 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	1744 // 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	1745 // start (for C-comments).
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1746 if (dir == FORWARD)
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 comment_end = skipwhite(saved_line);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1749 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1750 break;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1751 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1752
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1753 // 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	1754 // 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	1755 while (p > curbuf->b_p_com && *p != ',')
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1756 --p;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1757 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	1758 && lead_repl[-1] != ':'; --lead_repl)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1759 ;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1760 lead_repl_len = (int)(p - lead_repl);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1761
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1762 // 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	1763 // the comment-end
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1764 extra_space = TRUE;
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 // 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	1767 for (p2 = p; p2 && p2 != ':'; p2++)
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 (*p2 == COM_AUTO_END)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1770 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	1771 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1772 if (end_comment_pending == -1)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1773 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1774 // Find last character in end-comment string
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1775 while (p2 && p2 != ',')
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1776 p2++;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1777 end_comment_pending = p2[-1];
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1778 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1779 break;
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 if (*p == COM_FIRST)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1782 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1783 // 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	1784 // 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	1785 if (dir == BACKWARD)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1786 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1787 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1788 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1789 lead_repl = (char_u *)"";
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1790 lead_repl_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1791 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1792 break;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1793 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1794 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1795 if (lead_len)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1796 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1797 // allocate buffer (may concatenate p_extra later)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1798 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	1799 + (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	1800 allocated = leader; // remember to free it later
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 if (leader == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1803 lead_len = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1804 else
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 vim_strncpy(leader, saved_line, lead_len);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1807
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1808 // 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	1809 if (lead_repl != NULL)
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 int c = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1812 int off = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1813
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1814 for (p = lead_flags; p != NUL && p != ':'; )
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 if (p == COM_RIGHT \|\| p == COM_LEFT)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1817 c = *p++;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1818 else if (VIM_ISDIGIT(p) \|\| p == '-')
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1819 off = getdigits(&p);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1820 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1821 ++p;
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 if (c == COM_RIGHT) // right adjusted leader
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 // 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	1826 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	1827 && VIM_ISWHITE(*p); --p)
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 ++p;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1830
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1831 // 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	1832 // screen characters, not bytes.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1833 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1834 int repl_size = vim_strnsize(lead_repl,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1835 lead_repl_len);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1836 int old_size = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1837 char_u *endp = p;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1838 int l;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1839
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1840 while (old_size < repl_size && p > leader)
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 MB_PTR_BACK(leader, p);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1843 old_size += ptr2cells(p);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1844 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1845 l = lead_repl_len - (int)(endp - p);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1846 if (l != 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1847 mch_memmove(endp + l, endp,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1848 (size_t)((leader + lead_len) - endp));
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1849 lead_len += l;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1850 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1851 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	1852 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	1853 p[lead_repl_len] = NUL;
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 // 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	1856 while (--p >= leader)
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 int l = mb_head_off(leader, p);
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 if (l > 1)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1861 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1862 p -= l;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1863 if (ptr2cells(p) > 1)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1864 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1865 p[1] = ' ';
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1866 --l;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1867 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1868 mch_memmove(p + 1, p + l + 1,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1869 (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	1870 lead_len -= l;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1871 *p = ' ';
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1872 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1873 else if (!VIM_ISWHITE(*p))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1874 *p = ' ';
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1875 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1876 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1877 else // left adjusted leader
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 p = skipwhite(leader);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1880
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1881 // 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	1882 // 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	1883 // not to be overwritten.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1884 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1885 int repl_size = vim_strnsize(lead_repl,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1886 lead_repl_len);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1887 int i;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1888 int l;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1889
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1890 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	1891 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1892 l = (*mb_ptr2len)(p + i);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1893 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	1894 break;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1895 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1896 if (i != lead_repl_len)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1897 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1898 mch_memmove(p + lead_repl_len, p + i,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1899 (size_t)(lead_len - i - (p - leader)));
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1900 lead_len += lead_repl_len - i;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1901 }
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 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	1904
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1905 // 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	1906 // 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	1907 // remain the same.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1908 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	1909 if (!VIM_ISWHITE(*p))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1910 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1911 // 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	1912 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	1913 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1914 --lead_len;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1915 mch_memmove(p, p + 1,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1916 (leader + lead_len) - p);
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 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1919 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1920 int l = (*mb_ptr2len)(p);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1921
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1922 if (l > 1)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1923 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1924 if (ptr2cells(p) > 1)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1925 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1926 // Replace a double-wide char with
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1927 // two spaces
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1928 --l;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1929 *p++ = ' ';
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,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1932 (leader + lead_len) - p);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1933 lead_len -= l - 1;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1934 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1935 *p = ' ';
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1936 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1937 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1938 *p = NUL;
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
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1941 // Recompute the indent, it may have changed.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1942 if (curbuf->b_p_ai
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1943 #ifdef FEAT_SMARTINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1944 \|\| do_si
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1945 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1946 )
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1947 #ifdef FEAT_VARTABS
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1948 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	1949 curbuf->b_p_vts_array, FALSE);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1950 #else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1951 newindent = get_indent_str(leader,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1952 (int)curbuf->b_p_ts, FALSE);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1953 #endif
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 // Add the indent offset
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1956 if (newindent + off < 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1957 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1958 off = -newindent;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1959 newindent = 0;
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 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1962 newindent += off;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1963
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1964 // 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	1965 // alignment remains equal.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1966 while (off > 0 && lead_len > 0
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1967 && leader[lead_len - 1] == ' ')
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1968 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1969 // 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	1970 if (vim_strchr(skipwhite(leader), '\t') != NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1971 break;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1972 --lead_len;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1973 --off;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1974 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1975
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1976 // 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	1977 // extra space
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1978 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	1979 extra_space = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1980 leader[lead_len] = NUL;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1981 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1982
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1983 if (extra_space)
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 leader[lead_len++] = ' ';
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1986 leader[lead_len] = NUL;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1987 }
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 newcol = lead_len;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1990
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1991 // 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	1992 // is in the comment leader
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1993 if (newindent
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1994 #ifdef FEAT_SMARTINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1995 \|\| did_si
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1996 #endif
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 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	1999 while (lead_len && VIM_ISWHITE(*leader))
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 --lead_len;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2002 --newcol;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2003 ++leader;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2004 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2005 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2006
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2007 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2008 #ifdef FEAT_SMARTINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2009 did_si = can_si = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2010 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2011 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2012 else if (comment_end != NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2013 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2014 // 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	2015 // 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	2016 // 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	2017 // comment.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2018 if (comment_end[0] == '*' && comment_end[1] == '/' &&
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2019 (curbuf->b_p_ai
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2020 #ifdef FEAT_SMARTINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2021 \|\| do_si
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2022 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2023 ))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2024 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2025 old_cursor = curwin->w_cursor;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2026 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	2027 if ((pos = findmatch(NULL, NUL)) != NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2028 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2029 curwin->w_cursor.lnum = pos->lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2030 newindent = get_indent();
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 curwin->w_cursor = old_cursor;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2033 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2034 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2035 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2036
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2037 // (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	2038 if (p_extra != NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2039 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2040 *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	2041
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2042 // 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	2043 // non-blank.
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 // 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	2046 // 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	2047 if (REPLACE_NORMAL(State))
18757 c469e1930456 patch 8.1.2368: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18679 diff changeset	2048 replace_push(NUL); // end of extra blanks
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2049 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	2050 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2051 while ((p_extra == ' ' \|\| p_extra == '\t')
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2052 && (!enc_utf8
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2053 \|\| !utf_iscomposing(utf_ptr2char(p_extra + 1))))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2054 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2055 if (REPLACE_NORMAL(State))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2056 replace_push(*p_extra);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2057 ++p_extra;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2058 ++less_cols_off;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2059 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2060 }
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 // columns for marks adjusted for removed columns
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2063 less_cols = (int)(p_extra - saved_line);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2064 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2065
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2066 if (p_extra == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2067 p_extra = (char_u *)""; // append empty line
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 // 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	2070 if (lead_len)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2071 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2072 if (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	2073 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2074 int i;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2075 int padding = second_line_indent
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2076 - (newindent + (int)STRLEN(leader));
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2077
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2078 // 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	2079 // 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	2080 // whitespace needed before the comment char.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2081 for (i = 0; i < padding; i++)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2082 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2083 STRCAT(leader, " ");
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2084 less_cols--;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2085 newcol++;
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 STRCAT(leader, p_extra);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2089 p_extra = leader;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2090 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	2091 less_cols -= lead_len;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2092 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2093 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2094 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	2095
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2096 old_cursor = curwin->w_cursor;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2097 if (dir == BACKWARD)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2098 --curwin->w_cursor.lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2099 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	2100 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2101 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	2102 == FAIL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2103 goto theend;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2104 // 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	2105 // with markers.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2106 // 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	2107 // 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	2108 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	2109 #ifdef FEAT_DIFF
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2110 \|\| curwin->w_p_diff
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2111 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2112 )
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2113 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	2114 did_append = TRUE;
18763 49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name Bram Moolenaar <Bram@vim.org> parents: 18757 diff changeset	2115 #ifdef FEAT_PROP_POPUP
16662 1fc9cd08cf3c patch 8.1.1333: text properties don't always move after changes Bram Moolenaar <Bram@vim.org> parents: 16660 diff changeset	2116 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	2117 // 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	2118 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	2119 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	2120 #endif
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2121 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2122 else
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 // 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	2125 curwin->w_cursor.lnum++;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2126 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	2127 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2128 // 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	2129 // again, we don't want to save the new line for undo twice.
18757 c469e1930456 patch 8.1.2368: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18679 diff changeset	2130 (void)u_save_cursor(); // errors are ignored!
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2131 vr_lines_changed++;
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 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	2134 changed_bytes(curwin->w_cursor.lnum, 0);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2135 curwin->w_cursor.lnum--;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2136 did_append = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2137 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2138
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2139 if (newindent
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2140 #ifdef FEAT_SMARTINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2141 \|\| did_si
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2142 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2143 )
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2144 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2145 ++curwin->w_cursor.lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2146 #ifdef FEAT_SMARTINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2147 if (did_si)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2148 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2149 int sw = (int)get_sw_value(curbuf);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2150
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2151 if (p_sr)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2152 newindent -= newindent % sw;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2153 newindent += sw;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2154 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2155 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2156 // Copy the indent
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2157 if (curbuf->b_p_ci)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2158 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2159 (void)copy_indent(newindent, saved_line);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2160
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2161 // 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	2162 // 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	2163 // 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	2164 curbuf->b_p_pi = TRUE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2165 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2166 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2167 (void)set_indent(newindent, SIN_INSERT);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2168 less_cols -= curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2169
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2170 ai_col = curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2171
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2172 // 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	2173 // 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	2174 if (REPLACE_NORMAL(State))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2175 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	2176 replace_push(NUL);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2177 newcol += curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2178 #ifdef FEAT_SMARTINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2179 if (no_si)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2180 did_si = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2181 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2182 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2183
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2184 // 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	2185 // 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	2186 if (REPLACE_NORMAL(State))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2187 while (lead_len-- > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2188 replace_push(NUL);
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 curwin->w_cursor = old_cursor;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2191
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2192 if (dir == FORWARD)
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 if (trunc_line \|\| (State & INSERT))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2195 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2196 // truncate current line at cursor
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2197 saved_line[curwin->w_cursor.col] = NUL;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2198 // 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	2199 if (trunc_line && !(flags & OPENLINE_KEEPTRAIL))
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2200 truncate_spaces(saved_line);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2201 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	2202 saved_line = NULL;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2203 if (did_append)
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 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	2206 curwin->w_cursor.lnum + 1, 1L);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2207 did_append = FALSE;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2208
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2209 // 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	2210 if (flags & OPENLINE_MARKFIX)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2211 mark_col_adjust(curwin->w_cursor.lnum,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2212 curwin->w_cursor.col + less_cols_off,
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2213 1L, (long)-less_cols, 0);
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 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2216 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	2217 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2218
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2219 // 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	2220 // 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	2221 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	2222 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2223 if (did_append)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2224 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	2225
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2226 curwin->w_cursor.col = newcol;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2227 curwin->w_cursor.coladd = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2228
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2229 #if defined(FEAT_LISP) \|\| defined(FEAT_CINDENT)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2230 // 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	2231 // 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	2232 // normal INSERT mode.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2233 if (State & VREPLACE_FLAG)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2234 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2235 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	2236 State = INSERT;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2237 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2238 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2239 vreplace_mode = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2240 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2241 #ifdef FEAT_LISP
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2242 // May do lisp indenting.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2243 if (!p_paste
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2244 && leader == NULL
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2245 && curbuf->b_p_lisp
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2246 && curbuf->b_p_ai)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2247 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2248 fixthisline(get_lisp_indent);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2249 ai_col = (colnr_T)getwhitecols_curline();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2250 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2251 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2252 #ifdef FEAT_CINDENT
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2253 // 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	2254 if (!p_paste
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2255 && (curbuf->b_p_cin
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2256 # ifdef FEAT_EVAL
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2257 \|\| *curbuf->b_p_inde != NUL
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2258 # endif
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 && in_cinkeys(dir == FORWARD
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2261 ? KEY_OPEN_FORW
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2262 : 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	2263 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2264 do_c_expr_indent();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2265 ai_col = (colnr_T)getwhitecols_curline();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2266 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2267 #endif
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2268 #if defined(FEAT_LISP) \|\| defined(FEAT_CINDENT)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2269 if (vreplace_mode != 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2270 State = vreplace_mode;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2271 #endif
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 // 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	2274 // 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	2275 // onto the replace stack (via ins_char()).
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2276 if (State & VREPLACE_FLAG)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2277 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2278 // Put new line in p_extra
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2279 p_extra = vim_strsave(ml_get_curline());
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2280 if (p_extra == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2281 goto theend;
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 // Put back original line
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2284 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	2285
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2286 // Insert new stuff into line again
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2287 curwin->w_cursor.col = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2288 curwin->w_cursor.coladd = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2289 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	2290 vim_free(p_extra);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2291 next_line = NULL;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2292 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2293
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2294 retval = OK; // success!
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2295 theend:
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2296 curbuf->b_p_pi = saved_pi;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2297 vim_free(saved_line);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2298 vim_free(next_line);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2299 vim_free(allocated);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2300 return retval;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2301 }
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 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2304 * Delete from cursor to end of line.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2305 * Caller must have prepared for undo.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2306 * 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	2307 *
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2308 * Return FAIL for failure, OK otherwise.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2309 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2310 int
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2311 truncate_line(int fixpos)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2312 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2313 char_u *newp;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2314 linenr_T lnum = curwin->w_cursor.lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2315 colnr_T col = curwin->w_cursor.col;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2316
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2317 if (col == 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2318 newp = vim_strsave((char_u *)"");
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2319 else
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2320 newp = vim_strnsave(ml_get(lnum), col);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2321
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2322 if (newp == NULL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2323 return FAIL;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2324
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2325 ml_replace(lnum, newp, FALSE);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2326
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2327 // 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	2328 changed_bytes(lnum, curwin->w_cursor.col);
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 // 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	2331 if (fixpos && curwin->w_cursor.col > 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2332 --curwin->w_cursor.col;
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 return OK;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2335 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2336
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2337 /*
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2338 * Delete "nlines" lines at the cursor.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2339 * 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	2340 */
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2341 void
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2342 del_lines(long nlines, int undo)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2343 {
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2344 long n;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2345 linenr_T first = curwin->w_cursor.lnum;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2346
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2347 if (nlines <= 0)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2348 return;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2349
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2350 // save the deleted lines for undo
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2351 if (undo && u_savedel(first, nlines) == FAIL)
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2352 return;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2353
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2354 for (n = 0; n < nlines; )
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 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	2357 break;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2358
20599 d571231175b4 patch 8.2.0853: ml_delete() often called with FALSE argument Bram Moolenaar <Bram@vim.org> parents: 20229 diff changeset	2359 ml_delete_flags(first, ML_DEL_MESSAGE);
16631 7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2360 ++n;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2361
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2362 // If 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	2363 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	2364 break;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2365 }
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2366
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2367 // 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	2368 // trigger a callback to display the cursor.
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2369 curwin->w_cursor.col = 0;
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2370 check_cursor_lnum();
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2371
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2372 // 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	2373 deleted_lines_mark(first, n);
7217a9c5adb3 Add missing files from patch 8.1.1318 Bram Moolenaar <Bram@vim.org> parents: diff changeset	2374 }

Mercurial > vim

annotate src/change.c @ 25895:8e9864b98846 v8.2.3481