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

justification: recognize indented paragraphs also without --autoindent 

Pico does not require any option to do this, so nano should neither.

This fixes point 1) of https://savannah.gnu.org/bugs/?53933.
master
Benno Schulenberg 2018-05-18 12:51:14 +02:00
parent a6c0212158
commit d7fe5a7db3
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/text.c
View File

@ -2004,13 +2004,7 @@ bool indents_match(const char *a_line, size_t a_indent, const char
* 2) the line above it is not part of a paragraph, or * 2) the line above it is not part of a paragraph, or
* 3) the line above it has a different quote part, or * 3) the line above it has a different quote part, or
* 4) the indentation of this line is not an initial substring of * 4) the indentation of this line is not an initial substring of
* the indentation of the previous line, or * the indentation of the previous line. */
* 5) this line has no quote part and some indentation, and
* autoindent isn't turned on.
* The reason for number 5) is that if autoindent isn't turned on,
* then an indented line is expected to start a paragraph, as in
* books. Thus, nano can justify an indented paragraph only if
* autoindent is turned on. */
bool begpar(const filestruct *const line) bool begpar(const filestruct *const line)
{ {
size_t quote_len, indent_len, temp_id_len; size_t quote_len, indent_len, temp_id_len;
@ -2032,9 +2026,8 @@ bool begpar(const filestruct *const line)
temp_id_len = indent_length(line->prev->data + quote_len); temp_id_len = indent_length(line->prev->data + quote_len);
/* Case 2) or 5) or 4). */ /* Case 2) or 4). */
if (line->prev->data[quote_len + temp_id_len] == '\0' || if (line->prev->data[quote_len + temp_id_len] == '\0' ||
(quote_len == 0 && indent_len > 0 && !ISSET(AUTOINDENT)) ||
!indents_match(line->prev->data + quote_len, temp_id_len, !indents_match(line->prev->data + quote_len, temp_id_len,
line->data + quote_len, indent_len)) line->data + quote_len, indent_len))
return TRUE; return TRUE;
@ -2402,12 +2395,6 @@ void do_justify(bool full_justify)
* just after the space. */ * just after the space. */
break_pos += indent_len + 1; break_pos += indent_len + 1;
/* If this paragraph is non-quoted, and autoindent isn't
* turned on, set the indentation length to zero so that the
* indentation is treated as part of the line. */
if (quote_len == 0 && !ISSET(AUTOINDENT))
indent_len = 0;
/* Insert a new line after the current one. */ /* Insert a new line after the current one. */
splice_node(openfile->current, make_new_node(openfile->current)); splice_node(openfile->current, make_new_node(openfile->current));