diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-05-11 18:36:34 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-05-11 18:36:34 +0200 |
commit | ec28d1516eb8bb5dcaa42de145953a6d49aebb6f (patch) | |
tree | 6157e2786295b85ef37d8fe8eff0ba08d69684a1 | |
parent | 3f86ca0faa29cb862f876a97f87790f3a46a3858 (diff) |
patch 8.1.1318: code for text changes is in a "misc" filev8.1.1318
Problem: Code for text changes is in a "misc" file.
Solution: Move the code to change.c.
-rw-r--r-- | Filelist | 2 | ||||
-rw-r--r-- | src/Make_cyg_ming.mak | 1 | ||||
-rw-r--r-- | src/Make_dice.mak | 4 | ||||
-rw-r--r-- | src/Make_manx.mak | 6 | ||||
-rw-r--r-- | src/Make_morph.mak | 1 | ||||
-rw-r--r-- | src/Make_mvc.mak | 4 | ||||
-rw-r--r-- | src/Make_sas.mak | 5 | ||||
-rw-r--r-- | src/Make_vms.mms | 10 | ||||
-rw-r--r-- | src/Makefile | 10 | ||||
-rw-r--r-- | src/README.md | 1 | ||||
-rw-r--r-- | src/memline.c | 4 | ||||
-rw-r--r-- | src/misc1.c | 2249 | ||||
-rw-r--r-- | src/proto.h | 1 | ||||
-rw-r--r-- | src/proto/misc1.pro | 22 |
14 files changed, 44 insertions, 2276 deletions
@@ -20,6 +20,7 @@ SRC_ALL = \ src/blob.c \ src/blowfish.c \ src/buffer.c \ + src/change.c \ src/channel.c \ src/charset.c \ src/crypt.c \ @@ -155,6 +156,7 @@ SRC_ALL = \ src/proto/blob.pro \ src/proto/blowfish.pro \ src/proto/buffer.pro \ + src/proto/change.pro \ src/proto/channel.pro \ src/proto/charset.pro \ src/proto/crypt.pro \ diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index a2ff64af20..3e38a27cfe 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -705,6 +705,7 @@ OBJ = \ $(OUTDIR)/blob.o \ $(OUTDIR)/blowfish.o \ $(OUTDIR)/buffer.o \ + $(OUTDIR)/change.o \ $(OUTDIR)/charset.o \ $(OUTDIR)/crypt.o \ $(OUTDIR)/crypt_zip.o \ diff --git a/src/Make_dice.mak b/src/Make_dice.mak index 89fa589459..440955eb34 100644 --- a/src/Make_dice.mak +++ b/src/Make_dice.mak @@ -30,6 +30,7 @@ SRC = \ autocmd.c \ blowfish.c \ buffer.c \ + change.c \ charset.c \ crypt.c \ crypt_zip.c \ @@ -92,6 +93,7 @@ OBJ = o/arabic.o \ o/autocmd.o \ o/blowfish.o \ o/buffer.o \ + o/change.o \ o/charset.o \ o/crypt.o \ o/crypt_zip.o \ @@ -177,6 +179,8 @@ o/blowfish.o: blowfish.c $(SYMS) o/buffer.o: buffer.c $(SYMS) +o/change.o: change.c $(SYMS) + o/charset.o: charset.c $(SYMS) o/crypt.o: crypt.c $(SYMS) diff --git a/src/Make_manx.mak b/src/Make_manx.mak index e53522f06e..211d8ccebf 100644 --- a/src/Make_manx.mak +++ b/src/Make_manx.mak @@ -40,6 +40,7 @@ SRC = arabic.c \ autocmd.c \ blowfish.c \ buffer.c \ + change.c \ charset.c \ crypt.c \ crypt_zip.c \ @@ -104,6 +105,7 @@ OBJ = obj/arabic.o \ obj/autocmd.o \ obj/blowfish.o \ obj/buffer.o \ + obj/change.o \ obj/charset.o \ obj/crypt.o \ obj/crypt_zip.o \ @@ -166,6 +168,7 @@ PRO = proto/arabic.pro \ proto/autocmd.pro \ proto/blowfish.pro \ proto/buffer.pro \ + proto/change.pro \ proto/charset.pro \ proto/crypt.pro \ proto/crypt_zip.pro \ @@ -280,6 +283,9 @@ obj/blowfish.o: blowfish.c obj/buffer.o: buffer.c $(CCSYM) $@ buffer.c +obj/change.o: change.c + $(CCSYM) $@ change.c + obj/charset.o: charset.c $(CCSYM) $@ charset.c diff --git a/src/Make_morph.mak b/src/Make_morph.mak index a5ce62b8c6..1eb5ff52d7 100644 --- a/src/Make_morph.mak +++ b/src/Make_morph.mak @@ -28,6 +28,7 @@ SRC = arabic.c \ autocmd.c \ blowfish.c \ buffer.c \ + change.c \ charset.c \ crypt.c \ crypt_zip.c \ diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 36f18dc056..89f4e13fbb 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -700,6 +700,7 @@ OBJ = \ $(OUTDIR)\blob.obj \ $(OUTDIR)\blowfish.obj \ $(OUTDIR)\buffer.obj \ + $(OUTDIR)\change.obj \ $(OUTDIR)\charset.obj \ $(OUTDIR)\crypt.obj \ $(OUTDIR)\crypt_zip.obj \ @@ -1410,6 +1411,8 @@ $(OUTDIR)/blowfish.obj: $(OUTDIR) blowfish.c $(INCL) $(OUTDIR)/buffer.obj: $(OUTDIR) buffer.c $(INCL) +$(OUTDIR)/change.obj: $(OUTDIR) change.c $(INCL) + $(OUTDIR)/charset.obj: $(OUTDIR) charset.c $(INCL) $(OUTDIR)/crypt.obj: $(OUTDIR) crypt.c $(INCL) @@ -1700,6 +1703,7 @@ proto.h: \ proto/blob.pro \ proto/blowfish.pro \ proto/buffer.pro \ + proto/change.pro \ proto/charset.pro \ proto/crypt.pro \ proto/crypt_zip.pro \ diff --git a/src/Make_sas.mak b/src/Make_sas.mak index 0d8eb3d9ec..7090119d75 100644 --- a/src/Make_sas.mak +++ b/src/Make_sas.mak @@ -93,6 +93,7 @@ SRC = \ autocmd.c \ blowfish.c \ buffer.c \ + change.c \ charset.c \ crypt.c \ crypt_zip.c \ @@ -156,6 +157,7 @@ OBJ = \ autocmd.o \ blowfish.o \ buffer.o \ + change.o \ charset.o \ crypt.o \ crypt_zip.o \ @@ -219,6 +221,7 @@ PRO = \ proto/autocmd.pro \ proto/blowfish.pro \ proto/buffer.pro \ + proto/change.pro \ proto/charset.pro \ proto/crypt.pro \ proto/crypt_zip.pro \ @@ -340,6 +343,8 @@ blowfish.o: blowfish.c proto/blowfish.pro: blowfish.c buffer.o: buffer.c proto/buffer.pro: buffer.c +change.o: change.c +proto/change.pro: change.c charset.o: charset.c proto/charset.pro: charset.c crypt.o: crypt.c diff --git a/src/Make_vms.mms b/src/Make_vms.mms index e25e426fd5..3c41cc0548 100644 --- a/src/Make_vms.mms +++ b/src/Make_vms.mms @@ -2,7 +2,7 @@ # Makefile for Vim on OpenVMS # # Maintainer: Zoltan Arpadffy <arpadffy@polarhome.com> -# Last change: 2019 Apr 26 +# Last change: 2019 May 11 # # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64 # with MMS and MMK @@ -307,7 +307,7 @@ ALL_CFLAGS_VER = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) - ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(GUI_LIB) \ $(PERL_LIB) $(PYTHON_LIB) $(TCL_LIB) $(RUBY_LIB) -SRC = arabic.c autocmd.c beval.c blob.c blowfish.c buffer.c charset.c \ +SRC = arabic.c autocmd.c beval.c blob.c blowfish.c buffer.c change.c, charset.c \ crypt.c crypt_zip.c debugger.c dict.c diff.c digraph.c edit.c eval.c \ evalfunc.c ex_cmds.c ex_cmds2.c ex_docmd.c ex_eval.c ex_getln.c \ if_cscope.c if_xcmdsrv.c fileio.c findfile.c fold.c getchar.c \ @@ -320,7 +320,7 @@ SRC = arabic.c autocmd.c beval.c blob.c blowfish.c buffer.c charset.c \ $(GUI_SRC) $(PERL_SRC) $(PYTHON_SRC) $(TCL_SRC) \ $(RUBY_SRC) $(HANGULIN_SRC) $(MZSCH_SRC) $(XDIFF_SRC) -OBJ = arabic.obj autocmd.obj beval.obj blob.obj blowfish.obj buffer.obj \ +OBJ = arabic.obj autocmd.obj beval.obj blob.obj blowfish.obj buffer.obj change.obj \ charset.obj crypt.obj crypt_zip.obj debugger.obj dict.obj diff.obj \ digraph.obj edit.obj eval.obj evalfunc.obj ex_cmds.obj ex_cmds2.obj \ ex_docmd.obj ex_eval.obj ex_getln.obj if_cscope.obj if_xcmdsrv.obj \ @@ -510,6 +510,10 @@ buffer.obj : buffer.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ globals.h version.h +change.obj : change.c vim.h [.auto]config.h feature.h os_unix.h \ + ascii.h keymap.h term.h macros.h structs.h regexp.h \ + gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ + globals.h version.h charset.obj : charset.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ diff --git a/src/Makefile b/src/Makefile index 10ba8755b7..e50438c178 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1576,6 +1576,7 @@ BASIC_SRC = \ blob.c \ blowfish.c \ buffer.c \ + change.c \ charset.c \ crypt.c \ crypt_zip.c \ @@ -1691,6 +1692,7 @@ OBJ_COMMON = \ objects/autocmd.o \ objects/beval.o \ objects/buffer.o \ + objects/change.o \ objects/blob.o \ objects/blowfish.o \ objects/crypt.o \ @@ -1821,6 +1823,7 @@ PRO_AUTO = \ autocmd.pro \ blowfish.pro \ buffer.pro \ + change.pro \ charset.pro \ crypt.pro \ crypt_zip.pro \ @@ -2965,6 +2968,9 @@ objects/blowfish.o: blowfish.c objects/buffer.o: buffer.c $(CCC) -o $@ buffer.c +objects/change.o: change.c + $(CCC) -o $@ change.c + objects/charset.o: charset.c $(CCC) -o $@ charset.c @@ -3430,6 +3436,10 @@ objects/buffer.o: buffer.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h version.h +objects/change.o: change.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h version.h objects/charset.o: charset.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ diff --git a/src/README.md b/src/README.md index c6bb8ac25c..ff9f93ac6d 100644 --- a/src/README.md +++ b/src/README.md @@ -25,6 +25,7 @@ File name | Description --------- | ----------- autocmd.c | autocommands buffer.c | manipulating buffers (loaded files) +change.c | handling changes to text debugger.c | vim script debugger diff.c | diff mode (vimdiff) eval.c | expression evaluation diff --git a/src/memline.c b/src/memline.c index 1ef7ecfd19..812d10dc1a 100644 --- a/src/memline.c +++ b/src/memline.c @@ -1637,7 +1637,7 @@ ml_recover(void) * empty. Don't set the modified flag then. */ if (!(curbuf->b_ml.ml_line_count == 2 && *ml_get(1) == NUL)) { - changed_int(); + changed_internal(); ++CHANGEDTICK(curbuf); } } @@ -1651,7 +1651,7 @@ ml_recover(void) vim_free(p); if (i != 0) { - changed_int(); + changed_internal(); ++CHANGEDTICK(curbuf); break; } diff --git a/src/misc1.c b/src/misc1.c index a1c9a82711..5dcf268481 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -447,151 +447,6 @@ set_indent( } /* - * Copy the indent from ptr to the current line (and fill to size) - * Leaves the cursor on the first non-blank in the line. - * Returns TRUE if the line was changed. - */ - static int -copy_indent(int size, char_u *src) -{ - char_u *p = NULL; - char_u *line = NULL; - char_u *s; - int todo; - int ind_len; - int line_len = 0; - int tab_pad; - int ind_done; - int round; -#ifdef FEAT_VARTABS - int ind_col; -#endif - - /* Round 1: compute the number of characters needed for the indent - * Round 2: copy the characters. */ - for (round = 1; round <= 2; ++round) - { - todo = size; - ind_len = 0; - ind_done = 0; -#ifdef FEAT_VARTABS - ind_col = 0; -#endif - s = src; - - /* Count/copy the usable portion of the source line */ - while (todo > 0 && VIM_ISWHITE(*s)) - { - if (*s == TAB) - { -#ifdef FEAT_VARTABS - tab_pad = tabstop_padding(ind_done, curbuf->b_p_ts, - curbuf->b_p_vts_array); -#else - tab_pad = (int)curbuf->b_p_ts - - (ind_done % (int)curbuf->b_p_ts); -#endif - /* Stop if this tab will overshoot the target */ - if (todo < tab_pad) - break; - todo -= tab_pad; - ind_done += tab_pad; -#ifdef FEAT_VARTABS - ind_col += tab_pad; -#endif - } - else - { - --todo; - ++ind_done; -#ifdef FEAT_VARTABS - ++ind_col; -#endif - } - ++ind_len; - if (p != NULL) - *p++ = *s; - ++s; - } - - /* Fill to next tabstop with a tab, if possible */ -#ifdef FEAT_VARTABS - tab_pad = tabstop_padding(ind_done, curbuf->b_p_ts, - curbuf->b_p_vts_array); -#else - tab_pad = (int)curbuf->b_p_ts - (ind_done % (int)curbuf->b_p_ts); -#endif - if (todo >= tab_pad && !curbuf->b_p_et) - { - todo -= tab_pad; - ++ind_len; -#ifdef FEAT_VARTABS - ind_col += tab_pad; -#endif - if (p != NULL) - *p++ = TAB; - } - - /* Add tabs required for indent */ - if (!curbuf->b_p_et) - { -#ifdef FEAT_VARTABS - for (;;) - { - tab_pad = tabstop_padding(ind_col, curbuf->b_p_ts, - curbuf->b_p_vts_array); - if (todo < tab_pad) - break; - todo -= tab_pad; - ++ind_len; - ind_col += tab_pad; - if (p != NULL) - *p++ = TAB; - } -#else - while (todo >= (int)curbuf->b_p_ts) - { - todo -= (int)curbuf->b_p_ts; - ++ind_len; - if (p != NULL) - *p++ = TAB; - } -#endif - } - - /* Count/add spaces required for indent */ - while (todo > 0) - { - --todo; - ++ind_len; - if (p != NULL) - *p++ = ' '; - } - - if (p == NULL) - { - /* Allocate memory for the result: the copied indent, new indent - * and the rest of the line. */ - line_len = (int)STRLEN(ml_get_curline()) + 1; - line = alloc(ind_len + line_len); - if (line == NULL) - return FALSE; - p = line; - } - } - - /* Append the original line */ - mch_memmove(p, ml_get_curline(), (size_t)line_len); - - /* Replace the line */ - ml_replace(curwin->w_cursor.lnum, line, FALSE); - - /* Put the cursor after the indent. */ - curwin->w_cursor.col = ind_len; - return TRUE; -} - -/* * Return the indent of the current line after a number. Return -1 if no * number was found. Used for 'n' in 'formatoptions': numbered list. * Since a pattern is used it can actually handle more than numbers. @@ -704,1060 +559,6 @@ get_breakindent_win( } #endif - -/* - * open_line: Add a new line below or above the current line. - * - * For VREPLACE mode, we only add a new line when we get to the end of the - * file, otherwise we just start replacing the next line. - * - * Caller must take care of undo. Since VREPLACE may affect any number of - * lines however, it may call u_save_cursor() again when starting to change a - * new line. - * "flags": OPENLINE_DELSPACES delete spaces after cursor - * OPENLINE_DO_COM format comments - * OPENLINE_KEEPTRAIL keep trailing spaces - * OPENLINE_MARKFIX adjust mark positions after the line break - * OPENLINE_COM_LIST format comments with list or 2nd line indent - * - * "second_line_indent": indent for after ^^D in Insert mode or if flag - * OPENLINE_COM_LIST - * - * Return OK for success, FAIL for failure - */ - int -open_line( - int dir, /* FORWARD or BACKWARD */ - int flags, - int second_line_indent) -{ - char_u *saved_line; /* copy of the original line */ - char_u *next_line = NULL; /* copy of the next line */ - char_u *p_extra = NULL; /* what goes to next line */ - int less_cols = 0; /* less columns for mark in new line */ - int less_cols_off = 0; /* columns to skip for mark adjust */ - pos_T old_cursor; /* old cursor position */ - int newcol = 0; /* new cursor column */ - int newindent = 0; /* auto-indent of the new line */ - int n; - int trunc_line = FALSE; /* truncate current line afterwards */ - int retval = FAIL; /* return value */ -#ifdef FEAT_COMMENTS - int extra_len = 0; /* length of p_extra string */ - int lead_len; /* length of comment leader */ - char_u *lead_flags; /* position in 'comments' for comment leader */ - char_u *leader = NULL; /* copy of comment leader */ -#endif - char_u *allocated = NULL; /* allocated memory */ - char_u *p; - int saved_char = NUL; /* init for GCC */ -#if defined(FEAT_SMARTINDENT) || defined(FEAT_COMMENTS) - pos_T *pos; -#endif -#ifdef FEAT_SMARTINDENT - int do_si = (!p_paste && curbuf->b_p_si -# ifdef FEAT_CINDENT - && !curbuf->b_p_cin -# endif -# ifdef FEAT_EVAL - && *curbuf->b_p_inde == NUL -# endif - ); - int no_si = FALSE; /* reset did_si afterwards */ - int first_char = NUL; /* init for GCC */ -#endif -#if defined(FEAT_LISP) || defined(FEAT_CINDENT) - int vreplace_mode; -#endif - int did_append; /* appended a new line */ - int saved_pi = curbuf->b_p_pi; /* copy of preserveindent setting */ - - /* - * make a copy of the current line so we can mess with it - */ - saved_line = vim_strsave(ml_get_curline()); - if (saved_line == NULL) /* out of memory! */ - return FALSE; - - if (State & VREPLACE_FLAG) - { - /* - * With VREPLACE we make a copy of the next line, which we will be - * starting to replace. First make the new line empty and let vim play - * with the indenting and comment leader to its heart's content. Then - * we grab what it ended up putting on the new line, put back the - * original line, and call ins_char() to put each new character onto - * the line, replacing what was there before and pushing the right - * stuff onto the replace stack. -- webb. - */ - if (curwin->w_cursor.lnum < orig_line_count) - next_line = vim_strsave(ml_get(curwin->w_cursor.lnum + 1)); - else - next_line = vim_strsave((char_u *)""); - if (next_line == NULL) /* out of memory! */ - goto theend; - - /* - * In VREPLACE mode, a NL replaces the rest of the line, and starts - * replacing the next line, so push all of the characters left on the - * line onto the replace stack. We'll push any other characters that - * might be replaced at the start of the next line (due to autoindent - * etc) a bit later. - */ - replace_push(NUL); /* Call twice because BS over NL expects it */ - replace_push(NUL); - p = saved_line + curwin->w_cursor.col; - while (*p != NUL) - { - if (has_mbyte) - p += replace_push_mb(p); - else - replace_push(*p++); - } - saved_line[curwin->w_cursor.col] = NUL; - } - - if ((State & INSERT) && !(State & VREPLACE_FLAG)) - { - p_extra = saved_line + curwin->w_cursor.col; -#ifdef FEAT_SMARTINDENT - if (do_si) /* need first char after new line break */ - { - p = skipwhite(p_extra); - first_char = *p; - } -#endif -#ifdef FEAT_COMMENTS - extra_len = (int)STRLEN(p_extra); -#endif - saved_char = *p_extra; - *p_extra = NUL; - } - - u_clearline(); /* cannot do "U" command when adding lines */ -#ifdef FEAT_SMARTINDENT - did_si = FALSE; -#endif - ai_col = 0; - - /* - * If we just did an auto-indent, then we didn't type anything on - * the prior line, and it should be truncated. Do this even if 'ai' is not - * set because automatically inserting a comment leader also sets did_ai. - */ - if (dir == FORWARD && did_ai) - trunc_line = TRUE; - - /* - * If 'autoindent' and/or 'smartindent' is set, try to figure out what - * indent to use for the new line. - */ - if (curbuf->b_p_ai -#ifdef FEAT_SMARTINDENT - || do_si -#endif - ) - { - /* - * count white space on current line - */ -#ifdef FEAT_VARTABS - newindent = get_indent_str_vtab(saved_line, curbuf->b_p_ts, - curbuf->b_p_vts_array, FALSE); -#else - newindent = get_indent_str(saved_line, (int)curbuf->b_p_ts, FALSE); -#endif - if (newindent == 0 && !(flags & OPENLINE_COM_LIST)) - newindent = second_line_indent; /* for ^^D command in insert mode */ - -#ifdef FEAT_SMARTINDENT - /* - * Do smart indenting. - * In insert/replace mode (only when dir == FORWARD) - * we may move some text to the next line. If it starts with '{' - * don't add an indent. Fixes inserting a NL before '{' in line - * "if (condition) {" - */ - if (!trunc_line && do_si && *saved_line != NUL - && (p_extra == NULL || first_char != '{')) - { - char_u *ptr; - char_u last_char; - - old_cursor = curwin->w_cursor; - ptr = saved_line; -# ifdef FEAT_COMMENTS - if (flags & OPENLINE_DO_COM) - lead_len = get_leader_len(ptr, NULL, FALSE, TRUE); - else - lead_len = 0; -# endif - if (dir == FORWARD) - { - /* - * Skip preprocessor directives, unless they are - * recognised as comments. - */ - if ( -# ifdef FEAT_COMMENTS - lead_len == 0 && -# endif - ptr[0] == '#') - { - while (ptr[0] == '#' && curwin->w_cursor.lnum > 1) - ptr = ml_get(--curwin->w_cursor.lnum); - newindent = get_indent(); - } -# ifdef FEAT_COMMENTS - if (flags & OPENLINE_DO_COM) - lead_len = get_leader_len(ptr, NULL, FALSE, TRUE); - else - lead_len = 0; - if (lead_len > 0) - { - /* - * This case gets the following right: - * \* - * * A comment (read '\' as '/'). - * *\ - * #define IN_THE_WAY - * This should line up here; - */ - p = skipwhite(ptr); - if (p[0] == '/' && p[1] == '*') - p++; - if (p[0] == '*') - { - for (p++; *p; p++) - { - if (p[0] == '/' && p[-1] == '*') - { - /* - * End of C comment, indent should line up - * with the line containing the start of - * the comment - */ - curwin->w_cursor.col = (colnr_T)(p - ptr); - if ((pos = findmatch(NULL, NUL)) != NULL) - { - curwin->w_cursor.lnum = pos->lnum; - newindent = get_indent(); - } - } - } - } - } - else /* Not a comment line */ -# endif - { - /* Find last non-blank in line */ - p = ptr + STRLEN(ptr) - 1; - while (p > ptr && VIM_ISWHITE(*p)) - --p; - last_char = *p; - - /* - * find the character just before the '{' or ';' - */ - if (last_char == '{' || last_char == ';') - { - if (p > ptr) - --p; - while (p > ptr && VIM_ISWHITE(*p)) - --p; - } - /* - * Try to catch lines that are split over multiple - * lines. eg: - * if (condition && - * condition) { - * Should line up here! - * } - */ - if (*p == ')') - { - curwin->w_cursor.col = (colnr_T)(p - ptr); - if ((pos = findmatch(NULL, '(')) != NULL) - { - curwin->w_cursor.lnum = pos->lnum; - newindent = get_indent(); - ptr = ml_get_curline(); - } - } - /* - * If last character is '{' do indent, without - * checking for "if" and the like. - */ - if (last_char == '{') - { - did_si = TRUE; /* do indent */ - no_si = TRUE; /* don't delete it when '{' typed */ - } - /* - * Look for "if" and the like, use 'cinwords'. - * Don't do this if the previous line ended in ';' or - * '}'. - */ - else if (last_char != ';' && last_char != '}' - && cin_is_cinword(ptr)) - did_si = TRUE; - } - } - else /* dir == BACKWARD */ - { - /* - * Skip preprocessor directives, unless they are - * recognised as comments. - */ - if ( -# ifdef FEAT_COMMENTS - lead_len == 0 && -# endif - ptr[0] == '#') - { - int was_backslashed = FALSE; - - while ((ptr[0] == '#' || was_backslashed) && - curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) - { - if (*ptr && ptr[STRLEN(ptr) - 1] == '\\') - was_backslashed = TRUE; - else - was_backslashed = FALSE; - ptr = ml_get(++curwin->w_cursor.lnum); - } - if (was_backslashed) - newindent = 0; /* Got to end of file */ - else - newindent = get_indent(); - } - p = skipwhite(ptr); - if (*p == '}') /* if line starts with '}': do indent */ - did_si = TRUE; - else /* can delete indent when '{' typed */ - can_si_back = TRUE; - } - curwin->w_cursor = old_cursor; - } - if (do_si) - can_si = TRUE; -#endif /* FEAT_SMARTINDENT */ - - did_ai = TRUE; - } - -#ifdef FEAT_COMMENTS - /* - * Find out if the current line starts with a comment leader. - * This may then be inserted in front of the new line. - */ - end_comment_pending = NUL; - if (flags & OPENLINE_DO_COM) - lead_len = get_leader_len(saved_line, &lead_flags, dir == BACKWARD, TRUE); - else - lead_len = 0; - if (lead_len > 0) - { - char_u *lead_repl = NULL; /* replaces comment leader */ - int lead_repl_len = 0; /* length of *lead_repl */ - char_u lead_middle[COM_MAX_LEN]; /* middle-comment string */ - char_u lead_end[COM_MAX_LEN]; /* end-comment string */ - char_u *comment_end = NULL; /* where lead_end has been found */ - int extra_space = FALSE; /* append extra space */ - int current_flag; - int require_blank = FALSE; /* requires blank after middle */ - char_u *p2; - - /* - * If the comment leader has the start, middle or end flag, it may not - * be used or may be replaced with the middle leader. - */ - for (p = lead_flags; *p && *p != ':'; ++p) - { - if (*p == COM_BLANK) - { - require_blank = TRUE; - continue; - } - if (*p == COM_START || *p == COM_MIDDLE) - { - current_flag = *p; - if (*p == COM_START) - { - /* - * Doing "O" on a start of comment does not insert leader. - */ - if (dir == BACKWARD) - { - lead_len = 0; - break; - } - - /* find start of middle part */ - (void)copy_option_part(&p, lead_middle, COM_MAX_LEN, ","); - require_blank = FALSE; - } - - /* - * Isolate the strings of the middle and end leader. - */ - while (*p && p[-1] != ':') /* find end of middle flags */ - { - if (*p == COM_BLANK) - require_blank = TRUE; - ++p; - } - (void)copy_option_part(&p, lead_middle, COM_MAX_LEN, ","); - - while (*p && p[-1] != ':') /* find end of end flags */ - { - /* Check whether we allow automatic ending of comments */ - if (*p == COM_AUTO_END) - end_comment_pending = -1; /* means we want to set it */ - ++p; - } - n = copy_option_part(&p, lead_end, COM_MAX_LEN, ","); - - if (end_comment_pending == -1) /* we can set it now */ - end_comment_pending = lead_end[n - 1]; - - /* - * If the end of the comment is in the same line, don't use - * the comment leader. - */ - if (dir == FORWARD) - { - for (p = saved_line + lead_len; *p; ++p) - if (STRNCMP(p, lead_end, n) == 0) - { - comment_end = p; - lead_len = 0; - break; - } - } - - /* - * Doing "o" on a start of comment inserts the middle leader. - */ - if (lead_len > 0) - { - if (current_flag == COM_START) - { - lead_repl = lead_middle; - lead_repl_len = (int)STRLEN(lead_middle); - } - - /* - * If we have hit RETURN immediately after the start - * comment leader, then put a space after the middle - * comment leader on the next line. - */ - if (!VIM_ISWHITE(saved_line[lead_len - 1]) - && ((p_extra != NULL - && (int)curwin->w_cursor.col == lead_len) - || (p_extra == NULL - && saved_line[lead_len] == NUL) - || require_blank)) - extra_space = TRUE; - } - break; - } - if (*p == COM_END) - { - /* - * Doing "o" on the end of a comment does not insert leader. - * Remember where the end is, might want to use it to find the - * start (for C-comments). - */ - if (dir == FORWARD) - { - comment_end = skipwhite(saved_line); - lead_len = 0; - break; - } - - /* - * Doing "O" on the end of a comment inserts the middle leader. - * Find the string for the middle leader, searching backwards. - */ - while (p > curbuf->b_p_com && *p != ',') - --p; - for (lead_repl = p; lead_repl > curbuf->b_p_com - && lead_repl[-1] != ':'; --lead_repl) - ; - lead_repl_len = (int)(p - lead_repl); - - /* We can probably always add an extra space when doing "O" on - * the comment-end */ - extra_space = TRUE; - - /* Check whether we allow automatic ending of comments */ - for (p2 = p; *p2 && *p2 != ':'; p2++) - { - if (*p2 == COM_AUTO_END) - end_comment_pending = -1; /* means we want to set it */ - } - if (end_comment_pending == -1) - { - /* Find last character in end-comment string */ - while (*p2 && *p2 != ',') - p2++; - end_comment_pending = p2[-1]; - } - break; - } - if (*p == COM_FIRST) - { - /* - * Comment leader for first line only: Don't repeat leader - * when using "O", blank out leader when using "o". - */ - if (dir == BACKWARD) - lead_len = 0; - else - { - lead_repl = (char_u *)""; - lead_repl_len = 0; - } - break; - } - } - if (lead_len) - { - /* allocate buffer (may concatenate p_extra later) */ - leader = alloc(lead_len + lead_repl_len + extra_space + extra_len - + (second_line_indent > 0 ? second_line_indent : 0) + 1); - allocated = leader; /* remember to free it later */ - - if (leader == NULL) - lead_len = 0; - else - { - vim_strncpy(leader, saved_line, lead_len); - - /* - * Replace leader with lead_repl, right or left adjusted - */ - if (lead_repl != NULL) - { - int c = 0; - int off = 0; - - for (p = lead_flags; *p != NUL && *p != ':'; ) - { - if (*p == COM_RIGHT || *p == COM_LEFT) - c = *p++; - else if (VIM_ISDIGIT(*p) || *p == '-') - off = getdigits(&p); - else - ++p; - } - if (c == COM_RIGHT) /* right adjusted leader */ - { - /* find last non-white in the leader to line up with */ - for (p = leader + lead_len - 1; p > leader - && VIM_ISWHITE(*p); --p) - ; - ++p; - - /* Compute the length of the replaced characters in - * screen characters, not bytes. */ - { - int repl_size = vim_strnsize(lead_repl, - lead_repl_len); - int old_size = 0; - char_u *endp = p; - int l; - - while (old_size < repl_size && p > leader) - { - MB_PTR_BACK(leader, p); - old_size += ptr2cells(p); - } - l = lead_repl_len - (int)(endp - p); - if (l != 0) - mch_memmove(endp + l, endp, - (size_t)((leader + lead_len) - endp)); - lead_len += l; - } - mch_memmove(p, lead_repl, (size_t)lead_repl_len); - if (p + lead_repl_len > leader + lead_len) - p[lead_repl_len] = NUL; - - /* blank-out any other chars from the old leader. */ - while (--p >= leader) - { - int l = mb_head_off(leader, p); - - if (l > 1) - { - p -= l; - if (ptr2cells(p) > 1) |