ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

text: make indenting add to the beginning of the line 

Instead of inserting the extra whitespace after the current indentation
of a line, add it to the start of the line.  This causes a fixed amount
of visual whitespace to be added regardless of whether --tabstospaces
is used or not.

This fixes http://savannah.gnu.org/bugs/?51438,
and its ancestor https://savannah.gnu.org/bugs/?51408.
master
David Lawrence Ramsey 2017-07-07 11:06:55 -05:00 committed by Benno Schulenberg
parent 566a2daf12
commit 749b1b3d79
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/text.c
View File

@ -315,33 +315,38 @@ void do_indent(void)
line_indent[line_indent_len] = '\0'; line_indent[line_indent_len] = '\0';
/* Go through each line of the text. */ /* Go through the lines to see if there's a non-empty one. */
for (f = top; f != bot->next; f = f->next) {
if (f->data[0] != '\0')
break;
}
/* If all lines are empty, there is nothing to do. */
if (f == bot->next)
return;
/* Go through each of the lines, but skip empty ones. */
for (f = top; f != bot->next; f = f->next) { for (f = top; f != bot->next; f = f->next) {
size_t line_len = strlen(f->data); size_t line_len = strlen(f->data);
size_t indent_len = indent_length(f->data);
/* Add the characters in line_indent to if (f->data[0] == '\0')
* the beginning of the non-whitespace text of this line. */ continue;
/* Add the fabricated indentation to the beginning of the line. */
f->data = charealloc(f->data, line_len + line_indent_len + 1); f->data = charealloc(f->data, line_len + line_indent_len + 1);
charmove(&f->data[indent_len + line_indent_len], charmove(&f->data[line_indent_len], f->data, line_len + 1);
&f->data[indent_len], line_len - indent_len + 1); strncpy(f->data, line_indent, line_indent_len);
strncpy(f->data + indent_len, line_indent, line_indent_len);
openfile->totsize += line_indent_len; openfile->totsize += line_indent_len;
/* Keep track of the change in the current line. */ /* Keep track of the change in the current line. */
if (openfile->mark_set && f == openfile->mark_begin && if (openfile->mark_set && f == openfile->mark_begin)
openfile->mark_begin_x >= indent_len)
openfile->mark_begin_x += line_indent_len; openfile->mark_begin_x += line_indent_len;
if (f == openfile->current && openfile->current_x >= indent_len) { if (f == openfile->current) {
openfile->current_x += line_indent_len; openfile->current_x += line_indent_len;
openfile->placewewant = xplustabs(); openfile->placewewant = xplustabs();
} }
/* If the NO_NEWLINES flag isn't set, and this is the
* magicline, add a new magicline. */
if (!ISSET(NO_NEWLINES) && f == openfile->filebot)
new_magicline();
} }
/* Clean up. */ /* Clean up. */