Index: ChangeLog
===================================================================
RCS file: /cvsroot/xforms/xforms/ChangeLog,v
retrieving revision 1.120
diff -u -p -r1.120 ChangeLog
--- ChangeLog	6 Oct 2004 23:25:34 -0000	1.120
+++ ChangeLog	15 Dec 2004 09:31:04 -0000
@@ -1,3 +1,10 @@
+2004-12-15  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* lib/include/XBasic.h: add fl_set_locale
+
+	* lib/flresource.c (fl_initialize): do not set locale.
+	(fl_set_locale): new helper function, for setting the default locale.
+
 2004-10-05  Angus Leeming  <angus.leeming@btopenworld.com>
 
 	* xforms.spec.in: Updating SO_VERSION revealed a flaw in the logic
Index: NEWS
===================================================================
RCS file: /cvsroot/xforms/xforms/NEWS,v
retrieving revision 1.11
diff -u -p -r1.11 NEWS
--- NEWS	7 Oct 2004 08:17:39 -0000	1.11
+++ NEWS	15 Dec 2004 09:31:04 -0000
@@ -1,5 +1,10 @@
 ------------------------------------------
 V1.1 ???????????
+  o Do not initialize the locale in fl_initialize, since this is not
+    the job of the library. fl_initialize will now honor the current
+    locale setting. To revert to the old behaviour, the new
+    conveniency function fl_set_locale() can be called before
+    fl_initialize
   o Reset the horizontal offset of a browser to zero if the
     horizontal scrollbar is turned off (Bug #3205.)
   o Add a fl_replace_xyplot_point_in_overlay function that generalizes
Index: lib/flresource.c
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/flresource.c,v
retrieving revision 1.14
diff -u -p -r1.14 flresource.c
--- lib/flresource.c	18 May 2004 13:57:42 -0000	1.14
+++ lib/flresource.c	15 Dec 2004 09:31:04 -0000
@@ -760,6 +760,12 @@ void fl_set_input_navigate(unsigned int 
 }
 
 
+void fl_set_locale(void)
+{
+    setlocale(LC_ALL, "");
+}
+
+
 Display *
 fl_initialize(int *na, char *arg[], const char *appclass,
 	      FL_CMD_OPT * appopt, int nappopt)
@@ -776,8 +782,6 @@ fl_initialize(int *na, char *arg[], cons
 	return fl_display;
     }
 
-    setlocale(LC_ALL,"");
-
     fl_internal_init();
 
     XrmInitialize();
Index: lib/include/XBasic.h
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/include/XBasic.h,v
retrieving revision 1.5
diff -u -p -r1.5 XBasic.h
--- lib/include/XBasic.h	18 May 2004 13:57:52 -0000	1.5
+++ lib/include/XBasic.h	15 Dec 2004 09:31:04 -0000
@@ -837,6 +837,10 @@ FL_RESOURCE;
 
 #define FL_CMD_OPT   XrmOptionDescRec
 
+FL_EXPORT void fl_set_locale(
+		void
+		);
+
 FL_EXPORT Display *fl_initialize(
 		int *na,
 		char *arg[],