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

DB's justify fixes 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1450 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2003-02-12 03:21:45 +00:00
parent fdcb9e92d6
commit 428f620370
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -20,15 +20,21 @@ CVS code
- Fix assumption that matches is null terminated (David - Fix assumption that matches is null terminated (David
Benbennick). Benbennick).
- nano.c: - nano.c:
main() breakable()
- Fix nano not compiling with ENABLE_RCFILE and DISABLE_TABCOMP - Fix incorrect return value on short lines (David Benbennick).
(David Benbennick).
help_init()
- Fix crashing in do_help when COLS < 23 (David Benbennick).
do_help() do_help()
- Fix line lengths not being computed properly, causes display - Fix line lengths not being computed properly, causes display
glitches most noticeable with < 20 rows. New function glitches most noticeable with < 20 rows. New function
nano.c:line_len(). (David Benbennick). nano.c:line_len(). (David Benbennick).
do_justify()
- Add regfree() to quote regex (David Benbennick).
- Only copy previous indent if AUTOINDENT is set (David
Benbennick).
help_init()
- Fix crashing in do_help when COLS < 23 (David Benbennick).
main()
- Fix nano not compiling with ENABLE_RCFILE and DISABLE_TABCOMP
(David Benbennick).
- rcfile.c: - rcfile.c:
colortoint() colortoint()
- Don't bomb after invalid color and print bad color name - Don't bomb after invalid color and print bad color name

17
nano.c
View File

@ -2225,7 +2225,9 @@ int breakable(const char *line, int goal)
else else
goal -= 1; goal -= 1;
} }
return FALSE; /* If goal is not negative, the whole line (one word) was short
* enough. */
return goal >= 0;
} }
/* We are trying to break a chunk off line. We find the last space such /* We are trying to break a chunk off line. We find the last space such
@ -2400,10 +2402,10 @@ int do_justify(void)
/* There is no next paragraph, so nothing to justify. */ /* There is no next paragraph, so nothing to justify. */
if (current->next == NULL) { if (current->next == NULL) {
placewewant = 0; placewewant = 0;
if (current_y > editwinrows - 1)
edit_update(current, CENTER);
else
edit_refresh(); edit_refresh();
#ifdef HAVE_REGEX_H
regfree(&qreg);
#endif
return 0; return 0;
} }
current = current->next; current = current->next;
@ -2486,6 +2488,13 @@ int do_justify(void)
* line and copy text after break_pos into it. */ * line and copy text after break_pos into it. */
splice_node(current, make_new_node(current), splice_node(current, make_new_node(current),
current->next); current->next);
/* In a non-quoted paragraph, we copy the indent only if
AUTOINDENT is turned on. */
if (quote_len == 0)
#ifndef NANO_SMALL
if (!ISSET(AUTOINDENT))
#endif
indent_len = 0;
current->next->data = charalloc(indent_len + line_len - current->next->data = charalloc(indent_len + line_len -
break_pos); break_pos);
strncpy(current->next->data, current->data, strncpy(current->next->data, current->data,