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

Removing a condition and a break that cancel each other. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4984 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-06-18 21:23:50 +00:00
parent 336d1b8902
commit a81e141326
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -5,6 +5,8 @@
* src/text.c: And elide a totally unused 'strdata2'. * src/text.c: And elide a totally unused 'strdata2'.
* src/text.c: Rename the undo type UNSPLIT to JOIN, for clarity. * src/text.c: Rename the undo type UNSPLIT to JOIN, for clarity.
* src/global.c, src/rcfile.c: Rename function_type to key_type. * src/global.c, src/rcfile.c: Rename function_type to key_type.
* src/text.c (break_line): Remove a condition and a break that
cancel each other.
2014-06-18 Mark Majeres <mark@engine12.com> 2014-06-18 Mark Majeres <mark@engine12.com>
* src/text.c (add_undo): Don't start a new undo for CUT when the * src/text.c (add_undo): Don't start a new undo for CUT when the

15
src/text.c
View File

@ -1101,9 +1101,7 @@ void update_undo(undo_type action)
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "Done in update_undo (type was %d)\n", action); fprintf(stderr, "Done in update_undo (type was %d)\n", action);
#endif #endif
}
}
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */
#ifndef DISABLE_WRAPPING #ifndef DISABLE_WRAPPING
@ -1354,16 +1352,7 @@ ssize_t break_line(const char *line, ssize_t goal
char_len = parse_mbchar(line, NULL, NULL); char_len = parse_mbchar(line, NULL, NULL);
line += char_len; line += char_len;
while (*line != '\0' && (is_blank_mbchar(line) while (*line != '\0' && is_blank_mbchar(line)) {
#ifndef DISABLE_HELP
|| (newln && *line == '\n')
#endif
)) {
#ifndef DISABLE_HELP
if (newln && *line == '\n')
break;
#endif
char_len = parse_mbchar(line, NULL, NULL); char_len = parse_mbchar(line, NULL, NULL);
line += char_len; line += char_len;