diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 1f2c684dc187bbb9bdb83d519414f3aad0cb2cf1..84fcd1eb929ff52f25d7fda16d08ba7386742867 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.676 2008-04-13 15:20:30 geuzaine Exp $
+// $Id: GUI.cpp,v 1.677 2008-04-14 18:30:45 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -1281,17 +1281,17 @@ void GUI::set_context(Context_Item * menu_asked, int flag)
                   (Fl_Callback *) view_alias_cb, (void *)nb, 0);
         p[j]->add("Alias/View with Options", 0, 
                   (Fl_Callback *) view_alias_with_options_cb, (void *)nb, 0);
-        p[j]->add("Combine/Elements from Visible Views", 0, 
+        p[j]->add("Combine Elements/From Visible Views", 0, 
                   (Fl_Callback *) view_combine_space_visible_cb, (void *)nb, 0);
-        p[j]->add("Combine/Elements from All Views", 0, 
+        p[j]->add("Combine Elements/From All Views", 0, 
                   (Fl_Callback *) view_combine_space_all_cb, (void *)nb, 0);
-        p[j]->add("Combine/Elements by View Name", 0, 
+        p[j]->add("Combine Elements/By View Name", 0, 
                   (Fl_Callback *) view_combine_space_by_name_cb, (void *)nb, 0);
-        p[j]->add("Combine/Time Steps from Visible Views", 0, 
+        p[j]->add("Combine Time Steps/From Visible Views", 0, 
                   (Fl_Callback *) view_combine_time_visible_cb, (void *)nb, 0);
-        p[j]->add("Combine/Time Steps from All Views", 0, 
+        p[j]->add("Combine Time Steps/From All Views", 0, 
                   (Fl_Callback *) view_combine_time_all_cb, (void *)nb, 0);
-        p[j]->add("Combine/Time Steps by View Name", 0, 
+        p[j]->add("Combine Time Steps/By View Name", 0, 
                  (Fl_Callback *) view_combine_time_by_name_cb, (void *)nb, 0);
         p[j]->add("Set Visibility/All On", 0, 
                   (Fl_Callback *) view_all_visible_cb, (void *)1, 0);
diff --git a/Parser/Gmsh.l b/Parser/Gmsh.l
index 03ecb92fcfed6f5bc84a93ad600010dac02dd176..8865798d66b2e14459c5c86caba6050d9ef7eece 100644
--- a/Parser/Gmsh.l
+++ b/Parser/Gmsh.l
@@ -1,5 +1,5 @@
 %{
-// $Id: Gmsh.l,v 1.101 2008-03-18 08:41:22 remacle Exp $
+// $Id: Gmsh.l,v 1.102 2008-04-14 18:30:45 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -251,7 +251,7 @@ void skipcomments(void)
 
   while (1) {
     while ((c = yyinput()) != '*'){
-      if(c == EOF){
+      if(feof(yyin)){
         Msg(GERROR, "End of file in commented region");
         return;
       }
@@ -271,7 +271,7 @@ void parsestring(char endchar)
   // etc.) "as is" in the output string: see yyinput() above
   int i = 0;
   while ((c = yyinput()) != endchar) {
-    if(c == EOF){
+    if(feof(yyin)){
       Msg(GERROR, "End of file in string");
       break;
     }
@@ -296,7 +296,7 @@ void skipline()
 {
   int c;
   while ((c = yyinput()) != '\n'){
-    if(c == EOF) return;
+    if(feof(yyin)) return;
   }
 }
 
@@ -318,7 +318,7 @@ void skip_until(const char *skip, const char *until)
   while(1){
     while (1){
       chars[0] = yyinput();
-      if(chars[0] == (char)EOF){
+      if(feof(yyin)){
         Msg(GERROR, "Unexpected end of file");
 	return;
       }
@@ -333,7 +333,7 @@ void skip_until(const char *skip, const char *until)
     }
     for(i=1; i<l; i++){
       chars[i] = yyinput();
-      if(chars[i] == (char)EOF){
+      if(feof(yyin)){
 	l = i;
 	break;
       }
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index bd9f5e63c963173f2485dd68eaeca10c94298133..ac7ff1dea1acbd693e20c7be1e672bcc0dc700fc 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -324,7 +324,7 @@
 /* Copy the first part of user declarations.  */
 #line 1 "Gmsh.y"
 
-// $Id: Gmsh.tab.cpp,v 1.357 2008-03-29 10:19:36 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.358 2008-04-14 18:30:45 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 2a1e44ac922291ff4afda804886d90b7f36f8cc1..3c206685c08ed850ce9f8ddf28d42364034a72fe 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -835,7 +835,7 @@ int gmsh_yy_flex_debug = 0;
 char *gmsh_yytext;
 #line 1 "Gmsh.l"
 #line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.357 2008-03-29 10:19:41 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.358 2008-04-14 18:30:49 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -2851,7 +2851,7 @@ void skipcomments(void)
 
   while (1) {
     while ((c = yyinput()) != '*'){
-      if(c == EOF){
+      if(feof(gmsh_yyin)){
         Msg(GERROR, "End of file in commented region");
         return;
       }
@@ -2871,7 +2871,7 @@ void parsestring(char endchar)
   // etc.) "as is" in the output string: see yyinput() above
   int i = 0;
   while ((c = yyinput()) != endchar) {
-    if(c == EOF){
+    if(feof(gmsh_yyin)){
       Msg(GERROR, "End of file in string");
       break;
     }
@@ -2896,7 +2896,7 @@ void skipline()
 {
   int c;
   while ((c = yyinput()) != '\n'){
-    if(c == EOF) return;
+    if(feof(gmsh_yyin)) return;
   }
 }
 
@@ -2918,7 +2918,7 @@ void skip_until(const char *skip, const char *until)
   while(1){
     while (1){
       chars[0] = yyinput();
-      if(chars[0] == (char)EOF){
+      if(feof(gmsh_yyin)){
         Msg(GERROR, "Unexpected end of file");
 	return;
       }
@@ -2933,7 +2933,7 @@ void skip_until(const char *skip, const char *until)
     }
     for(i=1; i<l; i++){
       chars[i] = yyinput();
-      if(chars[i] == (char)EOF){
+      if(feof(gmsh_yyin)){
 	l = i;
 	break;
       }