ENH: merge changes in from main tree

2 files changed, 10 insertions, 6 deletions

diff --git a/Source/MFCDialog/PropertyList.cpp b/Source/MFCDialog/PropertyList.cpp
index 731e870..8765fa8 100644
--- a/Source/MFCDialog/PropertyList.cpp
+++ b/Source/MFCDialog/PropertyList.cpp
@@ -736,6 +736,12 @@ void CPropertyList::OnDelete()
   this->HideControls();
   this->SetTopIndex(0);
   InvalidateList();
+  m_curSel += 1;
+  if(m_curSel > this->GetCount())
+    {
+    m_curSel = this->GetCount();
+    }
+  this->SetCurSel(m_curSel);
 }
 
 void CPropertyList::OnHelp()
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 08102c3..ef7e5fe 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -621,21 +621,19 @@ void cmFindBase::ExpandRegistryAndCleanPath()
         j != this->SearchPathSuffixes.end(); ++j)
       {
       std::string p = *i + std::string("/") + *j;
-      if(cmSystemTools::FileIsDirectory(p.c_str()))
-        {
+      // add to all paths because the search path may be modified 
+      // later with lib being replaced for lib64 which may exist
         this->SearchPaths.push_back(p);
         }
       }
-    }
   // now put the path without the path suffixes in the SearchPaths
   for(i = finalPath.begin();
       i != finalPath.end(); ++i)
     {
-    if(cmSystemTools::FileIsDirectory(i->c_str()))
-      {
+    // put all search paths in because it may later be replaced
+    // by lib64 stuff fixes bug 4009
       this->SearchPaths.push_back(*i);
       }
-    }
 }
 
 void cmFindBase::PrintFindStuff()