diff options
| -rw-r--r-- | PACKAGE/lynx.iss | 15 | ||||
| -rw-r--r-- | PACKAGE/version.iss | 4 | ||||
| -rw-r--r-- | WWW/Library/Implementation/SGML.c | 4 |
3 files changed, 16 insertions, 7 deletions
diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss index 5c6c99e7..68d9b83c 100644 --- a/PACKAGE/lynx.iss +++ b/PACKAGE/lynx.iss @@ -1,4 +1,4 @@ -; $LynxId: lynx.iss,v 1.30 2019/01/02 10:07:14 tom Exp $ +; $LynxId: lynx.iss,v 1.32 2019/01/27 22:56:58 tom Exp $ ; vile:ts=4 sw=4 notabinsert fk=8bit ; ; This is the BASE script for different flavors of the installer for Lynx. @@ -19,11 +19,15 @@ #define MyAppExeName "lynx.exe" #endif +#if Ver < 0x5060100 #define MySendTo '{sendto}\' + myAppName + '.lnk' +#else +#define MySendTo '{usersendto}\' + myAppName + '.lnk' +#endif #define MyQuickLaunch '{userappdata}\Microsoft\Internet Explorer\Quick Launch\' + myAppName + '.lnk' #ifndef SourceExeName -#define SourceExeName "lynx.exe" +#define SourceExeName "lynx-default.exe" #endif #ifndef NoScreenDll @@ -510,7 +514,12 @@ begin // new-ssl matches "libssl-x-x-z", s/libssl/libcrypto/ SslFilename := 'libcrypto' + Copy(SslFilename, 7, Length(SslFilename)); CopyFromTo( SslDirectory, TargetDir, SslFilename ); - CopyFromTo( SslDirectory, TargetDir, 'msvcr120.dll' ); + // older releases of OpenSSL bundled the Visual Studio runtime + SslFilename := SslDirectory + '\' + 'msvcr120.dll'; + if FileExists(SslFilename) then + begin + CopyFromTo( SslDirectory, TargetDir, 'msvcr120.dll' ); + end end else begin diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss index 3eb17193..7ee688e7 100644 --- a/PACKAGE/version.iss +++ b/PACKAGE/version.iss @@ -4,8 +4,8 @@ #define LYNX_VERSION "2.9.0dev.1" ; most-recent full release and target -#define LYNX_RELEASE "2.8.9" -#define LYNX_TARGETS "2.8.9" +#define LYNX_RELEASE "2.9.0" +#define LYNX_TARGETS "2.9.0" #define MyAppProg "Lynx" #define MyAppName "Lynx - web browser" diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c index 6f0ebc26..47b8304a 100644 --- a/WWW/Library/Implementation/SGML.c +++ b/WWW/Library/Implementation/SGML.c @@ -1,5 +1,5 @@ /* - * $LynxId: SGML.c,v 1.167 2019/01/02 21:06:28 tom Exp $ + * $LynxId: SGML.c,v 1.168 2019/01/27 19:14:06 tom Exp $ * * General SGML Parser code SGML.c * ======================== @@ -1852,7 +1852,7 @@ static void SGML_character(HTStream *me, int c_in) if (TOASCII(clong) < 32 && c != '\t' && c != '\n' && c != '\r' && !IS_CJK_TTY && - !(UTF8_TTY_ISO2022JP && TOASCII(c) == '\033')) + !(UTF8_TTY_ISO2022JP && (TOASCII(c) == '\033'))) goto after_switch; /* |