APPROVE COMMIT 21.5 RECOMMEND 21.4
Francesco, could you apply the attached patch to your sources, please?
These are the only changes we want to make in your current version for
our distribution.
>>>> "Jerry" == Jerry James
<james(a)xemacs.org> writes:
Jerry> This sync undoes this change:
2002-07-14 Adrian Aichner <adrian(a)xemacs.org>
* etags.c: It's XEmacs, not Xemacs.
OK, this restores the preferred spelling in our version.
Index: lib-src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v
retrieving revision 1.210
diff -u -U0 -r1.210 ChangeLog
--- lib-src/ChangeLog 19 Jul 2006 15:22:34 -0000 1.210
+++ lib-src/ChangeLog 21 Jul 2006 02:08:51 -0000
@@ -0,0 +1,4 @@
+2006-07-21 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * etags.c: Xemacs -> XEmacs.
+
Index: lib-src/etags.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/etags.c,v
retrieving revision 1.35
diff -u -r1.35 etags.c
--- lib-src/etags.c 19 Jul 2006 15:22:34 -0000 1.35
+++ lib-src/etags.c 21 Jul 2006 02:08:57 -0000
@@ -59,10 +59,10 @@
/* On some systems, Emacs defines static as nothing for the sake
of unexec. We don't want that here since we don't use unexec. */
# undef static
-# ifndef PTR /* for Xemacs */
+# ifndef PTR /* for XEmacs */
# define PTR void *
# endif
-# ifndef __P /* for Xemacs */
+# ifndef __P /* for XEmacs */
# define __P(args) args
# endif
#else /* no config.h */
@@ -80,7 +80,7 @@
# define _GNU_SOURCE 1 /* enables some compiler checks on GNU */
#endif
-/* WIN32_NATIVE is for Xemacs.
+/* WIN32_NATIVE is for XEmacs.
MSDOS, WINDOWSNT, DOS_NT are for Emacs. */
#ifdef WIN32_NATIVE
# undef MSDOS
--
School of Systems and Information Engineering
http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.