37 files changed, 809 insertions, 364 deletions

diff --git a/src/.gitignore b/src/.gitignore
index 406ff7cd5e2..48c78a4f3a6 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -17,3 +17,4 @@ obj
 prefix-args
 stamp-oldxmenu
 temacs
+buildobj.lst
diff --git a/src/ChangeLog b/src/ChangeLog
index e0ae2429fcd..5895b4b6564 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,233 @@
+2004-11-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (Fkeymap_prompt): Accept symbol keymaps.
+
+2004-11-09  Kim F. Storm  <storm@cua.dk>
+
+        * xselect.c: Include <sys/types.h> and <unistd.h> (for getpid).
+        Fix various comments referring to XEvents instead of input events.
+        (x_queue_event): Fix format strings.
+        (x_stop_queuing_selection_requests): Likewise.
+
+        * xdisp.c (produce_image_glyph): Remove unused variable 'face_ascent'.
+        (pint2hrstr): Add extra braces to silence compiler.
+
+        * print.c (print_object): Fix format string.
+
+        * lread.c (read1): Fix next_char matching.
+
+        * lisp.h (Fdelete): Add EXFUN.
+        (replace_range_2): Add prototype.
+
+        * keyboard.c (read_avail_input): Remove unused variable 'discard'.
+
+        * intervals.h (NULL_INTERVAL_P): Add separate version when
+        ENABLE_CHECKING is not defined to silence compiler.
+        (compare_string_intervals): Add prototype.
+
+        * fringe.c (destroy_fringe_bitmap): Fix return type.
+        (Ffringe_bitmaps_at_pos): Remove unused var 'old_buffer'.
+
+        * emacs.c (Fdump_emacs): Fix format string.
+
+        * doc.c: Include <ctype.h>.
+        (Fsubstitute_command_keys): Remove unused variable 'firstkey'.
+
+        * data.c (store_symval_forwarding): Remove unused variables.
+
+        * callint.c (Fcall_interactively): Remove unused variable 'funcar'.
+
+2004-11-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * Makefile.in (stamp-oldxmenu): If HAVE_GTK, don't add dependencies
+        to ${OLDXMENU}.
+
+2004-11-09  Kim F. Storm  <storm@cua.dk>
+
+        * process.c (Fmake_network_process): Remove kludge for interrupted
+        connects on BSD.  If connect is interrupted, just close socket and
+        start over rather than sleeping and retry with same socket.
+
+2004-11-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * .cvsignore: Add buildobj.lst.
+
+        * doc.c: New variable Vbuild_files.
+        (Fsnarf_documentation): If Vbuild_files is nil, populate it with
+        file names from buildobh.lst.  Only attach docstrings from files
+        that are in Vbuild_files.
+        (syms_of_doc): Defvar Vbuild_files.
+
+        * Makefile.in (SOME_MACHINE_OBJECTS): Add fringe.o, image.o
+        and w32*.o.
+        (temacs${EXEEXT}): Generate buildobj.lst when temacs is linked.
+        (mostlyclean): rm buildobj.lst
+
+        * makefile.w32-in ($(TEMACS)): Generate buildobj.lst when temacs
+        is linked.
+
+2004-11-09  Kim F. Storm  <storm@cua.dk>
+
+        * fringe.c (update_window_fringes): Update fringe bitmaps if
+        cur and row ends_at_zv_p differs.  If bitmaps of a row is updated,
+        also update previous row to get rid of misc. artifacts.
+
+2004-11-08  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (fast_find_position): Fix start pos if header line present.
+        (note_mouse_highlight): Clear mouse face if we move out of text area.
+
+2004-11-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * editfns.c: Move #include "systime.h" before <sys/resource.h>.
+        Don't include <sys/time.h> explicitly.
+        Include <stdio.h> unconditionally, not just on MacOS.
+
+2004-11-08  Kenichi Handa  <handa@m17n.org>
+
+        * fontset.c (fontset_pattern_regexp): Cancel my previous change;
+        don't pay attention to '\' before '*'.
+        (fontset_pattern_regexp): Change the meaning of the second arg.
+        (Fnew_fontset): Call fs_query_fontset, not Fquery_fontset.
+        (check_fontset_name): Try NAME as literal at first, and if it
+        failes, try NAME as pattern.
+
+2004-11-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * emacs.c (Fdump_emacs): Only output warning on GNU/Linux.
+
+2004-11-07  Andreas Schwab  <schwab@suse.de>
+
+        * lisp.h: Declare Fmsdos_downcase_filename.
+        * dired.c: Don't declare Fmsdos_downcase_filename.
+        * fileio.c: Likewise.
+
+2004-11-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * dosfns.c (Fdos_memget, Fdos_memput): Use integer variable offs in
+        comparisons with integers instead of Lisp_Object address.
+        (Fmsdos_set_keyboard): Declare argument allkeys.
+
+        * msdos.c (IT_set_frame_parameters): Use EQ, not ==, for Lisp_Object:s.
+
+        * dired.c: extern declare Fmsdos_downcase_filename on MSDOS to avoid
+        int/Lisp_Object mixup.
+
+        * fileio.c: Ditto.
+
+2004-11-06  Steven Tamm  <steventamm@mac.com>
+
+        * editfns.c: Need to include sys/time.h before resource.h on darwin.
+
+2004-11-06  Richard M. Stallman  <rms@gnu.org>
+
+        * callint.c (Fcall_interactively): Avoid reusing EVENT for other data.
+
+        * xfaces.c (merge_named_face): GCPRO the face_name in the
+        named_merge_point struct that we make.
+        (merge_face_heights): Eliminate GCPRO arg.  All callers changed.
+
+        * keyboard.c (command_loop_1): Change Vtransient_mark_mode
+        before deciding whether to inactivate mark.
+
+2004-11-06  Lars Brinkhoff  <lars@nocrew.org>
+
+        * config.in: Regenerate (add HAVE_GETRUSAGE).
+        * editfns.c (Fget_internal_run_time): New function.
+        (syms_of_data): Defsubr it.
+        * fns.c (sxhash): As far as possible, merge calculation of
+        hash code for symbols and strings.
+
+2004-11-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * frame.c (syms_of_frame): Fix the example in the doc string.
+
+2004-11-06  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * eval.c (Feval): Remove check for INPUT_BLOCKED_P.
+
+        * xmenu.c (popup_get_selection, create_and_show_popup_menu)
+        (create_and_show_dialog): Revert change from 2004-10-31.
+
+2004-11-05  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * macros.c (syms_of_macros) <defining-kbd-macro>: Doc fix.
+
+2004-11-05  Kim F. Storm  <storm@cua.dk>
+
+        * print.c (print_object): Print Lisp_Misc_Save_Value objects.
+
+        * fileio.c (Ffile_modes): Doc fix.
+        (auto_save_1): Check for Ffile_modes nil value.
+
+2004-11-05  Kim F. Storm  <storm@cua.dk>
+
+        * xselect.c (struct selection_event_queue, selection_queue)
+        (x_queue_selection_requests, x_queue_event)
+        (x_start_queuing_selection_requests)
+        (x_stop_queuing_selection_requests): Add new queue for selection
+        input events to replace previous XEvent queue in xterm.c.
+        (queue_selection_requests_unwind): Adapt to new queue.
+        (x_reply_selection_request): Adapt to new queue.
+        Unexpect wait_object in case of x errors (memory leak).
+        (x_handle_selection_request, x_handle_selection_clear): Make static.
+        (x_handle_selection_event): New function.  May queue selection events.
+        (wait_for_property_change_unwind): Use save_value instead of cons.
+        Clear property_change_reply_object.
+        (wait_for_property_change): Abort if already waiting.
+        Use save_value instead of cons for unwind data.
+        (x_handle_property_notify): Skip events already arrived, but don't
+        free them, as "arrived" field is checked by wait_for_property_change,
+        and it will be freed by unwind or explicit unexpect_property_change.
+        (x_get_foreign_selection): Add to new queue.
+        (receive_incremental_selection): Don't unexpect wait_object when done
+        as it has already been freed by previous wait_for_property_change.
+
+        * xterm.h (x_start_queuing_selection_requests)
+        (x_stop_queuing_selection_requests, x_handle_selection_request)
+        (x_handle_selection_clear): Remove prototypes.
+        (x_handle_selection_event): Add prototype.
+
+        * xterm.c (handle_one_xevent): Don't queue X selection events
+        here, it may be too late if we start queuing after we have already
+        stored some selection events into the kbd buffer.
+        (struct selection_event_queue, queue, x_queue_selection_requests)
+        (x_queue_event, x_unqueue_events, x_start_queuing_selection_requests)
+        (x_stop_queuing_selection_requests): Remove/move to xselect.c.
+        (x_catch_errors_unwind): Block input around final XSync.
+
+        * keyboard.h (kbd_buffer_unget_event): Add prototype.
+
+        * keyboard.c (kbd_buffer_store_event_hold): Remove obsolete code.
+        (kbd_buffer_unget_event): New function.
+        (kbd_buffer_get_event, swallow_events): Combine SELECTION events
+        and use x_handle_selection_event.
+        (mark_kboards): Don't mark x and y of SELECTION_CLEAR_EVENT.
+
+2004-11-05  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xselect.c (TRACE3): New debug macro.
+        (x_reply_selection_request): Use it.
+        (receive_incremental_selection): In call to TRACE0, the name of
+        a symbol is in xname.
+
+2004-11-05  Kim F. Storm  <storm@cua.dk>
+
+        * fontset.c (fontset_pattern_regexp): Use unsigned char.
+
+2004-11-04  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * fileio.c (Fnext_read_file_uses_dialog_p): New function.
+
+        * gtkutil.h: Declare use_old_gtk_file_dialog.
+
+        * gtkutil.c: Make use_old_gtk_file_dialog non-static.
+        (xg_initialize): Move DEFVAR_BOOL for use_old_gtk_file_dialog ...
+        * xfns.c (syms_of_xfns): ... to here.
+
+        * gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
+        it doesn't start with /.
+
 2004-11-04  Kenichi Handa  <handa@m17n.org>
 
         * fontset.c (fontset_pattern_regexp): If '*' is preceded by '\',
@@ -67,20 +297,20 @@
 
         * lisp.h: Fx_file_dialog takes 5 parameters.
 
-        * xfns.c (Fx_file_dialog): Both Motif and GTK version:  Add
-        parameter only_dir_p.
+        * xfns.c (Fx_file_dialog): Both Motif and GTK version:
+        Add parameter only_dir_p.
         In Motif version, don't put DEFAULT_FILENAME in filter part of the
         dialog, just text field part.  Do not add DEFAULT_FILENAME
         to list of files if it isn't there.
         In GTK version, pass only_dir_p parameter to xg_get_file_name.
 
-        * macfns.c (Fx_file_dialog): Add parameter only_dir_p.  Check
-        only_dir_p instead of comparing prompt to "Dired".  When using
+        * macfns.c (Fx_file_dialog): Add parameter only_dir_p.
+        Check only_dir_p instead of comparing prompt to "Dired".  When using
         a save dialog, add option kNavDontConfirmReplacement, change title
         to "Enter name", change text for save button to "Ok".
 
-        * w32fns.c (Fx_file_dialog): Add parameter only_dir_p.  Check
-        only_dir_p instead of comparing prompt to "Dired".
+        * w32fns.c (Fx_file_dialog): Add parameter only_dir_p.
+        Check only_dir_p instead of comparing prompt to "Dired".
 
         * gtkutil.c (xg_get_file_with_chooser)
         (xg_get_file_with_selection): New functions, only defined ifdef
@@ -97,8 +327,8 @@
 
 2004-11-01  Kim F. Storm  <storm@cua.dk>
 
-        * process.c (connect_wait_mask, num_pending_connects): Only
-        declare and use them if NON_BLOCKING_CONNECT is defined.
+        * process.c (connect_wait_mask, num_pending_connects):
+        Only declare and use them if NON_BLOCKING_CONNECT is defined.
         (init_process): Initialize them if NON_BLOCKING_CONNECT defined.
         (IF_NON_BLOCKING_CONNECT): New helper macro.
         (wait_reading_process_output): Only declare and use local vars
@@ -113,8 +343,8 @@
         * xmenu.c: Add prototypes for forward function declarations.
         (popup_get_selection): Remove parameter do_timers, remove call to
         timer_check.
-        (create_and_show_popup_menu, create_and_show_dialog): Remove
-        parameter do_timers from call to popup_get_selection.
+        (create_and_show_popup_menu, create_and_show_dialog):
+        Remove parameter do_timers from call to popup_get_selection.
 
         * xdisp.c (update_tool_bar): Pass a copy of f->tool_bar_items to
         tool_bar_items and assign the result to f->tool_bar_items if
@@ -133,7 +363,7 @@
         * macterm.c: allow user to assign key modifiers to the Mac Option
         key via a 'mac-option-modifier' variable.
 
-2004-10-28  Stefan  <monnier@iro.umontreal.ca>
+2004-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * xselect.c (Vx_lost_selection_functions, Vx_sent_selection_functions):
         Rename from Vx_lost_selection_hooks and Vx_sent_selection_hooks.
diff --git a/src/Makefile.in b/src/Makefile.in
index 5d6112c8fec..40d7e2df53c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -596,8 +596,10 @@ obj=    dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \
    These go in the DOC file on all machines
    in case they are needed there.  */
 SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \
-  xterm.o xfns.o xmenu.o xselect.o xrdb.o \
-  mac.o macterm.o macfns.o macmenu.o fontset.o
+  xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
+  mac.o macterm.o macfns.o macmenu.o fontset.o \
+  w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \
+  w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o
 
 
 #ifdef TERMINFO
@@ -926,6 +928,7 @@ ${libsrc}make-docfile${EXEEXT}:
 #endif
 
 temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
+        echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst
         $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
     -o temacs ${STARTFILES} ${obj} ${otherobj}  \
     OBJECTS_MACHINE ${LIBES}
@@ -941,7 +944,7 @@ prefix-args${EXEEXT}: prefix-args.c $(config_h)
 #define OLDXMENU_OPTIONS
 #endif
 
-#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS)
+#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (HAVE_GTK)
 
 /* We use stamp-xmenu with these two deps
    to both ensure that lwlib gets remade based on its dependencies
@@ -997,12 +1000,12 @@ really-oldXMenu:
         @true  /* make -t should not create really-oldXMenu.  */
 .PHONY: really-oldXMenu
 #endif /* not USE_X_TOOLKIT */
-#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */
+#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */
 
 /* We don\'t really need this, but satisfy the dependency.  */
 stamp-oldxmenu:
         touch stamp-oldxmenu
-#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */
+#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */
 
 ../config.status:: epaths.in
         @echo "The file epaths.h needs to be set up from epaths.in."
@@ -1266,6 +1269,7 @@ mostlyclean:
         rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a
         rm -f ../etc/DOC
         rm -f bootstrap-emacs${EXEEXT}
+        rm -f buildobj.lst
 clean: mostlyclean
         rm -f emacs-*${EXEEXT} emacs${EXEEXT}
 /**/# This is used in making a distribution.
diff --git a/src/callint.c b/src/callint.c
index da88693cd78..bb71ad50f44 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -265,7 +265,6 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used.  */)
   Lisp_Object *args, *visargs;
   unsigned char **argstrings;
   Lisp_Object fun;
-  Lisp_Object funcar;
   Lisp_Object specs;
   Lisp_Object filter_specs;
   Lisp_Object teml;
@@ -451,25 +450,25 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used.  */)
         string++;
       else if (*string == '@')
         {
-          Lisp_Object event;
+          Lisp_Object event, tem;
 
           event = (next_event < key_count
                    ? XVECTOR (keys)->contents[next_event]
                    : Qnil);
           if (EVENT_HAS_PARAMETERS (event)
-              && (event = XCDR (event), CONSP (event))
-              && (event = XCAR (event), CONSP (event))
-              && (event = XCAR (event), WINDOWP (event)))
+              && (tem = XCDR (event), CONSP (tem))
+              && (tem = XCAR (tem), CONSP (tem))
+              && (tem = XCAR (tem), WINDOWP (tem)))
             {
-              if (MINI_WINDOW_P (XWINDOW (event))
-                  && ! (minibuf_level > 0 && EQ (event, minibuf_window)))
+              if (MINI_WINDOW_P (XWINDOW (tem))
+                  && ! (minibuf_level > 0 && EQ (tem, minibuf_window)))
                 error ("Attempt to select inactive minibuffer window");
 
               /* If the current buffer wants to clean up, let it.  */
               if (!NILP (Vmouse_leave_buffer_hook))
                 call1 (Vrun_hooks, Qmouse_leave_buffer_hook);
 
-              Fselect_window (event, Qnil);
+              Fselect_window (tem, Qnil);
             }
           string++;
         }
diff --git a/src/config.in b/src/config.in
index 0fb9126b470..fe1adc39f9d 100644
--- a/src/config.in
+++ b/src/config.in
@@ -196,6 +196,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `getpt' function. */
 #undef HAVE_GETPT
 
+/* Define to 1 if you have the `getrusage' function. */
+#undef HAVE_GETRUSAGE
+
 /* Define to 1 if you have the `getsockname' function. */
 #undef HAVE_GETSOCKNAME
 
diff --git a/src/data.c b/src/data.c
index 561a034b8fd..7f68cc864df 100644
--- a/src/data.c
+++ b/src/data.c
@@ -908,8 +908,6 @@ store_symval_forwarding (symbol, valcontents, newval, buf)
      register Lisp_Object valcontents, newval;
      struct buffer *buf;
 {
-  int offset;
-
   switch (SWITCH_ENUM_CAST (XTYPE (valcontents)))
     {
     case Lisp_Misc:
@@ -941,7 +939,7 @@ store_symval_forwarding (symbol, valcontents, newval, buf)
                             - (char *) &buffer_defaults);
               int idx = PER_BUFFER_IDX (offset);
 
-              Lisp_Object tail, buf;
+              Lisp_Object tail;
 
               if (idx <= 0)
                 break;
diff --git a/src/doc.c b/src/doc.c
index f722dd49b76..1bb78c0c376 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -24,6 +24,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <sys/types.h>
 #include <sys/file.h>   /* Must be after sys/types.h for USG and BSD4_1*/
+#include <ctype.h>
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
@@ -51,6 +52,9 @@ Lisp_Object Vdoc_file_name;
 
 Lisp_Object Qfunction_documentation;
 
+/* A list of files used to build this Emacs binary.  */
+static Lisp_Object Vbuild_files;
+
 extern Lisp_Object Voverriding_local_map;
 
 /* For VMS versions with limited file name syntax,
@@ -581,6 +585,7 @@ the same file name is found in the `doc-directory'.  */)
   register char *p, *end;
   Lisp_Object sym;
   char *name;
+  int skip_file = 0;
 
   CHECK_STRING (filename);
 
@@ -618,6 +623,54 @@ the same file name is found in the `doc-directory'.  */)
 #endif /* VMS4_4 */
 #endif /* VMS */
 
+  /* Vbuild_files is nil when temacs is run, and non-nil after that.  */
+  if (NILP (Vbuild_files))
+  {
+    size_t cp_size = 0;
+    size_t to_read;
+    int nr_read;
+    char *cp = NULL;
+    char *beg, *end;
+
+    fd = emacs_open ("buildobj.lst", O_RDONLY, 0);
+    if (fd < 0)
+      report_file_error ("Opening file buildobj.lst", Qnil);
+
+    filled = 0;
+    for (;;)
+      {
+        cp_size += 1024;
+        to_read = cp_size - 1 - filled;
+        cp = xrealloc (cp, cp_size);
+        nr_read = emacs_read (fd, &cp[filled], to_read);
+        filled += nr_read;
+        if (nr_read < to_read)
+          break;
+      }
+
+    emacs_close (fd);
+    cp[filled] = 0;
+
+    for (beg = cp; *beg; beg = end)
+      {
+        int len;
+
+        while (*beg && isspace (*beg)) ++beg;
+
+        for (end = beg; *end && ! isspace (*end); ++end)
+          if (*end == '/') beg = end+1;  /* skip directory part  */
+
+        len = end - beg;
+        if (len > 4 && end[-4] == '.' && end[-3] == 'o')
+          len -= 2;  /* Just take .o if it ends in .obj  */
+
+        if (len > 0)
+          Vbuild_files = Fcons (make_string (beg, len), Vbuild_files);
+      }
+
+    xfree (cp);
+  }
+
   fd = emacs_open (name, O_RDONLY, 0);
   if (fd < 0)
     report_file_error ("Opening doc string file",
@@ -640,10 +693,28 @@ the same file name is found in the `doc-directory'.  */)
       if (p != end)
         {
           end = (char *) index (p, '\n');
+
+          /* See if this is a file name, and if it is a file in build-files.  */
+          if (p[1] == 'S' && end - p > 4 && end[-2] == '.'
+              && (end[-1] == 'o' || end[-1] == 'c'))
+            {
+              int len = end - p - 2;
+              char *fromfile = alloca (len + 1);
+              strncpy (fromfile, &p[2], len);
+              fromfile[len] = 0;
+              if (fromfile[len-1] == 'c')
+                fromfile[len-1] = 'o';
+
+              if (EQ (Fmember (build_string (fromfile), Vbuild_files), Qnil))
+                skip_file = 1;
+              else
+                skip_file = 0;
+            }
+
           sym = oblookup (Vobarray, p + 2,
                           multibyte_chars_in_text (p + 2, end - p - 2),
                           end - p - 2);
-          if (SYMBOLP (sym))
+          if (! skip_file && SYMBOLP (sym))
             {
               /* Attach a docstring to a variable?  */
               if (p[1] == 'V')
@@ -756,7 +827,6 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
         }
       else if (strp[0] == '\\' && strp[1] == '[')
         {
-          Lisp_Object firstkey;
           int start_idx;
 
           changed = 1;
@@ -919,6 +989,10 @@ syms_of_doc ()
                doc: /* Name of file containing documentation strings of built-in symbols.  */);
   Vdoc_file_name = Qnil;
 
+  DEFVAR_LISP ("build-files", &Vbuild_files,
+               doc: /* A list of files used to build this Emacs binary.  */);
+  Vbuild_files = Qnil;
+
   defsubr (&Sdocumentation);
   defsubr (&Sdocumentation_property);
   defsubr (&Ssnarf_documentation);
diff --git a/src/dosfns.c b/src/dosfns.c
index a64dc31b234..3b3aac0efad 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -110,7 +110,7 @@ Return the updated VECTOR.  */)
   offs = (unsigned long) XINT (address);
   CHECK_VECTOR (vector);
   len = XVECTOR (vector)-> size;
-  if (len < 1 || len > 2048 || address < 0 || address > 0xfffff - len)
+  if (len < 1 || len > 2048 || offs < 0 || offs > 0xfffff - len)
     return Qnil;
   buf = alloca (len);
   dosmemget (offs, len, buf);
@@ -135,7 +135,7 @@ DEFUN ("msdos-memput", Fdos_memput, Sdos_memput, 2, 2, 0,
   offs = (unsigned long) XINT (address);
   CHECK_VECTOR (vector);
   len = XVECTOR (vector)-> size;
-  if (len < 1 || len > 2048 || address < 0 || address > 0xfffff - len)
+  if (len < 1 || len > 2048 || offs < 0 || offs > 0xfffff - len)
     return Qnil;
   buf = alloca (len);
 
@@ -155,7 +155,7 @@ If the optional argument ALLKEYS is non-nil, the keyboard is mapped for
 all keys; otherwise it is only used when the ALT key is pressed.
 The current keyboard layout is available in dos-keyboard-code.  */)
      (country_code, allkeys)
-     Lisp_Object country_code;
+     Lisp_Object country_code, allkeys;
 {
   CHECK_NUMBER (country_code);
   if (!dos_set_keyboard (XINT (country_code), !NILP (allkeys)))
diff --git a/src/editfns.c b/src/editfns.c
index f6e3a4bb357..0917fadb500 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 #include <sys/types.h>
+#include <stdio.h>
 
 #ifdef VMS
 #include "vms-pwd.h"
@@ -33,10 +34,13 @@ Boston, MA 02111-1307, USA.  */
 #include <unistd.h>
 #endif
 
-/* Without this, sprintf on Mac OS Classic will produce wrong
-   result.  */
-#ifdef MAC_OS8
-#include <stdio.h>
+/* systime.h includes <sys/time.h> which, on some systems, is required
+   for <sys/resource.h>; thus systime.h must be included before
+   <sys/resource.h> */
+#include "systime.h"
+
+#if defined HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
 #endif
 
 #include <ctype.h>
@@ -49,8 +53,6 @@ Boston, MA 02111-1307, USA.  */
 #include "frame.h"
 #include "window.h"
 
-#include "systime.h"
-
 #ifdef STDC_HEADERS
 #include <float.h>
 #define MAX_10_EXP      DBL_MAX_10_EXP
@@ -1370,6 +1372,47 @@ resolution finer than a second.  */)
 
   return Flist (3, result);
 }
+
+DEFUN ("get-internal-run-time", Fget_internal_run_time, Sget_internal_run_time,
+       0, 0, 0,
+       doc: /* Return the current run time used by Emacs.
+The time is returned as a list of three integers.  The first has the
+most significant 16 bits of the seconds, while the second has the
+least significant 16 bits.  The third integer gives the microsecond
+count.
+
+On systems that can't determine the run time, get-internal-run-time
+does the same thing as current-time.  The microsecond count is zero on
+systems that do not provide resolution finer than a second.  */)
+     ()
+{
+#ifdef HAVE_GETRUSAGE
+  struct rusage usage;
+  Lisp_Object result[3];
+  int secs, usecs;
+
+  if (getrusage (RUSAGE_SELF, &usage) < 0)
+    /* This shouldn't happen.  What action is appropriate?  */
+    Fsignal (Qerror, Qnil);
+
+  /* Sum up user time and system time.  */
+  secs = usage.ru_utime.tv_sec + usage.ru_stime.tv_sec;
+  usecs = usage.ru_utime.tv_usec + usage.ru_stime.tv_usec;
+  if (usecs >= 1000000)
+    {
+      usecs -= 1000000;
+      secs++;
+    }
+
+  XSETINT (result[0], (secs >> 16) & 0xffff);
+  XSETINT (result[1], (secs >> 0)  & 0xffff);
+  XSETINT (result[2], usecs);
+
+  return Flist (3, result);
+#else
+  return Fcurrent_time ();
+#endif
+}
 
 
 int
@@ -4447,6 +4490,7 @@ functions if all the text being accessed has this property.  */);
   defsubr (&Suser_full_name);
   defsubr (&Semacs_pid);
   defsubr (&Scurrent_time);
+  defsubr (&Sget_internal_run_time);
   defsubr (&Sformat_time_string);
   defsubr (&Sfloat_time);
   defsubr (&Sdecode_time);
diff --git a/src/emacs.c b/src/emacs.c
index 5e583137dae..16ae1129840 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1626,16 +1626,14 @@ main (argc, argv
       keys_of_minibuf ();
       keys_of_window ();
     }
-        else
+  else
     {
-      /*
-        Initialization that must be done even if the global variable
-        initialized is non zero
-      */
+      /* Initialization that must be done even if the global variable
+         initialized is non zero.  */
 #ifdef HAVE_NTGUI
       globals_of_w32fns ();
       globals_of_w32menu ();
-#endif  /* end #ifdef HAVE_NTGUI */
+#endif  /* HAVE_NTGUI */
     }
 
   init_charset ();
@@ -2189,16 +2187,19 @@ You must run Emacs in batch mode in order to dump it.  */)
   if (! noninteractive)
     error ("Dumping Emacs works only in batch mode");
 
+#ifdef __linux__
   if (heap_bss_diff > MAX_HEAP_BSS_DIFF)
     {
       fprintf (stderr, "**************************************************\n");
       fprintf (stderr, "Warning: Your system has a gap between BSS and the\n");
-      fprintf (stderr, "heap.  This usually means that exec-shield or\n");
-      fprintf (stderr, "something similar is in effect.  The dump may fail\n");
-      fprintf (stderr, "because of this.  See the section about exec-shield\n");
-      fprintf (stderr, "in etc/PROBLEMS for more information.\n");
+      fprintf (stderr, "heap (%lu byte).  This usually means that exec-shield\n",
+               heap_bss_diff);
+      fprintf (stderr, "or something similar is in effect.  The dump may\n");
+      fprintf (stderr, "fail because of this.  See the section about \n");
+      fprintf (stderr, "exec-shield in etc/PROBLEMS for more information.\n");
       fprintf (stderr, "**************************************************\n");
     }
+#endif /* __linux__ */
 
   /* Bind `command-line-processed' to nil before dumping,
      so that the dumped Emacs will process its command line
@@ -2287,7 +2288,7 @@ synchronize_locale (category, plocale, desired_locale)
     {
       *plocale = desired_locale;
       setlocale (category, (STRINGP (desired_locale)
-                            ? (char *)(SDATA (desired_locale))
+                            ? (char *) SDATA (desired_locale)
                             : ""));
     }
 }
diff --git a/src/eval.c b/src/eval.c
index 5fb35cee58b..d1d5d195762 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1996,7 +1996,7 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
   struct backtrace backtrace;
   struct gcpro gcpro1, gcpro2, gcpro3;
 
-  if (handling_signal || INPUT_BLOCKED_P)
+  if (handling_signal)
     abort ();
 
   if (SYMBOLP (form))
diff --git a/src/fileio.c b/src/fileio.c
index 83c0866cf06..6f52f792a5b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3371,7 +3371,8 @@ This is the sort of file that holds an ordinary stream of data bytes.  */)
 }
 
 DEFUN ("file-modes", Ffile_modes, Sfile_modes, 1, 1, 0,
-       doc: /* Return mode bits of file named FILENAME, as an integer.  */)
+       doc: /* Return mode bits of file named FILENAME, as an integer.
+Return nil, if file does not exist or is not accessible.  */)
      (filename)
      Lisp_Object filename;
 {
@@ -5628,17 +5629,21 @@ Lisp_Object
 auto_save_1 ()
 {
   struct stat st;
+  Lisp_Object modes;
+
+  auto_save_mode_bits = 0666;
 
   /* Get visited file's mode to become the auto save file's mode.  */
-  if (! NILP (current_buffer->filename)
-      && stat (SDATA (current_buffer->filename), &st) >= 0)
-    /* But make sure we can overwrite it later!  */
-    auto_save_mode_bits = st.st_mode | 0600;
-  else if (! NILP (current_buffer->filename))
-    /* Remote files don't cooperate with stat.  */
-    auto_save_mode_bits = XINT (Ffile_modes (current_buffer->filename)) | 0600;
-  else
-    auto_save_mode_bits = 0666;
+  if (! NILP (current_buffer->filename))
+    {
+      if (stat (SDATA (current_buffer->filename), &st) >= 0)
+        /* But make sure we can overwrite it later!  */
+        auto_save_mode_bits = st.st_mode | 0600;
+      else if ((modes = Ffile_modes (current_buffer->filename),
+                INTEGERP (modes)))
+        /* Remote files don't cooperate with stat.  */
+        auto_save_mode_bits = XINT (modes) | 0600;
+    }
 
   return
     Fwrite_region (Qnil, Qnil,
@@ -6090,6 +6095,23 @@ DEFUN ("read-file-name-internal", Fread_file_name_internal, Sread_file_name_inte
   return Ffile_exists_p (string);
 }
 
+DEFUN ("next-read-file-uses-dialog-p", Fnext_read_file_uses_dialog_p,
+       Snext_read_file_uses_dialog_p, 0, 0, 0,
+       doc: /* Return t if a call to `read-file-name' will use a dialog.
+The return value is only relevant for a call to `read-file-name' that happens
+before any other event (mouse or keypress) is handeled.  */)
+  ()
+{
+#if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK) || defined (TARGET_API_MAC_CARBON)
+  if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
+      && use_dialog_box
+      && use_file_dialog
+      && have_menus_p ())
+    return Qt;
+#endif
+  return Qnil;
+}
+
 DEFUN ("read-file-name", Fread_file_name, Sread_file_name, 1, 6, 0,
        doc: /* Read file name, prompting with PROMPT and completing in directory DIR.
 Value is not expanded---you must call `expand-file-name' yourself.
@@ -6222,10 +6244,7 @@ and `read-file-name-function'.  */)
   GCPRO2 (insdef, default_filename);
 
 #if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK) || defined (TARGET_API_MAC_CARBON)
-  if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
-      && use_dialog_box
-      && use_file_dialog
-      && have_menus_p ())
+  if (! NILP (Fnext_read_file_uses_dialog_p ()))
     {
       /* If DIR contains a file name, split it.  */
       Lisp_Object file;
@@ -6610,6 +6629,7 @@ a non-nil value.  */);
 
   defsubr (&Sread_file_name_internal);
   defsubr (&Sread_file_name);
+  defsubr (&Snext_read_file_uses_dialog_p);
 
 #ifdef unix
   defsubr (&Sunix_sync);
diff --git a/src/fns.c b/src/fns.c
index cfbcc83fe8d..442eb120b82 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -4476,15 +4476,14 @@ sxhash (obj, depth)
       hash = XUINT (obj);
       break;
 
-    case Lisp_Symbol:
-      hash = sxhash_string (SDATA (SYMBOL_NAME (obj)),
-                            SCHARS (SYMBOL_NAME (obj)));
-      break;
-
     case Lisp_Misc:
       hash = XUINT (obj);
       break;
 
+    case Lisp_Symbol:
+      obj = SYMBOL_NAME (obj);
+      /* Fall through.  */
+
     case Lisp_String:
       hash = sxhash_string (SDATA (obj), SCHARS (obj));
       break;
diff --git a/src/fontset.c b/src/fontset.c
index 52d3cc555c5..baa56ad3a6f 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1069,14 +1069,14 @@ fontset_pattern_regexp (pattern)
       || strcmp (SDATA (pattern), CACHED_FONTSET_NAME))
     {
       /* We must at first update the cached data.  */
-      char *regex, *p0, *p1;
+      unsigned char *regex, *p0, *p1;
       int ndashes = 0, nstars = 0;
-      
+
       for (p0 = SDATA (pattern); *p0; p0++)
         {
           if (*p0 == '-')
             ndashes++;
-          else if (*p0 == '*' && p0 > SDATA (pattern) && p0[-1] != '\\')
+          else if (*p0 == '*')
             nstars++;
         }
 
@@ -1084,14 +1084,14 @@ fontset_pattern_regexp (pattern)
          we convert "*" to "[^-]*" which is much faster in regular
          expression matching.  */
       if (ndashes < 14)
-        p1 = regex = (char *) alloca (SBYTES (pattern) + 2 * nstars + 1);
+        p1 = regex = (unsigned char *) alloca (SBYTES (pattern) + 2 * nstars + 1);
       else
-        p1 = regex = (char *) alloca (SBYTES (pattern) + 5 * nstars + 1);
+        p1 = regex = (unsigned char *) alloca (SBYTES (pattern) + 5 * nstars + 1);
 
       *p1++ = '^';
-      for (p0 = (char *) SDATA (pattern); *p0; p0++)
+      for (p0 = SDATA (pattern); *p0; p0++)
         {
-          if (*p0 == '*' && p0 > SDATA (pattern) && p0[-1] != '\\')
+          if (*p0 == '*')
             {
               if (ndashes < 14)
                 *p1++ = '.';
@@ -1115,31 +1115,35 @@ fontset_pattern_regexp (pattern)
 }
 
 /* Return ID of the base fontset named NAME.  If there's no such
-   fontset, return -1.  */
+   fontset, return -1.  NAME_PATTERN specifies how to treat NAME as this:
+     0: pattern containing '*' and '?' as wildcards
+     1: regular expression
+     2: literal fontset name
+*/
 
 int
-fs_query_fontset (name, regexpp)
+fs_query_fontset (name, name_pattern)
      Lisp_Object name;
-     int regexpp;
+     int name_pattern;
 {
   Lisp_Object tem;
   int i;
 
   name = Fdowncase (name);
-  if (!regexpp)
+  if (name_pattern != 1)
     {
       tem = Frassoc (name, Vfontset_alias_alist);
       if (NILP (tem))
         tem = Fassoc (name, Vfontset_alias_alist);
       if (CONSP (tem) && STRINGP (XCAR (tem)))
         name = XCAR (tem);
-      else
+      else if (name_pattern == 0)
         {
           tem = fontset_pattern_regexp (name);
           if (STRINGP (tem))
             {
               name = tem;
-              regexpp = 1;
+              name_pattern = 1;
             }
         }
     }
@@ -1154,7 +1158,7 @@ fs_query_fontset (name, regexpp)
         continue;
 
       this_name = FONTSET_NAME (fontset);
-      if (regexpp
+      if (name_pattern == 1
           ? fast_string_match (name, this_name) >= 0
           : !strcmp (SDATA (name), SDATA (this_name)))
         return i;
@@ -1284,7 +1288,11 @@ check_fontset_name (name)
     return Vdefault_fontset;
 
   CHECK_STRING (name);
-  id = fs_query_fontset (name, 0);
+  /* First try NAME as literal.  */
+  id = fs_query_fontset (name, 2);
+  if (id < 0)
+    /* For backward compatibility, try again NAME as pattern.  */
+    id = fs_query_fontset (name, 0);
   if (id < 0)
     error ("Fontset `%s' does not exist", SDATA (name));
   return FONTSET_FROM_ID (id);
diff --git a/src/frame.c b/src/frame.c
index d7da02db278..ea60297a282 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4037,7 +4037,7 @@ is a reasonable practice.  See also the variable `x-resource-name'.  */);
   DEFVAR_LISP ("default-frame-alist", &Vdefault_frame_alist,
                doc: /* Alist of default values for frame creation.
 These may be set in your init file, like this:
-  (setq default-frame-alist '((width . 80) (height . 55) (menu-bar-lines . 1))
+  (setq default-frame-alist '((width . 80) (height . 55) (menu-bar-lines . 1)))
 These override values given in window system configuration data,
  including X Windows' defaults database.
 For values specific to the first Emacs frame, see `initial-frame-alist'.
diff --git a/src/fringe.c b/src/fringe.c
index ef4c7631e05..3de55b405cc 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -930,6 +930,7 @@ update_window_fringes (w, force_p)
       if (force_p
           || row->y != cur->y
           || row->visible_height != cur->visible_height
+          || row->ends_at_zv_p != cur->ends_at_zv_p
           || left != cur->left_fringe_bitmap
           || right != cur->right_fringe_bitmap
           || left_face_id != cur->left_fringe_face_id
@@ -953,6 +954,9 @@ update_window_fringes (w, force_p)
       row->right_fringe_bitmap = right;
       row->left_fringe_face_id = left_face_id;
       row->right_fringe_face_id = right_face_id;
+
+      if (rn > 0 && row->redraw_fringe_bitmaps_p)
+        row[-1].redraw_fringe_bitmaps_p = cur[-1].redraw_fringe_bitmaps_p = 1;
     }
 
   return redraw_p;
@@ -1056,7 +1060,7 @@ compute_fringe_widths (f, redraw)
 
 /* Free resources used by a user-defined bitmap.  */
 
-int
+void
 destroy_fringe_bitmap (n)
      int n;
 {
@@ -1367,7 +1371,6 @@ Return nil if POS is not visible in WINDOW.  */)
      Lisp_Object pos, window;
 {
   struct window *w;
-  struct buffer *old_buffer = NULL;
   struct glyph_row *row;
   int textpos;
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index e1331891140..f5f05709e48 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1131,7 +1131,7 @@ enum
 };
 
 #ifdef HAVE_GTK_FILE_BOTH
-static int use_old_gtk_file_dialog;
+int use_old_gtk_file_dialog;
 #endif
 
 
@@ -1178,8 +1178,24 @@ xg_get_file_with_chooser (f, prompt, default_filename, mustmatch_p, only_dir_p)
 
 
   if (default_filename)
-    gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin),
-                                   default_filename);
+    {
+      Lisp_Object file;
+      struct gcpro gcpro1;
+      GCPRO1 (file);
+
+      /* File chooser does not understand ~/... in the file name.  It must be
+         an absolute name starting with /.  */
+      if (default_filename[0] != '/')
+        {
+          file = Fexpand_file_name (build_string (default_filename), Qnil);
+          default_filename = SDATA (file);
+        }
+
+      gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin),
+                                     default_filename);
+
+      UNGCPRO;
+    }
 
   gtk_widget_show (filewin);
 
@@ -3538,14 +3554,6 @@ xg_initialize ()
                                     "gtk-key-theme-name",
                                     "Emacs",
                                     EMACS_CLASS);
-
-#ifdef HAVE_GTK_FILE_BOTH
-  DEFVAR_BOOL ("use-old-gtk-file-dialog", &use_old_gtk_file_dialog,
-    doc: /* *Non-nil means that the old GTK file selection dialog is used.
-            If nil the new GTK file chooser is used instead.  To turn off
-            all file dialogs set the variable `use-file-dialog'.  */);
-  use_old_gtk_file_dialog = 0;
-#endif
 }
 
 #endif /* USE_GTK */
diff --git a/src/gtkutil.h b/src/gtkutil.h
index b2e2c5f2fff..44e82885d7f 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -126,6 +126,10 @@ typedef struct _widget_value
   struct _widget_value *free_list;
 } widget_value;
 
+#ifdef HAVE_GTK_FILE_BOTH
+extern int use_old_gtk_file_dialog;
+#endif
+
 extern widget_value *malloc_widget_value P_ ((void));
 extern void free_widget_value P_ ((widget_value *));
 
diff --git a/src/intervals.h b/src/intervals.h
index a8b011f4d92..f55a68667f3 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -84,9 +84,14 @@ struct interval
 #define INT_LISPLIKE(i) (BUFFERP ((Lisp_Object){(EMACS_INT)(i)}) \
                          || STRINGP ((Lisp_Object){(EMACS_INT)(i)}))
 #endif
+
+#ifdef ENABLE_CHECKING
 #define NULL_INTERVAL_P(i) \
    (CHECK (!INT_LISPLIKE (i), "non-interval"), (i) == NULL_INTERVAL)
 /* old #define NULL_INTERVAL_P(i) ((i) == NULL_INTERVAL || INT_LISPLIKE (i)) */
+#else
+#define NULL_INTERVAL_P(i) ((i) == NULL_INTERVAL)
+#endif
 
 /* True if this interval has no right child. */
 #define NULL_RIGHT_CHILD(i) ((i)->right == NULL_INTERVAL)
@@ -289,6 +294,7 @@ extern INTERVAL balance_intervals P_ ((INTERVAL));
 extern INLINE void copy_intervals_to_string P_ ((Lisp_Object, struct buffer *,
                                                  int, int));
 extern INTERVAL copy_intervals P_ ((INTERVAL, int, int));
+extern int compare_string_intervals P_ ((Lisp_Object, Lisp_Object));
 extern Lisp_Object textget P_ ((Lisp_Object, Lisp_Object));
 extern Lisp_Object lookup_char_property P_ ((Lisp_Object, Lisp_Object, int));
 extern void move_if_not_intangible P_ ((int));
diff --git a/src/keyboard.c b/src/keyboard.c
index 3360b11850e..c89a86eb80f 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1840,6 +1840,14 @@ command_loop_1 ()
 
       if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks))
         {
+          /* Setting transient-mark-mode to `only' is a way of
+             turning it on for just one command.  */
+
+          if (EQ (Vtransient_mark_mode, Qidentity))
+            Vtransient_mark_mode = Qnil;
+          if (EQ (Vtransient_mark_mode, Qonly))
+            Vtransient_mark_mode = Qidentity;
+
           if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode))
             {
               /* We could also call `deactivate'mark'.  */
@@ -1855,16 +1863,6 @@ command_loop_1 ()
             call1 (Vrun_hooks, intern ("activate-mark-hook"));
         }
 
-      /* Setting transient-mark-mode to `only' is a way of
-         turning it on for just one command.  */
-      if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks))
-        {
-          if (EQ (Vtransient_mark_mode, Qidentity))
-            Vtransient_mark_mode = Qnil;
-          if (EQ (Vtransient_mark_mode, Qonly))
-            Vtransient_mark_mode = Qidentity;
-        }
-
     finalize:
 
       if (current_buffer == prev_buffer
@@ -3697,36 +3695,26 @@ kbd_buffer_store_event_hold (event, hold_quit)
      Discard the event if it would fill the last slot.  */
   if (kbd_fetch_ptr - 1 != kbd_store_ptr)
     {
+      *kbd_store_ptr = *event;
+      ++kbd_store_ptr;
+    }
+}
 
-#if 0 /* The SELECTION_REQUEST_EVENT case looks bogus, and it's error
-         prone to assign individual members for other events, in case
-         the input_event structure is changed.  --2000-07-13, gerd.  */
-      struct input_event *sp = kbd_store_ptr;
-      sp->kind = event->kind;
-      if (event->kind == SELECTION_REQUEST_EVENT)
-        {
-          /* We must not use the ordinary copying code for this case,
-             since `part' is an enum and copying it might not copy enough
-             in this case.  */
-          bcopy (event, (char *) sp, sizeof (*event));
-        }
-      else
 
-        {
-          sp->code = event->code;
-          sp->part = event->part;
-          sp->frame_or_window = event->frame_or_window;
-          sp->arg = event->arg;
-          sp->modifiers = event->modifiers;
-          sp->x = event->x;
-          sp->y = event->y;
-          sp->timestamp = event->timestamp;
-        }
-#else
-      *kbd_store_ptr = *event;
-#endif
+/* Put an input event back in the head of the event queue.  */
 
-      ++kbd_store_ptr;
+void
+kbd_buffer_unget_event (event)
+     register struct input_event *event;
+{
+  if (kbd_fetch_ptr == kbd_buffer)
+    kbd_fetch_ptr = kbd_buffer + KBD_BUFFER_SIZE;
+
+  /* Don't let the very last slot in the buffer become full,  */
+  if (kbd_fetch_ptr - 1 != kbd_store_ptr)
+    {
+      --kbd_fetch_ptr;
+      *kbd_fetch_ptr = *event;
     }
 }
 
@@ -3941,7 +3929,8 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
       /* These two kinds of events get special handling
          and don't actually appear to the command loop.
          We return nil for them.  */
-      if (event->kind == SELECTION_REQUEST_EVENT)
+      if (event->kind == SELECTION_REQUEST_EVENT
+          || event->kind == SELECTION_CLEAR_EVENT)
         {
 #ifdef HAVE_X11
           struct input_event copy;
@@ -3952,7 +3941,7 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
           copy = *event;
           kbd_fetch_ptr = event + 1;
           input_pending = readable_events (0);
-          x_handle_selection_request (&copy);
+          x_handle_selection_event (&copy);
 #else
           /* We're getting selection request events, but we don't have
              a window system.  */
@@ -3960,22 +3949,6 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
 #endif
         }
 
-      else if (event->kind == SELECTION_CLEAR_EVENT)
-        {
-#ifdef HAVE_X11
-          struct input_event copy;
-
-          /* Remove it from the buffer before processing it.  */
-          copy = *event;
-          kbd_fetch_ptr = event + 1;
-          input_pending = readable_events (0);
-          x_handle_selection_clear (&copy);
-#else
-          /* We're getting selection request events, but we don't have
-             a window system.  */
-          abort ();
-#endif
-        }
 #if defined (HAVE_X11) || defined (HAVE_NTGUI) || defined (MAC_OS)
       else if (event->kind == DELETE_WINDOW_EVENT)
         {
@@ -4200,7 +4173,8 @@ swallow_events (do_display)
 
       /* These two kinds of events get special handling
          and don't actually appear to the command loop.  */
-      if (event->kind == SELECTION_REQUEST_EVENT)
+      if (event->kind == SELECTION_REQUEST_EVENT
+          || event->kind == SELECTION_CLEAR_EVENT)
         {
 #ifdef HAVE_X11
           struct input_event copy;
@@ -4211,25 +4185,7 @@ swallow_events (do_display)
           copy = *event;
           kbd_fetch_ptr = event + 1;
           input_pending = readable_events (0);
-          x_handle_selection_request (&copy);
-#else
-          /* We're getting selection request events, but we don't have
-             a window system.  */
-          abort ();
-#endif
-        }
-
-      else if (event->kind == SELECTION_CLEAR_EVENT)
-        {
-#ifdef HAVE_X11
-          struct input_event copy;
-
-          /* Remove it from the buffer before processing it,  */
-          copy = *event;
-
-          kbd_fetch_ptr = event + 1;
-          input_pending = readable_events (0);
-          x_handle_selection_clear (&copy);
+          x_handle_selection_event (&copy);
 #else
           /* We're getting selection request events, but we don't have
              a window system.  */
@@ -6670,7 +6626,6 @@ read_avail_input (expected)
 
   if (read_socket_hook)
     {
-      int discard = 0;
       int nr;
       struct input_event hold_quit;
 
@@ -11454,7 +11409,8 @@ mark_kboards ()
       {
         if (event == kbd_buffer + KBD_BUFFER_SIZE)
           event = kbd_buffer;
-        if (event->kind != SELECTION_REQUEST_EVENT)
+        if (event->kind != SELECTION_REQUEST_EVENT
+            && event->kind != SELECTION_CLEAR_EVENT)
           {
             mark_object (event->x);
             mark_object (event->y);
diff --git a/src/keyboard.h b/src/keyboard.h
index 08cb934d3fe..8df3a2452a7 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -330,6 +330,7 @@ extern int lucid_event_type_list_p P_ ((Lisp_Object));
 extern void kbd_buffer_store_event P_ ((struct input_event *));
 extern void kbd_buffer_store_event_hold P_ ((struct input_event *,
                                              struct input_event *));
+extern void kbd_buffer_unget_event P_ ((struct input_event *));
 #ifdef POLL_FOR_INPUT
 extern void poll_for_input_1 P_ ((void));
 #endif
diff --git a/src/keymap.c b/src/keymap.c
index 1711e7fbc36..1a86caff4c4 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -214,13 +214,13 @@ when reading a key-sequence to be looked-up in this keymap.  */)
      (map)
      Lisp_Object map;
 {
+  map = get_keymap (map, 0, 0);
   while (CONSP (map))
     {
-      register Lisp_Object tem;
-      tem = Fcar (map);
+      Lisp_Object tem = XCAR (map);
       if (STRINGP (tem))
         return tem;
-      map = Fcdr (map);
+      map = XCDR (map);
     }
   return Qnil;
 }
diff --git a/src/lisp.h b/src/lisp.h
index 19995c58f54..b49602c1303 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2302,6 +2302,7 @@ EXFUN (Felt, 2);
 EXFUN (Fmember, 2);
 EXFUN (Frassq, 2);
 EXFUN (Fdelq, 2);
+EXFUN (Fdelete, 2);
 EXFUN (Fsort, 2);
 EXFUN (Freverse, 1);
 EXFUN (Fnreverse, 1);
@@ -2386,6 +2387,7 @@ extern void adjust_after_replace P_ ((int, int, Lisp_Object, int, int));
 extern void adjust_after_replace_noundo P_ ((int, int, int, int, int, int));
 extern void adjust_after_insert P_ ((int, int, int, int, int));
 extern void replace_range P_ ((int, int, Lisp_Object, int, int, int));
+extern void replace_range_2 P_ ((int, int, int, int, char *, int, int, int));
 extern void syms_of_insdel P_ ((void));
 
 /* Defined in dispnew.c */
@@ -3179,6 +3181,11 @@ extern void syms_of_xterm P_ ((void));
 
 /* Defined in getloadavg.c */
 extern int getloadavg P_ ((double [], int));
+
+#ifdef MSDOS
+/* Defined in msdos.c */
+EXFUN (Fmsdos_downcase_filename, 1);
+#endif
 
 /* Nonzero means Emacs has already been initialized.
    Used during startup to detect startup of dumped Emacs.  */
diff --git a/src/lread.c b/src/lread.c
index 0634a4c7c30..5e733f22a6d 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2581,9 +2581,9 @@ read1 (readcharfun, pch, first_in_list)
 
         if (next_char <= 040
             || (next_char < 0200
-                && index ("\"';([#?", next_char)
-                || (!first_in_list && next_char == '`')
-                || (new_backquote_flag && next_char == ',')))
+                && (index ("\"';([#?", next_char)
+                    || (!first_in_list && next_char == '`')
+                    || (new_backquote_flag && next_char == ','))))
           {
             *pch = c;
             return Qnil;
@@ -3819,7 +3819,7 @@ init_lread ()
   /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is
      almost never correct, thereby causing a warning to be printed out that
      confuses users.  Since PATH_LOADSEARCH is always overridden by the
-     EMACSLOADPATH environment variable below, disable the warning on NT.  
+     EMACSLOADPATH environment variable below, disable the warning on NT.
      Also, when using the "self-contained" option for Carbon Emacs for MacOSX,
      the "standard" paths may not exist and would be overridden by
      EMACSLOADPATH as on NT.  Since this depends on how the executable
diff --git a/src/macros.c b/src/macros.c
index d0219a3be04..09ae87b0a59 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -392,7 +392,9 @@ syms_of_macros ()
   defsubr (&Sstore_kbd_macro_event);
 
   DEFVAR_KBOARD ("defining-kbd-macro", defining_kbd_macro,
-                 doc: /* Non-nil while a keyboard macro is being defined.  Don't set this!  */);
+                 doc: /* Non-nil while a keyboard macro is being defined.  Don't set this!
+The value is the symbol `append' while appending to the definition of
+an existing macro.  */);
 
   DEFVAR_LISP ("executing-macro", &Vexecuting_macro,
                doc: /* Currently executing keyboard macro (string or vector); nil if none executing.  */);
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 5918e771399..bd8b3ba1e36 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -171,6 +171,9 @@ temacs:         $(BLD) $(TEMACS)
 $(TEMACS):      $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES)
         $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
         "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 20
+        echo $(OBJ0) > $(BLD)/buildobj.lst
+        echo $(OBJ1) >> $(BLD)/buildobj.lst
+        echo $(WIN32OBJ) >> $(BLD)/buildobj.lst
 
 bootstrap: bootstrap-emacs
 
diff --git a/src/msdos.c b/src/msdos.c
index 0020be310a6..f863984fac3 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -2320,7 +2320,7 @@ IT_set_frame_parameters (f, alist)
 
   /* If we are creating a new frame, begin with the original screen colors
      used for the initial frame.  */
-  if (alist == Vdefault_frame_alist
+  if (EQ (alist, Vdefault_frame_alist)
       && initial_screen_colors[0] != -1 && initial_screen_colors[1] != -1)
     {
       FRAME_FOREGROUND_PIXEL (f) = initial_screen_colors[0];
diff --git a/src/print.c b/src/print.c
index 84625a89edd..3a21ef29560 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2183,6 +2183,15 @@ print_object (obj, printcharfun, escapeflag)
           PRINTCHAR ('>');
           break;
 
+        case Lisp_Misc_Save_Value:
+          strout ("#<save_value ", -1, -1, printcharfun, 0);
+          sprintf(buf, "ptr=0x%08lx int=%d",
+                  (unsigned long) XSAVE_VALUE (obj)->pointer,
+                  XSAVE_VALUE (obj)->integer);
+          strout (buf, -1, -1, printcharfun, 0);
+          PRINTCHAR ('>');
+          break;
+
         default:
           goto badtype;
         }
diff --git a/src/process.c b/src/process.c
index 76967cd7ac2..699c99cdcb8 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2723,7 +2723,6 @@ usage: (make-network-process &rest ARGS)  */)
   int xerrno = 0;
   int s = -1, outch, inch;
   struct gcpro gcpro1;
-  int retry = 0;
   int count = SPECPDL_INDEX ();
   int count1;
   Lisp_Object QCaddress;  /* one of QClocal or QCremote */
@@ -3024,6 +3023,8 @@ usage: (make-network-process &rest ARGS)  */)
     {
       int optn, optbits;
 
+    retry_connect:
+
       s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol);
       if (s < 0)
         {
@@ -3102,8 +3103,6 @@ usage: (make-network-process &rest ARGS)  */)
           break;
         }
 
-    retry_connect:
-
       immediate_quit = 1;
       QUIT;
 
@@ -3145,22 +3144,13 @@ usage: (make-network-process &rest ARGS)  */)
 
       immediate_quit = 0;
 
-      if (xerrno == EINTR)
-        goto retry_connect;
-      if (xerrno == EADDRINUSE && retry < 20)
-        {
-          /* A delay here is needed on some FreeBSD systems,
-             and it is harmless, since this retrying takes time anyway
-             and should be infrequent.  */
-          Fsleep_for (make_number (1), Qnil);
-          retry++;
-          goto retry_connect;
-        }
-
       /* Discard the unwind protect closing S.  */
       specpdl_ptr = specpdl + count1;
       emacs_close (s);
       s = -1;
+
+      if (xerrno == EINTR)
+        goto retry_connect;
     }
 
   if (s >= 0)
diff --git a/src/window.c b/src/window.c
index b6738457de4..976e2b505cf 100644
--- a/src/window.c
+++ b/src/window.c
@@ -204,7 +204,7 @@ static int window_initialized;
 Lisp_Object Qwindow_configuration_change_hook;
 Lisp_Object Vwindow_configuration_change_hook;
 
-/* Nonzero means scroll commands try to put point
+/* Non-nil means scroll commands try to put point
    at the same screen height as previously.  */
 
 Lisp_Object Vscroll_preserve_screen_position;
@@ -4523,7 +4523,7 @@ window_scroll_pixel_based (window, n, whole, noerror)
       start = it.current.pos;
     }
 
-  /* If scroll_preserve_screen_position is non-zero, we try to set
+  /* If scroll_preserve_screen_position is non-nil, we try to set
      point in the same window line as it is now, so get that line.  */
   if (!NILP (Vscroll_preserve_screen_position))
     {
diff --git a/src/xdisp.c b/src/xdisp.c
index 22f870d16ef..5498bbcde00 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16142,27 +16142,31 @@ pint2hrstr (buf, width, d)
         {
           tenths = remainder / 100;
           if (50 <= remainder % 100)
-            if (tenths < 9)
-              tenths++;
-            else
-              {
-                quotient++;
-                if (quotient == 10)
-                  tenths = -1;
-                else
-                  tenths = 0;
-              }
+            {
+              if (tenths < 9)
+                tenths++;
+              else
+                {
+                  quotient++;
+                  if (quotient == 10)
+                    tenths = -1;
+                  else
+                    tenths = 0;
+                }
+            }
         }
       else
         if (500 <= remainder)
-          if (quotient < 999)
-            quotient++;
-          else
-            {
-              quotient = 1;
-              exponent++;
-              tenths = 0;
-            }
+          {
+            if (quotient < 999)
+              quotient++;
+            else
+              {
+                quotient = 1;
+                exponent++;
+                tenths = 0;
+              }
+          }
     }
 
   /* Calculate the LENGTH of QUOTIENT.TENTHS as a string. */
@@ -18455,7 +18459,7 @@ produce_image_glyph (it)
 {
   struct image *img;
   struct face *face;
-  int face_ascent, glyph_ascent;
+  int glyph_ascent;
   struct glyph_slice slice;
 
   xassert (it->what == IT_IMAGE);
@@ -18538,7 +18542,7 @@ produce_image_glyph (it)
 
 #if 0  /* this breaks image tiling */
   /* If this glyph is alone on the last line, adjust it.ascent to minimum row ascent.  */
-  face_ascent = face->font ? FONT_BASE (face->font) : FRAME_BASELINE_OFFSET (it->f);
+  int face_ascent = face->font ? FONT_BASE (face->font) : FRAME_BASELINE_OFFSET (it->f);
   if (face_ascent > it->ascent)
     it->ascent = it->phys_ascent = face_ascent;
 #endif
@@ -20558,19 +20562,20 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop)
   int past_end = 0;
 
   first = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
+  if (charpos < MATRIX_ROW_START_CHARPOS (first))
+    {
+      *x = first->x;
+      *y = first->y;
+      *hpos = 0;
+      *vpos = MATRIX_ROW_VPOS (first, w->current_matrix);
+      return 1;
+    }
+
   row = row_containing_pos (w, charpos, first, NULL, 0);
   if (row == NULL)
     {
-      if (charpos < MATRIX_ROW_START_CHARPOS (first))
-        {
-          *x = *y = *hpos = *vpos = 0;
-          return 1;
-        }
-      else
-        {
-          row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
-          past_end = 1;
-        }
+      row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
+      past_end = 1;
     }
 
   *x = row->x;
@@ -21116,8 +21121,10 @@ note_mouse_highlight (f, x, y)
   /* Which window is that in?  */
   window = window_from_coordinates (f, x, y, &part, 0, 0, 1);
 
-  /* If we were displaying active text in another window, clear that.  */
-  if (! EQ (window, dpyinfo->mouse_face_window))
+  /* If we were displaying active text in another window, clear that.
+     Also clear if we move out of text area in same window.  */
+  if (! EQ (window, dpyinfo->mouse_face_window)
+      || (part != ON_TEXT && !NILP (dpyinfo->mouse_face_window)))
     clear_mouse_face (dpyinfo);
 
   /* Not on a window -> return.  */
diff --git a/src/xfaces.c b/src/xfaces.c
index 19369353f5e..fc2cd6b0af4 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3511,8 +3511,8 @@ set_lface_from_font_name (f, lface, fontname, force_p, may_fail_p)
    call into lisp.  */
 
 Lisp_Object
-merge_face_heights (from, to, invalid, gcpro)
-     Lisp_Object from, to, invalid, gcpro;
+merge_face_heights (from, to, invalid)
+     Lisp_Object from, to, invalid;
 {
   Lisp_Object result = invalid;
 
@@ -3537,16 +3537,11 @@ merge_face_heights (from, to, invalid, gcpro)
       /* Call function with current height as argument.
          From is the new height.  */
       Lisp_Object args[2];
-      struct gcpro gcpro1;
-
-      GCPRO1 (gcpro);
 
       args[0] = from;
       args[1] = to;
       result = safe_call (2, args);
 
-      UNGCPRO;
-
       /* Ensure that if TO was absolute, so is the result.  */
       if (INTEGERP (to) && !INTEGERP (result))
         result = invalid;
@@ -3599,8 +3594,7 @@ merge_face_vectors (f, from, to, named_merge_points)
     if (!UNSPECIFIEDP (from[i]))
       {
         if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
-          to[i] = merge_face_heights (from[i], to[i], to[i],
-                                      named_merge_points);
+          to[i] = merge_face_heights (from[i], to[i], to[i]);
         else
           to[i] = from[i];
       }
@@ -3627,11 +3621,16 @@ merge_named_face (f, face_name, to, named_merge_points)
   if (push_named_merge_point (&named_merge_point,
                               face_name, &named_merge_points))
     {
+      struct gcpro gcpro1;
       Lisp_Object from[LFACE_VECTOR_SIZE];
       int ok = get_lface_attributes (f, face_name, from, 0);
 
       if (ok)
-        merge_face_vectors (f, from, to, named_merge_points);
+        {
+          GCPRO1 (named_merge_point.face_name);
+          merge_face_vectors (f, from, to, named_merge_points);
+          UNGCPRO;
+        }
 
       return ok;
     }
@@ -3722,8 +3721,7 @@ merge_face_ref (f, face_ref, to, err_msgs, named_merge_points)
               else if (EQ (keyword, QCheight))
                 {
                   Lisp_Object new_height =
-                    merge_face_heights (value, to[LFACE_HEIGHT_INDEX],
-                                        Qnil, Qnil);
+                    merge_face_heights (value, to[LFACE_HEIGHT_INDEX], Qnil);
 
                   if (! NILP (new_height))
                     to[LFACE_HEIGHT_INDEX] = new_height;
@@ -4110,7 +4108,7 @@ FRAME 0 means change the face on all frames, and change the default
                   /* The default face must have an absolute size,
                      otherwise, we do a test merge with a random
                      height to see if VALUE's ok. */
-                  : merge_face_heights (value, make_number (10), Qnil, Qnil));
+                  : merge_face_heights (value, make_number (10), Qnil));
 
           if (!INTEGERP (test) || XINT (test) <= 0)
             signal_error ("Invalid face height", value);
@@ -4824,7 +4822,7 @@ the result will be absolute, otherwise it will be relative.  */)
   if (EQ (value1, Qunspecified))
     return value2;
   else if (EQ (attribute, QCheight))
-    return merge_face_heights (value1, value2, value1, Qnil);
+    return merge_face_heights (value1, value2, value1);
   else
     return value1;
 }
diff --git a/src/xfns.c b/src/xfns.c
index 8ddb29310df..46bce6536c8 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5541,6 +5541,14 @@ Chinese, Japanese, and Korean.  */);
   Fprovide (intern ("x-toolkit"), Qnil);
   Fprovide (intern ("gtk"), Qnil);
 
+#ifdef HAVE_GTK_FILE_BOTH
+  DEFVAR_BOOL ("use-old-gtk-file-dialog", &use_old_gtk_file_dialog,
+    doc: /* *Non-nil means that the old GTK file selection dialog is used.
+If nil the new GTK file chooser is used instead.  To turn off
+all file dialogs set the variable `use-file-dialog'.  */);
+  use_old_gtk_file_dialog = 0;
+#endif
+
   DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string,
                doc: /* Version info for GTK+.  */);
   {
diff --git a/src/xmenu.c b/src/xmenu.c
index 0da826e4cb0..f7e24e66838 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -115,7 +115,7 @@ extern XtAppContext Xt_app_con;
 
 static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **));
 static void popup_get_selection P_ ((XEvent *, struct x_display_info *,
-                                     LWLIB_ID, int));
+                                     LWLIB_ID, int, int));
 
 /* Define HAVE_BOXES if menus can handle radio and toggle buttons.  */
 
@@ -157,6 +157,8 @@ static void single_keymap_panes P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
 static void list_of_panes P_ ((Lisp_Object));
 static void list_of_items P_ ((Lisp_Object));
 
+extern EMACS_TIME timer_check P_ ((int));
+
 
 /* This holds a Lisp vector that holds the results of decoding
    the keymaps or alist-of-alists that specify a menu.
@@ -1120,7 +1122,6 @@ on the left of the dialog box and all following items on the right.
    popped down (deactivated).  This is used for x-popup-menu
    and x-popup-dialog; it is not used for the menu bar.
 
-   If DO_TIMERS is nonzero, run timers.
    If DOWN_ON_KEYPRESS is nonzero, pop down if a key is pressed.
 
    NOTE: All calls to popup_get_selection should be protected
@@ -1128,17 +1129,22 @@ on the left of the dialog box and all following items on the right.
 
 #ifdef USE_X_TOOLKIT
 static void
-popup_get_selection (initial_event, dpyinfo, id, down_on_keypress)
+popup_get_selection (initial_event, dpyinfo, id, do_timers, down_on_keypress)
      XEvent *initial_event;
      struct x_display_info *dpyinfo;
      LWLIB_ID id;
+     int do_timers;
      int down_on_keypress;
 {
   XEvent event;
 
   while (popup_activated_flag)
     {
-      if (initial_event)
+       /* If we have no events to run, consider timers.  */      
+       if (do_timers && !XtAppPending (Xt_app_con))      
+         timer_check (1);        
+
+       if (initial_event)
         {
           event = *initial_event;
           initial_event = 0;
@@ -2484,7 +2490,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click)
   popup_activated_flag = 1;
 
   /* Process events that apply to the menu.  */
-  popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 0);
+  popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 0, 0);
 
   /* fp turned off the following statement and wrote a comment
      that it is unnecessary--that the menu has already disappeared.
@@ -2878,7 +2884,8 @@ create_and_show_dialog (f, first_wv)
                            Fcons (make_number (dialog_id >> (fact)),
                                   make_number (dialog_id & ~(-1 << (fact)))));
 
-    popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), dialog_id, 1);
+    popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f),
+                         dialog_id, 1, 1);
 
     unbind_to (count, Qnil);
   }
diff --git a/src/xselect.c b/src/xselect.c
index 35f4586b754..c89347be2cd 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -24,6 +24,14 @@ Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 #include <stdio.h>      /* termhooks.h needs this */
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include "lisp.h"
 #include "xterm.h"      /* for all of the X includes */
 #include "dispextern.h" /* frame.h seems to want this */
@@ -32,6 +40,7 @@ Boston, MA 02111-1307, USA.  */
 #include "buffer.h"
 #include "process.h"
 #include "termhooks.h"
+#include "keyboard.h"
 
 #include <X11/Xproto.h>
 
@@ -85,10 +94,13 @@ static void initialize_cut_buffers P_ ((Display *, Window));
   fprintf (stderr, "%d: " fmt "\n", getpid (), a0)
 #define TRACE2(fmt, a0, a1) \
   fprintf (stderr, "%d: " fmt "\n", getpid (), a0, a1)
+#define TRACE3(fmt, a0, a1, a2) \
+  fprintf (stderr, "%d: " fmt "\n", getpid (), a0, a1, a2)
 #else
 #define TRACE0(fmt)             (void) 0
 #define TRACE1(fmt, a0)         (void) 0
 #define TRACE2(fmt, a0, a1)     (void) 0
+#define TRACE3(fmt, a0, a1)     (void) 0
 #endif
 
 
@@ -168,6 +180,89 @@ static void lisp_data_to_selection_data ();
 static Lisp_Object selection_data_to_lisp_data ();
 static Lisp_Object x_get_window_property_as_lisp_data ();
 
+
+
+/* Define a queue to save up SELECTION_REQUEST_EVENT events for later
+   handling.  */
+
+struct selection_event_queue
+  {
+    struct input_event event;
+    struct selection_event_queue *next;
+  };
+
+static struct selection_event_queue *selection_queue;
+
+/* Nonzero means queue up SELECTION_REQUEST_EVENT events.  */
+
+static int x_queue_selection_requests;
+
+/* Queue up an SELECTION_REQUEST_EVENT *EVENT, to be processed later.  */
+
+static void
+x_queue_event (event)
+     struct input_event *event;
+{
+  struct selection_event_queue *queue_tmp;
+
+  /* Don't queue repeated requests.
+     This only happens for large requests which uses the incremental protocol.  */
+  for (queue_tmp = selection_queue; queue_tmp; queue_tmp = queue_tmp->next)
+    {
+      if (!bcmp (&queue_tmp->event, event, sizeof (*event)))
+        {
+          TRACE1 ("DECLINE DUP SELECTION EVENT %08lx", (unsigned long)queue_tmp);
+          x_decline_selection_request (event);
+          return;
+        }
+    }
+
+  queue_tmp
+    = (struct selection_event_queue *) xmalloc (sizeof (struct selection_event_queue));
+
+  if (queue_tmp != NULL)
+    {
+      TRACE1 ("QUEUE SELECTION EVENT %08lx", (unsigned long)queue_tmp);
+      queue_tmp->event = *event;
+      queue_tmp->next = selection_queue;
+      selection_queue = queue_tmp;
+    }
+}
+
+/* Start queuing SELECTION_REQUEST_EVENT events.  */
+
+static void
+x_start_queuing_selection_requests ()
+{
+  if (x_queue_selection_requests)
+    abort ();
+
+  x_queue_selection_requests++;
+  TRACE1 ("x_start_queuing_selection_requests %d", x_queue_selection_requests);
+}
+
+/* Stop queuing SELECTION_REQUEST_EVENT events.  */
+
+static void
+x_stop_queuing_selection_requests ()
+{
+  TRACE1 ("x_stop_queuing_selection_requests %d", x_queue_selection_requests);
+  --x_queue_selection_requests;
+
+  /* Take all the queued events and put them back
+     so that they get processed afresh.  */
+
+  while (selection_queue != NULL)
+    {
+      struct selection_event_queue *queue_tmp = selection_queue;
+      TRACE1 ("RESTORE SELECTION EVENT %08lx", (unsigned long)queue_tmp);
+      kbd_buffer_unget_event (&queue_tmp->event);
+      selection_queue = queue_tmp->next;
+      xfree ((char *)queue_tmp);
+    }
+}
+
+
 /* This converts a Lisp symbol to a server Atom, avoiding a server
    roundtrip whenever possible.  */
 
@@ -557,13 +652,10 @@ static struct prop_location *property_change_reply_object;
 static struct prop_location *property_change_wait_list;
 
 static Lisp_Object
-queue_selection_requests_unwind (frame)
-     Lisp_Object frame;
+queue_selection_requests_unwind (tem)
+     Lisp_Object tem;
 {
-  FRAME_PTR f = XFRAME (frame);
-
-  if (! NILP (frame))
-    x_stop_queuing_selection_requests (FRAME_X_DISPLAY (f));
+  x_stop_queuing_selection_requests ();
   return Qnil;
 }
 
@@ -623,6 +715,17 @@ x_reply_selection_request (event, format, data, size, type)
   BLOCK_INPUT;
   count = x_catch_errors (display);
 
+#ifdef TRACE_SELECTION
+  {
+    static int cnt;
+    char *sel = XGetAtomName (display, reply.selection);
+    char *tgt = XGetAtomName (display, reply.target);
+    TRACE3 ("%s, target %s (%d)", sel, tgt, ++cnt);
+    if (sel) XFree (sel);
+    if (tgt) XFree (tgt);
+  }
+#endif /* TRACE_SELECTION */
+
   /* Store the data on the requested property.
      If the selection is large, only store the first N bytes of it.
    */
@@ -650,10 +753,10 @@ x_reply_selection_request (event, format, data, size, type)
          bother trying to queue them.  */
       if (!NILP (frame))
         {
-          x_start_queuing_selection_requests (display);
+          x_start_queuing_selection_requests ();
 
           record_unwind_protect (queue_selection_requests_unwind,
-                                 frame);
+                                 Qnil);
         }
 
       if (x_window_to_frame (dpyinfo, window)) /* #### debug */
@@ -687,6 +790,8 @@ x_reply_selection_request (event, format, data, size, type)
                   XGetAtomName (display, reply.property));
           wait_for_property_change (wait_object);
         }
+      else
+        unexpect_property_change (wait_object);
 
       TRACE0 ("Got ACK");
       while (bytes_remaining)
@@ -760,7 +865,7 @@ x_reply_selection_request (event, format, data, size, type)
 /* Handle a SelectionRequest event EVENT.
    This is called from keyboard.c when such an event is found in the queue.  */
 
-void
+static void
 x_handle_selection_request (event)
      struct input_event *event;
 {
@@ -775,6 +880,10 @@ x_handle_selection_request (event)
   struct x_display_info *dpyinfo
     = x_display_info_for_display (SELECTION_EVENT_DISPLAY (event));
 
+  TRACE2 ("x_handle_selection_request, from=0x%08lx time=%lu",
+          (unsigned long) SELECTION_EVENT_REQUESTOR (event),
+          (unsigned long) SELECTION_EVENT_TIME (event));
+
   local_selection_data = Qnil;
   target_symbol = Qnil;
   converted_selection = Qnil;
@@ -869,7 +978,7 @@ x_handle_selection_request (event)
    client cleared out our previously asserted selection.
    This is called from keyboard.c when such an event is found in the queue.  */
 
-void
+static void
 x_handle_selection_clear (event)
      struct input_event *event;
 {
@@ -882,6 +991,8 @@ x_handle_selection_clear (event)
   struct x_display_info *dpyinfo = x_display_info_for_display (display);
   struct x_display_info *t_dpyinfo;
 
+  TRACE0 ("x_handle_selection_clear");
+
   /* If the new selection owner is also Emacs,
      don't clear the new selection.  */
   BLOCK_INPUT;
@@ -950,6 +1061,24 @@ x_handle_selection_clear (event)
   }
 }
 
+void
+x_handle_selection_event (event)
+     struct input_event *event;
+{
+  TRACE0 ("x_handle_selection_event");
+
+  if (event->kind == SELECTION_REQUEST_EVENT)
+    {
+      if (x_queue_selection_requests)
+        x_queue_event (event);
+      else
+        x_handle_selection_request (event);
+    }
+  else
+    x_handle_selection_clear (event);
+}
+
+
 /* Clear all selections that were made from frame F.
    We do this when about to delete a frame.  */
 
@@ -1080,12 +1209,14 @@ unexpect_property_change (location)
 /* Remove the property change expectation element for IDENTIFIER.  */
 
 static Lisp_Object
-wait_for_property_change_unwind (identifierval)
-     Lisp_Object identifierval;
+wait_for_property_change_unwind (loc)
+     Lisp_Object loc;
 {
-  unexpect_property_change ((struct prop_location *)
-                            (XFASTINT (XCAR (identifierval)) << 16
-                             | XFASTINT (XCDR (identifierval))));
+  struct prop_location *location = XSAVE_VALUE (loc)->pointer;
+
+  unexpect_property_change (location);
+  if (location == property_change_reply_object)
+    property_change_reply_object = 0;
   return Qnil;
 }
 
@@ -1098,18 +1229,17 @@ wait_for_property_change (location)
 {
   int secs, usecs;
   int count = SPECPDL_INDEX ();
-  Lisp_Object tem;
 
-  tem = Fcons (Qnil, Qnil);
-  XSETCARFASTINT (tem, (EMACS_UINT)location >> 16);
-  XSETCDRFASTINT (tem, (EMACS_UINT)location & 0xffff);
+  if (property_change_reply_object)
+    abort ();
 
   /* Make sure to do unexpect_property_change if we quit or err.  */
-  record_unwind_protect (wait_for_property_change_unwind, tem);
+  record_unwind_protect (wait_for_property_change_unwind,
+                         make_save_value (location, 0));
 
   XSETCAR (property_change_reply, Qnil);
-
   property_change_reply_object = location;
+
   /* If the event we are waiting for arrives beyond here, it will set
      property_change_reply, because property_change_reply_object says so.  */
   if (! location->arrived)
@@ -1140,7 +1270,8 @@ x_handle_property_notify (event)
 
   while (rest)
     {
-      if (rest->property == event->atom
+      if (!rest->arrived
+          && rest->property == event->atom
           && rest->window == event->window
           && rest->display == event->display
           && rest->desired_state == event->state)
@@ -1156,11 +1287,6 @@ x_handle_property_notify (event)
           if (rest == property_change_reply_object)
             XSETCAR (property_change_reply, Qt);
 
-          if (prev)
-            prev->next = rest->next;
-          else
-            property_change_wait_list = rest->next;
-          xfree (rest);
           return;
         }
 
@@ -1286,10 +1412,10 @@ x_get_foreign_selection (selection_symbol, target_type, time_stamp)
      bother trying to queue them.  */
   if (!NILP (frame))
     {
-      x_start_queuing_selection_requests (display);
+      x_start_queuing_selection_requests ();
 
       record_unwind_protect (queue_selection_requests_unwind,
-                             frame);
+                             Qnil);
     }
   UNBLOCK_INPUT;
 
@@ -1445,10 +1571,10 @@ receive_incremental_selection (display, window, property, target_type,
   BLOCK_INPUT;
   XSelectInput (display, window, STANDARD_EVENT_SET | PropertyChangeMask);
   TRACE1 ("  Delete property %s",
-          XSYMBOL (x_atom_to_symbol (display, property))->name->data);
+          SDATA (SYMBOL_NAME (x_atom_to_symbol (display, property))));
   XDeleteProperty (display, window, property);
   TRACE1 ("  Expect new value of property %s",
-          XSYMBOL (x_atom_to_symbol (display, property))->name->data);
+          SDATA (SYMBOL_NAME (x_atom_to_symbol (display, property))));
   wait_object = expect_property_change (display, window, property,
                                         PropertyNewValue);
   XFlush (display);
@@ -1478,7 +1604,6 @@ receive_incremental_selection (display, window, property, target_type,
 
           if (! waiting_for_other_props_on_window (display, window))
             XSelectInput (display, window, STANDARD_EVENT_SET);
-          unexpect_property_change (wait_object);
           /* Use xfree, not XFree, because x_get_window_property
              calls xmalloc itself.  */
           if (tmp_data) xfree (tmp_data);
diff --git a/src/xterm.c b/src/xterm.c
index 9b5d768b2af..c8c5d6e95c4 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5581,73 +5581,6 @@ x_scroll_bar_clear (f)
 }
 
 
-/* Define a queue to save up SelectionRequest events for later handling.  */
-
-struct selection_event_queue
-  {
-    XEvent event;
-    struct selection_event_queue *next;
-  };
-
-static struct selection_event_queue *queue;
-
-/* Nonzero means queue up certain events--don't process them yet.  */
-
-static int x_queue_selection_requests;
-
-/* Queue up an X event *EVENT, to be processed later.  */
-
-static void
-x_queue_event (f, event)
-     FRAME_PTR f;
-     XEvent *event;
-{
-  struct selection_event_queue *queue_tmp
-    = (struct selection_event_queue *) xmalloc (sizeof (struct selection_event_queue));
-
-  if (queue_tmp != NULL)
-    {
-      queue_tmp->event = *event;
-      queue_tmp->next = queue;
-      queue = queue_tmp;
-    }
-}
-
-/* Take all the queued events and put them back
-   so that they get processed afresh.  */
-
-static void
-x_unqueue_events (display)
-     Display *display;
-{
-  while (queue != NULL)
-    {
-      struct selection_event_queue *queue_tmp = queue;
-      XPutBackEvent (display, &queue_tmp->event);
-      queue = queue_tmp->next;
-      xfree ((char *)queue_tmp);
-    }
-}
-
-/* Start queuing SelectionRequest events.  */
-
-void
-x_start_queuing_selection_requests (display)
-     Display *display;
-{
-  x_queue_selection_requests++;
-}
-
-/* Stop queuing SelectionRequest events.  */
-
-void
-x_stop_queuing_selection_requests (display)
-     Display *display;
-{
-  x_queue_selection_requests--;
-  x_unqueue_events (display);
-}
-
 /* The main X event-reading loop - XTread_socket.  */
 
 #if 0
@@ -6025,11 +5958,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
       if (!x_window_to_frame (dpyinfo, event.xselectionrequest.owner))
         goto OTHER;
 #endif /* USE_X_TOOLKIT */
-      if (x_queue_selection_requests)
-        x_queue_event (x_window_to_frame (dpyinfo, event.xselectionrequest.owner),
-                       &event);
-      else
-        {
+      {
           XSelectionRequestEvent *eventp
             = (XSelectionRequestEvent *) &event;
 
@@ -6041,7 +5970,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
           SELECTION_EVENT_PROPERTY (&inev) = eventp->property;
           SELECTION_EVENT_TIME (&inev) = eventp->time;
           inev.frame_or_window = Qnil;
-        }
+      }
       break;
 
     case PropertyNotify:
@@ -7626,7 +7555,11 @@ x_catch_errors_unwind (old_val)
   /* The display may have been closed before this function is called.
      Check if it is still open before calling XSync.  */
   if (x_display_info_for_display (dpy) != 0)
-    XSync (dpy, False);
+    {
+      BLOCK_INPUT;
+      XSync (dpy, False);
+      UNBLOCK_INPUT;
+    }
 
   x_error_message_string = XCDR (old_val);
   return Qnil;
diff --git a/src/xterm.h b/src/xterm.h
index 4e38ac18e3d..ffd7e31f297 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -52,7 +52,7 @@ typedef GtkWidget *xt_or_gtk_widget;
 #undef XSync
 #define XSync(d, b) do { gdk_window_process_all_updates (); \
                          XSync (d, b);  } while (0)
-     
+
 
 #endif /* USE_GTK */
 
@@ -976,8 +976,6 @@ int x_alloc_nearest_color P_ ((struct frame *, Colormap, XColor *));
 
 extern void cancel_mouse_face P_ ((struct frame *));
 extern void x_scroll_bar_clear P_ ((struct frame *));
-extern void x_start_queuing_selection_requests P_ ((Display *));
-extern void x_stop_queuing_selection_requests P_ ((Display *));
 extern int x_text_icon P_ ((struct frame *, char *));
 extern int x_bitmap_icon P_ ((struct frame *, Lisp_Object));
 extern int x_catch_errors P_ ((Display *));
@@ -1013,8 +1011,7 @@ extern int x_dispatch_event P_ ((XEvent *, Display *));
 
 extern void x_handle_property_notify P_ ((XPropertyEvent *));
 extern void x_handle_selection_notify P_ ((XSelectionEvent *));
-extern void x_handle_selection_request P_ ((struct input_event *));
-extern void x_handle_selection_clear P_ ((struct input_event *));
+extern void x_handle_selection_event P_ ((struct input_event *));
 extern void x_clear_frame_selections P_ ((struct frame *));
 
 extern int x_handle_dnd_message P_ ((struct frame *,