[setup - the official Cygwin setup program used to install Cygwin and keep it up to date] branch master, updated. release_2.876-11-g3074ce5

[setup - the official Cygwin setup program used to install Cygwin and keep it up to date] branch master, updated. release_2.876-11-g3074ce5

[jturney]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=3074ce5eceb9a14ab3afd09458d12c3db701dd77

commit 3074ce5eceb9a14ab3afd09458d12c3db701dd77
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Aug 30 23:07:25 2016 +0100

    Remove unused grammar for dependent package architecture information
    
    A dependency package entry can apparently end with '[architecturelist]', but
    this would be completely ignored if anything ever generated it...
    
    Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=78b032d0c214c2838b21b485253074c41a79492c

commit 78b032d0c214c2838b21b485253074c41a79492c
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sat Sep 10 17:56:27 2016 +0100

    Fully initialize PROPSHEETPAGE
    
    Avoids uninitilized data access errors reported by Dr.Memory
    
    Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=5431e180d4b63ccd46385a5ef4685c1d6730d7be

commit 5431e180d4b63ccd46385a5ef4685c1d6730d7be
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Dec 9 14:56:25 2016 +0000

    Use English button labels 'Keep', 'Current' and 'Test'
    
    Use the English words 'Keep', 'Current' and 'Test' as button labels, rather
    than 'Keep', 'Curr' and 'Exp'.
    
    Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>


Diff:
---
 iniparse.yy |   13 ++-----------
 proppage.cc |    1 +
 res.rc      |    8 ++++----
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/iniparse.yy b/iniparse.yy
index 173c665..8ae1e2d 100644
--- a/iniparse.yy
+++ b/iniparse.yy
@@ -195,8 +195,8 @@ listseparator: /* empty */
  ;
  
 versionedpackageentry /* empty not allowed */
- : STRING { iniBuilder->buildPackageListOrNode($1); } versioncriteria architecture
- | versionedpackageentry OR STRING { iniBuilder->buildPackageListOrNode($3); } versioncriteria architecture
+ : STRING { iniBuilder->buildPackageListOrNode($1); } versioncriteria
+ | versionedpackageentry OR STRING { iniBuilder->buildPackageListOrNode($3); } versioncriteria
  ;
 
 versioncriteria: /* empty */
@@ -210,16 +210,7 @@ operator /* non-empty */
  | LTEQUAL { iniBuilder->buildPackageListOperator (PackageSpecification::LessThanEquals); }
  | GTEQUAL { iniBuilder->buildPackageListOperator (PackageSpecification::MoreThanEquals); }
  ;
- 
-architecture: /* empty */
- | OPENSQUARE architecturelist CLOSESQUARE
- ;
 
-architecturelist: /* empty */
- | architecturelist STRING
- ;
-  
- 
 SourceFilesList: /* empty */
  | SourceFilesList MD5 STRING STRING { iniBuilder->buildSourceFile ((unsigned char *)$2, $3, $4);  } NL
  ;
diff --git a/proppage.cc b/proppage.cc
index c03e5f7..d4d2926 100644
--- a/proppage.cc
+++ b/proppage.cc
@@ -67,6 +67,7 @@ PropertyPage::Create (DLGPROC dlgproc,
 			BOOL (*cproc) (HWND h, int id, HWND hwndctl,
 				       UINT code), int TemplateID)
 {
+  memset(&psp, 0, sizeof (PROPSHEETPAGE));
   psp.dwSize = sizeof (PROPSHEETPAGE);
   psp.dwFlags = 0;
   psp.hInstance = GetInstance ();
diff --git a/res.rc b/res.rc
index 1227418..aad74ac 100644
--- a/res.rc
+++ b/res.rc
@@ -309,7 +309,7 @@ BEGIN
 END
 
 // Width for Keep/Prev/Curr/Exp buttons.
-#define SETUP_KPCE_W		(30)
+#define SETUP_KPCE_W		(35)
 
 // Right-aligned controls.
 #define SETUP_EXP_X		(SETUP_STANDARD_DIALOG_W - SETUP_KPCE_W - 7)
@@ -346,9 +346,9 @@ BEGIN
                     SETUP_CLEAR_W, 14
     CONTROL         "&Keep", IDC_CHOOSE_KEEP, "Button", BS_AUTORADIOBUTTON
                     | WS_GROUP | WS_TABSTOP, SETUP_KEEP_X, 30, SETUP_KPCE_W, 14
-    CONTROL         "C&urr", IDC_CHOOSE_CURR, "Button", BS_AUTORADIOBUTTON,
+    CONTROL         "C&urrent", IDC_CHOOSE_CURR, "Button", BS_AUTORADIOBUTTON,
                     SETUP_CURR_X, 30, SETUP_KPCE_W, 14
-    CONTROL         "E&xp", IDC_CHOOSE_EXP, "Button", BS_AUTORADIOBUTTON,
+    CONTROL         "&Test", IDC_CHOOSE_EXP, "Button", BS_AUTORADIOBUTTON,
                     SETUP_EXP_X, 30, SETUP_KPCE_W, 14
     CONTROL         "", IDC_HEADSEPARATOR, "Static", SS_BLACKFRAME | SS_SUNKEN,
                     0, 28, SETUP_STANDARD_DIALOG_W, 1
@@ -535,7 +535,7 @@ BEGIN
     IDS_TRUSTCURR_TOOLTIP   "Globally select the version that is currently "
        "considered the most stable. (RECOMMENDED)"
     IDS_TRUSTEXP_TOOLTIP    "Globally select the most recent version, even if "
-       "that version is considered Experimental or for test use by the maintainer."
+       "that version is considered experimental or for test use by the maintainer."
     IDS_VIEWBUTTON_TOOLTIP  "Select the package view.  This determines "
        "which packages are shown below.\r\n"
        "\r\n"