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

tweaks: improve a comment, remove unneeded braces, reshuffle some lines

master
Benno Schulenberg 2021-05-28 16:42:56 +02:00
parent 3a86b24a3e
commit 6ab70c2b0a
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/text.c
View File

@ -60,8 +60,8 @@ void do_mark(void)
} }
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */
/* Insert a tab. If the TABS_TO_SPACES flag is set, insert the number /* Insert a tab. Or, if --tabstospaces is in effect, insert the number
* of spaces that a tab would normally take up. */ * of spaces that a tab would normally take up at this position. */
void do_tab(void) void do_tab(void)
{ {
#ifdef ENABLE_COLOR #ifdef ENABLE_COLOR
@ -133,12 +133,12 @@ void do_indent(void)
indentation = nmalloc(tabsize + 1); indentation = nmalloc(tabsize + 1);
/* Set the indentation to either a bunch of spaces or a single tab. */
#ifdef ENABLE_COLOR #ifdef ENABLE_COLOR
if (openfile->syntax && openfile->syntax->tab) if (openfile->syntax && openfile->syntax->tab)
indentation = mallocstrcpy(indentation, openfile->syntax->tab); indentation = mallocstrcpy(indentation, openfile->syntax->tab);
else else
#endif #endif
/* Set the indentation to either a bunch of spaces or a single tab. */
if (ISSET(TABS_TO_SPACES)) { if (ISSET(TABS_TO_SPACES)) {
memset(indentation, ' ', tabsize); memset(indentation, ' ', tabsize);
indentation[tabsize] = '\0'; indentation[tabsize] = '\0';
@ -415,11 +415,9 @@ void do_comment(void)
/* Comment/uncomment each of the selected lines when possible, and /* Comment/uncomment each of the selected lines when possible, and
* store undo data when a line changed. */ * store undo data when a line changed. */
for (line = top; line != bot->next; line = line->next) { for (line = top; line != bot->next; line = line->next)
if (comment_line(action, line, comment_seq)) { if (comment_line(action, line, comment_seq))
update_multiline_undo(line->lineno, ""); update_multiline_undo(line->lineno, "");
}
}
set_modified(); set_modified();
ensure_firstcolumn_is_aligned(); ensure_firstcolumn_is_aligned();
@ -1084,24 +1082,24 @@ void update_multiline_undo(ssize_t lineno, char *indentation)
/* If there already is a group and the current line is contiguous with it, /* If there already is a group and the current line is contiguous with it,
* extend the group; otherwise, create a new group. */ * extend the group; otherwise, create a new group. */
if (u->grouping && u->grouping->bottom_line + 1 == lineno) { if (u->grouping && u->grouping->bottom_line + 1 == lineno) {
size_t number_of_lines; size_t number_of_lines = lineno - u->grouping->top_line + 1;
u->grouping->bottom_line++; u->grouping->bottom_line = lineno;
number_of_lines = u->grouping->bottom_line - u->grouping->top_line + 1;
u->grouping->indentations = nrealloc(u->grouping->indentations, u->grouping->indentations = nrealloc(u->grouping->indentations,
number_of_lines * sizeof(char *)); number_of_lines * sizeof(char *));
u->grouping->indentations[number_of_lines - 1] = copy_of(indentation); u->grouping->indentations[number_of_lines - 1] = copy_of(indentation);
} else { } else {
groupstruct *born = nmalloc(sizeof(groupstruct)); groupstruct *born = nmalloc(sizeof(groupstruct));
born->next = u->grouping;
u->grouping = born;
born->top_line = lineno; born->top_line = lineno;
born->bottom_line = lineno; born->bottom_line = lineno;
u->grouping->indentations = nmalloc(sizeof(char *)); born->indentations = nmalloc(sizeof(char *));
u->grouping->indentations[0] = copy_of(indentation); born->indentations[0] = copy_of(indentation);
born->next = u->grouping;
u->grouping = born;
} }
/* Store the file size after the change, to be used when redoing. */ /* Store the file size after the change, to be used when redoing. */