diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | PACKAGE/lynx.spec | 4 | ||||
| -rw-r--r-- | PACKAGE/version.iss | 2 | ||||
| -rw-r--r-- | WWW/Library/Implementation/HTTCP.c | 4 | ||||
| -rw-r--r-- | src/GridText.c | 21 | ||||
| -rw-r--r-- | src/LYLocal.c | 8 |
6 files changed, 22 insertions, 23 deletions
diff --git a/CHANGES b/CHANGES index 86ee7f52..360be685 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,11 @@ --- $LynxId: CHANGES,v 1.633 2012/11/17 01:30:19 tom Exp $ +-- $LynxId: CHANGES,v 1.634 2012/11/18 21:54:53 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== -2012-11-16 (2.8.8dev.15) +2012-11-18 (2.8.8dev.15) +* corrected position of highlighting from search/whereis function when using + multibyte characters (Debian #673385) -TD * modify default case for HTLoadGopher() to use the file's suffix to obtain a MIME mapping rather than always storing unknown types to disk (suggested by Dario Niederman) -TD diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec index cbb06339..6a0949a8 100644 --- a/PACKAGE/lynx.spec +++ b/PACKAGE/lynx.spec @@ -1,4 +1,4 @@ -# $LynxId: lynx.spec,v 1.15 2012/11/08 22:39:38 tom Exp $ +# $LynxId: lynx.spec,v 1.16 2012/11/17 01:55:11 tom Exp $ Summary: A text-based Web browser Name: lynx Version: 2.8.8 @@ -24,6 +24,8 @@ HTTP, FTP, WAIS, and NNTP servers. %define lynx_etc %{_sysconfdir}/lynx %prep + +%define debug_package %{nil} %setup -q -n lynx%{version}%{release} %build diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss index 2cc4a0af..1105d26b 100644 --- a/PACKAGE/version.iss +++ b/PACKAGE/version.iss @@ -1,7 +1,7 @@ ; version used for Inno Setup files. ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ -#define LYNX_VERSION "2.8.8dev.15" +#define LYNX_VERSION "2.8.8dev.14" ; most-recent full release and target #define LYNX_RELEASE "2.8.7" diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index 01b52674..b413491b 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTTCP.c,v 1.123 2012/11/13 21:35:01 tom Exp $ + * $LynxId: HTTCP.c,v 1.124 2012/11/18 22:24:15 tom Exp $ * * Generic Communication Code HTTCP.c * ========================== @@ -1470,7 +1470,7 @@ static size_t fill_addrinfo(void **buffer, need += phost->ai_addrlen; need += sizeof(LYNX_ADDRINFO); } - CTRACE((tfp, "...fill_addrinfo %d:%lu\n", limit, need)); + CTRACE((tfp, "...fill_addrinfo %d:%lu\n", limit, (unsigned long) need)); if ((result = calloc(need, sizeof(char))) == 0) outofmem(__FILE__, "fill_addrinfo"); diff --git a/src/GridText.c b/src/GridText.c index ad4dc232..0f8b1e14 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -1,5 +1,5 @@ /* - * $LynxId: GridText.c,v 1.241 2012/11/16 10:55:31 tom Exp $ + * $LynxId: GridText.c,v 1.243 2012/11/18 22:09:20 tom Exp $ * * Character grid hypertext object * =============================== @@ -2163,10 +2163,9 @@ static void display_page(HText *text, ((int) line->offset + LenNeeded) <= DISPLAY_COLS) { size_t itmp = 0; size_t written = 0; - int x_pos = offset + (int) (cp - data); + int x_off = offset + (int) (cp - data); size_t len = strlen(target); size_t utf_extra = 0; - int y; text->page_has_target = YES; @@ -2185,14 +2184,16 @@ static void display_page(HText *text, /* * Ignore special characters. */ - x_pos--; + x_off--; } else if (&data[itmp] >= cp) { if (cp == &data[itmp]) { /* * First printable character of target. */ - LYmove((i + title_lines), x_pos); + LYmove((i + title_lines), + line->offset + LYstrExtent2(line->data, + x_off - line->offset)); } /* * Output all the printable target chars. @@ -2226,17 +2227,11 @@ static void display_page(HText *text, * line. -FM */ LYstopTargetEmphasis(); - LYGetYX(y, offset); - (void) y; data = (char *) &data[itmp]; + offset = (int) (data - line->data + line->offset); - /* - * Adjust the cursor position, should we be at - * the end of the line, or not have another hit - * in it. -FM - */ - LYmove((i + title_lines + 1), 0); } /* end while */ + LYmove((i + title_lines + 1), 0); #endif /* USE_COLOR_STYLE */ #endif /* SHOW_WHEREIS_TARGETS */ diff --git a/src/LYLocal.c b/src/LYLocal.c index 52c57e9f..54d43c85 100644 --- a/src/LYLocal.c +++ b/src/LYLocal.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYLocal.c,v 1.118 2012/02/09 11:45:06 tom Exp $ + * $LynxId: LYLocal.c,v 1.119 2012/11/18 22:25:54 tom Exp $ * * Routines to manipulate the local filesystem. * Written by: Rick Mallett, Carleton University @@ -1568,8 +1568,8 @@ static int permit_location(char *destpath, char amode[10]; char *tmpbuf = NULL; - HTSprintf0(&tmpbuf, "chmod %.4o %s", (unsigned int) new_mode, destpath); - sprintf(amode, "%.4o", (unsigned int) new_mode); + HTSprintf0(&tmpbuf, "chmod %.4o %s", (unsigned) new_mode, destpath); + sprintf(amode, "%.4o", (unsigned) new_mode); args = make_argv("chmod", amode, destpath, @@ -1584,7 +1584,7 @@ static int permit_location(char *destpath, code = -1; } CTRACE((tfp, "builtin chmod %.4o ->%d\n\t%s\n", - new_mode, code, destpath)); + (unsigned) new_mode, code, destpath)); } if (code == 1) LYforce_no_cache = TRUE; /* Force update of dired listing. */ |