Fix my regex.h breakage

gnome/gscreen.c

@@ -2399,7 +2399,7 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
 				   evbox,
 				   NULL, NULL);
 	gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("Location:")), FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), cwd, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (hbox), cwd, TRUE, TRUE, 0);
 	dock =  gnome_dock_item_new ("gmc-toolbar1", GNOME_DOCK_ITEM_BEH_EXCLUSIVE | GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL);
 	gtk_container_add (GTK_CONTAINER(dock),status_line);
 	gnome_dock_add_item (GNOME_DOCK(GNOME_APP (panel->xwindow)->dock),

gtkedit/edit.h

@@ -79,7 +79,7 @@
 #    	 endif
 #    endif
  
-#    include "regex.h"
+#    include <regex.h>
 
 #endif
 
@@ -123,7 +123,7 @@
 #    include "src/win.h"
 #    include "vfs/vfs.h"
 #    include "src/menu.h"
-#    include "src/regex.h"
+#    include <regex.h>
 #    define WANT_WIDGETS
      
 #    define WIDGET_COMMAND (WIDGET_USER + 10)

src/Makefile.in

@@ -32,7 +32,7 @@ HDRS =	color.h file.h mouse.h user.h dialog.h find.h main.h		\
 	help.h profile.h dlg.h option.h tree.h info.h			\
 	widget.h chmod.h cons.saver.h mad.h wtools.h chown.h		\
 	subshell.h view.h setup.h key.h ext.h boxes.h			\
-	hotlist.h layout.h fsusage.h mountlist.h regex.h complete.h	\
+	hotlist.h layout.h fsusage.h mountlist.h eregex.h complete.h	\
 	myslang.h command.h cmd.h tty.h fs.h panelize.h achown.h	\
 	learn.h listmode.h features.inc background.h			\
 	x.h textconf.h i18n.h findme.h popt.h filegui.h keys.h xtty.h	\

src/eregex.h

@@ -475,6 +475,7 @@ extern char *re_comp _RE_ARGS ((const char *));
 extern int re_exec _RE_ARGS ((const char *));
 #endif
 
+#if 0
 /* POSIX compatibility.  */
 extern int regcomp _RE_ARGS ((regex_t *preg, const char *pattern, int cflags));
 extern int regexec
@@ -484,6 +485,7 @@ extern size_t regerror
   _RE_ARGS ((int errcode, const regex_t *preg, char *errbuf,
              size_t errbuf_size));
 extern void regfree _RE_ARGS ((regex_t *preg));
+#endif
 
 #endif /* not __REGEXP_LIBRARY_H__ */
 

src/file.c

@@ -82,7 +82,7 @@
 #include <time.h>
 #include <utime.h>
 #include "mad.h"
-#include "regex.h"
+#include "eregex.h"
 #include "util.h"
 #include "dialog.h"
 #include "global.h"

src/regex.c

@@ -149,7 +149,7 @@ init_syntax_once ()
 #endif /* not emacs */
 
 /* Get the interface, including the syntax bits.  */
-#include "regex.h"
+#include "eregex.h"
 
 /* isalpha etc. are used for the character classes.  */
 #include <ctype.h>