diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp
index 424bcbf428fdf014cfe793f9a902066c84bab142..e6157b49c6da0ce03e906184ba91ef4bbd58f526 100644
--- a/Graphics/Geom.cpp
+++ b/Graphics/Geom.cpp
@@ -1,4 +1,4 @@
-// $Id: Geom.cpp,v 1.12 2001-01-12 13:28:58 geuzaine Exp $
+// $Id: Geom.cpp,v 1.13 2001-01-24 11:24:05 geuzaine Exp $
 
 #include "Gmsh.h"
 #include "GmshUI.h"
@@ -784,10 +784,21 @@ void ZeroHighlight(Mesh *m){
 
 void BeginHighlight(void){
   if(CTX.geom.highlight){
+#ifdef _XMOTIF
+    if(CTX.overlay){ 
+      InitOverlay();
+    }
+    else{ 
+      Init();
+    }
+#endif
     Highlighted = 1;
     glPushMatrix();
     InitPosition();    
-  }  
+#ifdef _XMOTIF
+    if(CTX.db) glDrawBuffer(GL_FRONT);
+#endif
+  }
 }
 
 
@@ -800,6 +811,9 @@ void EndHighlight(int permanent){
   else{
     if(CTX.geom.highlight) {
       glPopMatrix();
+#ifdef _XMOTIF
+      if(CTX.db) glDrawBuffer(GL_BACK);
+#endif
     }
   }
 }
diff --git a/Makefile b/Makefile
index a230a65102c28d067a09b9a88920b296c4a928fe..a05d66fbe3a23dc2236956bc945aec6d53dc54aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.42 2001-01-19 22:32:31 remacle Exp $
+# $Id: Makefile,v 1.43 2001-01-24 11:24:03 geuzaine Exp $
 # ----------------------------------------------------------------------
 #  Makefile for Gmsh  
 # ----------------------------------------------------------------------
@@ -24,8 +24,8 @@ OPENGL_MOTIF_LIB = -lGLw
  MESA_STATIC_LIB = $(HOME)/SOURCES/Mesa-static/lib/libGLU.a\
                    $(HOME)/SOURCES/Mesa-static/lib/libGL.a
 MESA_MOTIF_STATIC_LIB = $(HOME)/SOURCES/Mesa-static/lib/libGLw.a
-     XMOTIF_LIB = /usr/local/lib/libXm.so.2 -L/usr/X11R6/lib -lXt -lX11 -lXext
-#      XMOTIF_LIB = -L/usr/local/lib -L/usr/X11R6/LessTif/Motif1.2/lib -lXm\
+#     XMOTIF_LIB = /usr/local/lib/libXm.so.2 -L/usr/X11R6/lib -lXt -lX11 -lXext
+      XMOTIF_LIB = -L/usr/local/lib -L/usr/X11R6/LessTif/Motif1.2/lib -lXm\
                    -L/usr/X11R6/lib -lXt -lX11 -lXext 
         FLTK_LIB = -L$(HOME)/SOURCES/fltk/lib -lfltk\
                    -L/usr/X11R6/lib -lXext -lX11
diff --git a/Motif/Message.cpp b/Motif/Message.cpp
index ce7ba4beb669b23610e4493ee7389adad8680131..43408b4dff787ece5adc92a20ec1cf804c1cf0f9 100644
--- a/Motif/Message.cpp
+++ b/Motif/Message.cpp
@@ -1,4 +1,4 @@
-// $Id: Message.cpp,v 1.4 2001-01-13 15:41:35 geuzaine Exp $
+// $Id: Message.cpp,v 1.5 2001-01-24 11:24:06 geuzaine Exp $
 
 #include <signal.h>
 #include <sys/resource.h>
@@ -108,6 +108,7 @@ void Msg(int level, char *fmt, ...){
     }
     break;
   case STATUS2 :
+  case STATUS2N :
     if(CTX.interactive){
       if(CTX.verbosity > 1){
         fprintf(stderr, STATUS_STR);
@@ -122,7 +123,8 @@ void Msg(int level, char *fmt, ...){
       XmUpdateDisplay(WID.G.infoLabel);
     }
     break;
-  case STATUS1:
+  case STATUS1 :
+  case STATUS1N :
     if(CTX.interactive){
       if(CTX.verbosity > 1){
         fprintf(stderr, STATUS_STR);
@@ -137,7 +139,8 @@ void Msg(int level, char *fmt, ...){
       XmUpdateDisplay(WID.G.selectLabel);
     }
     break;
-  case STATUS3:
+  case STATUS3 :
+  case STATUS3N :
     if(CTX.interactive){
       if(CTX.verbosity > 1){
         fprintf(stderr, STATUS_STR);