diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2009-05-30 12:57:46 -0400 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2009-05-30 12:57:46 -0400 |
| commit | 1d1833659f91e213385bb741e424b4a197f54ceb (patch) | |
| tree | 0cd26ba003e9eee4c251eb674ea88d79750b9596 /src | |
| parent | a321a1e3ce91c7cd6a97cc4a652062ebfa20363f (diff) | |
| download | lynx-snapshots-1d1833659f91e213385bb741e424b4a197f54ceb.tar.gz | |
snapshot of project "lynx", label v2-8-7pre_4b
Diffstat (limited to 'src')
| -rw-r--r-- | src/GridText.c | 12 | ||||
| -rw-r--r-- | src/LYCharUtils.c | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/GridText.c b/src/GridText.c index e45755df..19d634f7 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -1,5 +1,5 @@ /* - * $LynxId: GridText.c,v 1.170 2009/05/29 00:04:24 tom Exp $ + * $LynxId: GridText.c,v 1.171 2009/05/30 12:54:35 tom Exp $ * * Character grid hypertext object * =============================== @@ -2695,7 +2695,6 @@ static HTLine *insert_blanks_in_line(HTLine *line, int line_number, /* line->size is in bytes, so it may be larger than needed... */ int curlim = (ip < ninserts ? oldpos[ip] - /* Include'em all! */ : ((int) line->size <= MAX_LINE ? MAX_LINE + 1 : (int) line->size + 1)); @@ -3196,13 +3195,16 @@ static void split_line(HText *text, unsigned split) spare = WRAP_COLS(text) - (int) style->rightIndent - indent + + ctrl_chars_on_previous_line - LYstrExtent2(previous->data, previous->size); if (spare < 0 && LYwideLines) /* Can be wider than screen */ spare = 0; #else - spare = WRAP_COLS(text) - - (int) style->rightIndent - indent + - ctrl_chars_on_previous_line - previous->size; + spare = WRAP_COLS(text) + - (int) style->rightIndent + - indent + + ctrl_chars_on_previous_line + - previous->size; if (spare < 0 && LYwideLines) /* Can be wider than screen */ spare = 0; diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c index 7e0e0e55..8760ec39 100644 --- a/src/LYCharUtils.c +++ b/src/LYCharUtils.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYCharUtils.c,v 1.99 2009/05/25 13:45:35 tom Exp $ + * $LynxId: LYCharUtils.c,v 1.100 2009/05/30 11:56:03 tom Exp $ * * Functions associated with LYCharSets.c and the Lynx version of HTML.c - FM * ========================================================================== @@ -2113,9 +2113,9 @@ void LYHandleMETA(HTStructured * me, const BOOL *present, } CTRACE((tfp, "LYHandleMETA: HTTP-EQUIV=\"%s\" NAME=\"%s\" CONTENT=\"%s\"\n", - (http_equiv ? http_equiv : "NULL"), - (name ? name : "NULL"), - (content ? content : "NULL"))); + NONNULL(http_equiv), + NONNULL(name), + NONNULL(content))); /* * Make sure we have META name/value pairs to handle. - FM |