# HG changeset patch
# User ben
# Date 990879895 0
# Node ID 55e998c311f54c509d7d4434c80978af4ca9017c
# Parent  0e1f61d4b978cdbb268f6f1aae541f75f8f07714
[xemacs-hg @ 2001-05-26 12:24:50 by ben]
buffer.c, data.c: move text-conversion-error into data.c, along with other errors.

xemacs.mak: fix use of targets so that config.h doesn't end up being passed
	to the C compiler as an input file; that creates warnings.
	put back config.inc into depend-file targets; removed previously
	in a wrong attempt to fix this same problem.

configure.in: rewrite warning output so that it doesn't happen by default --
	you should only get warnings when something is actively wrong,
	not just because a feature is not present.

diff -r 0e1f61d4b978 -r 55e998c311f5 nt/ChangeLog
--- a/nt/ChangeLog	Sat May 26 06:11:08 2001 +0000
+++ b/nt/ChangeLog	Sat May 26 12:24:55 2001 +0000
@@ -1,3 +1,14 @@
+2001-05-26  Ben Wing  <ben@xemacs.org>
+
+	* xemacs.mak (DEPEND):
+	* xemacs.mak (LASTFILE_OBJS):
+	* xemacs.mak (LWLIB_OBJS):
+	* xemacs.mak (TEMACS_OBJS):
+	fix use of targets so that config.h doesn't end up being passed
+	to the C compiler as an input file; that creates warnings.
+	put back config.inc into depend-file targets; removed previously
+	in a wrong attempt to fix this same problem.
+
 2001-05-24  Ben Wing  <ben@xemacs.org>
 
 	* xemacs.mak (DOC):
diff -r 0e1f61d4b978 -r 55e998c311f5 nt/xemacs.mak
--- a/nt/xemacs.mak	Sat May 26 06:11:08 2001 +0000
+++ b/nt/xemacs.mak	Sat May 26 12:24:55 2001 +0000
@@ -325,13 +325,13 @@
 ! if defined(_)
 !  if [perl -p -e "s/^\\x23if defined(.+)/!if defined$$1/; s/^\\x23e/!e/;" \
 	-e "s/([\\s=^])([\\w\\d\\.\\-^]+\\.[ch^])/$$1$(SRC:\=\\\\)\\\\$$2/g;" \
-	-e "s/^(.+)\\.o:(.+)/$(OUTDIR:\=\\\\)\\\\$$1.obj:$$2/;" \
+	-e "s/^(.+)\\.o:(.+)/$(OUTDIR:\=\\\\)\\\\$$1.obj:$$2 $(NT:\=\\\\)\\\\config.inc/;" \
 	< $(SRC)\depend > $(OUTDIR)\depend.tmp]
 !  endif
 ! else
 !  if [perl -p -e "s/^\x23if defined(.+)/!if defined$$1/; s/^\x23e/!e/;" \
 	-e "s/([\s=^])([\w\d\.\-^]+\.[ch^])/$$1$(SRC:\=\\)\\$$2/g;" \
-	-e "s/^(.+)\.o:(.+)/$(OUTDIR:\=\\)\\$$1.obj:$$2/;" \
+	-e "s/^(.+)\.o:(.+)/$(OUTDIR:\=\\)\\$$1.obj:$$2 $(NT:\=\\)\\config.inc/;" \
 	< $(SRC)\depend > $(OUTDIR)\depend.tmp]
 !  endif
 ! endif
@@ -605,7 +605,7 @@
 	link.exe -lib -nologo -out:$@ $(LASTFILE_OBJS)
 
 $(OUTDIR)\lastfile.obj:	$(LASTFILE_SRC)\lastfile.c
-	 $(CCV) $(LASTFILE_FLAGS) $**
+	 $(CCV) $(LASTFILE_FLAGS) $(LASTFILE_SRC)\$(@B).c
 
 !endif
 
@@ -632,22 +632,22 @@
 	link.exe -lib -nologo -out:$@ $(LWLIB_OBJS)
 
 $(OUTDIR)\lwlib-utils.obj:	$(LWLIB_SRCDIR)\lwlib-utils.c
-	 $(CCV) $(LWLIB_FLAGS) $**
+	 $(CCV) $(LWLIB_FLAGS) $(LWLIB_SRCDIR)\$(@B).c
 
 $(OUTDIR)\lwlib-Xaw.obj:	$(LWLIB_SRCDIR)\lwlib-Xaw.c
-	 $(CCV) $(LWLIB_FLAGS) $**
+	 $(CCV) $(LWLIB_FLAGS) $(LWLIB_SRCDIR)\$(@B).c
 
 $(OUTDIR)\lwlib-Xlw.obj:	$(LWLIB_SRCDIR)\lwlib-Xlw.c
-	 $(CCV) $(LWLIB_FLAGS) $**
+	 $(CCV) $(LWLIB_FLAGS) $(LWLIB_SRCDIR)\$(@B).c
 
 $(OUTDIR)\lwlib.obj:		$(LWLIB_SRCDIR)\lwlib.c
-	 $(CCV) $(LWLIB_FLAGS) $**
+	 $(CCV) $(LWLIB_FLAGS) $(LWLIB_SRCDIR)\$(@B).c
 
 $(OUTDIR)\xlwmenu.obj:		$(LWLIB_SRCDIR)\xlwmenu.c
-	 $(CCV) $(LWLIB_FLAGS) $**
+	 $(CCV) $(LWLIB_FLAGS) $(LWLIB_SRCDIR)\$(@B).c
 
 $(OUTDIR)\xlwscrollbar.obj:	$(LWLIB_SRCDIR)\xlwscrollbar.c
-	 $(CCV) $(LWLIB_FLAGS) $**
+	 $(CCV) $(LWLIB_FLAGS) $(LWLIB_SRCDIR)\$(@B).c
 
 !endif
 #------------------------------------------------------------------------------
@@ -1053,10 +1053,10 @@
 $(OUTDIR)\emacs.obj:	$(XEMACS)\version.sh
 
 $(OUTDIR)\TopLevelEmacsShell.obj:	$(TEMACS_SRC)\EmacsShell-sub.c
-	$(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TOP_LEVEL_EMACS_SHELL $** -Fo$@
+	$(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TOP_LEVEL_EMACS_SHELL $(TEMACS_SRC)\$(@B).c -Fo$@
 
 $(OUTDIR)\TransientEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c
-	$(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TRANSIENT_EMACS_SHELL $** -Fo$@
+	$(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TRANSIENT_EMACS_SHELL $(TEMACS_SRC)\$(@B).c -Fo$@
 
 $(OUTDIR)\alloc.obj: $(TEMACS_SRC)\alloc.c
 
diff -r 0e1f61d4b978 -r 55e998c311f5 src/ChangeLog
--- a/src/ChangeLog	Sat May 26 06:11:08 2001 +0000
+++ b/src/ChangeLog	Sat May 26 12:24:55 2001 +0000
@@ -1,3 +1,11 @@
+2001-05-26  Ben Wing  <ben@xemacs.org>
+
+	* buffer.c:
+	* buffer.c (syms_of_buffer):
+	* data.c:
+	* data.c (init_errors_once_early):
+	move text-conversion-error into data.c, along with other errors.
+
 2001-05-26  Martin Buchholz  <martin@xemacs.org>
 
 	* print.c (print_internal): Fix compile error.
diff -r 0e1f61d4b978 -r 55e998c311f5 src/buffer.c
--- a/src/buffer.c	Sat May 26 06:11:08 2001 +0000
+++ b/src/buffer.c	Sat May 26 12:24:55 2001 +0000
@@ -93,8 +93,6 @@
 
 #include "sysfile.h"
 
-Lisp_Object Qtext_conversion_error;
-
 struct buffer *current_buffer;	/* the current buffer */
 
 /* This structure holds the default values of the buffer-local variables
@@ -2098,8 +2096,6 @@
 {
   INIT_LRECORD_IMPLEMENTATION (buffer);
 
-  DEFERROR_STANDARD (Qtext_conversion_error, Qconversion_error);
-
   DEFSYMBOL (Qbuffer_live_p);
   DEFSYMBOL (Qbuffer_or_string_p);
   DEFSYMBOL (Qmode_class);
diff -r 0e1f61d4b978 -r 55e998c311f5 src/data.c
--- a/src/data.c	Sat May 26 06:11:08 2001 +0000
+++ b/src/data.c	Sat May 26 12:24:55 2001 +0000
@@ -55,6 +55,7 @@
 Lisp_Object Qediting_error;
 Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only;
 Lisp_Object Qio_error, Qfile_error, Qconversion_error, Qend_of_file;
+Lisp_Object Qtext_conversion_error;
 Lisp_Object Qarith_error, Qrange_error, Qdomain_error;
 Lisp_Object Qsingularity_error, Qoverflow_error, Qunderflow_error;
 Lisp_Object Qintegerp, Qnatnump, Qsymbolp;
@@ -2099,6 +2100,7 @@
   DEFERROR_STANDARD (Qfile_error, Qio_error);
   DEFERROR (Qend_of_file, "End of file or stream", Qfile_error);
   DEFERROR_STANDARD (Qconversion_error, Qio_error);
+  DEFERROR_STANDARD (Qtext_conversion_error, Qconversion_error);
 
   DEFERROR (Qarith_error, "Arithmetic error", Qinvalid_operation);
   DEFERROR (Qrange_error, "Arithmetic range error", Qarith_error);