# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1039003069 0
# Node ID 9994fce2e427ba7ff8f118111843059139336573
# Parent  81f6fbdaa1179d5a495a94d67bc2d55046923467
*** empty log message ***

diff -r 81f6fbdaa117 -r 9994fce2e427 lib-src/ChangeLog
--- a/lib-src/ChangeLog	Wed Dec 04 11:56:55 2002 +0000
+++ b/lib-src/ChangeLog	Wed Dec 04 11:57:49 2002 +0000
@@ -1,3 +1,30 @@
+2002-12-04  Richard M. Stallman  <rms@gnu.org>
+
+	* Update getopt from gnulib version; changes described below.
+
+	* getopt1.c: Conditionally find getopt.h.
+	[_LIBC] (getopt_long, getopt_long_only): Do libc_hidden_def.
+
+	* getopt.c (const): Move outside !HAVE_CONFIG_H conditional.
+	(libintl.h): Include this if _LIBC.  Otherwise include gettext.h.
+	(wchar.h): Include, maybe.		     
+	(attribute_hidden): Define if not defind.
+	(__getopt_initialized): Use attribute_hidden.
+	(__libc_argc, __libc_argv): Renamed from original_argc, etc.
+	(__getopt_nonoption_flags, nonoption_flags_max_len, nonoption_flags_len):
+	Conditional on USE_NONOPTION_FLAGS.
+	(SWAP_FLAGS): New definitions.
+	(exchange): Test USE_NONOPTION_FLAGS.
+	(_getopt_initialize): Test USE_NONOPTION_FLAGS.
+	(_getopt_internal): Error if argc < 1.  New local var print_errors.
+	Improve test for ambiguous long option.
+	Add LIBIO support for error message output.
+	(NONOPTION_P): Test USE_NONOPTION_FLAGS.
+
+	* getopt.h: Maybe include ctype.h.
+	Treat __cplusplus like __STDC__.
+	(decls): Use __ in arg names.
+
 2002-12-02  Stephen Eglen  <stephen@gnu.org>
 
 	* emacsclient.c (main): Tell user how to start server within Emacs
diff -r 81f6fbdaa117 -r 9994fce2e427 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Dec 04 11:56:55 2002 +0000
+++ b/lisp/ChangeLog	Wed Dec 04 11:57:49 2002 +0000
@@ -1,3 +1,20 @@
+2002-12-04  Richard M. Stallman  <rms@gnu.org>
+
+	* gud.el (gud-menu-map): Delete CVS conflict markers.
+
+	* progmodes/cc-vars.el: Simply require wid-edit and custom
+	in eval-when-compile.
+
+	* progmodes/cc-menus.el: Don't require imenu.
+
+	* progmodes/cc-langs.el: Don't require cl.
+	(c-delete-duplicates): New function.  Use instead of delete-duplicates.
+
+	* progmodes/cc-bytecomp.el (cc-bytecomp-obsolete-var):
+	Add an else-clause to the if to avoid confused compiler warning.
+
+	* tooltip.el (tooltip-gud-tips-p): Undo previous change.
+
 2002-12-03  Dave Love  <fx@gnu.org>
 
 	* international/ucs-tables.el (ucs-unify-8859, ucs-unify-8859)
diff -r 81f6fbdaa117 -r 9994fce2e427 src/ChangeLog
--- a/src/ChangeLog	Wed Dec 04 11:56:55 2002 +0000
+++ b/src/ChangeLog	Wed Dec 04 11:57:49 2002 +0000
@@ -1,3 +1,11 @@
+2002-12-04  Richard M. Stallman  <rms@gnu.org>
+
+	* sysdep.c (fcntl.h): Test only HAVE_FCNTL_H.
+
+	* fileio.c (fcntl.h): Test only HAVE_FCNTL_H.
+
+	* alloca.c: Don't use #error.
+
 2002-12-03  Dave Love  <fx@gnu.org>
 
 	* buffer.c (Qucs_set_table_for_input): New.