diff options
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | alpine/mailview.c | 5 | ||||
| -rw-r--r-- | autom4te.cache/output.0 | 20 | ||||
| -rw-r--r-- | autom4te.cache/output.2 | 20 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | pith/pine.hlp | 7 | ||||
| -rw-r--r-- | pith/string.c | 8 | ||||
| -rw-r--r-- | po/Makefile.in | 2 |
8 files changed, 51 insertions, 33 deletions
@@ -1 +1 @@ -2.11.2 +2.11.3 diff --git a/alpine/mailview.c b/alpine/mailview.c index 86fd627f..2a85bddf 100644 --- a/alpine/mailview.c +++ b/alpine/mailview.c @@ -1423,6 +1423,9 @@ url_launch(HANDLE_S *handle) if(!*toolp) *cmdp++ = ' '; + if(cmdp[-1] == '\'') /* unquote old '_URL_' */ + cmdp--; + copied = 1; for(p = handle->h.url.path; p && *p && cmdp-cmd < URL_MAX_LAUNCH; p++) @@ -1432,6 +1435,8 @@ url_launch(HANDLE_S *handle) if(*toolp) toolp += 5; /* length of "_URL_" */ + if(*toolp == '\'') + toolp++; } else if(!(*cmdp++ = *toolp++)) diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index 740025e2..8749c1fe 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -1,7 +1,7 @@ @%:@! /bin/sh @%:@ From configure.ac Rev:2 by chappa@washington.edu. @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.2. +@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.3. @%:@ @%:@ Report bugs to <chappa@washington.edu>. @%:@ @@ -730,8 +730,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='alpine' PACKAGE_TARNAME='alpine' -PACKAGE_VERSION='2.11.2' -PACKAGE_STRING='alpine 2.11.2' +PACKAGE_VERSION='2.11.3' +PACKAGE_STRING='alpine 2.11.3' PACKAGE_BUGREPORT='chappa@washington.edu' PACKAGE_URL='' @@ -1594,7 +1594,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures alpine 2.11.2 to adapt to many kinds of systems. +\`configure' configures alpine 2.11.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1664,7 +1664,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of alpine 2.11.2:";; + short | recursive ) echo "Configuration of alpine 2.11.3:";; esac cat <<\_ACEOF @@ -1948,7 +1948,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -alpine configure 2.11.2 +alpine configure 2.11.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2554,7 +2554,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by alpine $as_me 2.11.2, which was +It was created by alpine $as_me 2.11.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3375,7 +3375,7 @@ fi # Define the identity of the package. PACKAGE='alpine' - VERSION='2.11.2' + VERSION='2.11.3' cat >>confdefs.h <<_ACEOF @@ -20094,7 +20094,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by alpine $as_me 2.11.2, which was +This file was extended by alpine $as_me 2.11.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20160,7 +20160,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -alpine config.status 2.11.2 +alpine config.status 2.11.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/autom4te.cache/output.2 b/autom4te.cache/output.2 index 740025e2..8749c1fe 100644 --- a/autom4te.cache/output.2 +++ b/autom4te.cache/output.2 @@ -1,7 +1,7 @@ @%:@! /bin/sh @%:@ From configure.ac Rev:2 by chappa@washington.edu. @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.2. +@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.3. @%:@ @%:@ Report bugs to <chappa@washington.edu>. @%:@ @@ -730,8 +730,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='alpine' PACKAGE_TARNAME='alpine' -PACKAGE_VERSION='2.11.2' -PACKAGE_STRING='alpine 2.11.2' +PACKAGE_VERSION='2.11.3' +PACKAGE_STRING='alpine 2.11.3' PACKAGE_BUGREPORT='chappa@washington.edu' PACKAGE_URL='' @@ -1594,7 +1594,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures alpine 2.11.2 to adapt to many kinds of systems. +\`configure' configures alpine 2.11.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1664,7 +1664,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of alpine 2.11.2:";; + short | recursive ) echo "Configuration of alpine 2.11.3:";; esac cat <<\_ACEOF @@ -1948,7 +1948,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -alpine configure 2.11.2 +alpine configure 2.11.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2554,7 +2554,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by alpine $as_me 2.11.2, which was +It was created by alpine $as_me 2.11.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3375,7 +3375,7 @@ fi # Define the identity of the package. PACKAGE='alpine' - VERSION='2.11.2' + VERSION='2.11.3' cat >>confdefs.h <<_ACEOF @@ -20094,7 +20094,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by alpine $as_me 2.11.2, which was +This file was extended by alpine $as_me 2.11.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20160,7 +20160,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -alpine config.status 2.11.2 +alpine config.status 2.11.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Rev:2 by chappa@washington.edu. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for alpine 2.11.2. +# Generated by GNU Autoconf 2.69 for alpine 2.11.3. # # Report bugs to <chappa@washington.edu>. # @@ -730,8 +730,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='alpine' PACKAGE_TARNAME='alpine' -PACKAGE_VERSION='2.11.2' -PACKAGE_STRING='alpine 2.11.2' +PACKAGE_VERSION='2.11.3' +PACKAGE_STRING='alpine 2.11.3' PACKAGE_BUGREPORT='chappa@washington.edu' PACKAGE_URL='' @@ -1594,7 +1594,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures alpine 2.11.2 to adapt to many kinds of systems. +\`configure' configures alpine 2.11.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1664,7 +1664,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of alpine 2.11.2:";; + short | recursive ) echo "Configuration of alpine 2.11.3:";; esac cat <<\_ACEOF @@ -1948,7 +1948,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -alpine configure 2.11.2 +alpine configure 2.11.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2554,7 +2554,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by alpine $as_me 2.11.2, which was +It was created by alpine $as_me 2.11.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3375,7 +3375,7 @@ fi # Define the identity of the package. PACKAGE='alpine' - VERSION='2.11.2' + VERSION='2.11.3' cat >>confdefs.h <<_ACEOF @@ -20094,7 +20094,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by alpine $as_me 2.11.2, which was +This file was extended by alpine $as_me 2.11.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20160,7 +20160,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -alpine config.status 2.11.2 +alpine config.status 2.11.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/pith/pine.hlp b/pith/pine.hlp index 1017d965..ce7d04be 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 26 2013-08-28 22:31:51 +Alpine Commit 27 2013-08-30 23:54:12 ============= h_news ================= <HTML> <HEAD> @@ -191,12 +191,17 @@ Additions include: <P> Bugs that have been addressed include: <UL> + <LI> DATE tokens were not internally transformed to UTF-8, which made their + values appear garbled or incomplete in the screen. Reported by Werner + Scheinast. <LI> Fixes to configure script so that it will not require PAM for every system. <LI> Fix to configure script so that it will use CPPFLAGS instead of CPPCFLAGS, and so the --with-ssl-include-dir option take effect during the build. Fix by Ulf-Dietrich Braumann. <LI> Fix in WebAlpine: do not use deprecated dereference in pointer, needs to use tcl_getstringresult() instead. Reported by Ulf-Dietrich Braumann. + <LI> Quoted string in URL Viewers configuration variable were not + unquoted before passing to viewer. <LI> Fix in configure script to detect location of tcl library; add /usr/local in FreeBSD and fix a bug in configure script that used $alpine_TCLINC instead of $alpine_TCLINC/tcl.h. Reported and fixed diff --git a/pith/string.c b/pith/string.c index a0a826df..65ebd19c 100644 --- a/pith/string.c +++ b/pith/string.c @@ -776,6 +776,14 @@ month_abbrev_locale(int month_num) tm.tm_mon = month_num-1; our_strftime(buf, sizeof(buf), "%b", &tm); + if(strucmp("UTF-8", ps_global->display_charmap)){ + char *s; + s = convert_to_utf8(buf, ps_global->display_charmap, 0); + strncpy(buf, s ? s : "", sizeof(buf)); + buf[sizeof(buf)-1] = '\0'; + if(s) fs_give((void **)&s); + } + /* * If it is all digits, then use the English * words instead. Look for diff --git a/po/Makefile.in b/po/Makefile.in index 70e3682f..16455ca7 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -11,7 +11,7 @@ # Origin: gettext-0.16 PACKAGE = alpine -VERSION = 2.11.2 +VERSION = 2.11.3 PACKAGE_BUGREPORT = chappa@washington.edu SHELL = /bin/sh |