4 files changed, 10 insertions, 7 deletions
diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx
index 01dd78fd7..d8739dfb5 100644
--- a/src/Fl_File_Chooser.cxx
+++ b/src/Fl_File_Chooser.cxx
@@ -218,7 +218,7 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char
         fileName->callback((Fl_Callback*)cb_fileName);
         fileName->when(FL_WHEN_ENTER_KEY);
         Fl_Group::current()->resizable(fileName);
-        fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY_ALWAYS);
+        fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY);
       } // Fl_File_Input* fileName
       { Fl_Box* o = new Fl_Box(10, 310, 105, 25, "Filename:");
         o->labelfont(1);
diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl
index 22b529483..b40fb615d 100644
--- a/src/Fl_File_Chooser.fl
+++ b/src/Fl_File_Chooser.fl
@@ -123,7 +123,7 @@ window->hide();}
         Fl_File_Input fileName {
           callback {fileNameCB();}
           private xywh {115 300 365 35} labelfont 1 when 8 resizable
-          code0 {fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY_ALWAYS);}
+          code0 {fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY);}
         }
         Fl_Box {} {
           label {Filename:}
diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx
index 5e9772e60..3b0562988 100644
--- a/src/Fl_File_Chooser2.cxx
+++ b/src/Fl_File_Chooser2.cxx
@@ -134,9 +134,12 @@ Fl_File_Chooser::count() {
   for (i = 1, fcount = 0; i <= fileList->size(); i ++)
     if (fileList->selected(i)) {
       // See if this file is a directory...
-      filename = (char *)fileList->text(i);
+      // matt: why would we do that? It is perfectly legal to select multiple
+      // directories in a DIR chooser. They are visually selected and value(i)
+      // returns all of them as expected
+      //filename = (char *)fileList->text(i);
 
-      if (filename[strlen(filename) - 1] != '/')
+      //if (filename[strlen(filename) - 1] != '/')
 	fcount ++;
     }
 
@@ -505,8 +508,8 @@ Fl_File_Chooser::fileNameCB()
 		first_line;	// First matching line
   const char	*file;		// File from directory
 
-
 //  puts("fileNameCB()");
+//  printf("Event: %s\n", fl_eventnames[Fl::event()]);
 
   // Get the filename from the text field...
   filename = (char *)fileName->value();
diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx
index 192b35893..fae224401 100644
--- a/src/Fl_Help_View.cxx
+++ b/src/Fl_Help_View.cxx
@@ -2872,7 +2872,7 @@ void Fl_Help_View::end_selection(int clipboard)
           *d++ = *src++;
         }
         c = src[-1];
-        p = isspace(c) ? ' ' : c;
+        p = isspace(c&255) ? ' ' : c;
       }
       continue;
     }
@@ -2888,7 +2888,7 @@ void Fl_Help_View::end_selection(int clipboard)
     }
     int n = s-value_;
     if (n>selection_first && n<=selection_last) {
-      if (!pre && isspace(c)) c = ' ';
+      if (!pre && isspace(c&255)) c = ' ';
       if (p!=' '||c!=' ')
         *d++ = c;
       p = c;