diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2012-07-12 09:16:02 -0400 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2012-07-12 09:16:02 -0400 |
| commit | 03ef79e69d72d1bea7eb133859a06cb615902d75 (patch) | |
| tree | 9444af95c7e1dec93e6a11530b6120f9cee80f27 | |
| parent | 4e59e679dc753f077bd2ab6f972b76fc16039d9e (diff) | |
| download | lynx-snapshots-03ef79e69d72d1bea7eb133859a06cb615902d75.tar.gz | |
snapshot of project "lynx", label v2-8-8dev_12f
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | makefile.msc | 4 | ||||
| -rw-r--r-- | src/LYMainLoop.c | 8 | ||||
| -rw-r--r-- | src/LYPrint.c | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/CHANGES b/CHANGES index 5e61ef28..f48d418f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,10 @@ --- $LynxId: CHANGES,v 1.600 2012/07/06 21:20:56 tom Exp $ +-- $LynxId: CHANGES,v 1.601 2012/07/12 09:16:02 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== -2012-07-06 (2.8.8dev.13) +2012-07-12 (2.8.8dev.13) +* use PDCurses "wide" variation in makefile.msc -TD * modified quoting for parameter values passed to blat mailer to ensure that it handles embedded blanks (report by pfourier) -TD * fix regression introduced by changes for Debian #603648 -TD diff --git a/makefile.msc b/makefile.msc index ca166495..f2da6d42 100644 --- a/makefile.msc +++ b/makefile.msc @@ -1,4 +1,4 @@ -# $LynxId: makefile.msc,v 1.27 2012/02/10 19:30:03 tom Exp $ +# $LynxId: makefile.msc,v 1.28 2012/07/12 09:16:02 tom Exp $ # # Makefile for `Lynx' browser for Microsoft Visual C++ 4.2 or later # @@ -53,7 +53,7 @@ SSL_LIBS = "$(SSL_DIR)\lib\ssleay32.lib" "$(SSL_DIR)\lib\libeay32.lib" !endif !if "$(SCREEN)" == "pdcurses" -SCREEN_DEFS = /D "PDCURSES" /D "COLOR_CURSES" /D "FANCY_CURSES" +SCREEN_DEFS = /D "PDCURSES" /D "COLOR_CURSES" /D "FANCY_CURSES" /D "WIDE_CURSES" SCREEN_LIB = pdcurses !else SCREEN_DEFS = /D "USE_SLANG" diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c index 8b318ef5..d1520d51 100644 --- a/src/LYMainLoop.c +++ b/src/LYMainLoop.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYMainLoop.c,v 1.209 2012/07/06 16:18:57 tom Exp $ + * $LynxId: LYMainLoop.c,v 1.210 2012/07/07 16:28:47 tom Exp $ */ #include <HTUtils.h> #include <HTAccess.h> @@ -7069,9 +7069,9 @@ int mainloop(void) follow_col = -1; CTRACE((tfp, "Handling key as %s\n", - LYKeycodeToKcmd(cmd) - ? LYKeycodeToKcmd(cmd)->name - : "unknown")); + ((LYKeycodeToKcmd((LYKeymapCode) cmd) != 0) + ? LYKeycodeToKcmd((LYKeymapCode) cmd)->name + : "unknown"))); switch (cmd) { case -1: HTUserMsg(COMMAND_UNKNOWN); diff --git a/src/LYPrint.c b/src/LYPrint.c index 1cea439f..7ba27e08 100644 --- a/src/LYPrint.c +++ b/src/LYPrint.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYPrint.c,v 1.95 2012/02/09 18:55:26 tom Exp $ + * $LynxId: LYPrint.c,v 1.96 2012/07/07 15:19:42 tom Exp $ */ #include <HTUtils.h> #include <HTAccess.h> @@ -504,7 +504,7 @@ static void send_file_to_mail(DocInfo *newdoc, } _statusline(MAIL_ADDRESS_PROMPT); - BStrCopy0(user_response, personal_mail_address); + BStrCopy0(user_response, NonNull(personal_mail_address)); if (LYgetBString(&user_response, VISIBLE, 0, RECALL_MAIL) < 0 || isBEmpty(user_response)) { CancelPrint(MAIL_REQUEST_CANCELLED); |