--- a/ChangeLog	Thu May 01 21:52:32 2003 +0000
+++ b/ChangeLog	Fri May 02 06:00:43 2003 +0000
@@ -1,3 +1,13 @@
+2003-04-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* PROBLEMS (Windows): New: auxiliary programs for Windows.
+
+2003-03-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* Makefile.in.in (TAGS tags): Make DEFUNed functions be tags.
+	Patch by Martin Buchholz <martin@xemacs.org>.
+	<15410.44105.753590.169241@gargle.gargle.HOWL>
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.

--- a/Makefile.in.in	Thu May 01 21:52:32 2003 +0000
+++ b/Makefile.in.in	Fri May 02 06:00:43 2003 +0000
@@ -613,7 +613,9 @@
 	  echo "Using etags from `which etags`."
 	PATH=`$(pwd)`/lib-src:$$PATH ; export PATH; cd ${srcdir} && \
 	find src lwlib lib-src modules ${PRUNE_VC} -name '*.[ch]' -print | \
-	  xargs etags -a -r '/[ 	]*DEF\(VAR\|INE\)_[A-Z_]+[ 	]*([ 	]*"\([^"]+\)"/\2/'; \
+	  xargs etags -a \
+		-r '/[ 	]*DEF\(VAR\|INE\)_[A-Z_]+[ 	]*([ 	]*"\([^"]+\)"/\2/' \
+	        -r '/^DEFUN[	]*([	]*"\([^"]+\)"[	]*,[ 	]*\([A-Za-z0-9_]+\)/\2/'; \
 	find ${tagslisp} ${PRUNE_VC} -name '*.el' ! -name 'auto-autoloads.el' -print | \
 	  xargs etags -a -l none -r "/^(def\\(var\\|un\\|alias\\|const\\|macro\\|subst\\|struct\\|face\\|group\\|custom\\|ine-\\(function\\|compiler-macro\\|[a-z-]+alias\\)\\)[ 	]+'?\\([^ 	]+\\)/\\3/"
 

--- a/PROBLEMS	Thu May 01 21:52:32 2003 +0000
+++ b/PROBLEMS	Fri May 02 06:00:43 2003 +0000
@@ -740,6 +740,19 @@
 
 ** Windows
 
+*** XEmacs complains "No such file or directory, diff"
+
+or "ispell" or other commands that seem related to whatever you just
+tried to do.
+
+There are a large number of common (in the sense that "everyone has
+these, really") Unix utilities that are not provided with XEmacs.  The
+GNU Project's implementations are available for Windows in the the
+Cygwin distribution (http://www.cygwin.com/), which also provides a
+complete Unix emulation environment (and thus makes ports of Unix
+utilities nearly trivial).  Another implementation is that from MinGW
+(http://www.mingw.org/msys.shtml).
+
 *** Weird crashes in pdump load or shortly after pdump load.
 
 This can happen with incremental linking.  Check if you have set

--- a/man/ChangeLog	Thu May 01 21:52:32 2003 +0000
+++ b/man/ChangeLog	Fri May 02 06:00:43 2003 +0000
@@ -1,3 +1,7 @@
+2003-04-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs-faq.texi (Q6.4.3): New: auxiliary programs for Windows.
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.

--- a/man/xemacs-faq.texi	Thu May 01 21:52:32 2003 +0000
+++ b/man/xemacs-faq.texi	Fri May 02 06:00:43 2003 +0000
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2003/03/27 12:57:48 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2003/05/02 06:00:43 $
 @sp 1
 @author Tony Rossini <rossini@@biostat.washington.edu>
 @author Ben Wing <ben@@xemacs.org>
@@ -415,6 +415,7 @@
 Troubleshooting:
 * Q6.4.1::      XEmacs won't start on Windows.
 * Q6.4.2::      Why do I get a blank toolbar on Windows 95?
+* Q6.4.3::      XEmacs complains "No such file or directory, diff"
 
 
 Current Events:
@@ -6237,6 +6238,8 @@
 Troubleshooting:
 * Q6.4.1::      XEmacs won't start on Windows.
 * Q6.4.2::      Why do I get a blank toolbar on Windows 95?
+* Q6.4.3::      XEmacs complains "No such file or directory, diff"
+
 @end menu
 
 @node Q6.0.1, Q6.0.2, MS Windows, MS Windows
@@ -6877,7 +6880,7 @@
 binaries, but you can use the 21.1 binaries if you are very paranoid
 about stability.  @xref{Q6.0.3}.
 
-@node Q6.4.2, , Q6.4.1, MS Windows
+@node Q6.4.2, Q6.4.3, Q6.4.1, MS Windows
 @unnumberedsubsec Q6.4.2 Why do I get a blank toolbar on Windows 95?
 
 You need at least version 4.71 of the system file @file{comctl32.dll}.
@@ -6886,6 +6889,21 @@
 site.  Go into support and search for @file{comctl32.dll}.  The download
 is a self-installing executable.
 
+@node Q6.4.3, , Q6.4.2, MS Windows
+@unnumberedsubsec Q6.4.3 XEmacs complains "No such file or directory, diff"
+
+or "ispell" or other commands that seem related to whatever you just
+tried to do (M-x ediff or M-$, for example).
+
+There are a large number of common (in the sense that "everyone has
+these, they really do") Unix utilities that are not provided with
+XEmacs.  The GNU Project's implementations are available for Windows in
+the the Cygwin distribution (@uref{http://www.cygwin.com/}), which also
+provides a complete Unix emulation environment (and thus makes ports of
+Unix utilities nearly trivial).  Another implementation is that from
+MinGW (@uref{http://www.mingw.org/msys.shtml}).  If you know of others,
+please let us know!
+
 
 
 @node Current Events,  , MS Windows, Top