Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-40

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-535
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-536
   sync-tree with gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-537
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-538
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-539
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-540
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-541
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-542
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-545
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-546
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-547
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-548
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-549
   Use symbol-matching for generic-mode keywords

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-550
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--devo--0--patch-2
   Add {arch}/=cvs-sync-make-log

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--base-0
   Import from Gnus CVS branch V5-8

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-1
   {arch}/=tagging-method: Add CVS and autoconf grot to junk regexp

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-2
   Use explicit tags for autoconf input files

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-3
   Remove RCS keywords

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-4
   Fix copied explicit id-tags

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-5
   Add {arch}/=cvs-sync-make-log

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-6
   configure.in: Use ifelse instead of m4_if for arch-tag: comment

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--base-0
   tag of miles@gnu.org--gnu-2004/gnus--rel--5.8--base-0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-1
   Gnus 5.10, from CVS branch v5-10

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-2
   Merge from gnus--rel--5.8

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-3
   Use explicit tags for autoconf input files

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-4
   sync-tree with gnus--rel--5.8

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-5
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-6
   Merge from gnus--rel--5.8

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-7
   Remove RCS keywords

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-8
   Merge from gnus--rel--5.8

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-9
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-10
   Add {arch}/=cvs-sync-make-log

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-11
   Merge from gnus--rel--5.8

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-12
   Update from CVS: make.bat: Fix line endings around arch-tag.

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-13
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-17
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-21
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-22
   Update from CVS: lisp/nndb.el (require): Remove tcp and duplicate cl.

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-23
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-24
   lisp/nnimap.el (nnimap-open-connection): Remove extraneous end-paren

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-25
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-26
   Update from CVS

11 files changed, 228 insertions, 111 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 52426939562..955c8929f92 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,85 @@
+2004-09-14  Stefan  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Finsert_file_contents): Fix case of replacement in a
+        narrowed buffer.
+
+2004-09-14  Kim F. Storm  <storm@cua.dk>
+
+        * puresize.h (PURESIZE_RATIO): Define based on BITS_PER_EMACS_INT.
+
+        * xfaces.c (Qface_no_inherit): New var.
+        (syms_of_xfaces): Intern and staticpro it.
+        (Finternal_make_lisp_face, Finternal_set_lisp_face_attribute)
+        (Finternal_copy_lisp_face, update_face_from_frame_parameter):
+        Don't increment face_change_count when face has non-nil
+        face-no-inherit property.
+
+2004-09-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * bytecode.c (BYTE_CODE_QUIT): Add missing AFTER_POTENTIAL_GC.
+        (Fbyte_code): Remove dead code after `wrong_type_argument'.
+
+        * alloc.c (Fgarbage_collect): Mark keyboards, gtk data, and specpdl
+        before doing the mark_stack_check_gcpros since they are not on the stack.
+
+2004-09-12  Kim F. Storm  <storm@cua.dk>
+
+        * editfns.c (Fformat): Handle format strings with multiple text
+        properties.  Reverse text property list from the format string,
+        so the positions are in increasing order.
+
+2004-09-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xselect.c (x_reply_selection_request): XSync and UNBLOCK before
+        x_uncatch_errors so that possible protocol errors are delivered.
+
+2004-09-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (msdos.o): Depend on buffer.h, commands.h, and
+        blockinput.h.
+        (dosfns.o): Depend on blockinput.h, window.h, dispextern.h,
+        charset.h, and coding.h
+        (w16select.o): Depend on buffer.h, charset.h, coding.h, and
+        composite.h.
+        (term.o): Depend on window.h and keymap.h.
+        (abbrev.o): Depend on syntax.h.
+        (callint.o): Depend on keymap.h.
+        (casefiddle.o): Depend on charset.h and keymap.h.
+        (category.o): Depend on keymap.h.
+        (coding.o): Depend on dispextern.h.
+        (cmds.o): Depend on keyboard.h and keymap.h.
+        (dispnew.o): Depend on indent.h and intervals.h.
+        (doc.o): Depend on keymap.h.
+        (editfns.o): Depend on frame.h.
+        (emacs.o): Depend on dispextern.h.
+        (fileio.o): Don't depend on ccl.h.
+        (filelock.o): Depend on charset.h and coding.h.
+        (frame.o): Depend on w32term.h and macterm.h.
+        (insdel.o): Depend on region-cache.h.
+        (keyboard.o): Depend on keymap.h, w32term.h, and macterm.h.
+        (minibuf.o): Depend on $(INTERVALS_SRC) and keymap.h.
+        (search.o): Depend on $(INTERVALS_SRC).
+        (syntax.o): Depend on keymap.h, regex.h, and $(INTERVALS_SRC).
+        (window.o): Depend on keymap.h, blockinput.h, $(INTERVALS_SRC),
+        xterm.h, w32term.h, and macterm.h.
+        (xdisp.o): Depend on keyboard.h, $(INTERVALS_SRC), xterm.h,
+        w32term.h, and macterm.h.
+        (xfaces.o): Depend on keyboard.h, $(INTERVALS_SRC),
+        region-cache.h, xterm.h, w32term.h, and macterm.h.
+        (bytecode.o): Depend on dispextern.h, frame.h, and xterm.h.
+        (data.o): Depend on frame.h.
+        (fns.o): Depend on keymap.h, xterm.h, and blockinput.h.
+        (print.o): Depend on termchar.h and $(INTERVALS_SRC).
+        (lread.o): Depend on $(INTERVALS_SRC), termhooks.h, and coding.h.
+        (intervals.o): Depend on keymap.h.
+
+        * msdos.c (msdos_set_cursor_shape, IT_display_cursor): Add
+        debugging print-out to termscript.
+
+2004-09-09  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (decode_mode_spec): Use current buffer for most purposes.
+
 2004-09-08  Richard M. Stallman  <rms@gnu.org>
 
         * window.c (Fset_window_buffer): Doc fix.
@@ -12446,7 +12528,7 @@
 
 2002-02-15  Andreas Schwab  <schwab@suse.de>
 
-        * puresize.h (BASE_PURESIZE): Increase to 9/5.
+        * puresize.h (PURESIZE_RATIO): Increase to 9/5.
 
         * alloc.c (NSTATICS): Increase to 1280.
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 14a4a64f1cc..007c0584c5a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1024,29 +1024,32 @@ alloca.o: alloca.c blockinput.h atimer.h
    and so rarely changed in ways that do require any.  */
 
 abbrev.o: abbrev.c buffer.h window.h dispextern.h commands.h character.h \
-        $(config_h)
+        syntax.h $(config_h)
 buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \
    dispextern.h $(INTERVAL_SRC) blockinput.h atimer.h systime.h character.h \
    $(config_h)
-callint.o: callint.c window.h commands.h buffer.h \
+callint.o: callint.c window.h commands.h buffer.h keymap.h \
    keyboard.h dispextern.h $(config_h)
 callproc.o: callproc.c epaths.h buffer.h commands.h $(config_h) \
         process.h systty.h syssignal.h character.h coding.h ccl.h msdos.h \
-        composite.h
+        composite.h w32.h
 casefiddle.o: casefiddle.c syntax.h commands.h buffer.h character.h \
-   composite.h $(config_h)
+   composite.h \
+        charset.h keymap.h $(config_h)
 casetab.o: casetab.c buffer.h $(config_h)
-category.o: category.c category.h buffer.h charset.h character.h $(config_h)
+category.o: category.c category.h buffer.h charset.h keymap.h   \
+        character.h $(config_h)
 ccl.o: ccl.c ccl.h charset.h character.h coding.h $(config_h)
 character.o: character.c character.h buffer.h charset.h composite.h disptab.h \
    $(config.h)
 charset.o: charset.c charset.h character.h buffer.h coding.h composite.h \
    disptab.h $(config_h)
 chartab.o: charset.h character.h $(config.h)
-coding.o: coding.c coding.h ccl.h buffer.h character.h charset.h intervals.h composite.h window.h $(config_h)
+coding.o: coding.c coding.h ccl.h buffer.h character.h charset.h intervals.h composite.h \
+        window.h dispextern.h $(config_h)
 cm.o: cm.c cm.h termhooks.h $(config_h)
 cmds.o: cmds.c syntax.h buffer.h character.h commands.h window.h $(config_h) \
-        msdos.h dispextern.h
+        msdos.h dispextern.h keyboard.h keymap.h
 pre-crt0.o: pre-crt0.c
 ecrt0.o: ecrt0.c $(config_h)
         CRT0_COMPILE ${srcdir}/ecrt0.c
@@ -1054,25 +1057,26 @@ dired.o: dired.c commands.h buffer.h $(config_h) character.h charset.h \
    coding.h regex.h systime.h
 dispnew.o: dispnew.c  systty.h systime.h commands.h process.h frame.h \
    window.h buffer.h dispextern.h termchar.h termopts.h termhooks.h cm.h \
-   disptab.h \
+   disptab.h indent.h intervals.h \
    xterm.h blockinput.h atimer.h character.h msdos.h composite.h keyboard.h \
    $(config_h)
-doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.h character.h
+doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.h keymap.h character.h
 doprnt.o: doprnt.c character.h $(config_h)
-dosfns.o: buffer.h termchar.h termhooks.h frame.h msdos.h dosfns.h $(config_h)
+dosfns.o: buffer.h termchar.h termhooks.h frame.h blockinput.h window.h \
+   msdos.h dosfns.h dispextern.h charset.h coding.h $(config_h)
 editfns.o: editfns.c window.h buffer.h systime.h $(INTERVAL_SRC) character.h \
-   coding.h dispextern.h $(config_h)
+   coding.h dispextern.h frame.h $(config_h)
 emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \
    termhooks.h buffer.h atimer.h systime.h $(INTERVAL_SRC) $(config_h) \
-   window.h keyboard.h keymap.h
+   window.h dispextern.h keyboard.h keymap.h
 fileio.o: fileio.c window.h buffer.h systime.h $(INTERVAL_SRC) character.h \
-   coding.h ccl.h msdos.h dispextern.h $(config_h)
+   coding.h msdos.h dispextern.h $(config_h)
 filelock.o: filelock.c buffer.h character.h charset.h coding.h systime.h \
    epaths.h $(config_h)
 filemode.o: filemode.c  $(config_h)
 frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
    blockinput.h atimer.h systime.h buffer.h character.h fontset.h \
-   msdos.h dosfns.h dispextern.h $(config_h)
+   msdos.h dosfns.h dispextern.h w32term.h macterm.h $(config_h)
 fringe.o: fringe.c dispextern.h frame.h window.h buffer.h $(config_h)
 fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h character.h \
    charset.h frame.h keyboard.h $(config_h)
@@ -1083,11 +1087,11 @@ indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \
    termopts.h disptab.h region-cache.h character.h category.h composite.h \
    dispextern.h keyboard.h
 insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h character.h \
-   dispextern.h atimer.h systime.h $(config_h)
+   dispextern.h atimer.h systime.h region-cache.h $(config_h)
 keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h character.h \
    commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \
    systty.h systime.h dispextern.h syntax.h $(INTERVAL_SRC) blockinput.h \
-   atimer.h xterm.h puresize.h msdos.h $(config_h)
+   atimer.h xterm.h puresize.h msdos.h keymap.h w32term.h macterm.h $(config_h)
 keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \
    atimer.h systime.h puresize.h character.h intervals.h $(config_h)
 lastfile.o: lastfile.c  $(config_h)
@@ -1100,11 +1104,11 @@ vm-limit.o: vm-limit.c mem-limits.h $(config_h)
 marker.o: marker.c buffer.h character.h $(config_h)
 md5.o: md5.c md5.h $(config_h)
 minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.h \
-   buffer.h commands.h character.h msdos.h $(config_h)
+   buffer.h commands.h character.h msdos.h $(INTERVAL_SRC) keymap.h $(config_h)
 mktime.o: mktime.c $(config_h)
 msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \
    termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \
-   keyboard.h intervals.h $(config_h)
+   keyboard.h intervals.h buffer.h commands.h blockinput.h $(config_h)
 process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \
    commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \
    blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \
@@ -1116,16 +1120,17 @@ scroll.o: scroll.c termchar.h dispextern.h frame.h msdos.h keyboard.h \
    $(config_h)
 search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \
    blockinput.h atimer.h systime.h category.h character.h composite.h \
+   $(INTERVAL_SRC) \
    $(config_h)
 strftime.o: strftime.c $(config_h)
 syntax.o: syntax.c syntax.h buffer.h commands.h category.h character.h \
-   composite.h $(config_h)
+   composite.h keymap.h regex.h $(INTERVAL_SRC) $(config_h)
 sysdep.o: sysdep.c syssignal.h systty.h systime.h syswait.h blockinput.h \
    process.h dispextern.h termhooks.h termchar.h termopts.h \
    frame.h atimer.h window.h msdos.h dosfns.h keyboard.h  $(config_h)
 term.o: term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \
    disptab.h dispextern.h keyboard.h character.h charset.h coding.h ccl.h \
-   msdos.h keymap.h
+   msdos.h window.h keymap.h
 termcap.o: termcap.c $(config_h)
 terminfo.o: terminfo.c $(config_h)
 tparam.o: tparam.c $(config_h)
@@ -1135,19 +1140,21 @@ undo.o: undo.c buffer.h commands.h $(config_h)
 UNEXEC_ALIAS=UNEXEC
 $(UNEXEC_ALIAS): UNEXEC_SRC $(config_h)
 w16select.o: w16select.c dispextern.h frame.h blockinput.h atimer.h systime.h \
-   msdos.h $(config_h)
+   msdos.h buffer.h charset.h coding.h composite.h $(config_h)
 widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \
    $(srcdir)/../lwlib/lwlib.h $(config_h)
 window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \
    termhooks.h disptab.h keyboard.h dispextern.h msdos.h composite.h \
+   keymap.h blockinput.h $(INTERVAL_SRC) xterm.h w32term.h macterm.h $(config_h)
+xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h \
+   coding.h termchar.h frame.h window.h disptab.h termhooks.h character.h     \
+   charset.h keyboard.h $(INTERVAL_SRC) region-cache.h xterm.h w32term.h      \
+   macterm.h $(config_h) msdos.h composite.h fontset.h blockinput.h atimer.h  \
+   systime.h keymap.h
+xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h   \
+   window.h character.h charset.h msdos.h dosfns.h composite.h atimer.h \
+   systime.h keyboard.h fontset.h w32term.h macterm.h $(INTERVAL_SRC)   \
    $(config_h)
-xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h coding.h \
-   termchar.h frame.h window.h disptab.h termhooks.h character.h charset.h \
-   $(config_h) msdos.h composite.h fontset.h blockinput.h atimer.h systime.h \
-   keymap.h region-cache.h
-xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \
-   window.h character.h charset.h msdos.h dosfns.h composite.h atimer.h \
-   systime.h fontset.h $(config_h) $(INTERVAL_SRC)
 xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \
    $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \
    character.h charset.h coding.h gtkutil.h $(config_h) termhooks.h
@@ -1175,23 +1182,26 @@ atimer.o: atimer.c atimer.h systime.h $(config_h)
 alloc.o: alloc.c process.h frame.h window.h buffer.h  puresize.h syssignal.h keyboard.h \
  blockinput.h atimer.h systime.h character.h dispextern.h $(config_h) \
  $(INTERVAL_SRC)
-bytecode.o: bytecode.c buffer.h syntax.h character.h window.h $(config_h)
-data.o: data.c buffer.h puresize.h character.h syssignal.h keyboard.h \
+bytecode.o: bytecode.c buffer.h syntax.h character.h window.h dispextern.h \
+  frame.h xterm.h $(config_h)
+data.o: data.c buffer.h puresize.h character.h syssignal.h keyboard.h frame.h \
  $(config_h)
 eval.o: eval.c commands.h keyboard.h blockinput.h atimer.h systime.h \
   dispextern.h $(config_h)
 floatfns.o: floatfns.c $(config_h)
 fns.o: fns.c commands.h $(config_h) frame.h buffer.h character.h keyboard.h \
- frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h
+ keymap.h frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h \
+ blockinput.h xterm.h
 print.o: print.c process.h frame.h window.h buffer.h keyboard.h character.h \
-   $(config_h) dispextern.h msdos.h composite.h
+   $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.h
 lread.o: lread.c commands.h keyboard.h buffer.h epaths.h character.h \
- charset.h $(config_h) termhooks.h coding.h msdos.h
+ charset.h $(config_h) $(INTERVAL_SRC) termhooks.h coding.h msdos.h
 
 /* Text properties support */
 textprop.o: textprop.c buffer.h window.h dispextern.h $(INTERVAL_SRC) \
         $(config_h)
-intervals.o: intervals.c buffer.h $(INTERVAL_SRC) keyboard.h puresize.h $(config_h)
+intervals.o: intervals.c buffer.h $(INTERVAL_SRC) keyboard.h puresize.h \
+        keymap.h $(config_h)
 composite.o: composite.c buffer.h  character.h $(INTERVAL_SRC) $(config_h)
 
 /* System-specific programs to be made.
diff --git a/src/alloc.c b/src/alloc.c
index 567b8c7a925..4b31ec7897e 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1,6 +1,6 @@
 /* Storage allocation and gc for GNU Emacs Lisp interpreter.
-   Copyright (C) 1985,86,88,93,94,95,97,98,1999,2000,01,02,03,2004
-      Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999,
+      2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4411,6 +4411,20 @@ returns nil, because real GC can't be done.  */)
   for (i = 0; i < staticidx; i++)
     mark_object (*staticvec[i]);
 
+  for (bind = specpdl; bind != specpdl_ptr; bind++)
+    {
+      mark_object (bind->symbol);
+      mark_object (bind->old_value);
+    }
+  mark_kboards ();
+
+#ifdef USE_GTK
+  {
+    extern void xg_mark_data ();
+    xg_mark_data ();
+  }
+#endif
+
 #if (GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS \
      || GC_MARK_STACK == GC_MARK_STACK_CHECK_GCPROS)
   mark_stack ();
@@ -4424,11 +4438,6 @@ returns nil, because real GC can't be done.  */)
 #endif
 
   mark_byte_stack ();
-  for (bind = specpdl; bind != specpdl_ptr; bind++)
-    {
-      mark_object (bind->symbol);
-      mark_object (bind->old_value);
-    }
   for (catch = catchlist; catch; catch = catch->next)
     {
       mark_object (catch->tag);
@@ -4440,19 +4449,11 @@ returns nil, because real GC can't be done.  */)
       mark_object (handler->var);
     }
   mark_backtrace ();
-  mark_kboards ();
 
 #if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
   mark_stack ();
 #endif
 
-#ifdef USE_GTK
-  {
-    extern void xg_mark_data ();
-    xg_mark_data ();
-  }
-#endif
-
   /* Everything is now marked, except for the things that require special
      finalization, i.e. the undo_list.
      Look thru every buffer's undo list
diff --git a/src/bytecode.c b/src/bytecode.c
index b30a410f80e..d130b3b3d42 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1,5 +1,5 @@
 /* Execution of byte code produced by bytecomp.el.
-   Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003
+   Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -387,6 +387,7 @@ unmark_byte_stack ()
         Vquit_flag = Qnil;                              \
         BEFORE_POTENTIAL_GC ();                         \
         Fsignal (Qquit, Qnil);                          \
+        AFTER_POTENTIAL_GC ();                          \
       }                                                 \
   } while (0)
 
@@ -539,9 +540,7 @@ If the third argument is incorrect, Emacs may crash.  */)
               TOP = Qnil;
             else
               {
-                BEFORE_POTENTIAL_GC ();
-                Fcar (wrong_type_argument (Qlistp, v1));
-                AFTER_POTENTIAL_GC ();
+                wrong_type_argument (Qlistp, v1);
               }
             break;
           }
@@ -574,9 +573,7 @@ If the third argument is incorrect, Emacs may crash.  */)
               TOP = Qnil;
             else
               {
-                BEFORE_POTENTIAL_GC ();
-                Fcdr (wrong_type_argument (Qlistp, v1));
-                AFTER_POTENTIAL_GC ();
+                wrong_type_argument (Qlistp, v1);
               }
             break;
           }
@@ -907,11 +904,7 @@ If the third argument is incorrect, Emacs may crash.  */)
                 else if (!NILP (v1))
                   {
                     immediate_quit = 0;
-                    BEFORE_POTENTIAL_GC ();
-                    v1 = wrong_type_argument (Qlistp, v1);
-                    AFTER_POTENTIAL_GC ();
-                    immediate_quit = 1;
-                    op++;
+                    wrong_type_argument (Qlistp, v1);
                   }
               }
             immediate_quit = 0;
@@ -920,11 +913,7 @@ If the third argument is incorrect, Emacs may crash.  */)
             else if (NILP (v1))
               TOP = Qnil;
             else
-              {
-                BEFORE_POTENTIAL_GC ();
-                Fcar (wrong_type_argument (Qlistp, v1));
-                AFTER_POTENTIAL_GC ();
-              }
+              wrong_type_argument (Qlistp, v1);
             break;
           }
 
@@ -1561,11 +1550,7 @@ If the third argument is incorrect, Emacs may crash.  */)
                     else if (!NILP (v1))
                       {
                         immediate_quit = 0;
-                        BEFORE_POTENTIAL_GC ();
-                        v1 = wrong_type_argument (Qlistp, v1);
-                        AFTER_POTENTIAL_GC ();
-                        immediate_quit = 1;
-                        op++;
+                        wrong_type_argument (Qlistp, v1);
                       }
                   }
                 immediate_quit = 0;
@@ -1574,11 +1559,7 @@ If the third argument is incorrect, Emacs may crash.  */)
                 else if (NILP (v1))
                   TOP = Qnil;
                 else
-                  {
-                    BEFORE_POTENTIAL_GC ();
-                    Fcar (wrong_type_argument (Qlistp, v1));
-                    AFTER_POTENTIAL_GC ();
-                  }
+                  wrong_type_argument (Qlistp, v1);
               }
             else
               {
diff --git a/src/editfns.c b/src/editfns.c
index 7fdd5598bf8..49617f7ebc9 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3824,11 +3824,13 @@ usage: (format STRING &rest OBJECTS)  */)
 
           /* Adjust the bounds of each text property
              to the proper start and end in the output string.  */
-          /* We take advantage of the fact that the positions in PROPS
-             are in increasing order, so that we can do (effectively)
-             one scan through the position space of the format string.
 
-             BYTEPOS is the byte position in the format string,
+          /* Put the positions in PROPS in increasing order, so that
+             we can do (effectively) one scan through the position
+             space of the format string.  */
+          props = Fnreverse (props);
+
+          /* BYTEPOS is the byte position in the format string,
              POSITION is the untranslated char position in it,
              TRANSLATED is the translated char position in BUF,
              and ARGN is the number of the next arg we will come to.  */
diff --git a/src/fileio.c b/src/fileio.c
index f3678cac0e5..7c0490e6978 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1,6 +1,6 @@
 /* File IO for GNU Emacs.
-   Copyright (C) 1985,86,87,88,93,94,95,96,97,98,99,2000,01,03,2004
-     Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998,
+     1999, 2000, 2001, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4304,7 +4304,7 @@ actually used.  */)
       /* Replace the chars that we need to replace,
          and update INSERTED to equal the number of bytes
          we are taking from the decoded string.  */
-      inserted -= (Z_BYTE - same_at_end) + (same_at_start - BEG_BYTE);
+      inserted -= (ZV_BYTE - same_at_end) + (same_at_start - BEGV_BYTE);
 
       if (same_at_end != same_at_start)
         {
diff --git a/src/msdos.c b/src/msdos.c
index daa4199d6a7..0020be310a6 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -752,6 +752,9 @@ msdos_set_cursor_shape (struct frame *f, int start_line, int width)
   if (f && f != SELECTED_FRAME())
     return;
 
+  if (termscript)
+    fprintf (termscript, "\nCURSOR SHAPE=(%d,%d)", start_line, width);
+
   /* The character cell size in scan lines is stored at 40:85 in the
      BIOS data area.  */
   max_line = _farpeekw (_dos_ds, 0x485) - 1;
@@ -851,10 +854,12 @@ IT_set_cursor_type (struct frame *f, Lisp_Object cursor_type)
         }
     }
   else
-    /* Treat anything unknown as "box cursor".  This includes nil, so
-       that a frame which doesn't specify a cursor type gets a box,
-       which is the default in Emacs.  */
-    msdos_set_cursor_shape (f, 0, BOX_CURSOR_WIDTH);
+    {
+      /* Treat anything unknown as "box cursor".  This includes nil, so
+         that a frame which doesn't specify a cursor type gets a box,
+         which is the default in Emacs.  */
+      msdos_set_cursor_shape (f, 0, BOX_CURSOR_WIDTH);
+    }
 }
 
 static void
@@ -1826,6 +1831,8 @@ static int cursor_cleared;
 static void
 IT_display_cursor (int on)
 {
+  if (termscript)
+    fprintf (termscript, "\nCURSOR %s", on ? "ON" : "OFF");
   if (on && cursor_cleared)
     {
       ScreenSetCursor (current_pos_Y, current_pos_X);
diff --git a/src/puresize.h b/src/puresize.h
index 8088a374765..054b2bc4c89 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -47,7 +47,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */
 #ifndef PURESIZE_RATIO
-#if VALBITS + GCTYPEBITS + 1 > 32
+#if BITS_PER_EMACS_INT > 32
 #define PURESIZE_RATIO 9/5      /* Don't surround with `()'. */
 #else
 #define PURESIZE_RATIO 1
diff --git a/src/xdisp.c b/src/xdisp.c
index 6f88827bf73..a756b99577c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16228,7 +16228,10 @@ decode_mode_spec_coding (coding_system, buf, eol_flag)
    generated by character C.  PRECISION >= 0 means don't return a
    string longer than that value.  FIELD_WIDTH > 0 means pad the
    string returned with spaces to that value.  Return 1 in *MULTIBYTE
-   if the result is multibyte text.  */
+   if the result is multibyte text.
+
+   Note we operate on the current buffer for most purposes,
+   the exception being w->base_line_pos.  */
 
 static char lots_of_dashes[] = "--------------------------------------------------------------------------------------------------------------------------------------------";
 
@@ -16242,7 +16245,7 @@ decode_mode_spec (w, c, field_width, precision, multibyte)
   Lisp_Object obj;
   struct frame *f = XFRAME (WINDOW_FRAME (w));
   char *decode_mode_spec_buf = f->decode_mode_spec_buffer;
-  struct buffer *b = XBUFFER (w->buffer);
+  struct buffer *b = current_buffer;
 
   obj = Qnil;
   *multibyte = 0;
@@ -16544,7 +16547,7 @@ decode_mode_spec (w, c, field_width, precision, multibyte)
 
     case 's':
       /* status of process */
-      obj = Fget_buffer_process (w->buffer);
+      obj = Fget_buffer_process (Fcurrent_buffer ());
       if (NILP (obj))
         return "no process";
 #ifdef subprocesses
diff --git a/src/xfaces.c b/src/xfaces.c
index 6e8a64e3c41..19369353f5e 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -389,6 +389,10 @@ Lisp_Object Qforeground_color, Qbackground_color;
 Lisp_Object Qface;
 extern Lisp_Object Qmouse_face;
 
+/* Property for basic faces which other faces cannot inherit.  */
+
+Lisp_Object Qface_no_inherit;
+
 /* Error symbol for wrong_type_argument in load_pixmap.  */
 
 Lisp_Object Qbitmap_spec_p;
@@ -3944,8 +3948,11 @@ Value is a vector of face attributes.  */)
      depend on the face, make sure they are all removed.  This is done
      by incrementing face_change_count.  The next call to
      init_iterator will then free realized faces.  */
-  ++face_change_count;
-  ++windows_or_buffers_changed;
+  if (NILP (Fget (face, Qface_no_inherit)))
+    {
+      ++face_change_count;
+      ++windows_or_buffers_changed;
+    }
 
   xassert (LFACEP (lface));
   check_lface (lface);
@@ -4020,8 +4027,11 @@ The value is TO.  */)
      depend on the face, make sure they are all removed.  This is done
      by incrementing face_change_count.  The next call to
      init_iterator will then free realized faces.  */
-  ++face_change_count;
-  ++windows_or_buffers_changed;
+  if (NILP (Fget (to, Qface_no_inherit)))
+    {
+      ++face_change_count;
+      ++windows_or_buffers_changed;
+    }
 
   return to;
 }
@@ -4385,6 +4395,7 @@ FRAME 0 means change the face on all frames, and change the default
      by incrementing face_change_count.  The next call to
      init_iterator will then free realized faces.  */
   if (!EQ (frame, Qt)
+      && NILP (Fget (face, Qface_no_inherit))
       && (EQ (attr, QCfont)
           || EQ (attr, QCfontset)
           || NILP (Fequal (old_value, value))))
@@ -4538,6 +4549,7 @@ update_face_from_frame_parameter (f, param, new_value)
      struct frame *f;
      Lisp_Object param, new_value;
 {
+  Lisp_Object face = Qnil;
   Lisp_Object lface;
 
   /* If there are no faces yet, give up.  This is the case when called
@@ -4546,17 +4558,10 @@ update_face_from_frame_parameter (f, param, new_value)
   if (NILP (f->face_alist))
     return;
 
-  /* Changing a named face means that all realized faces depending on
-     that face are invalid.  Since we cannot tell which realized faces
-     depend on the face, make sure they are all removed.  This is done
-     by incrementing face_change_count.  The next call to
-     init_iterator will then free realized faces.  */
-  ++face_change_count;
-  ++windows_or_buffers_changed;
-
   if (EQ (param, Qforeground_color))
     {
-      lface = lface_from_face_name (f, Qdefault, 1);
+      face = Qdefault;
+      lface = lface_from_face_name (f, face, 1);
       LFACE_FOREGROUND (lface) = (STRINGP (new_value)
                                   ? new_value : Qunspecified);
       realize_basic_faces (f);
@@ -4571,29 +4576,45 @@ update_face_from_frame_parameter (f, param, new_value)
       XSETFRAME (frame, f);
       call1 (Qframe_update_face_colors, frame);
 
-      lface = lface_from_face_name (f, Qdefault, 1);
+      face = Qdefault;
+      lface = lface_from_face_name (f, face, 1);
       LFACE_BACKGROUND (lface) = (STRINGP (new_value)
                                   ? new_value : Qunspecified);
       realize_basic_faces (f);
     }
-  if (EQ (param, Qborder_color))
+  else if (EQ (param, Qborder_color))
     {
-      lface = lface_from_face_name (f, Qborder, 1);
+      face = Qborder;
+      lface = lface_from_face_name (f, face, 1);
       LFACE_BACKGROUND (lface) = (STRINGP (new_value)
                                   ? new_value : Qunspecified);
     }
   else if (EQ (param, Qcursor_color))
     {
-      lface = lface_from_face_name (f, Qcursor, 1);
+      face = Qcursor;
+      lface = lface_from_face_name (f, face, 1);
       LFACE_BACKGROUND (lface) = (STRINGP (new_value)
                                   ? new_value : Qunspecified);
     }
   else if (EQ (param, Qmouse_color))
     {
-      lface = lface_from_face_name (f, Qmouse, 1);
+      face = Qmouse;
+      lface = lface_from_face_name (f, face, 1);
       LFACE_BACKGROUND (lface) = (STRINGP (new_value)
                                   ? new_value : Qunspecified);
     }
+
+  /* Changing a named face means that all realized faces depending on
+     that face are invalid.  Since we cannot tell which realized faces
+     depend on the face, make sure they are all removed.  This is done
+     by incrementing face_change_count.  The next call to
+     init_iterator will then free realized faces.  */
+  if (!NILP (face)
+      && NILP (Fget (face, Qface_no_inherit)))
+    {
+      ++face_change_count;
+      ++windows_or_buffers_changed;
+    }
 }
 
 
@@ -7951,6 +7972,8 @@ syms_of_xfaces ()
 {
   Qface = intern ("face");
   staticpro (&Qface);
+  Qface_no_inherit = intern ("face-no-inherit");
+  staticpro (&Qface_no_inherit);
   Qbitmap_spec_p = intern ("bitmap-spec-p");
   staticpro (&Qbitmap_spec_p);
   Qframe_update_face_colors = intern ("frame-update-face-colors");
diff --git a/src/xselect.c b/src/xselect.c
index 5de1beb9ac4..1e3efd2bf54 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -744,7 +744,15 @@ x_reply_selection_request (event, format, data, size, type)
      refering to the deleted window, and we'll get a BadWindow error
      in XTread_socket when processing the events.  I don't have
      an idea how to fix that.  gerd, 2001-01-98.   */
-  XFlush (display);
+  /* 2004-09-10: XSync and UNBLOCK so that possible protocol errors are
+     delivered before uncatch errors.  */
+  XSync (display, False);
+  UNBLOCK_INPUT;
+
+  /* GTK queues events in addition to the queue in Xlib.  So we
+     UNBLOCK to enter the event loop and get possible errors delivered,
+     and then BLOCK again because x_uncatch_errors requires it.  */
+  BLOCK_INPUT;
   x_uncatch_errors (display, count);
   UNBLOCK_INPUT;
 }