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

Unwrapping some lines, rewrapping some others more logically, 

plus several other esthetic tweaks.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5275 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2015-06-28 14:12:25 +00:00
parent 296ff1ed2a
commit 953ccc990f
2 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4,6 +4,8 @@
decreased. This fixes Savannah bug #45424. decreased. This fixes Savannah bug #45424.
* src/text.c (do_deletion): There is no need to check again for the * src/text.c (do_deletion): There is no need to check again for the
line ending -- it was done already in the encompassing 'if'. line ending -- it was done already in the encompassing 'if'.
* src/text.c: Unwrap some lines, rewrap some others more logically,
plus several other esthetic tweaks.
2015-06-27 Benno Schulenberg <bensberg@justemail.net> 2015-06-27 Benno Schulenberg <bensberg@justemail.net>
* src/text.c (do_undo, add_undo): Skip undoing a backspace *only* when * src/text.c (do_undo, add_undo): Skip undoing a backspace *only* when

77
src/text.c
View File

@ -73,7 +73,7 @@ char *invocation_error(const char *name)
sprintf(message, invoke_error, name); sprintf(message, invoke_error, name);
return message; return message;
} }
#endif /* !DISABLE_COLOR || !DISABLE_SPELLER */ #endif
/* Delete the character under the cursor. */ /* Delete the character under the cursor. */
void do_deletion(undo_type action) void do_deletion(undo_type action)
@ -82,7 +82,8 @@ void do_deletion(undo_type action)
size_t orig_lenpt = 0; size_t orig_lenpt = 0;
#endif #endif
assert(openfile->current != NULL && openfile->current->data != NULL && openfile->current_x <= strlen(openfile->current->data)); assert(openfile->current != NULL && openfile->current->data != NULL &&
openfile->current_x <= strlen(openfile->current->data));
openfile->placewewant = xplustabs(); openfile->placewewant = xplustabs();
@ -109,9 +110,8 @@ void do_deletion(undo_type action)
null_at(&openfile->current->data, openfile->current_x + null_at(&openfile->current->data, openfile->current_x +
line_len - char_buf_len); line_len - char_buf_len);
#ifndef NANO_TINY #ifndef NANO_TINY
if (openfile->mark_set && openfile->mark_begin == if (openfile->mark_set && openfile->mark_begin == openfile->current &&
openfile->current && openfile->current_x < openfile->current_x < openfile->mark_begin_x)
openfile->mark_begin_x)
openfile->mark_begin_x -= char_buf_len; openfile->mark_begin_x -= char_buf_len;
#endif #endif
openfile->totsize--; openfile->totsize--;
@ -128,8 +128,8 @@ void do_deletion(undo_type action)
strlen(openfile->current->data) + strlen(foo->data) + 1); strlen(openfile->current->data) + strlen(foo->data) + 1);
strcat(openfile->current->data, foo->data); strcat(openfile->current->data, foo->data);
#ifndef NANO_TINY #ifndef NANO_TINY
if (openfile->mark_set && openfile->mark_begin == if (openfile->mark_set &&
openfile->current->next) { openfile->mark_begin == openfile->current->next) {
openfile->mark_begin = openfile->current; openfile->mark_begin = openfile->current;
openfile->mark_begin_x += openfile->current_x; openfile->mark_begin_x += openfile->current_x;
} }
@ -148,8 +148,8 @@ void do_deletion(undo_type action)
/* If the NO_NEWLINES flag isn't set, and text has been added to /* If the NO_NEWLINES flag isn't set, and text has been added to
* the magicline as a result of deleting at the end of the line * the magicline as a result of deleting at the end of the line
* before filebot, add a new magicline. */ * before filebot, add a new magicline. */
if (!ISSET(NO_NEWLINES) && openfile->current == if (!ISSET(NO_NEWLINES) && openfile->current == openfile->filebot &&
openfile->filebot && openfile->current->data[0] != '\0') openfile->current->data[0] != '\0')
new_magicline(); new_magicline();
} else } else
return; return;
@ -166,6 +166,7 @@ void do_deletion(undo_type action)
update_line(openfile->current, openfile->current_x); update_line(openfile->current, openfile->current_x);
} }
/* Delete the character under the cursor. */
void do_delete(void) void do_delete(void)
{ {
do_deletion(DEL); do_deletion(DEL);
@ -175,8 +176,7 @@ void do_delete(void)
* character, and then delete the character under the cursor. */ * character, and then delete the character under the cursor. */
void do_backspace(void) void do_backspace(void)
{ {
if (openfile->current != openfile->fileage || if (openfile->current != openfile->fileage || openfile->current_x > 0) {
openfile->current_x > 0) {
do_left(); do_left();
do_deletion(BACK); do_deletion(BACK);
} }
@ -204,12 +204,9 @@ void do_tab(void)
do_output(output, output_len, TRUE); do_output(output, output_len, TRUE);
free(output); free(output);
} else { } else
#endif #endif
do_output((char *) "\t", 1, TRUE); do_output((char *) "\t", 1, TRUE);
#ifndef NANO_TINY
}
#endif
} }
#ifndef NANO_TINY #ifndef NANO_TINY
@ -288,8 +285,7 @@ void do_indent(ssize_t cols)
if (!unindent) { if (!unindent) {
/* If we're indenting, add the characters in line_indent to /* If we're indenting, add the characters in line_indent to
* the beginning of the non-whitespace text of this line. */ * the beginning of the non-whitespace text of this line. */
f->data = charealloc(f->data, line_len + f->data = charealloc(f->data, line_len + line_indent_len + 1);
line_indent_len + 1);
charmove(&f->data[indent_len + line_indent_len], charmove(&f->data[indent_len + line_indent_len],
&f->data[indent_len], line_len - indent_len + 1); &f->data[indent_len], line_len - indent_len + 1);
strncpy(f->data + indent_len, line_indent, line_indent_len); strncpy(f->data + indent_len, line_indent, line_indent_len);
@ -297,11 +293,10 @@ void do_indent(ssize_t cols)
/* 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 >= indent_len)
openfile->mark_begin_x += line_indent_len; openfile->mark_begin_x += line_indent_len;
if (f == openfile->current && openfile->current_x >= if (f == openfile->current && openfile->current_x >= indent_len)
indent_len)
openfile->current_x += line_indent_len; openfile->current_x += line_indent_len;
/* If the NO_NEWLINES flag isn't set, and this is the /* If the NO_NEWLINES flag isn't set, and this is the
@ -310,12 +305,10 @@ void do_indent(ssize_t cols)
new_magicline(); new_magicline();
} else { } else {
size_t indent_col = strnlenpt(f->data, indent_len); size_t indent_col = strnlenpt(f->data, indent_len);
/* The length in columns of the indentation on this /* The length in columns of the indentation on this line. */
* line. */
if (cols <= indent_col) { if (cols <= indent_col) {
size_t indent_new = actual_x(f->data, indent_col - size_t indent_new = actual_x(f->data, indent_col - cols);
cols);
/* The length of the indentation remaining on /* The length of the indentation remaining on
* this line after we unindent. */ * this line after we unindent. */
size_t indent_shift = indent_len - indent_new; size_t indent_shift = indent_len - indent_new;
@ -339,17 +332,16 @@ void do_indent(ssize_t cols)
openfile->mark_begin_x -= indent_shift; openfile->mark_begin_x -= indent_shift;
} }
if (f == openfile->current && openfile->current_x > if (f == openfile->current &&
indent_new) { openfile->current_x > indent_new) {
if (openfile->current_x <= indent_len) if (openfile->current_x <= indent_len)
openfile->current_x = indent_new; openfile->current_x = indent_new;
else else
openfile->current_x -= indent_shift; openfile->current_x -= indent_shift;
} }
/* We've unindented, so set indent_changed to TRUE. */ /* We've unindented, so the indentation changed. */
if (!indent_changed) indent_changed = TRUE;
indent_changed = TRUE;
} }
} }
} }
@ -497,7 +489,7 @@ void do_undo(void)
case SPLIT_BEGIN: case SPLIT_BEGIN:
undidmsg = _("text add"); undidmsg = _("text add");
break; break;
#endif /* !DISABLE_WRAPPING */ #endif
case JOIN: case JOIN:
undidmsg = _("line join"); undidmsg = _("line join");
/* When the join was done by a Backspace at the tail of the file, /* When the join was done by a Backspace at the tail of the file,
@ -651,7 +643,7 @@ void do_redo(void)
case SPLIT_END: case SPLIT_END:
redidmsg = _("text add"); redidmsg = _("text add");
break; break;
#endif /* !DISABLE_WRAPPING */ #endif
case JOIN: case JOIN:
redidmsg = _("line join"); redidmsg = _("line join");
len = strlen(f->data) + strlen(u->strdata) + 1; len = strlen(f->data) + strlen(u->strdata) + 1;
@ -739,9 +731,8 @@ void do_enter(bool undoing)
#endif #endif
null_at(&openfile->current->data, openfile->current_x); null_at(&openfile->current->data, openfile->current_x);
#ifndef NANO_TINY #ifndef NANO_TINY
if (openfile->mark_set && openfile->current == if (openfile->mark_set && openfile->current == openfile->mark_begin &&
openfile->mark_begin && openfile->current_x < openfile->current_x < openfile->mark_begin_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;
} }
@ -750,8 +741,7 @@ void do_enter(bool undoing)
if (openfile->current == openfile->filebot) if (openfile->current == openfile->filebot)
openfile->filebot = newnode; openfile->filebot = newnode;
splice_node(openfile->current, newnode, splice_node(openfile->current, newnode, openfile->current->next);
openfile->current->next);
renumber(openfile->current); renumber(openfile->current);
openfile->current = newnode; openfile->current = newnode;
@ -965,7 +955,7 @@ void add_undo(undo_type action)
break; break;
case SPLIT_END: case SPLIT_END:
break; break;
#endif /* !DISABLE_WRAPPING */ #endif
case INSERT: case INSERT:
break; break;
case REPLACE: case REPLACE:
@ -1112,8 +1102,8 @@ fprintf(stderr, " >> Updating... action = %d, fs->last_action = %d, openfile->c
u->lineno = u->mark_begin_lineno + u->cutbottom->lineno - u->cutbuffer->lineno; u->lineno = u->mark_begin_lineno + u->cutbottom->lineno - u->cutbuffer->lineno;
if (ISSET(CUT_TO_END) || u->type == CUT_EOF) { if (ISSET(CUT_TO_END) || u->type == CUT_EOF) {
u->begin = strlen(u->cutbottom->data); u->begin = strlen(u->cutbottom->data);
if(u->lineno == u->mark_begin_lineno) if (u->lineno == u->mark_begin_lineno)
u->begin += u->mark_begin_x; u->begin += u->mark_begin_x;
} }
} }
break; break;
@ -1131,7 +1121,7 @@ fprintf(stderr, " >> Updating... action = %d, fs->last_action = %d, openfile->c
#ifndef DISABLE_WRAPPING #ifndef DISABLE_WRAPPING
case SPLIT_BEGIN: case SPLIT_BEGIN:
case SPLIT_END: case SPLIT_END:
#endif /* !DISABLE_WRAPPING */ #endif
case JOIN: case JOIN:
/* These cases are handled by the earlier check for a new line and action. */ /* These cases are handled by the earlier check for a new line and action. */
case OTHER: case OTHER:
@ -2449,7 +2439,7 @@ bool do_int_spell_fix(const char *word)
unpartition_filestruct(&filepart); unpartition_filestruct(&filepart);
openfile->mark_set = TRUE; openfile->mark_set = TRUE;
} }
#endif #endif /* !NANO_TINY */
/* Restore the search/replace strings. */ /* Restore the search/replace strings. */
free(last_search); free(last_search);
@ -2816,7 +2806,7 @@ const char *do_alt_speller(char *tempfile_name)
/* Turn the mark back on. */ /* Turn the mark back on. */
openfile->mark_set = TRUE; openfile->mark_set = TRUE;
} }
#endif #endif /* !NANO_TINY */
/* Go back to the old position. */ /* Go back to the old position. */
goto_line_posx(lineno_save, current_x_save); goto_line_posx(lineno_save, current_x_save);
@ -2903,7 +2893,6 @@ void lint_cleanup(void)
display_main_list(); display_main_list();
} }
/* Run linter. Based on alt-speller code. Return NULL for normal /* Run linter. Based on alt-speller code. Return NULL for normal
* termination, and the error string otherwise. */ * termination, and the error string otherwise. */
void do_linter(void) void do_linter(void)
@ -3210,7 +3199,7 @@ void do_linter(void)
} }
blank_statusbar(); blank_statusbar();
#ifndef NANO_TINY #ifndef NANO_TINY
free_lints_and_return: free_lints_and_return:
#endif #endif
for (tmplint = lints; tmplint != NULL; tmplint = tmplint->next) { for (tmplint = lints; tmplint != NULL; tmplint = tmplint->next) {
free(tmplint->msg); free(tmplint->msg);