# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 1064859484 0
# Node ID d2c6900fc175e3ba33f47f3a64bc77fa9facd927
# Parent  9064ba07898b35e429269bc6bc7b3549046e08f9
*** empty log message ***

diff -r 9064ba07898b -r d2c6900fc175 ChangeLog
--- a/ChangeLog	Mon Sep 29 18:17:35 2003 +0000
+++ b/ChangeLog	Mon Sep 29 18:18:04 2003 +0000
@@ -1,3 +1,7 @@
+2003-09-29  Dave Love  <fx@gnu.org>
+
+	* configure.in: Merge from HEAD.
+
 2003-07-29  Richard M. Stallman  <rms@gnu.org>
 
 	* configure.in (HAVE_XIM): Define if XIM is available.
diff -r 9064ba07898b -r d2c6900fc175 configure
--- a/configure	Mon Sep 29 18:17:35 2003 +0000
+++ b/configure	Mon Sep 29 18:18:04 2003 +0000
@@ -2576,7 +2576,7 @@
   powerpc-apple-darwin* )
     machine=powermac opsys=darwin
     # Define CPP as follows to make autoconf work correctly.
-    CPP="cc -E -traditional-cpp"
+    CPP="gcc -E -no-cpp-precomp"
   ;;
 
   ## AMD x86-64 Linux-based GNU system
@@ -8191,7 +8191,7 @@
    { (exit 1); exit 1; }; };
   fi
   GLIB_REQUIRED=2.0.1
-  GTK_REQUIRED=2.2
+  GTK_REQUIRED=2.0.1
   GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
 
     if test "X${with_pkg_config_prog}" != X; then
diff -r 9064ba07898b -r d2c6900fc175 etc/NEWS
--- a/etc/NEWS	Mon Sep 29 18:17:35 2003 +0000
+++ b/etc/NEWS	Mon Sep 29 18:18:04 2003 +0000
@@ -61,11 +61,14 @@
 
 * Lisp changes in Emacs 22.1
 
+map-char-table's behaviour has changed.
+
 New functions: characterp, max-char, map-charset-chars,
 define-charset-alias, primary-charset, set-primary-charset,
 unify-charset, clear-charset-maps, charset-priority-list,
 set-charset-priority, define-coding-system,
-define-coding-system-alias, coding-system-aliases
+define-coding-system-alias, coding-system-aliases, langinfo,
+string-to-multibyte.
 
 Changed functions: copy-sequence, decode-char, encode-char,
 set-fontset-font, new-fontset, modify-syntax-entry, define-charset,
diff -r 9064ba07898b -r d2c6900fc175 src/ChangeLog.22
--- a/src/ChangeLog.22	Mon Sep 29 18:17:35 2003 +0000
+++ b/src/ChangeLog.22	Mon Sep 29 18:18:04 2003 +0000
@@ -1,3 +1,52 @@
+2003-09-29  Dave Love  <fx@gnu.org>
+
+	* xmenu.c (find_and_call_menu_selection): Make menu_bar_items_used
+	EMACS_INT.
+
+	* xfns.c (DefaultDepthOfScreen, x_encode_text): Remove unused vars.
+
+	* xfaces.c (face_numeric_value): Declare dim size_t.
+	(Finternal_lisp_face_equal_p): Remove unused f.
+
+	* xdisp.c (BUILD_CHAR_GLYPH_STRINGS, display_and_set_cursor)
+	(MATRIX_ROW): Remove unused vars.
+	(draw_glyphs, x_insert_glyphs, fast_find_position)
+	(fast_find_position, fast_find_string_pos): Use EMACS_INT for
+	byte/char counts.
+
+	* regex.c (regex_compile): Remove unused var.
+
+	* minibuf.c (Fminibuffer_complete_word): Remove unused var.
+
+	* keymap.c (Fset_keymap_parent, map_keymap, Fcopy_keymap)
+	(Faccessible_keymaps, where_is_internal): Remove unused vars.
+
+	* keyboard.c (cancel_hourglass_unwind): Return Qnil.
+
+	* frame.c (frame_name_fnn_p): Make len EMACS_INT.
+
+	* fileio.c (Fwrite_region): Remove unused var.
+
+	* dispnew.c (adjust_frame_glyphs_for_frame_redisplay)
+	(adjust_frame_glyphs_for_window_redisplay): Remove unused ch_dim.
+
+	* composite.c (Fremove_list_of_text_properties): Declare.
+
+	* coding.c (inhibit_pre_post_conversion): Removed (unused).
+	(alloc_destination, produce_chars): Use EMACS_INT for byte/char
+	counts.
+	(coding_inherit_eol_type): Remove unused attrs.
+	(detect_coding): Cast arg of detect_eol.
+
+	* charset.c (syms_of_charset): Remove unused var p.
+	(find_charsets_in_text, Ffind_charset_region): Use EMACS_INT for
+	byte/char counts.
+
+	* casetab.c (set_case_table): Remove unused var.
+
+	* window.c (Fdisplay_buffer, Fframe_selected_window): Remove
+	unsued vars.
+
 2003-09-26  Dave Love  <fx@gnu.org>
 
 	* xterm.c (x_bitmap_mask): Declare.