# HG changeset patch
# User jhar
# Date 1025907304 0
# Node ID 2fd2239ea63aebab2186e3e25c099c217bb0e7bd
# Parent  37e56e920ac5ce6d9dd4cf9dfa69e79c61c547d7
[xemacs-hg @ 2002-07-05 22:15:01 by jhar]
Fix native win32 version of dired

diff -r 37e56e920ac5 -r 2fd2239ea63a src/ChangeLog
--- a/src/ChangeLog	Fri Jul 05 20:35:55 2002 +0000
+++ b/src/ChangeLog	Fri Jul 05 22:15:04 2002 +0000
@@ -1,3 +1,9 @@
+2002-07-05  Jonathan Harris  <jonathan@xemacs.org>
+
+	* emacs.c (main_1): Conditionalise calls to
+	syms_of_dired_mswindows() and vars_of_dired_mswindows() on
+	WIN32_NATIVE instead of redundant HAVE_MSW_C_DIRED
+	
 2002-07-03  Mike Sperber <mike@xemacs.org>
 
 	* emacs.c (main_1): We need to call init_ralloc twice for PDUMP,
diff -r 37e56e920ac5 -r 2fd2239ea63a src/emacs.c
--- a/src/emacs.c	Fri Jul 05 20:35:55 2002 +0000
+++ b/src/emacs.c	Fri Jul 05 22:15:04 2002 +0000
@@ -1362,10 +1362,8 @@
       syms_of_scrollbar_mswindows ();
 #endif
 #endif	/* HAVE_MS_WINDOWS */
-#ifdef HAVE_MSW_C_DIRED
+#ifdef WIN32_NATIVE
       syms_of_dired_mswindows ();
-#endif
-#ifdef WIN32_NATIVE
       syms_of_nt ();
 #endif
 #if defined (WIN32_NATIVE) || defined (CYGWIN)
@@ -1772,6 +1770,7 @@
       vars_of_module ();
 #endif
 #ifdef WIN32_NATIVE
+      vars_of_dired_mswindows ();
       vars_of_nt ();
 #endif
       vars_of_objects ();
@@ -1876,9 +1875,6 @@
 #ifdef HAVE_MENUBARS
       vars_of_menubar_mswindows ();
 #endif
-#ifdef HAVE_MSW_C_DIRED
-      vars_of_dired_mswindows ();
-#endif
 #ifdef HAVE_DIALOGS
       vars_of_dialog_mswindows ();
 #endif