* new version 2.20.8.

   * Make sure titlebar (the line at the top of the screen) always
     contains the name of the folder/newsgroup that is open, if this fits
     in the title.

   * Fix a bug in the Windows version in which width of characters in the
     width ambiguous zone was computed incorrectly. Reported by
     Ulf-Dietrich Braumann.

13 files changed, 57 insertions, 35 deletions

diff --git a/VERSION b/VERSION
index 0e5b3f69..09324607 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.20.7
+2.20.8
diff --git a/alpine/alpine.c b/alpine/alpine.c
index b444c17e..c7542da8 100644
--- a/alpine/alpine.c
+++ b/alpine/alpine.c
@@ -299,7 +299,13 @@ main(int argc, char **argv)
 	exit(-1);
     }
 
+    /* Windows has its own functions to determine width of a character
+     * in the screen, so this is not necessary to do in Window, and
+     * using pith_ucs4width does not produce the correct result
+     */
+#ifndef _WINDOWS
     mail_parameters(NULL, SET_UCS4WIDTH, (void *) pith_ucs4width);
+#endif /* _WINDOWS */
     mail_parameters(NULL, SET_QUOTA, (void *) pine_parse_quota);
     /* set some default timeouts in case pinerc is remote */
     mail_parameters(NULL, SET_OPENTIMEOUT, (void *)(long)30);
diff --git a/alpine/osdep/mswin.rc b/alpine/osdep/mswin.rc
index e7e12bcb..2a93f1cd 100644
--- a/alpine/osdep/mswin.rc
+++ b/alpine/osdep/mswin.rc
@@ -244,8 +244,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,20,7,0
- PRODUCTVERSION 2,20,7,0
+ FILEVERSION 2,20,8,0
+ PRODUCTVERSION 2,20,8,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -267,12 +267,12 @@ BEGIN
 #else
             VALUE "FileDescription", "Alpine\0"
 #endif
-            VALUE "FileVersion", "2.20.7\0"
+            VALUE "FileVersion", "2.20.8\0"
             VALUE "InternalName", "alpine\0"
             VALUE "LegalCopyright", "Copyright 2006-2009 University of Washington, Copyright 2013-2014\0"
             VALUE "OriginalFilename", "alpine.exe\0"
             VALUE "ProductName", "alpine\0"
-            VALUE "ProductVersion", "2.20.7\0"
+            VALUE "ProductVersion", "2.20.8\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/alpine/titlebar.c b/alpine/titlebar.c
index 35f462ad..d190460c 100644
--- a/alpine/titlebar.c
+++ b/alpine/titlebar.c
@@ -396,6 +396,8 @@ current_titlebar_color(void)
         "Title".  The rule for existence is that in the
         space between 1) and 2) there must be one space between
         3) and 4) AND at least 50% of 4) must be displayed.
+	However, if the folder name can be displayed, then do
+	so, and display as much as possible of the collection name.
 
    Returns - Formatted title bar 
  ----*/
@@ -758,6 +760,15 @@ try_smaller_loc:
 			else if(ss_len > 0 && ss_len <= avail){
 			    q = fold_tmp;
 			    strncpy(q, ss_string, sizeof(fold_tmp)-(q-fold_tmp));
+			} else if(fold_len < avail){
+			    q = fold_tmp;
+			    if(fold_len + 7 < avail){
+			       *q++ = '<';
+			       q += utf8_pad_to_width(q, as.context_name, sizeof(fold_tmp)-(q-fold_tmp), avail - fold_len - 3, 1);
+			       *q++ = '>';
+			       *q++ = ' ';
+			    }
+			    strncpy(q, as.folder_name, sizeof(fold_tmp)-(q-fold_tmp));
 			}
 			/* else leave it out */
 		    }
diff --git a/configure b/configure
index de3ef49f..84eee6c5 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Rev:17 by chappa@washington.edu.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.20.7.
+# Generated by GNU Autoconf 2.69 for alpine 2.20.8.
 #
 # Report bugs to <chappa@washington.edu>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='alpine'
 PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.20.7'
-PACKAGE_STRING='alpine 2.20.7'
+PACKAGE_VERSION='2.20.8'
+PACKAGE_STRING='alpine 2.20.8'
 PACKAGE_BUGREPORT='chappa@washington.edu'
 PACKAGE_URL=''
 
@@ -1466,7 +1466,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.20.7 to adapt to many kinds of systems.
+\`configure' configures alpine 2.20.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1536,7 +1536,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of alpine 2.20.7:";;
+     short | recursive ) echo "Configuration of alpine 2.20.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1830,7 +1830,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-alpine configure 2.20.7
+alpine configure 2.20.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2436,7 +2436,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.20.7, which was
+It was created by alpine $as_me 2.20.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3305,7 +3305,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='alpine'
- VERSION='2.20.7'
+ VERSION='2.20.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21303,7 +21303,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.20.7, which was
+This file was extended by alpine $as_me 2.20.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21369,7 +21369,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.20.7
+alpine config.status 2.20.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/doc/alpine.1 b/doc/alpine.1
index de09c608..b844bad9 100644
--- a/doc/alpine.1
+++ b/doc/alpine.1
@@ -1,4 +1,4 @@
-.TH alpine 1 "Version 2.20.7"
+.TH alpine 1 "Version 2.20.8"
 .SH NAME
 alpine \- an Alternatively Licensed Program for Internet News and Email
 .SH SYNTAX 
diff --git a/doc/tech-notes/index.html b/doc/tech-notes/index.html
index 95fae07d..398bf680 100644
--- a/doc/tech-notes/index.html
+++ b/doc/tech-notes/index.html
@@ -3,7 +3,7 @@
 <BODY>
 <H1>Alpine Technical Notes</H1>
  
-Version 2.20.7, April 2015
+Version 2.20.8, April 2015
 
 <H2><A NAME="TOC">Table of Contents</A></H2><P>
 
diff --git a/doc/tech-notes/tech-notes.txt b/doc/tech-notes/tech-notes.txt
index dd5b9c4c..7dcdfe8c 100644
--- a/doc/tech-notes/tech-notes.txt
+++ b/doc/tech-notes/tech-notes.txt
@@ -1,7 +1,7 @@
 
                              Alpine Technical Notes
 
-   Version 2.20.7, April 2015
+   Version 2.20.8, April 2015
 
 Table of Contents
 
diff --git a/mapi/pmapi.c b/mapi/pmapi.c
index fe398992..1fd4d236 100644
--- a/mapi/pmapi.c
+++ b/mapi/pmapi.c
@@ -1952,7 +1952,7 @@ BOOL APIENTRY DllMain(
 
 	now = time((time_t *)0);
 	tm_now = localtime(&now);
-	fprintf(ms_global->dfd, "pmapi32.dll for Alpine Version 2.20.7\r\n");
+	fprintf(ms_global->dfd, "pmapi32.dll for Alpine Version 2.20.8\r\n");
 	fprintf(ms_global->dfd, " Build date: %s\r\n", datestamp);
 	fprintf(ms_global->dfd,
 		" please report all bugs to chappa@gmx.com\r\n");
diff --git a/mapi/pmapi.rc b/mapi/pmapi.rc
index 5c0957ec..b8ca142d 100644
--- a/mapi/pmapi.rc
+++ b/mapi/pmapi.rc
@@ -98,8 +98,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,20,7,0
- PRODUCTVERSION 2,20,7,0
+ FILEVERSION 2,20,8,0
+ PRODUCTVERSION 2,20,8,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x29L
@@ -117,14 +117,14 @@ BEGIN
             VALUE "Comments", "alpine info: http://patches.freeiz.com/alpine\0"
             VALUE "CompanyName", "Patches for Alpine\0"
             VALUE "FileDescription", "Simple MAPI DLL for Alpine for Windows\0"
-            VALUE "FileVersion", "2.20.7\0"
+            VALUE "FileVersion", "2.20.8\0"
             VALUE "InternalName", "pmapi32\0"
             VALUE "LegalCopyright", "Copyright ? University of Washington 2006-2009, Eduardo Chappa 2013-2014\0"
             VALUE "LegalTrademarks", "Apache License, Version 2.0\0"
             VALUE "OriginalFilename", "pmapi32.dll\0"
             VALUE "PrivateBuild", " \0"
             VALUE "ProductName", "Simple MAPI for Alpine for Windows\0"
-            VALUE "ProductVersion", "2.20.7\0"
+            VALUE "ProductVersion", "2.20.8\0"
             VALUE "SpecialBuild", " \0"
         END
     END
diff --git a/pith/charconv/utf8.c b/pith/charconv/utf8.c
index 29341f71..b5ce6255 100644
--- a/pith/charconv/utf8.c
+++ b/pith/charconv/utf8.c
@@ -100,13 +100,14 @@ wcellwidth(UCS ucs)
 #endif
 }
 
+/* ambiguous width zone character function */
 int
 pith_ucs4width(UCS ucs)
 {
 #ifndef _WINDOWS
   return wcwidth((wchar_t) ucs);
 #else
-  return 0;
+  return (ucs >= 0x2100) ? 2 : 1; 
 #endif /* _WINDOWS */
 }
 
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 200be84f..65adbef4 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 76 2015-04-23 00:24:02
+Alpine Commit 77 2015-05-01 23:22:47
 ============= h_news =================
 <HTML>
 <HEAD>
@@ -218,8 +218,12 @@ Additions include:
   <LI> For a multipart/alternative message, the Take Address command will 
        work on the part that is being read.
 
-  <LI> When sending a message, allow for 512 characters of consecutive non-white
-       space before folding the subject line.
+  <LI> When sending a message, allow for 512 characters of consecutive 
+       non-white space before folding the subject line.
+
+  <LI> Make sure titlebar (the line at the top of the screen) always 
+       contains the name of the folder/newsgroup that is open, if this 
+       fits in the title.
 </UL>
 
  
diff --git a/po/Makefile.in b/po/Makefile.in
index 1afc5521..5f5c7387 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -11,7 +11,7 @@
 # Origin: gettext-0.16
 
 PACKAGE = alpine
-VERSION = 2.20.7
+VERSION = 2.20.8
 PACKAGE_BUGREPORT = chappa@washington.edu
 
 SHELL = /bin/sh
@@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644
 # We use $(mkdir_p).
 # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
 # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# ${SHELL} /run/media/echappa/Alpine/alpine/alpinegit/install-sh does not start with $(SHELL), so we add it.
+# ${SHELL} /run/media/chappa/Alpine/alpine/alpinegit/install-sh does not start with $(SHELL), so we add it.
 # In automake >= 1.10, $(MKDIR_P) is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) ${SHELL} /run/media/echappa/Alpine/alpine/alpinegit/install-sh -d
-install_sh = $(SHELL) ${SHELL} /run/media/echappa/Alpine/alpine/alpinegit/install-sh
+mkinstalldirs = $(SHELL) ${SHELL} /run/media/chappa/Alpine/alpine/alpinegit/install-sh -d
+install_sh = $(SHELL) ${SHELL} /run/media/chappa/Alpine/alpine/alpinegit/install-sh
 MKDIR_P = /usr/bin/mkdir -p
 mkdir_p = $(MKDIR_P)
 
@@ -51,12 +51,12 @@ MSGFMT_ = /usr/bin/msgfmt
 MSGFMT_no = /usr/bin/msgfmt
 MSGFMT_yes = /usr/bin/msgfmt
 MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
-XGETTEXT_ = /usr/bin/xgettext
-XGETTEXT_no = /usr/bin/xgettext
-XGETTEXT_yes = /usr/bin/xgettext
+XGETTEXT_ = :
+XGETTEXT_no = :
+XGETTEXT_yes = :
 XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge
-MSGMERGE_UPDATE = /usr/bin/msgmerge --update
+MSGMERGE_UPDATE = : --update
 MSGINIT = msginit
 MSGCONV = msgconv
 MSGFILTER = msgfilter