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

tweaks: adjust some comments and indentation and ordering

master
Benno Schulenberg 2016-12-13 19:27:33 +01:00
parent a772194102
commit ea9f62fc0f
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/text.c
View File

@ -980,7 +980,7 @@ void do_redo(void)
} }
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */
/* Someone hits Enter *gasp!* */ /* Break the current line at the cursor position. */
void do_enter() void do_enter()
{ {
filestruct *newnode = make_new_node(openfile->current); filestruct *newnode = make_new_node(openfile->current);
@ -991,45 +991,48 @@ void do_enter()
#ifndef NANO_TINY #ifndef NANO_TINY
add_undo(ENTER); add_undo(ENTER);
/* Do auto-indenting, like the neolithic Turbo Pascal editor. */
if (ISSET(AUTOINDENT)) { if (ISSET(AUTOINDENT)) {
/* If we are breaking the line in the indentation, the new
* indentation should have only current_x characters, and
* current_x should not change. */
extra = indent_length(openfile->current->data); extra = indent_length(openfile->current->data);
/* If we are breaking the line in the indentation, limit the new
* indentation to the current x position. */
if (extra > openfile->current_x) if (extra > openfile->current_x)
extra = openfile->current_x; extra = openfile->current_x;
} }
#endif #endif
newnode->data = charalloc(strlen(openfile->current->data + newnode->data = charalloc(strlen(openfile->current->data +
openfile->current_x) + extra + 1); openfile->current_x) + extra + 1);
strcpy(&newnode->data[extra], openfile->current->data + strcpy(&newnode->data[extra], openfile->current->data +
openfile->current_x); openfile->current_x);
#ifndef NANO_TINY #ifndef NANO_TINY
if (ISSET(AUTOINDENT)) { if (ISSET(AUTOINDENT)) {
/* Copy the whitespace from the current line to the new one. */
strncpy(newnode->data, openfile->current->data, extra); strncpy(newnode->data, openfile->current->data, extra);
openfile->totsize += extra; openfile->totsize += extra;
} }
#endif #endif
null_at(&openfile->current->data, openfile->current_x); null_at(&openfile->current->data, openfile->current_x);
#ifndef NANO_TINY #ifndef NANO_TINY
/* Adjust the mark if it was on the current line after the cursor. */
if (openfile->mark_set && openfile->current == openfile->mark_begin && if (openfile->mark_set && openfile->current == openfile->mark_begin &&
openfile->current_x < openfile->mark_begin_x) { openfile->current_x < openfile->mark_begin_x) {
openfile->mark_begin = newnode; openfile->mark_begin = newnode;
openfile->mark_begin_x += extra - openfile->current_x; openfile->mark_begin_x += extra - openfile->current_x;
} }
#endif #endif
openfile->current_x = extra;
splice_node(openfile->current, newnode); splice_node(openfile->current, newnode);
openfile->current = newnode;
renumber(newnode); renumber(newnode);
openfile->current = newnode;
openfile->current_x = extra;
openfile->placewewant = xplustabs();
openfile->totsize++; openfile->totsize++;
set_modified(); set_modified();
openfile->placewewant = xplustabs();
#ifndef NANO_TINY #ifndef NANO_TINY
update_undo(ENTER); update_undo(ENTER);
#endif #endif