Merge from trunk.

17 files changed, 725 insertions, 887 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 125028297d1..6bac6f00a3f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -29,8 +29,8 @@
         GLYPH_CODE_FACE returns EMACS_INT, not int.
         * dispextern.h (merge_faces):
         * xfaces.c (merge_faces):
-        * xdisp.c (get_next_display_element):
-        (next_element_from_display_vector): Don't assume EMACS_INT fits in int.
+        * xdisp.c (get_next_display_element, next_element_from_display_vector):
+        Don't assume EMACS_INT fits in int.
 
         * character.h (CHAR_VALID_P): Remove unused parameter.
         * fontset.c, lisp.h, xdisp.c: All uses changed.
@@ -85,7 +85,7 @@
         arguments are no wider than unsigned, as a compile-time check
         to prevent future regressions in this area.
         * data.c (Faset):
-        * editfns.c (Fchar_to_string, general_insert_function, Finsert_char):
+        * editfns.c (Fchar_to_string, general_insert_function, Finsert_char)
         (Fsubst_char_in_region):
         * fns.c (concat):
         * xdisp.c (decode_mode_spec_coding):
@@ -95,8 +95,6 @@
         characters.  Without this test, these functions did the wrong
         thing with wildly out-of-range values on 64-bit hosts.
 
-2011-06-12  Paul Eggert  <eggert@cs.ucla.edu>
-
         Remove incorrect casts to 'unsigned' that lose info on 64-bit hosts.
         These casts should not be needed on 32-bit hosts, either.
         * keyboard.c (read_char):
@@ -106,14 +104,12 @@
         This fixes comparison bugs on 64-bit hosts.
         (ASCII_CHAR_P): Use it.
         * casefiddle.c (casify_object):
-        * character.h (ASCII_BYTE_P, CHAR_VALID_P):
+        * character.h (ASCII_BYTE_P, CHAR_VALID_P)
         (SINGLE_BYTE_CHAR_P, CHAR_STRING):
         * composite.h (COMPOSITION_ENCODE_RULE_VALID):
         * dispextern.h (FACE_FROM_ID):
         * keyboard.c (read_char): Use UNSIGNED_CMP.
 
-2011-06-11  Paul Eggert  <eggert@cs.ucla.edu>
-
         * xmenu.c (dialog_selection_callback) [!USE_GTK]: Cast to intptr_t,
         not to EMACS_INT, to avoid GCC warning.
 
@@ -123,7 +119,8 @@
         The cast incorrectly truncated 64-bit byte offsets to 32 bits, and
         isn't needed on 32-bit machines.
 
-        * buffer.c (Fgenerate_new_buffer_name): Use EMACS_INT for count, not int.
+        * buffer.c (Fgenerate_new_buffer_name):
+        Use EMACS_INT for count, not int.
         (advance_to_char_boundary): Return EMACS_INT, not int.
 
         * data.c (Qcompiled_function): Now static.
@@ -143,8 +140,8 @@
         * alloc.c: Use EMACS_INT, not int, to count objects.
         (total_conses, total_markers, total_symbols, total_vector_size)
         (total_free_conses, total_free_markers, total_free_symbols)
-        (total_free_floats, total_floats, total_free_intervals, total_intervals)
-        (total_strings, total_free_strings):
+        (total_free_floats, total_floats, total_free_intervals)
+        (total_intervals, total_strings, total_free_strings):
         Now EMACS_INT, not int.  All uses changed.
         (Fgarbage_collect): Compute overall total using a double, so that
         integer overflow is less likely to be a problem.  Check for overflow
@@ -184,6 +181,126 @@
 
         * alloc.c (Fmake_string): Check for out-of-range init.
 
+2011-06-12  Martin Rudalics  <rudalics@gmx.at>
+
+        * frame.c (make_frame): Call other_buffer_safely instead of
+        other_buffer.
+
+        * window.c (temp_output_buffer_show): Call display_buffer with
+        second argument Vtemp_buffer_show_specifiers and reset latter
+        immediately after the call.
+        (Vtemp_buffer_show_specifiers): New variable.
+        (auto_window_vscroll_p, next_screen_context_lines)
+        (Vscroll_preserve_screen_position): Remove leading asterisks from
+        doc-strings.
+
+2011-06-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix minor problems found by GCC 4.6.0 static checking.
+        * buffer.c (Qclone_number): Remove for now, as it's unused.
+        (record_buffer, Funrecord_buffer): Rename local to avoid shadowing.
+        (record_buffer): Remove unused local.
+        * frame.c (other_visible_frames, frame_buffer_list): Now static.
+        (set_frame_buffer_list): Remove; unused.
+        * frame.h (other_visible_frames): Remove decl.
+        * keyboard.h (menu_items_inuse): Declare only if USE_GTK || USE_MOTIF.
+        * lisp.h (frame_buffer_list, set_frame_buffer_list): Remove decls.
+        (add_gpm_wait_descriptor, delete_gpm_wait_descriptor): Declare only
+        if HAVE_GPM.
+        * menu.c (menu_items_inuse): Now static unless USE_GTK || USE_MOTIF.
+        * process.c (add_gpm_wait_descriptor, delete_gpm_wait_descriptor):
+        Define only if HAVE_GPM.
+        * widget.c (EmacsFrameResize, emacsFrameClassRec): Now static.
+        (update_hints_inhibit): Remove; never set.  All uses removed.
+        * widgetprv.h (emacsFrameClassRec): Remove decl.
+        * window.c (delete_deletable_window): Now returns void, since it
+        wasn't returning anything.
+        (compare_window_configurations): Remove unused locals.
+        * xfns.c (x_set_scroll_bar_default_width): Remove unused locals.
+        * xmenu.c (x_menu_set_in_use): Define only if USE_GTK || USE_MOTIF.
+        (dialog_selection_callback) [!USE_GTK]: Prefer intptr_t for integers
+        the same widths as pointers.  This follows up on the 2011-05-06 patch.
+        * xterm.c (x_alloc_lighter_color_for_widget): Define only if USE_LUCID.
+        * xterm.h: Likewise.
+        (x_menu_set_in_use): Declare only if USE_GTK || USE_MOTIF.
+
+2011-06-12  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in: Update dependencies.
+        (LISP_H): Add lib/intprops.h.
+
+2011-06-11  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (gif_load): Add animation frame delay to the metadata.
+        (syms_of_image): Use DEFSYM.  New symbol `delay'.
+
+2011-06-11  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (delete_deletable_window): Re-add.
+        (Fset_window_configuration): Rewrite to handle dead buffers and
+        consequently deletable windows.
+        (window_tree, Fwindow_tree): Remove.  Supply functionality in
+        window.el.
+        (compare_window_configurations): Simplify code.
+
+2011-06-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * image.c (imagemagick_load_image): Fix type mismatch.
+        (Fimagemagick_types): Likewise.
+
+        * window.h (replace_buffer_in_windows): Declare.
+
+2011-06-11  Martin Rudalics  <rudalics@gmx.at>
+
+        * buffer.c: New Lisp objects Qbuffer_list_update_hook and
+        Qclone_number.  Remove external declaration of Qdelete_window.
+        (Fbuffer_list): Rewrite doc-string.  Minor restructuring of
+        code.
+        (Fget_buffer_create, Fmake_indirect_buffer, Frename_buffer): Run
+        Qbuffer_list_update_hook if allowed.
+        (Fother_buffer): Rewrite doc-string.  Major rewrite for new
+        buffer list implementation.
+        (other_buffer_safely): New function.
+        (Fkill_buffer): Replace call to replace_buffer_in_all_windows by
+        calls to replace_buffer_in_windows and
+        replace_buffer_in_windows_safely.  Run Qbuffer_list_update_hook
+        if allowed.
+        (record_buffer): Inhibit quitting and rewrite using quittable
+        functions.  Run Qbuffer_list_update_hook if allowed.
+        (Frecord_buffer, Funrecord_buffer): New functions.
+        (switch_to_buffer_1, Fswitch_to_buffer): Remove.  Move
+        switch-to-buffer to window.el.
+        (bury-buffer): Move to window.el.
+        (Vbuffer_list_update_hook): New variable.
+
+        * lisp.h (other_buffer_safely): Add prototype in buffer.c
+        section.
+
+        * window.h (resize_frame_windows): Move up in code.
+        (Fwindow_frame): Remove EXFUN.
+        (replace_buffer_in_all_windows): Remove prototype.
+        (replace_buffer_in_windows_safely): Add prototype.
+
+        * window.c: Declare Qdelete_window static again.  Move down
+        declaration of select_count.
+        (Fnext_window, Fprevious_window): Rewrite doc-strings.
+        (Fother_window): Move to window.el.
+        (window_loop): Remove DELETE_BUFFER_WINDOWS and UNSHOW_BUFFER
+        cases.  Add REPLACE_BUFFER_IN_WINDOWS_SAFELY case.
+        (Fdelete_windows_on, Freplace_buffer_in_windows): Move to
+        window.el.
+        (replace_buffer_in_windows): Implement by calling
+        Qreplace_buffer_in_windows.
+        (replace_buffer_in_all_windows): Remove with some functionality
+        moved into replace_buffer_in_windows_safely.
+        (replace_buffer_in_windows_safely): New function.
+        (select_window_norecord, select_frame_norecord): Move in front
+        of run_window_configuration_change_hook.  Remove now obsolete
+        declarations.
+        (Fset_window_buffer): Rewrite doc-string.  Call
+        Qrecord_window_buffer.
+        (keys_of_window): Move binding for other-window to window.el.
+
 2011-06-11  Chong Yidong  <cyd@stupidchicken.com>
 
         * dispextern.h (struct image): Replace data member, whose int_val
diff --git a/src/buffer.c b/src/buffer.c
index 0c4cdb544a5..d7adf63c98b 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -131,12 +131,14 @@ static Lisp_Object Qprotected_field;
 static Lisp_Object QSFundamental;       /* A string "Fundamental" */
 
 static Lisp_Object Qkill_buffer_hook;
+static Lisp_Object Qbuffer_list_update_hook;
 
 static Lisp_Object Qget_file_buffer;
 
 static Lisp_Object Qoverlayp;
 
 Lisp_Object Qpriority, Qbefore_string, Qafter_string;
+
 static Lisp_Object Qevaporate;
 
 Lisp_Object Qmodification_hooks;
@@ -171,9 +173,9 @@ Value is nil if OBJECT is not a buffer or if it has been killed.  */)
 
 DEFUN ("buffer-list", Fbuffer_list, Sbuffer_list, 0, 1, 0,
        doc: /* Return a list of all existing live buffers.
-If the optional arg FRAME is a frame, we return the buffer list
-in the proper order for that frame: the buffers in FRAME's `buffer-list'
-frame parameter come first, followed by the rest of the buffers.  */)
+If the optional arg FRAME is a frame, we return the buffer list in the
+proper order for that frame: the buffers show in FRAME come first,
+followed by the rest of the buffers.  */)
   (Lisp_Object frame)
 {
   Lisp_Object general;
@@ -185,9 +187,9 @@ frame parameter come first, followed by the rest of the buffers.  */)
       Lisp_Object args[3];
 
       CHECK_FRAME (frame);
-
       framelist = Fcopy_sequence (XFRAME (frame)->buffer_list);
-      prevlist = Fnreverse (Fcopy_sequence (XFRAME (frame)->buried_buffer_list));
+      prevlist = Fnreverse (Fcopy_sequence
+                            (XFRAME (frame)->buried_buffer_list));
 
       /* Remove from GENERAL any buffer that duplicates one in
          FRAMELIST or PREVLIST.  */
@@ -209,8 +211,8 @@ frame parameter come first, followed by the rest of the buffers.  */)
       args[2] = prevlist;
       return Fnconc (3, args);
     }
-
-  return general;
+  else
+    return general;
 }
 
 /* Like Fassoc, but use Fstring_equal to compare
@@ -384,6 +386,9 @@ even if it is dead.  The return value is never nil.  */)
   /* Put this in the alist of all live buffers.  */
   XSETBUFFER (buffer, b);
   Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buffer), Qnil));
+  /* And run buffer-list-update-hook.  */
+  if (!NILP (Vrun_hooks))
+    call1 (Vrun_hooks, Qbuffer_list_update_hook);
 
   /* An error in calling the function here (should someone redefine it)
      can lead to infinite regress until you run out of stack.  rms
@@ -659,6 +664,10 @@ CLONE nil means the indirect buffer's state is reset to default values.  */)
       set_buffer_internal_1 (old_b);
     }
 
+  /* Run buffer-list-update-hook.  */
+  if (!NILP (Vrun_hooks))
+    call1 (Vrun_hooks, Qbuffer_list_update_hook);
+
   return buf;
 }
 
@@ -1262,81 +1271,119 @@ This does not change the name of the visited file (if any).  */)
   if (NILP (BVAR (current_buffer, filename))
       && !NILP (BVAR (current_buffer, auto_save_file_name)))
     call0 (intern ("rename-auto-save-file"));
+
+  /* Run buffer-list-update-hook.  */
+  if (!NILP (Vrun_hooks))
+    call1 (Vrun_hooks, Qbuffer_list_update_hook);
+
   /* Refetch since that last call may have done GC.  */
   return BVAR (current_buffer, name);
 }
 
 DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0,
        doc: /* Return most recently selected buffer other than BUFFER.
-Buffers not visible in windows are preferred to visible buffers,
-unless optional second argument VISIBLE-OK is non-nil.
-If the optional third argument FRAME is non-nil, use that frame's
-buffer list instead of the selected frame's buffer list.
-If no other buffer exists, the buffer `*scratch*' is returned.
-If BUFFER is omitted or nil, some interesting buffer is returned.  */)
+Buffers not visible in windows are preferred to visible buffers, unless
+optional second argument VISIBLE-OK is non-nil.  Ignore the argument
+BUFFER unless it denotes a live buffer.  If the optional third argument
+FRAME is non-nil, use that frame's buffer list instead of the selected
+frame's buffer list.
+
+The buffer is found by scanning the selected or specified frame's buffer
+list first, followed by the list of all buffers.  If no other buffer
+exists, return the buffer `*scratch*' (creating it if necessary).  */)
   (register Lisp_Object buffer, Lisp_Object visible_ok, Lisp_Object frame)
 {
-  register Lisp_Object tail, buf, notsogood, tem, pred, add_ons;
-  notsogood = Qnil;
+  Lisp_Object Fset_buffer_major_mode (Lisp_Object buffer);
+  Lisp_Object tail, buf, pred;
+  Lisp_Object notsogood = Qnil;
 
   if (NILP (frame))
     frame = selected_frame;
 
   CHECK_FRAME (frame);
 
-  tail = Vbuffer_alist;
   pred = frame_buffer_predicate (frame);
-
-  /* Consider buffers that have been seen in the selected frame
-     before other buffers.  */
-
-  tem = frame_buffer_list (frame);
-  add_ons = Qnil;
-  while (CONSP (tem))
+  /* Consider buffers that have been seen in the frame first.  */
+  tail = XFRAME (frame)->buffer_list;
+  for (; CONSP (tail); tail = XCDR (tail))
     {
-      if (BUFFERP (XCAR (tem)))
-        add_ons = Fcons (Fcons (Qnil, XCAR (tem)), add_ons);
-      tem = XCDR (tem);
+      buf = XCAR (tail);
+      if (BUFFERP (buf) && !EQ (buf, buffer)
+          && !NILP (BVAR (XBUFFER (buf), name))
+          && (SREF (BVAR (XBUFFER (buf), name), 0) != ' ')
+          /* If the frame has a buffer_predicate, disregard buffers that
+             don't fit the predicate.  */
+          && (NILP (pred) || !NILP (call1 (pred, buf))))
+        {
+          if (!NILP (visible_ok)
+              || NILP (Fget_buffer_window (buf, Qvisible)))
+            return buf;
+          else if (NILP (notsogood))
+            notsogood = buf;
+        }
     }
-  tail = nconc2 (Fnreverse (add_ons), tail);
 
+  /* Consider alist of all buffers next.  */
+  tail = Vbuffer_alist;
   for (; CONSP (tail); tail = XCDR (tail))
     {
       buf = Fcdr (XCAR (tail));
-      if (EQ (buf, buffer))
-        continue;
+      if (BUFFERP (buf) && !EQ (buf, buffer)
+          && !NILP (BVAR (XBUFFER (buf), name))
+          && (SREF (BVAR (XBUFFER (buf), name), 0) != ' ')
+          /* If the frame has a buffer_predicate, disregard buffers that
+             don't fit the predicate.  */
+          && (NILP (pred) || !NILP (call1 (pred, buf))))
+        {
+          if (!NILP (visible_ok)
+              || NILP (Fget_buffer_window (buf, Qvisible)))
+            return buf;
+          else if (NILP (notsogood))
+            notsogood = buf;
+        }
+    }
+
+  if (!NILP (notsogood))
+    return notsogood;
+  else
+    {
+      buf = Fget_buffer (build_string ("*scratch*"));
       if (NILP (buf))
-        continue;
-      if (NILP (BVAR (XBUFFER (buf), name)))
-        continue;
-      if (SREF (BVAR (XBUFFER (buf), name), 0) == ' ')
-        continue;
-      /* If the selected frame has a buffer_predicate,
-         disregard buffers that don't fit the predicate.  */
-      if (!NILP (pred))
         {
-          tem = call1 (pred, buf);
-          if (NILP (tem))
-            continue;
+          buf = Fget_buffer_create (build_string ("*scratch*"));
+          Fset_buffer_major_mode (buf);
         }
+      return buf;
+    }
+}
 
-      if (NILP (visible_ok))
-        tem = Fget_buffer_window (buf, Qvisible);
-      else
-        tem = Qnil;
-      if (NILP (tem))
+/* The following function is a safe variant of Fother_buffer: It doesn't
+   pay attention to any frame-local buffer lists, doesn't care about
+   visibility of buffers, and doesn't evaluate any frame predicates.  */
+
+Lisp_Object
+other_buffer_safely (Lisp_Object buffer)
+{
+  Lisp_Object Fset_buffer_major_mode (Lisp_Object buffer);
+  Lisp_Object tail, buf;
+
+  tail = Vbuffer_alist;
+  for (; CONSP (tail); tail = XCDR (tail))
+    {
+      buf = Fcdr (XCAR (tail));
+      if (BUFFERP (buf) && !EQ (buf, buffer)
+          && !NILP (BVAR (XBUFFER (buf), name))
+          && (SREF (BVAR (XBUFFER (buf), name), 0) != ' '))
         return buf;
-      if (NILP (notsogood))
-        notsogood = buf;
     }
-  if (!NILP (notsogood))
-    return notsogood;
+
   buf = Fget_buffer (build_string ("*scratch*"));
   if (NILP (buf))
     {
       buf = Fget_buffer_create (build_string ("*scratch*"));
       Fset_buffer_major_mode (buf);
     }
+
   return buf;
 }
 
@@ -1509,13 +1556,20 @@ with SIGHUP.  */)
   if (NILP (BVAR (b, name)))
     return Qnil;
 
+  /* These may run Lisp code and into infinite loops (if someone
+     insisted on circular lists) so allow quitting here.  */
+  replace_buffer_in_windows (buffer);
+  frames_discard_buffer (buffer);
+
   clear_charpos_cache (b);
 
   tem = Vinhibit_quit;
   Vinhibit_quit = Qt;
-  replace_buffer_in_all_windows (buffer);
+  /* Remove the buffer from the list of all buffers.  */
   Vbuffer_alist = Fdelq (Frassq (buffer, Vbuffer_alist), Vbuffer_alist);
-  frames_discard_buffer (buffer);
+  /* If replace_buffer_in_windows didn't do its job correctly fix that
+     now.  */
+  replace_buffer_in_windows_safely (buffer);
   Vinhibit_quit = tem;
 
   /* Delete any auto-save file, if we saved it in this session.
@@ -1589,83 +1643,102 @@ with SIGHUP.  */)
   UNBLOCK_INPUT;
   BVAR (b, undo_list) = Qnil;
 
+  /* Run buffer-list-update-hook.  */
+  if (!NILP (Vrun_hooks))
+    call1 (Vrun_hooks, Qbuffer_list_update_hook);
+
   return Qt;
 }
 
-/* Move the assoc for buffer BUF to the front of buffer-alist.  Since
-   we do this each time BUF is selected visibly, the more recently
-   selected buffers are always closer to the front of the list.  This
-   means that other_buffer is more likely to choose a relevant buffer.  */
+/* Move association for BUFFER to the front of buffer (a)lists.  Since
+   we do this each time BUFFER is selected visibly, the more recently
+   selected buffers are always closer to the front of those lists.  This
+   means that other_buffer is more likely to choose a relevant buffer.
+
+   Note that this moves BUFFER to the front of the buffer lists of the
+   selected frame even if BUFFER is not shown there.  If BUFFER is not
+   shown in the selected frame, consider the present behavior a feature.
+   `select-window' gets this right since it shows BUFFER in the selected
+   window when calling us.  */
 
 void
-record_buffer (Lisp_Object buf)
+record_buffer (Lisp_Object buffer)
 {
-  register Lisp_Object list, prev;
-  Lisp_Object frame;
-  frame = selected_frame;
+  Lisp_Object aelt, aelt_cons, tem;
+  register struct frame *f = XFRAME (selected_frame);
 
-  prev = Qnil;
-  for (list = Vbuffer_alist; CONSP (list); list = XCDR (list))
-    {
-      if (EQ (XCDR (XCAR (list)), buf))
-        break;
-      prev = list;
-    }
+  CHECK_BUFFER (buffer);
 
-  /* Effectively do Vbuffer_alist = Fdelq (list, Vbuffer_alist);
-     we cannot use Fdelq itself here because it allows quitting.  */
+  /* Update Vbuffer_alist (we know that it has an entry for BUFFER).
+     Don't allow quitting since this might leave the buffer list in an
+     inconsistent state.  */
+  tem = Vinhibit_quit;
+  Vinhibit_quit = Qt;
+  aelt = Frassq (buffer, Vbuffer_alist);
+  aelt_cons = Fmemq (aelt, Vbuffer_alist);
+  Vbuffer_alist = Fdelq (aelt, Vbuffer_alist);
+  XSETCDR (aelt_cons, Vbuffer_alist);
+  Vbuffer_alist = aelt_cons;
+  Vinhibit_quit = tem;
 
-  if (NILP (prev))
-    Vbuffer_alist = XCDR (Vbuffer_alist);
-  else
-    XSETCDR (prev, XCDR (XCDR (prev)));
+  /* Update buffer list of selected frame.  */
+  f->buffer_list = Fcons (buffer, Fdelq (buffer, f->buffer_list));
+  f->buried_buffer_list = Fdelq (buffer, f->buried_buffer_list);
 
-  XSETCDR (list, Vbuffer_alist);
-  Vbuffer_alist = list;
+  /* Run buffer-list-update-hook.  */
+  if (!NILP (Vrun_hooks))
+    call1 (Vrun_hooks, Qbuffer_list_update_hook);
+}
 
-  /* Effectively do a delq on buried_buffer_list.  */
+DEFUN ("record-buffer", Frecord_buffer, Srecord_buffer, 1, 1, 0,
+       doc: /* Move BUFFER to the front of the buffer list.
+Return BUFFER.  */)
+  (Lisp_Object buffer)
+{
+  CHECK_BUFFER (buffer);
 
-  prev = Qnil;
-  for (list = XFRAME (frame)->buried_buffer_list; CONSP (list);
-       list = XCDR (list))
-    {
-      if (EQ (XCAR (list), buf))
-        {
-          if (NILP (prev))
-            XFRAME (frame)->buried_buffer_list = XCDR (list);
-          else
-            XSETCDR (prev, XCDR (XCDR (prev)));
-          break;
-        }
-      prev = list;
-    }
+  record_buffer (buffer);
 
-  /* Now move this buffer to the front of frame_buffer_list also.  */
+  return buffer;
+}
 
-  prev = Qnil;
-  for (list = frame_buffer_list (frame); CONSP (list);
-       list = XCDR (list))
-    {
-      if (EQ (XCAR (list), buf))
-        break;
-      prev = list;
-    }
+  /* Move BUFFER to the end of the buffer (a)lists.  Do nothing if the
+     buffer is killed.  For the selected frame's buffer list this moves
+     BUFFER to its end even if it was never shown in that frame.  If
+     this happens we have a feature, hence `unrecord-buffer' should be
+     called only when BUFFER was shown in the selected frame.  */
 
-  /* Effectively do delq.  */
+DEFUN ("unrecord-buffer", Funrecord_buffer, Sunrecord_buffer, 1, 1, 0,
+       doc: /* Move BUFFER to the end of the buffer list.
+Return BUFFER.  */)
+  (Lisp_Object buffer)
+{
+  Lisp_Object aelt, aelt_cons, tem;
+  register struct frame *f = XFRAME (selected_frame);
 
-  if (CONSP (list))
-    {
-      if (NILP (prev))
-        set_frame_buffer_list (frame,
-                               XCDR (frame_buffer_list (frame)));
-      else
-        XSETCDR (prev, XCDR (XCDR (prev)));
+  CHECK_BUFFER (buffer);
 
-      XSETCDR (list, frame_buffer_list (frame));
-      set_frame_buffer_list (frame, list);
-    }
-  else
-    set_frame_buffer_list (frame, Fcons (buf, frame_buffer_list (frame)));
+  /* Update Vbuffer_alist (we know that it has an entry for BUFFER).
+     Don't allow quitting since this might leave the buffer list in an
+     inconsistent state.  */
+  tem = Vinhibit_quit;
+  Vinhibit_quit = Qt;
+  aelt = Frassq (buffer, Vbuffer_alist);
+  aelt_cons = Fmemq (aelt, Vbuffer_alist);
+  Vbuffer_alist = Fdelq (aelt, Vbuffer_alist);
+  XSETCDR (aelt_cons, Qnil);
+  Vbuffer_alist = nconc2 (Vbuffer_alist, aelt_cons);
+  Vinhibit_quit = tem;
+
+  /* Update buffer lists of selected frame.  */
+  f->buffer_list = Fdelq (buffer, f->buffer_list);
+  f->buried_buffer_list = Fcons (buffer, Fdelq (buffer, f->buried_buffer_list));
+
+  /* Run buffer-list-update-hook.  */
+  if (!NILP (Vrun_hooks))
+    call1 (Vrun_hooks, Qbuffer_list_update_hook);
+
+  return buffer;
 }
 
 DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0,
@@ -1708,86 +1781,6 @@ the current buffer's major mode.  */)
   return unbind_to (count, Qnil);
 }
 
-/* Switch to buffer BUFFER in the selected window.
-   If NORECORD is non-nil, don't call record_buffer.  */
-
-static Lisp_Object
-switch_to_buffer_1 (Lisp_Object buffer_or_name, Lisp_Object norecord)
-{
-  register Lisp_Object buffer;
-
-  if (NILP (buffer_or_name))
-    buffer = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil);
-  else
-    {
-      buffer = Fget_buffer (buffer_or_name);
-      if (NILP (buffer))
-        {
-          buffer = Fget_buffer_create (buffer_or_name);
-          Fset_buffer_major_mode (buffer);
-        }
-    }
-  Fset_buffer (buffer);
-  if (NILP (norecord))
-    record_buffer (buffer);
-
-  Fset_window_buffer (EQ (selected_window, minibuf_window)
-                      ? Fnext_window (minibuf_window, Qnil, Qnil)
-                      : selected_window,
-                      buffer, Qnil);
-
-  return buffer;
-}
-
-DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2,
-       "(list (read-buffer-to-switch \"Switch to buffer: \"))",
-       doc: /* Make BUFFER-OR-NAME current and display it in selected window.
-BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or
-nil.  Return the buffer switched to.
-
-If BUFFER-OR-NAME is a string and does not identify an existing
-buffer, create a new buffer with that name.  Interactively, if
-`confirm-nonexistent-file-or-buffer' is non-nil, request
-confirmation before creating a new buffer.  If BUFFER-OR-NAME is
-nil, switch to buffer returned by `other-buffer'.
-
-Optional second arg NORECORD non-nil means do not put this buffer
-at the front of the list of recently selected ones.  This
-function returns the buffer it switched to as a Lisp object.
-
-If the selected window is the minibuffer window or dedicated to
-its buffer, use `pop-to-buffer' for displaying the buffer.
-
-WARNING: This is NOT the way to work on another buffer temporarily
-within a Lisp program!  Use `set-buffer' instead.  That avoids
-messing with the window-buffer correspondences.  */)
-  (Lisp_Object buffer_or_name, Lisp_Object norecord)
-{
-  if (EQ (buffer_or_name, Fwindow_buffer (selected_window)))
-    {
-      /* Basically a NOP.  Avoid signalling an error in the case where
-         the selected window is dedicated, or a minibuffer.  */
-
-      /* But do put this buffer at the front of the buffer list, unless
-         that has been inhibited.  Note that even if BUFFER-OR-NAME is
-         at the front of the main buffer-list already, we still want to
-         move it to the front of the frame's buffer list.  */
-      if (NILP (norecord))
-        record_buffer (buffer_or_name);
-      return Fset_buffer (buffer_or_name);
-    }
-  else if (EQ (minibuf_window, selected_window)
-           /* If `dedicated' is neither nil nor t, it means it's
-              dedicatedness can be overridden by an explicit request
-              such as a call to switch-to-buffer.  */
-           || EQ (Fwindow_dedicated_p (selected_window), Qt))
-    /* We can't use the selected window so let `pop-to-buffer' try some
-       other window. */
-    return call3 (intern ("pop-to-buffer"), buffer_or_name, Qnil, norecord);
-  else
-    return switch_to_buffer_1 (buffer_or_name, norecord);
-}
-
 DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0,
        doc: /* Return the current buffer as a Lisp object.  */)
   (void)
@@ -1937,70 +1930,6 @@ DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only,
     xsignal1 (Qbuffer_read_only, Fcurrent_buffer ());
   return Qnil;
 }
-
-extern Lisp_Object Qdelete_window;
-
-DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "",
-       doc: /* Put BUFFER-OR-NAME at the end of the list of all buffers.
-There it is the least likely candidate for `other-buffer' to return;
-thus, the least likely buffer for \\[switch-to-buffer] to select by
-default.
-
-The argument may be a buffer name or an actual buffer object.  If
-BUFFER-OR-NAME is nil or omitted, bury the current buffer and remove it
-from the selected window if it is displayed there.  If the selected
-window is dedicated to its buffer, delete that window if there are other
-windows on the same frame.  If the selected window is the only window on
-its frame, iconify that frame.  */)
-  (register Lisp_Object buffer_or_name)
-{
-  Lisp_Object buffer;
-
-  /* Figure out what buffer we're going to bury.  */
-  if (NILP (buffer_or_name))
-    {
-      Lisp_Object tem;
-      XSETBUFFER (buffer, current_buffer);
-
-      tem = Fwindow_buffer (selected_window);
-      /* If we're burying the current buffer, unshow it.  */
-      if (EQ (buffer, tem))
-        {
-          if (NILP (Fwindow_dedicated_p (selected_window)))
-            Fswitch_to_buffer (Fother_buffer (buffer, Qnil, Qnil), Qnil);
-          else if (NILP (XWINDOW (selected_window)->parent))
-            Ficonify_frame (Fwindow_frame (selected_window));
-          else
-            call1 (Qdelete_window, selected_window);
-        }
-    }
-  else
-    {
-      buffer = Fget_buffer (buffer_or_name);
-      if (NILP (buffer))
-        nsberror (buffer_or_name);
-    }
-
-  /* Move buffer to the end of the buffer list.  Do nothing if the
-     buffer is killed.  */
-  if (!NILP (BVAR (XBUFFER (buffer), name)))
-    {
-      Lisp_Object aelt, list;
-
-      aelt = Frassq (buffer, Vbuffer_alist);
-      list = Fmemq (aelt, Vbuffer_alist);
-      Vbuffer_alist = Fdelq (aelt, Vbuffer_alist);
-      XSETCDR (list, Qnil);
-      Vbuffer_alist = nconc2 (Vbuffer_alist, list);
-
-      XFRAME (selected_frame)->buffer_list
-        = Fdelq (buffer, XFRAME (selected_frame)->buffer_list);
-      XFRAME (selected_frame)->buried_buffer_list
-        = Fcons (buffer, Fdelq (buffer, XFRAME (selected_frame)->buried_buffer_list));
-    }
-
-  return Qnil;
-}
 
 DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*",
        doc: /* Delete the entire contents of the current buffer.
@@ -6101,6 +6030,15 @@ The function `kill-all-local-variables' runs this before doing anything else.  *
   Qchange_major_mode_hook = intern_c_string ("change-major-mode-hook");
   staticpro (&Qchange_major_mode_hook);
 
+  DEFVAR_LISP ("buffer-list-update-hook", Vbuffer_list_update_hook,
+               doc: /* Hook run when the buffer list changes.
+Functions running this hook are `get-buffer-create',
+`make-indirect-buffer', `rename-buffer', `kill-buffer',
+`record-buffer' and `unrecord-buffer'.  */);
+  Vbuffer_list_update_hook = Qnil;
+  Qbuffer_list_update_hook = intern_c_string ("buffer-list-update-hook");
+  staticpro (&Qbuffer_list_update_hook);
+
   defsubr (&Sbuffer_live_p);
   defsubr (&Sbuffer_list);
   defsubr (&Sget_buffer);
@@ -6122,12 +6060,12 @@ The function `kill-all-local-variables' runs this before doing anything else.  *
   defsubr (&Sother_buffer);
   defsubr (&Sbuffer_enable_undo);
   defsubr (&Skill_buffer);
+  defsubr (&Srecord_buffer);
+  defsubr (&Sunrecord_buffer);
   defsubr (&Sset_buffer_major_mode);
-  defsubr (&Sswitch_to_buffer);
   defsubr (&Scurrent_buffer);
   defsubr (&Sset_buffer);
   defsubr (&Sbarf_if_buffer_read_only);
-  defsubr (&Sbury_buffer);
   defsubr (&Serase_buffer);
   defsubr (&Sbuffer_swap_text);
   defsubr (&Sset_buffer_multibyte);
diff --git a/src/frame.c b/src/frame.c
index 6baf2d0e671..34474417efa 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -370,7 +370,7 @@ make_frame (int mini_p)
     /* If buf is a 'hidden' buffer (i.e. one whose name starts with
        a space), try to find another one.  */
     if (SREF (Fbuffer_name (buf), 0) == ' ')
-      buf = Fother_buffer (buf, Qnil, Qnil);
+      buf = other_buffer_safely (buf);
 
     /* Use set_window_buffer, not Fset_window_buffer, and don't let
        hooks be run by it.  The reason is that the whole frame/window
@@ -1115,7 +1115,7 @@ Otherwise, include all frames.  */)
    0 if all frames aside from F are invisible.
    (Exception: if F is the terminal frame, and we are using X, return 1.)  */
 
-int
+static int
 other_visible_frames (FRAME_PTR f)
 {
   /* We know the selected frame is visible,
@@ -2012,20 +2012,12 @@ frame_buffer_predicate (Lisp_Object frame)
 
 /* Return the buffer-list of the selected frame.  */
 
-Lisp_Object
+static Lisp_Object
 frame_buffer_list (Lisp_Object frame)
 {
   return XFRAME (frame)->buffer_list;
 }
 
-/* Set the buffer-list of the selected frame.  */
-
-void
-set_frame_buffer_list (Lisp_Object frame, Lisp_Object list)
-{
-  XFRAME (frame)->buffer_list = list;
-}
-
 /* Discard BUFFER from the buffer-list and buried-buffer-list of each frame.  */
 
 void
diff --git a/src/frame.h b/src/frame.h
index db57b1be980..8dccfb8540a 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -844,7 +844,6 @@ extern struct frame *make_frame_without_minibuffer (Lisp_Object,
                                                     struct kboard *,
                                                     Lisp_Object);
 #endif /* HAVE_WINDOW_SYSTEM */
-extern int other_visible_frames (struct frame *);
 extern void frame_make_pointer_invisible (void);
 extern void frame_make_pointer_visible (void);
 extern Lisp_Object delete_frame (Lisp_Object, Lisp_Object);
diff --git a/src/image.c b/src/image.c
index b755d741443..495bfdc0eef 100644
--- a/src/image.c
+++ b/src/image.c
@@ -564,7 +564,6 @@ static Lisp_Object Qxbm;
 /* Keywords.  */
 
 Lisp_Object QCascent, QCmargin, QCrelief;
-static Lisp_Object Qcount, Qextension_data;
 Lisp_Object QCconversion;
 static Lisp_Object QCheuristic_mask;
 static Lisp_Object QCcolor_symbols;
@@ -573,6 +572,7 @@ static Lisp_Object QCcrop, QCrotation;
 
 /* Other symbols.  */
 
+static Lisp_Object Qcount, Qextension_data, Qdelay;
 static Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic;
 
 /* Function prototypes.  */
@@ -7315,16 +7315,31 @@ gif_load (struct frame *f, struct image *img)
   img->lisp_data = Qnil;
   if (gif->SavedImages[idx].ExtensionBlockCount > 0)
     {
+      unsigned int delay = 0;
       ExtensionBlock *ext = gif->SavedImages[idx].ExtensionBlocks;
       for (i = 0; i < gif->SavedImages[idx].ExtensionBlockCount; i++, ext++)
         /* Append (... FUNCTION "BYTES") */
-        img->lisp_data = Fcons (make_unibyte_string (ext->Bytes, ext->ByteCount),
-                                Fcons (make_number (ext->Function),
-                                       img->lisp_data));
+        {
+          img->lisp_data
+            = Fcons (make_number (ext->Function),
+                     Fcons (make_unibyte_string (ext->Bytes, ext->ByteCount),
+                            img->lisp_data));
+          if (ext->Function == GIF_LOCAL_DESCRIPTOR_EXTENSION
+              && ext->ByteCount == 4)
+            {
+              delay = ext->Bytes[2] << CHAR_BIT;
+              delay |= ext->Bytes[1];
+            }
+        }
       img->lisp_data = Fcons (Qextension_data,
-                              Fcons (Fnreverse (img->lisp_data),
-                                     Qnil));
+                              Fcons (img->lisp_data, Qnil));
+      if (delay)
+        img->lisp_data
+          = Fcons (Qdelay,
+                   Fcons (make_float (((double) delay) * 0.01),
+                          img->lisp_data));
     }
+
   if (gif->ImageCount > 1)
     img->lisp_data = Fcons (Qcount,
                             Fcons (make_number (gif->ImageCount),
@@ -7480,8 +7495,8 @@ imagemagick_load_image (struct frame *f, struct image *img,
                         unsigned char *contents, unsigned int size,
                         char *filename)
 {
-  unsigned long width;
-  unsigned long height;
+  size_t width;
+  size_t height;
 
   MagickBooleanType status;
 
@@ -7858,7 +7873,7 @@ recognize as images, such as C.  See `imagemagick-types-inhibit'.  */)
   (void)
 {
   Lisp_Object typelist = Qnil;
-  unsigned long numf = 0;
+  size_t numf = 0;
   ExceptionInfo ex;
   char **imtypes = GetMagickList ("*", &numf, &ex);
   int i;
@@ -8688,75 +8703,49 @@ as a ratio to the frame height and width.  If the value is
 non-numeric, there is no explicit limit on the size of images.  */);
   Vmax_image_size = make_float (MAX_IMAGE_SIZE);
 
-  Qpbm = intern_c_string ("pbm");
-  staticpro (&Qpbm);
+  DEFSYM (Qpbm, "pbm");
   ADD_IMAGE_TYPE (Qpbm);
 
-  Qxbm = intern_c_string ("xbm");
-  staticpro (&Qxbm);
+  DEFSYM (Qxbm, "xbm");
   ADD_IMAGE_TYPE (Qxbm);
 
   define_image_type (&xbm_type, 1);
   define_image_type (&pbm_type, 1);
 
-  Qcount = intern_c_string ("count");
-  staticpro (&Qcount);
-  Qextension_data = intern_c_string ("extension-data");
-  staticpro (&Qextension_data);
-
-  QCascent = intern_c_string (":ascent");
-  staticpro (&QCascent);
-  QCmargin = intern_c_string (":margin");
-  staticpro (&QCmargin);
-  QCrelief = intern_c_string (":relief");
-  staticpro (&QCrelief);
-  QCconversion = intern_c_string (":conversion");
-  staticpro (&QCconversion);
-  QCcolor_symbols = intern_c_string (":color-symbols");
-  staticpro (&QCcolor_symbols);
-  QCheuristic_mask = intern_c_string (":heuristic-mask");
-  staticpro (&QCheuristic_mask);
-  QCindex = intern_c_string (":index");
-  staticpro (&QCindex);
-  QCgeometry = intern_c_string (":geometry");
-  staticpro (&QCgeometry);
-  QCcrop = intern_c_string (":crop");
-  staticpro (&QCcrop);
-  QCrotation = intern_c_string (":rotation");
-  staticpro (&QCrotation);
-  QCmatrix = intern_c_string (":matrix");
-  staticpro (&QCmatrix);
-  QCcolor_adjustment = intern_c_string (":color-adjustment");
-  staticpro (&QCcolor_adjustment);
-  QCmask = intern_c_string (":mask");
-  staticpro (&QCmask);
-
-  Qlaplace = intern_c_string ("laplace");
-  staticpro (&Qlaplace);
-  Qemboss = intern_c_string ("emboss");
-  staticpro (&Qemboss);
-  Qedge_detection = intern_c_string ("edge-detection");
-  staticpro (&Qedge_detection);
-  Qheuristic = intern_c_string ("heuristic");
-  staticpro (&Qheuristic);
-
-  Qpostscript = intern_c_string ("postscript");
-  staticpro (&Qpostscript);
+  DEFSYM (Qcount, "count");
+  DEFSYM (Qextension_data, "extension-data");
+  DEFSYM (Qdelay, "delay");
+
+  DEFSYM (QCascent, ":ascent");
+  DEFSYM (QCmargin, ":margin");
+  DEFSYM (QCrelief, ":relief");
+  DEFSYM (QCconversion, ":conversion");
+  DEFSYM (QCcolor_symbols, ":color-symbols");
+  DEFSYM (QCheuristic_mask, ":heuristic-mask");
+  DEFSYM (QCindex, ":index");
+  DEFSYM (QCgeometry, ":geometry");
+  DEFSYM (QCcrop, ":crop");
+  DEFSYM (QCrotation, ":rotation");
+  DEFSYM (QCmatrix, ":matrix");
+  DEFSYM (QCcolor_adjustment, ":color-adjustment");
+  DEFSYM (QCmask, ":mask");
+
+  DEFSYM (Qlaplace, "laplace");
+  DEFSYM (Qemboss, "emboss");
+  DEFSYM (Qedge_detection, "edge-detection");
+  DEFSYM (Qheuristic, "heuristic");
+
+  DEFSYM (Qpostscript, "postscript");
 #ifdef HAVE_GHOSTSCRIPT
   ADD_IMAGE_TYPE (Qpostscript);
-  QCloader = intern_c_string (":loader");
-  staticpro (&QCloader);
-  QCbounding_box = intern_c_string (":bounding-box");
-  staticpro (&QCbounding_box);
-  QCpt_width = intern_c_string (":pt-width");
-  staticpro (&QCpt_width);
-  QCpt_height = intern_c_string (":pt-height");
-  staticpro (&QCpt_height);
+  DEFSYM (QCloader, ":loader");
+  DEFSYM (QCbounding_box, ":bounding-box");
+  DEFSYM (QCpt_width, ":pt-width");
+  DEFSYM (QCpt_height, ":pt-height");
 #endif /* HAVE_GHOSTSCRIPT */
 
 #ifdef HAVE_NTGUI
-  Qlibpng_version = intern_c_string ("libpng-version");
-  staticpro (&Qlibpng_version);
+  DEFSYM (Qlibpng_version, "libpng-version");
   Fset (Qlibpng_version,
 #if HAVE_PNG
         make_number (PNG_LIBPNG_VER)
@@ -8767,53 +8756,43 @@ non-numeric, there is no explicit limit on the size of images.  */);
 #endif
 
 #if defined (HAVE_XPM) || defined (HAVE_NS)
-  Qxpm = intern_c_string ("xpm");
-  staticpro (&Qxpm);
+  DEFSYM (Qxpm, "xpm");
   ADD_IMAGE_TYPE (Qxpm);
 #endif
 
 #if defined (HAVE_JPEG) || defined (HAVE_NS)
-  Qjpeg = intern_c_string ("jpeg");
-  staticpro (&Qjpeg);
+  DEFSYM (Qjpeg, "jpeg");
   ADD_IMAGE_TYPE (Qjpeg);
 #endif
 
 #if defined (HAVE_TIFF) || defined (HAVE_NS)
-  Qtiff = intern_c_string ("tiff");
-  staticpro (&Qtiff);
+  DEFSYM (Qtiff, "tiff");
   ADD_IMAGE_TYPE (Qtiff);
 #endif
 
 #if defined (HAVE_GIF) || defined (HAVE_NS)
-  Qgif = intern_c_string ("gif");
-  staticpro (&Qgif);
+  DEFSYM (Qgif, "gif");
   ADD_IMAGE_TYPE (Qgif);
 #endif
 
 #if defined (HAVE_PNG) || defined (HAVE_NS)
-  Qpng = intern_c_string ("png");
-  staticpro (&Qpng);
+  DEFSYM (Qpng, "png");
   ADD_IMAGE_TYPE (Qpng);
 #endif
 
 #if defined (HAVE_IMAGEMAGICK)
-  Qimagemagick = intern_c_string ("imagemagick");
-  staticpro (&Qimagemagick);
+  DEFSYM (Qimagemagick, "imagemagick");
   ADD_IMAGE_TYPE (Qimagemagick);
 #endif
 
 #if defined (HAVE_RSVG)
-  Qsvg = intern_c_string ("svg");
-  staticpro (&Qsvg);
+  DEFSYM (Qsvg, "svg");
   ADD_IMAGE_TYPE (Qsvg);
 #ifdef HAVE_NTGUI
   /* Other libraries used directly by svg code.  */
-  Qgdk_pixbuf = intern_c_string ("gdk-pixbuf");
-  staticpro (&Qgdk_pixbuf);
-  Qglib = intern_c_string ("glib");
-  staticpro (&Qglib);
-  Qgobject = intern_c_string ("gobject");
-  staticpro (&Qgobject);
+  DEFSYM (Qgdk_pixbuf, "gdk-pixbuf");
+  DEFSYM (Qglib, "glib");
+  DEFSYM (Qgobject, "gobject");
 #endif /* HAVE_NTGUI  */
 #endif /* HAVE_RSVG  */
 
diff --git a/src/keyboard.h b/src/keyboard.h
index 802c99edb5e..20763c35f3a 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -268,7 +268,9 @@ extern Lisp_Object menu_items;
 
 /* If non-nil, means that the global vars defined here are already in use.
    Used to detect cases where we try to re-enter this non-reentrant code.  */
+#if defined USE_GTK || defined USE_MOTIF
 extern Lisp_Object menu_items_inuse;
+#endif
 
 /* Number of slots currently allocated in menu_items.  */
 extern int menu_items_allocated;
diff --git a/src/lisp.h b/src/lisp.h
index 389762a07e5..3f6a84f8fa3 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3043,6 +3043,7 @@ extern Lisp_Object set_buffer_if_live (Lisp_Object);
 EXFUN (Fbarf_if_buffer_read_only, 0);
 EXFUN (Fcurrent_buffer, 0);
 EXFUN (Fother_buffer, 3);
+extern Lisp_Object other_buffer_safely (Lisp_Object);
 EXFUN (Foverlay_get, 2);
 EXFUN (Fbuffer_modified_p, 1);
 EXFUN (Fset_buffer_modified_p, 1);
@@ -3253,9 +3254,7 @@ EXFUN (Fframe_parameter, 2);
 EXFUN (Fmodify_frame_parameters, 2);
 EXFUN (Fraise_frame, 1);
 EXFUN (Fredirect_frame_focus, 2);
-extern Lisp_Object frame_buffer_list (Lisp_Object);
 extern void frames_discard_buffer (Lisp_Object);
-extern void set_frame_buffer_list (Lisp_Object, Lisp_Object);
 extern void syms_of_frame (void);
 
 /* Defined in emacs.c */
@@ -3312,8 +3311,10 @@ extern int wait_reading_process_output (int, int, int, int,
                                         int);
 extern void add_keyboard_wait_descriptor (int);
 extern void delete_keyboard_wait_descriptor (int);
+#ifdef HAVE_GPM
 extern void add_gpm_wait_descriptor (int);
 extern void delete_gpm_wait_descriptor (int);
+#endif
 extern void close_process_descs (void);
 extern void init_process (void);
 extern void syms_of_process (void);
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 8da589a7115..d4fafcfc047 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -388,6 +388,7 @@ CONFIG_H   = $(EMACS_ROOT)/src/s/ms-w32.h \
              $(EMACS_ROOT)/nt/inc/sys/stat.h
 LISP_H     = $(SRC)/lisp.h \
              $(SRC)/globals.h \
+             $(EMACS_ROOT)/lib/intprops.h \
              $(EMACS_ROOT)/nt/inc/inttypes.h \
              $(EMACS_ROOT)/nt/inc/stdint.h
 PROCESS_H  = $(SRC)/process.h \
@@ -566,7 +567,6 @@ $(BLD)/ccl.$(O) : \
 $(BLD)/character.$(O) : \
         $(SRC)/character.c \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/lib/intprops.h \
         $(LISP_H) \
         $(SRC)/buffer.h \
         $(SRC)/character.h \
@@ -654,7 +654,6 @@ $(BLD)/data.$(O) : \
         $(SRC)/data.c \
         $(CONFIG_H) \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(EMACS_ROOT)/lib/intprops.h \
         $(LISP_H) \
         $(SRC)/buffer.h \
         $(SRC)/ccl.h \
@@ -752,7 +751,6 @@ $(BLD)/editfns.$(O) : \
         $(EMACS_ROOT)/nt/inc/pwd.h \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(EMACS_ROOT)/lib/intprops.h \
         $(EMACS_ROOT)/lib/strftime.h \
         $(EMACS_ROOT)/lib/verify.h \
         $(LISP_H) \
@@ -1034,7 +1032,6 @@ $(BLD)/insdel.$(O) : \
         $(SRC)/insdel.c \
         $(CONFIG_H) \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(EMACS_ROOT)/lib/intprops.h \
         $(LISP_H) \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
@@ -1052,7 +1049,6 @@ $(BLD)/intervals.$(O) : \
         $(SRC)/intervals.c \
         $(CONFIG_H) \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(EMACS_ROOT)/lib/intprops.h \
         $(LISP_H) \
         $(SRC)/buffer.h \
         $(SRC)/coding.h \
@@ -1305,7 +1301,6 @@ $(BLD)/print.$(O) : \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(EMACS_ROOT)/lib/ftoastr.h \
-        $(EMACS_ROOT)/lib/intprops.h \
         $(LISP_H) \
         $(PROCESS_H) \
         $(SRC)/atimer.h \
diff --git a/src/menu.c b/src/menu.c
index 7eda4c6ebb5..fa31c8a51c1 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -67,6 +67,9 @@ Lisp_Object menu_items;
 
 /* If non-nil, means that the global vars defined here are already in use.
    Used to detect cases where we try to re-enter this non-reentrant code.  */
+#if ! (defined USE_GTK || defined USE_MOTIF)
+static
+#endif
 Lisp_Object menu_items_inuse;
 
 /* Number of slots currently allocated in menu_items.  */
diff --git a/src/process.c b/src/process.c
index 51deb1c933f..9ff7dd198dd 100644
--- a/src/process.c
+++ b/src/process.c
@@ -6593,6 +6593,8 @@ DEFUN ("process-filter-multibyte-p", Fprocess_filter_multibyte_p,
 
 
 
+# ifdef HAVE_GPM
+
 void
 add_gpm_wait_descriptor (int desc)
 {
@@ -6605,6 +6607,8 @@ delete_gpm_wait_descriptor (int desc)
   delete_keyboard_wait_descriptor (desc);
 }
 
+# endif
+
 # ifdef SIGIO
 
 /* Return nonzero if *MASK has a bit set
diff --git a/src/widget.c b/src/widget.c
index daea382d654..6d871ad7cb2 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -78,7 +78,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 static void EmacsFrameInitialize (Widget request, Widget new, ArgList dum1, Cardinal *dum2);
 static void EmacsFrameDestroy (Widget widget);
 static void EmacsFrameRealize (Widget widget, XtValueMask *mask, XSetWindowAttributes *attrs);
-void EmacsFrameResize (Widget widget);
+static void EmacsFrameResize (Widget widget);
 static Boolean EmacsFrameSetValues (Widget cur_widget, Widget req_widget, Widget new_widget, ArgList dum1, Cardinal *dum2);
 static XtGeometryResult EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry *request, XtWidgetGeometry *result);
 
@@ -137,7 +137,7 @@ emacsFrameTranslations [] = "\
 ";
 */
 
-EmacsFrameClassRec emacsFrameClassRec = {
+static EmacsFrameClassRec emacsFrameClassRec = {
     { /* core fields */
     /* superclass               */      &widgetClassRec,
     /* class_name               */      "EmacsFrame",
@@ -463,10 +463,6 @@ set_frame_size (EmacsFrame ew)
   }
 }
 
-/* Nonzero tells update_wm_hints not to do anything
-   (the caller should call update_wm_hints explicitly later.)  */
-int update_hints_inhibit;
-
 static void
 update_wm_hints (EmacsFrame ew)
 {
@@ -481,9 +477,6 @@ update_wm_hints (EmacsFrame ew)
   int base_height;
   int min_rows = 0, min_cols = 0;
 
-  if (update_hints_inhibit)
-    return;
-
 #if 0
   check_frame_size (ew->emacs_frame.frame, &min_rows, &min_cols);
 #endif
@@ -699,7 +692,7 @@ EmacsFrameDestroy (Widget widget)
   UNBLOCK_INPUT;
 }
 
-void
+static void
 EmacsFrameResize (Widget widget)
 {
   EmacsFrame ew = (EmacsFrame)widget;
diff --git a/src/widgetprv.h b/src/widgetprv.h
index 5df0976f879..997a70e026c 100644
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -70,9 +70,4 @@ typedef struct _EmacsFrameClassRec {	/* full class record declaration */
     EmacsFrameClassPart emacs_frame_class;
 } EmacsFrameClassRec;
 
-extern EmacsFrameClassRec emacsFrameClassRec;    /* class pointer */
-
-
-
 #endif /* _EmacsFrameP_h */
-
diff --git a/src/window.c b/src/window.c
index 7a026b3a1c7..65df9f26e64 100644
--- a/src/window.c
+++ b/src/window.c
@@ -50,9 +50,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "nsterm.h"
 #endif
 
-Lisp_Object Qwindowp, Qwindow_live_p, Qdelete_window;
+Lisp_Object Qwindowp, Qwindow_live_p;
 static Lisp_Object Qwindow_configuration_p, Qrecord_window_buffer;
-static Lisp_Object Qwindow_deletable_p, Qdisplay_buffer;
+static Lisp_Object Qwindow_deletable_p, Qdelete_window, Qdisplay_buffer;
 static Lisp_Object Qreplace_buffer_in_windows, Qget_mru_window;
 static Lisp_Object Qresize_root_window, Qresize_root_window_vertically;
 static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;
@@ -310,6 +310,8 @@ selected windows appears and to which many commands apply.  */)
   return selected_window;
 }
 
+int window_select_count;
+
 /* If select_window is called with inhibit_point_swap non-zero it will
    not store point of the old selected window's buffer back into that
    window's pointm slot.  This is needed by Fset_window_configuration to
@@ -1972,6 +1974,14 @@ recombine_windows (Lisp_Object window)
         }
     }
 }
+
+/* If WINDOW can be deleted, delete it.  */
+static void
+delete_deletable_window (Lisp_Object window)
+{
+  if (!NILP (call1 (Qwindow_deletable_p, window)))
+    call1 (Qdelete_window, window);
+}
 
 /***********************************************************************
                              Window List
@@ -2210,35 +2220,32 @@ next_window (Lisp_Object window, Lisp_Object minibuf, Lisp_Object all_frames, in
 
 DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0,
        doc: /* Return window following WINDOW in cyclic ordering of windows.
-WINDOW defaults to the selected window. The optional arguments
-MINIBUF and ALL-FRAMES specify the set of windows to consider.
-
-MINIBUF t means consider the minibuffer window even if the
-minibuffer is not active.  MINIBUF nil or omitted means consider
-the minibuffer window only if the minibuffer is active.  Any
-other value means do not consider the minibuffer window even if
-the minibuffer is active.
-
-Several frames may share a single minibuffer; if the minibuffer
-is active, all windows on all frames that share that minibuffer
-are considered too.  Therefore, if you are using a separate
-minibuffer frame and the minibuffer is active and MINIBUF says it
-counts, `next-window' considers the windows in the frame from
-which you entered the minibuffer, as well as the minibuffer
-window.
+WINDOW must be a live window and defaults to the selected one. The
+optional arguments MINIBUF and ALL-FRAMES specify the set of windows to
+consider.
+
+MINIBUF nil or omitted means consider the minibuffer window only if the
+minibuffer is active.  MINIBUF t means consider the minibuffer window
+even if the minibuffer is not active.  Any other value means do not
+consider the minibuffer window even if the minibuffer is active.
+
+ALL-FRAMES nil or omitted means consider all windows on WINDOW's frame,
+plus the minibuffer window if specified by the MINIBUF argument.  If the
+minibuffer counts, consider all windows on all frames that share that
+minibuffer too.  The following non-nil values of ALL-FRAMES have special
+meanings:
+
+- t means consider all windows on all existing frames.
+
+- `visible' means consider all windows on all visible frames.
+
+- 0 (the number zero) means consider all windows on all visible and
+  iconified frames.
+
+- A frame means consider all windows on that frame only.
 
-ALL-FRAMES nil or omitted means consider all windows on WINDOW's
- frame, plus the minibuffer window if specified by the MINIBUF
- argument, see above.  If the minibuffer counts, consider all
- windows on all frames that share that minibuffer too.
-ALL-FRAMES t means consider all windows on all existing frames.
-ALL-FRAMES `visible' means consider all windows on all visible
- frames on the current terminal.
-ALL-FRAMES 0 means consider all windows on all visible and
- iconified frames on the current terminal.
-ALL-FRAMES a frame means consider all windows on that frame only.
 Anything else means consider all windows on WINDOW's frame and no
- others.
+others.
 
 If you use consistent values for MINIBUF and ALL-FRAMES, you can use
 `next-window' to iterate through the entire cycle of acceptable
@@ -2252,9 +2259,32 @@ windows, eventually ending up back at the window you started with.
 
 DEFUN ("previous-window", Fprevious_window, Sprevious_window, 0, 3, 0,
        doc: /* Return window preceding WINDOW in cyclic ordering of windows.
-WINDOW defaults to the selected window. The optional arguments
-MINIBUF and ALL-FRAMES specify the set of windows to consider.
-For the precise meaning of these arguments see `next-window'.
+WINDOW must be a live window and defaults to the selected one.  The
+optional arguments MINIBUF and ALL-FRAMES specify the set of windows to
+consider.
+
+MINIBUF nil or omitted means consider the minibuffer window only if the
+minibuffer is active.  MINIBUF t means consider the minibuffer window
+even if the minibuffer is not active.  Any other value means do not
+consider the minibuffer window even if the minibuffer is active.
+
+ALL-FRAMES nil or omitted means consider all windows on WINDOW's frame,
+plus the minibuffer window if specified by the MINIBUF argument.  If the
+minibuffer counts, consider all windows on all frames that share that
+minibuffer too.  The following non-nil values of ALL-FRAMES have special
+meanings:
+
+- t means consider all windows on all existing frames.
+
+- `visible' means consider all windows on all visible frames.
+
+- 0 (the number zero) means consider all windows on all visible and
+  iconified frames.
+
+- A frame means consider all windows on that frame only.
+
+Anything else means consider all windows on WINDOW's frame and no
+others.
 
 If you use consistent values for MINIBUF and ALL-FRAMES, you can
 use `previous-window' to iterate through the entire cycle of
@@ -2267,37 +2297,6 @@ reverse order.  */)
 }
 
 
-DEFUN ("other-window", Fother_window, Sother_window, 1, 2, "p",
-       doc: /* Select another window in cyclic ordering of windows.
-COUNT specifies the number of windows to skip, starting with the
-selected window, before making the selection.  If COUNT is
-positive, skip COUNT windows forwards.  If COUNT is negative,
-skip -COUNT windows backwards.  COUNT zero means do not skip any
-window, so select the selected window.  In an interactive call,
-COUNT is the numeric prefix argument.  Return nil.
-
-This function uses `next-window' for finding the window to select.
-The argument ALL-FRAMES has the same meaning as in `next-window',
-but the MINIBUF argument of `next-window' is always effectively
-nil.  */)
-  (Lisp_Object count, Lisp_Object all_frames)
-{
-  Lisp_Object window;
-  int i;
-
-  CHECK_NUMBER (count);
-  window = selected_window;
-
-  for (i = XINT (count); i > 0; --i)
-    window = Fnext_window (window, Qnil, all_frames);
-  for (; i < 0; ++i)
-    window = Fprevious_window (window, Qnil, all_frames);
-
-  Fselect_window (window, Qnil);
-  return Qnil;
-}
-
-
 /* Return a list of windows in cyclic ordering.  Arguments are like
    for `next-window'.  */
 
@@ -2397,10 +2396,9 @@ be listed first but no error is signalled.  */)
 enum window_loop
 {
   WINDOW_LOOP_UNUSED,
-  GET_BUFFER_WINDOW,            /* Arg is buffer */
-  DELETE_BUFFER_WINDOWS,        /* Arg is buffer */
-  UNSHOW_BUFFER,                /* Arg is buffer */
-  REDISPLAY_BUFFER_WINDOWS,     /* Arg is buffer */
+  GET_BUFFER_WINDOW,                /* Arg is buffer */
+  REPLACE_BUFFER_IN_WINDOWS_SAFELY, /* Arg is buffer */
+  REDISPLAY_BUFFER_WINDOWS,         /* Arg is buffer */
   CHECK_ALL_WINDOWS
 };
 
@@ -2408,6 +2406,7 @@ static Lisp_Object
 window_loop (enum window_loop type, Lisp_Object obj, int mini, Lisp_Object frames)
 {
   Lisp_Object window, windows, best_window, frame_arg;
+  int frame_best_window_flag = 0;
   struct frame *f;
   struct gcpro gcpro1;
 
@@ -2457,110 +2456,51 @@ window_loop (enum window_loop type, Lisp_Object obj, int mini, Lisp_Object frame
          is visible, since Fwindow_list skips non-visible frames if
          that is desired, under the control of frame_arg.  */
       if (!MINI_WINDOW_P (w)
-          /* For UNSHOW_BUFFER, we must always consider all windows.  */
-          || type == UNSHOW_BUFFER
+          /* For REPLACE_BUFFER_IN_WINDOWS_SAFELY, we must always
+             consider all windows.  */
+          || type == REPLACE_BUFFER_IN_WINDOWS_SAFELY
           || (mini && minibuf_level > 0))
         switch (type)
           {
           case GET_BUFFER_WINDOW:
             if (EQ (w->buffer, obj)
-                /* Don't find any minibuffer window
-                   except the one that is currently in use.  */
-                && (MINI_WINDOW_P (w)
-                    ? EQ (window, minibuf_window)
-                    : 1))
+                /* Don't find any minibuffer window except the one that
+                   is currently in use.  */
+                && (MINI_WINDOW_P (w) ? EQ (window, minibuf_window) : 1))
               {
-                if (NILP (best_window))
-                  best_window = window;
-                else if (EQ (window, selected_window))
-                  /* Prefer to return selected-window.  */
+                if (EQ (window, selected_window))
+                  /* Preferably return the selected window.  */
                   RETURN_UNGCPRO (window);
-                else if (EQ (Fwindow_frame (window), selected_frame))
-                  /* Prefer windows on the current frame.  */
-                  best_window = window;
-              }
-            break;
-
-          case DELETE_BUFFER_WINDOWS:
-            if (EQ (w->buffer, obj))
-              {
-                struct frame *fr = XFRAME (WINDOW_FRAME (w));
-
-                /* If this window is dedicated, and in a frame of its own,
-                   kill the frame.  */
-                if (EQ (window, FRAME_ROOT_WINDOW (fr))
-                    && !NILP (w->dedicated)
-                    && other_visible_frames (fr))
-                  {
-                    /* Skip the other windows on this frame.
-                       There might be one, the minibuffer!  */
-                    while (CONSP (XCDR (windows))
-                           && EQ (XWINDOW (XCAR (windows))->frame,
-                                  XWINDOW (XCAR (XCDR (windows)))->frame))
-                      windows = XCDR (windows);
-
-                    /* Now we can safely delete the frame.  */
-                    delete_frame (w->frame, Qnil);
-                  }
-                else if (NILP (w->parent))
+                else if (EQ (XWINDOW (window)->frame, selected_frame)
+                         && !frame_best_window_flag)
+                  /* Prefer windows on the current frame (but don't
+                     choose another one if we have one already).  */
                   {
-                    /* If we're deleting the buffer displayed in the
-                       only window on the frame, find a new buffer to
-                       display there.  */
-                    Lisp_Object buffer;
-                    buffer = Fother_buffer (obj, Qnil, w->frame);
-                    /* Reset dedicated state of window.  */
-                    w->dedicated = Qnil;
-                    Fset_window_buffer (window, buffer, Qnil);
-                    if (EQ (window, selected_window))
-                      Fset_buffer (w->buffer);
+                    best_window = window;
+                    frame_best_window_flag = 1;
                   }
-                else
-                  call1 (Qdelete_window, window);
+                else if (NILP (best_window))
+                  best_window = window;
               }
             break;
 
-          case UNSHOW_BUFFER:
+          case REPLACE_BUFFER_IN_WINDOWS_SAFELY:
+            /* We could simply check whether the buffer shown by window
+               is live, and show another buffer in case it isn't.  */
             if (EQ (w->buffer, obj))
               {
-                Lisp_Object buffer;
-                struct frame *fr = XFRAME (w->frame);
-
-                /* Find another buffer to show in this window.  */
-                buffer = Fother_buffer (obj, Qnil, w->frame);
-
-                /* If this window is dedicated, and in a frame of its own,
-                   kill the frame.  */
-                if (EQ (window, FRAME_ROOT_WINDOW (fr))
-                    && !NILP (w->dedicated)
-                    && other_visible_frames (fr))
-                  {
-                    /* Skip the other windows on this frame.
-                       There might be one, the minibuffer!  */
-                    while (CONSP (XCDR (windows))
-                           && EQ (XWINDOW (XCAR (windows))->frame,
-                                  XWINDOW (XCAR (XCDR (windows)))->frame))
-                      windows = XCDR (windows);
-
-                    /* Now we can safely delete the frame.  */
-                    delete_frame (w->frame, Qnil);
-                  }
-                else if (!NILP (w->dedicated) && !NILP (w->parent))
-                  {
-                    Lisp_Object window_to_delete;
-                    XSETWINDOW (window_to_delete, w);
-                    /* If this window is dedicated and not the only window
-                       in its frame, then kill it.  */
-                        call1 (Qdelete_window, window_to_delete);
-                  }
-                else
-                  {
-                    /* Otherwise show a different buffer in the window.  */
-                    w->dedicated = Qnil;
-                    Fset_window_buffer (window, buffer, Qnil);
-                    if (EQ (window, selected_window))
-                      Fset_buffer (w->buffer);
-                  }
+                /* Undedicate WINDOW.  */
+                w->dedicated = Qnil;
+                /* Make WINDOW show the buffer returned by
+                   other_buffer_safely, don't run any hooks.  */
+                set_window_buffer
+                  (window, other_buffer_safely (w->buffer), 0, 0);
+                /* If WINDOW is the selected window, make its buffer
+                   current.  But do so only if the window shows the
+                   current buffer (Bug#6454).  */
+                if (EQ (window, selected_window)
+                    && XBUFFER (w->buffer) == current_buffer)
+                  Fset_buffer (w->buffer);
               }
             break;
 
@@ -2875,85 +2815,26 @@ window-start value is reasonable when this function is called.  */)
 }
 
 
-DEFUN ("delete-windows-on", Fdelete_windows_on, Sdelete_windows_on,
-       0, 2, "bDelete windows on (buffer): ",
-       doc: /* Delete all windows showing BUFFER-OR-NAME.
-BUFFER-OR-NAME may be a buffer or the name of an existing buffer and
-defaults to the current buffer.
-
-Optional second argument FRAME controls which frames are affected.
-If optional argument FRAME is `visible', search all visible frames.
-If FRAME is 0, search all visible and iconified frames.
-If FRAME is nil, search all frames.
-If FRAME is t, search only the selected frame.
-If FRAME is a frame, search only that frame.
-When a window showing BUFFER-OR-NAME is dedicated and the only window of
-its frame, that frame is deleted when there are other frames left.  */)
-  (Lisp_Object buffer_or_name, Lisp_Object frame)
+void
+replace_buffer_in_windows (Lisp_Object buffer)
 {
-  Lisp_Object buffer;
-
-  /* FRAME uses t and nil to mean the opposite of what window_loop
-     expects.  */
-  if (NILP (frame))
-    frame = Qt;
-  else if (EQ (frame, Qt))
-    frame = Qnil;
-
-  if (NILP (buffer_or_name))
-    buffer = Fcurrent_buffer ();
-  else
-    {
-      buffer = Fget_buffer (buffer_or_name);
-      CHECK_BUFFER (buffer);
-    }
-
-  window_loop (DELETE_BUFFER_WINDOWS, buffer, 0, frame);
-
-  return Qnil;
+  call1 (Qreplace_buffer_in_windows, buffer);
 }
 
-DEFUN ("replace-buffer-in-windows", Freplace_buffer_in_windows,
-       Sreplace_buffer_in_windows,
-       0, 1, "bReplace buffer in windows: ",
-       doc: /* Replace BUFFER-OR-NAME with some other buffer in all windows showing it.
-BUFFER-OR-NAME may be a buffer or the name of an existing buffer and
-defaults to the current buffer.
-
-When a window showing BUFFER-OR-NAME is dedicated that window is
-deleted.  If that window is the only window on its frame, that frame is
-deleted too when there are other frames left.  If there are no other
-frames left, some other buffer is displayed in that window.  */)
-  (Lisp_Object buffer_or_name)
-{
-  Lisp_Object buffer;
-
-  if (NILP (buffer_or_name))
-    buffer = Fcurrent_buffer ();
-  else
-    {
-      buffer = Fget_buffer (buffer_or_name);
-      CHECK_BUFFER (buffer);
-    }
-
-  window_loop (UNSHOW_BUFFER, buffer, 0, Qt);
-
-  return Qnil;
-}
 
-/* Replace BUFFER with some other buffer in all windows
-   of all frames, even those on other keyboards.  */
+/* Safely replace BUFFER with some other buffer in all windows of all
+   frames, even those on other keyboards.  */
 
 void
-replace_buffer_in_all_windows (Lisp_Object buffer)
+replace_buffer_in_windows_safely (Lisp_Object buffer)
 {
   Lisp_Object tail, frame;
 
-  /* A single call to window_loop won't do the job
-     because it only considers frames on the current keyboard.
-     So loop manually over frames, and handle each one.  */
+  /* A single call to window_loop won't do the job because it only
+     considers frames on the current keyboard.  So loop manually over
+     frames, and handle each one.  */
   FOR_EACH_FRAME (tail, frame)
-    window_loop (UNSHOW_BUFFER, buffer, 1, frame);
+    window_loop (REPLACE_BUFFER_IN_WINDOWS_SAFELY, buffer, 1, frame);
 }
 
 /* If *ROWS or *COLS are too small a size for FRAME, set them to the
@@ -3014,8 +2895,6 @@ adjust_window_margins (struct window *w)
   return 1;
 }
 
-int window_select_count;
-
 static Lisp_Object Fset_window_margins (Lisp_Object, Lisp_Object, Lisp_Object);
 static Lisp_Object Fset_window_fringes (Lisp_Object, Lisp_Object, Lisp_Object,
                                         Lisp_Object);
@@ -3023,6 +2902,8 @@ static Lisp_Object Fset_window_scroll_bars (Lisp_Object, Lisp_Object,
                                             Lisp_Object, Lisp_Object);
 static Lisp_Object Fset_window_vscroll (Lisp_Object, Lisp_Object, Lisp_Object);
 
+/* The following three routines are needed for running a window's
+   configuration change hook.  */
 static void
 run_funs (Lisp_Object funs)
 {
@@ -3031,8 +2912,19 @@ run_funs (Lisp_Object funs)
       call0 (XCAR (funs));
 }
 
-static Lisp_Object select_window_norecord (Lisp_Object window);
-static Lisp_Object select_frame_norecord (Lisp_Object frame);
+static Lisp_Object
+select_window_norecord (Lisp_Object window)
+{
+  return WINDOW_LIVE_P (window)
+    ? Fselect_window (window, Qt) : selected_window;
+}
+
+static Lisp_Object
+select_frame_norecord (Lisp_Object frame)
+{
+  return FRAME_LIVE_P (XFRAME (frame))
+    ? Fselect_frame (frame, Qt) : selected_frame;
+}
 
 void
 run_window_configuration_change_hook (struct frame *f)
@@ -3209,11 +3101,13 @@ WINDOW can be any window and defaults to the selected one.  */)
 
 DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0,
        doc: /* Make WINDOW display BUFFER-OR-NAME as its contents.
-WINDOW defaults to the selected window.  BUFFER-OR-NAME must be a buffer
-or the name of an existing buffer.  Optional third argument KEEP-MARGINS
-non-nil means that WINDOW's current display margins, fringe widths, and
-scroll bar settings are preserved; the default is to reset these from
-the local settings for BUFFER-OR-NAME or the frame defaults.  Return nil.
+WINDOW has to be a live window and defaults to the selected one.
+BUFFER-OR-NAME must be a buffer or the name of an existing buffer.
+
+Optional third argument KEEP-MARGINS non-nil means that WINDOW's current
+display margins, fringe widths, and scroll bar settings are preserved;
+the default is to reset these from the local settings for BUFFER-OR-NAME
+or the frame defaults.  Return nil.
 
 This function throws an error when WINDOW is strongly dedicated to its
 buffer (that is `window-dedicated-p' returns t for WINDOW) and does not
@@ -3238,32 +3132,26 @@ This function runs `window-scroll-functions' before running
   else if (!EQ (tem, Qt))
     /* w->buffer is t when the window is first being set up.  */
     {
-      if (EQ (tem, buffer))
-        return Qnil;
-      else if (EQ (w->dedicated, Qt))
-        error ("Window is dedicated to `%s'", SDATA (BVAR (XBUFFER (tem), name)));
-      else
-        w->dedicated = Qnil;
+      if (!EQ (tem, buffer))
+        {
+          if (EQ (w->dedicated, Qt))
+            /* WINDOW is strongly dedicated to its buffer, signal an
+               error.  */
+            error ("Window is dedicated to `%s'", SDATA (BVAR (XBUFFER (tem), name)));
+          else
+            /* WINDOW is weakly dedicated to its buffer, reset
+               dedicatedness.  */
+            w->dedicated = Qnil;
+
+          call1 (Qrecord_window_buffer, window);
+        }
 
       unshow_buffer (w);
     }
 
   set_window_buffer (window, buffer, 1, !NILP (keep_margins));
-  return Qnil;
-}
 
-static Lisp_Object
-select_window_norecord (Lisp_Object window)
-{
-  return WINDOW_LIVE_P (window)
-    ? Fselect_window (window, Qt) : selected_window;
-}
-
-static Lisp_Object
-select_frame_norecord (Lisp_Object frame)
-{
-  return FRAME_LIVE_P (XFRAME (frame))
-    ? Fselect_frame (frame, Qt) : selected_frame;
+  return Qnil;
 }
 
 static Lisp_Object
@@ -3336,7 +3224,10 @@ temp_output_buffer_show (register Lisp_Object buf)
     call1 (Vtemp_buffer_show_function, buf);
   else
     {
-      window = display_buffer (buf, Qnil, Qnil);
+      window = display_buffer (buf, Vtemp_buffer_show_specifiers, Qnil);
+      /* Reset Vtemp_buffer_show_specifiers immediately so it won't
+         affect subsequent calls.  */
+      Vtemp_buffer_show_specifiers = Qnil;
 
       if (!EQ (XWINDOW (window)->frame, selected_frame))
         Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window)));
@@ -3799,7 +3690,7 @@ resize_frame_windows (struct frame *f, int size, int horflag)
 DEFUN ("split-window-internal", Fsplit_window_internal, Ssplit_window_internal, 4, 4, 0,
        doc: /* Split window OLD.
 Second argument TOTAL-SIZE specifies the number of lines or columns of the
-new window.  In any case TOTAL-SIZE must be a positive integer
+new window.  In any case TOTAL-SIZE must be a positive integer.
 
 Third argument SIDE nil (or `below') specifies that the new window shall
 be located below WINDOW.  SIDE `above' means the new window shall be
@@ -4280,7 +4171,6 @@ DEFUN ("resize-mini-window-internal", Fresize_mini_window_internal, Sresize_mini
   else error ("Failed to resize minibuffer window");
 }
 
-
 /* Mark window cursors off for all windows in the window tree rooted
    at W by setting their phys_cursor_on_p flag to zero.  Called from
    xterm.c, e.g. when a frame is cleared and thereby all cursors on
@@ -5337,7 +5227,6 @@ and redisplay normally--don't erase and redraw the frame.  */)
   return Qnil;
 }
 
-
 DEFUN ("window-text-height", Fwindow_text_height, Swindow_text_height,
        0, 1, 0,
        doc: /* Return the height in lines of the text display area of WINDOW.
@@ -5510,6 +5399,7 @@ the return value is nil.  Otherwise the value is t.  */)
   struct Lisp_Vector *saved_windows;
   Lisp_Object new_current_buffer;
   Lisp_Object frame;
+  Lisp_Object auto_buffer_name;
   FRAME_PTR f;
   EMACS_INT old_point = -1;
 
@@ -5565,6 +5455,8 @@ the return value is nil.  Otherwise the value is t.  */)
      However, there is other stuff we should still try to do below.  */
   if (FRAME_LIVE_P (f))
     {
+      Lisp_Object window;
+      Lisp_Object dead_windows = Qnil;
       register struct window *w;
       register struct saved_window *p;
       struct window *root_window;
@@ -5641,7 +5533,8 @@ the return value is nil.  Otherwise the value is t.  */)
       for (k = 0; k < saved_windows->header.size; k++)
         {
           p = SAVED_WINDOW_N (saved_windows, k);
-          w = XWINDOW (p->window);
+          window = p->window;
+          w = XWINDOW (window);
           w->next = Qnil;
 
           if (!NILP (p->parent))
@@ -5704,55 +5597,70 @@ the return value is nil.  Otherwise the value is t.  */)
 
           /* Reinstall the saved buffer and pointers into it.  */
           if (NILP (p->buffer))
+            /* An internal window.  */
             w->buffer = p->buffer;
+          else if (!NILP (BVAR (XBUFFER (p->buffer), name)))
+            /* If saved buffer is alive, install it.  */
+            {
+              w->buffer = p->buffer;
+              w->start_at_line_beg = p->start_at_line_beg;
+              set_marker_restricted (w->start, p->start, w->buffer);
+              set_marker_restricted (w->pointm, p->pointm, w->buffer);
+              Fset_marker (BVAR (XBUFFER (w->buffer), mark),
+                           p->mark, w->buffer);
+
+              /* As documented in Fcurrent_window_configuration, don't
+                 restore the location of point in the buffer which was
+                 current when the window configuration was recorded.  */
+              if (!EQ (p->buffer, new_current_buffer)
+                  && XBUFFER (p->buffer) == current_buffer)
+                Fgoto_char (w->pointm);
+            }
+          else if (!NILP (w->buffer) && !NILP (BVAR (XBUFFER (w->buffer), name)))
+            /* Keep window's old buffer; make sure the markers are
+               real.  */
+            {
+              /* Set window markers at start of visible range.  */
+              if (XMARKER (w->start)->buffer == 0)
+                set_marker_restricted (w->start, make_number (0),
+                                       w->buffer);
+              if (XMARKER (w->pointm)->buffer == 0)
+                set_marker_restricted_both (w->pointm, w->buffer,
+                                            BUF_PT (XBUFFER (w->buffer)),
+                                            BUF_PT_BYTE (XBUFFER (w->buffer)));
+              w->start_at_line_beg = Qt;
+            }
+          else if (STRINGP (auto_buffer_name =
+                            Fwindow_parameter (window, Qauto_buffer_name))
+                   && SCHARS (auto_buffer_name) != 0
+                   && !NILP (w->buffer = Fget_buffer_create (auto_buffer_name)))
+            {
+              set_marker_restricted (w->start, make_number (0), w->buffer);
+              set_marker_restricted (w->pointm, make_number (0), w->buffer);
+              w->start_at_line_beg = Qt;
+            }
           else
+            /* Window has no live buffer, get one.  */
             {
-              if (!NILP (BVAR (XBUFFER (p->buffer), name)))
-                /* If saved buffer is alive, install it.  */
-                {
-                  w->buffer = p->buffer;
-                  w->start_at_line_beg = p->start_at_line_beg;
-                  set_marker_restricted (w->start, p->start, w->buffer);
-                  set_marker_restricted (w->pointm, p->pointm, w->buffer);
-                  Fset_marker (BVAR (XBUFFER (w->buffer), mark),
-                               p->mark, w->buffer);
-
-                  /* As documented in Fcurrent_window_configuration, don't
-                     restore the location of point in the buffer which was
-                     current when the window configuration was recorded.  */
-                  if (!EQ (p->buffer, new_current_buffer)
-                      && XBUFFER (p->buffer) == current_buffer)
-                    Fgoto_char (w->pointm);
-                }
-              else if (NILP (w->buffer) || NILP (BVAR (XBUFFER (w->buffer), name)))
-                /* Else unless window has a live buffer, get one.  */
-                {
-                  w->buffer = Fcdr (Fcar (Vbuffer_alist));
-                  /* This will set the markers to beginning of visible
-                     range.  */
-                  set_marker_restricted (w->start, make_number (0), w->buffer);
-                  set_marker_restricted (w->pointm, make_number (0),w->buffer);
-                  w->start_at_line_beg = Qt;
-                }
-              else
-                /* Keeping window's old buffer; make sure the markers
-                   are real.  */
-                {
-                  /* Set window markers at start of visible range.  */
-                  if (XMARKER (w->start)->buffer == 0)
-                    set_marker_restricted (w->start, make_number (0),
-                                           w->buffer);
-                  if (XMARKER (w->pointm)->buffer == 0)
-                    set_marker_restricted_both (w->pointm, w->buffer,
-                                                BUF_PT (XBUFFER (w->buffer)),
-                                                BUF_PT_BYTE (XBUFFER (w->buffer)));
-                  w->start_at_line_beg = Qt;
-                }
+              /* Get the buffer via other_buffer_safely in order to
+              avoid showing an unimportant buffer and, if necessary, to
+              recreate *scratch* in the course (part of Juanma's bs-show
+              scenario from March 2011).  */
+              w->buffer = other_buffer_safely (Fcurrent_buffer ());
+              /* This will set the markers to beginning of visible
+                 range.  */
+              set_marker_restricted (w->start, make_number (0), w->buffer);
+              set_marker_restricted (w->pointm, make_number (0), w->buffer);
+              w->start_at_line_beg = Qt;
+              if (!NILP (w->dedicated))
+                /* Record this window as dead.  */
+                dead_windows = Fcons (window, dead_windows);
+              /* Make sure window is no more dedicated.  */
+              w->dedicated = Qnil;
             }
         }
 
       FRAME_ROOT_WINDOW (f) = data->root_window;
-
       /* Arrange *not* to restore point in the buffer that was
          current when the window configuration was saved.  */
       if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer))
@@ -5760,10 +5668,10 @@ the return value is nil.  Otherwise the value is t.  */)
                                make_number (old_point),
                                XWINDOW (data->current_window)->buffer);
 
-      /* In the following call to `select-window, prevent "swapping
-         out point" in the old selected window using the buffer that
-         has been restored into it.  We already swapped out that point
-         from that window's old buffer.  */
+      /* In the following call to `select-window', prevent "swapping out
+         point" in the old selected window using the buffer that has
+         been restored into it.  We already swapped out that point from
+         that window's old buffer.  */
       select_window (data->current_window, Qnil, 1);
       BVAR (XBUFFER (XWINDOW (selected_window)->buffer), last_selected_window)
         = selected_window;
@@ -5804,9 +5712,16 @@ the return value is nil.  Otherwise the value is t.  */)
         }
 
       adjust_glyphs (f);
-
       UNBLOCK_INPUT;
 
+      /* Scan dead buffer windows.  */
+      for (; CONSP (dead_windows); dead_windows = XCDR (dead_windows))
+        {
+          window = XCAR (dead_windows);
+          if (WINDOW_LIVE_P (window) && !EQ (window, FRAME_ROOT_WINDOW (f)))
+            delete_deletable_window (window);
+        }
+
       /* Fselect_window will have made f the selected frame, so we
          reselect the proper frame here.  Fhandle_switch_frame will change the
          selected window too, but that doesn't make the call to
@@ -6052,82 +5967,6 @@ redirection (see `redirect-frame-focus').  */)
   XSETWINDOW_CONFIGURATION (tem, data);
   return (tem);
 }
-
-
-/***********************************************************************
-                            Window Split Tree
- ***********************************************************************/
-
-static Lisp_Object
-window_tree (struct window *w)
-{
-  Lisp_Object tail = Qnil;
-  Lisp_Object result = Qnil;
-
-  while (w)
-    {
-      Lisp_Object wn;
-
-      XSETWINDOW (wn, w);
-      if (!NILP (w->hchild))
-        wn = Fcons (Qnil, Fcons (Fwindow_edges (wn),
-                                 window_tree (XWINDOW (w->hchild))));
-      else if (!NILP (w->vchild))
-        wn = Fcons (Qt, Fcons (Fwindow_edges (wn),
-                               window_tree (XWINDOW (w->vchild))));
-
-      if (NILP (result))
-        {
-          result = tail = Fcons (wn, Qnil);
-        }
-      else
-        {
-          XSETCDR (tail, Fcons (wn, Qnil));
-          tail = XCDR (tail);
-        }
-
-      w = NILP (w->next) ? 0 : XWINDOW (w->next);
-    }
-
-  return result;
-}
-
-
-
-DEFUN ("window-tree", Fwindow_tree, Swindow_tree,
-       0, 1, 0,
-       doc: /* Return the window tree for frame FRAME.
-
-The return value is a list of the form (ROOT MINI), where ROOT
-represents the window tree of the frame's root window, and MINI
-is the frame's minibuffer window.
-
-If the root window is not split, ROOT is the root window itself.
-Otherwise, ROOT is a list (DIR EDGES W1 W2 ...) where DIR is nil for a
-horizontal split, and t for a vertical split, EDGES gives the combined
-size and position of the subwindows in the split, and the rest of the
-elements are the subwindows in the split.  Each of the subwindows may
-again be a window or a list representing a window split, and so on.
-EDGES is a list \(LEFT TOP RIGHT BOTTOM) as returned by `window-edges'.
-
-If FRAME is nil or omitted, return information on the currently
-selected frame.  */)
-  (Lisp_Object frame)
-{
-  FRAME_PTR f;
-
-  if (NILP (frame))
-    frame = selected_frame;
-
-  CHECK_FRAME (frame);
-  f = XFRAME (frame);
-
-  if (!FRAME_LIVE_P (f))
-    return Qnil;
-
-  return window_tree (XWINDOW (FRAME_ROOT_WINDOW (f)));
-}
-
 
 /***********************************************************************
                             Marginal Areas
@@ -6487,116 +6326,81 @@ freeze_window_starts (struct frame *f, int freeze_p)
                             Initialization
  ***********************************************************************/
 
-/* Return 1 if window configurations C1 and C2
-   describe the same state of affairs.  This is used by Fequal.  */
+/* Return 1 if window configurations CONFIGURATION1 and CONFIGURATION2
+   describe the same state of affairs.  This is used by Fequal.
+
+   ignore_positions non-zero means ignore non-matching scroll positions
+   and the like.
+
+   This ignores a couple of things like the dedicatedness status of
+   window, splits, nest and the like.  This might have to be fixed.  */
 
 int
-compare_window_configurations (Lisp_Object c1, Lisp_Object c2, int ignore_positions)
+compare_window_configurations (Lisp_Object configuration1, Lisp_Object configuration2, int ignore_positions)
 {
   register struct save_window_data *d1, *d2;
-  struct Lisp_Vector *sw1, *sw2;
+  struct Lisp_Vector *sws1, *sws2;
   int i;
 
-  CHECK_WINDOW_CONFIGURATION (c1);
-  CHECK_WINDOW_CONFIGURATION (c2);
-
-  d1 = (struct save_window_data *) XVECTOR (c1);
-  d2 = (struct save_window_data *) XVECTOR (c2);
-  sw1 = XVECTOR (d1->saved_windows);
-  sw2 = XVECTOR (d2->saved_windows);
-
-  if (d1->frame_cols != d2->frame_cols)
-    return 0;
-  if (d1->frame_lines != d2->frame_lines)
-    return 0;
-  if (d1->frame_menu_bar_lines != d2->frame_menu_bar_lines)
-    return 0;
-  if (! EQ (d1->selected_frame, d2->selected_frame))
-    return 0;
-  /* Don't compare the current_window field directly.
-     Instead see w1_is_current and w2_is_current, below.  */
-  if (! EQ (d1->current_buffer, d2->current_buffer))
-    return 0;
-  if (! ignore_positions)
-    {
-      if (! EQ (d1->minibuf_scroll_window, d2->minibuf_scroll_window))
-        return 0;
-      if (! EQ (d1->minibuf_selected_window, d2->minibuf_selected_window))
-        return 0;
-    }
-  /* Don't compare the root_window field.
-     We don't require the two configurations
-     to use the same window object,
-     and the two root windows must be equivalent
-     if everything else compares equal.  */
-  if (! EQ (d1->focus_frame, d2->focus_frame))
-    return 0;
-
-  /* Verify that the two confis have the same number of windows.  */
-  if (sw1->header.size != sw2->header.size)
+  CHECK_WINDOW_CONFIGURATION (configuration1);
+  CHECK_WINDOW_CONFIGURATION (configuration2);
+
+  d1 = (struct save_window_data *) XVECTOR (configuration1);
+  d2 = (struct save_window_data *) XVECTOR (configuration2);
+  sws1 = XVECTOR (d1->saved_windows);
+  sws2 = XVECTOR (d2->saved_windows);
+
+  /* Frame settings must match.  */
+  if (d1->frame_cols != d2->frame_cols
+      || d1->frame_lines != d2->frame_lines
+      || d1->frame_menu_bar_lines != d2->frame_menu_bar_lines
+      || !EQ (d1->selected_frame, d2->selected_frame)
+      || !EQ (d1->current_buffer, d2->current_buffer)
+      || (!ignore_positions
+          && (!EQ (d1->minibuf_scroll_window, d2->minibuf_scroll_window)
+              || !EQ (d1->minibuf_selected_window, d2->minibuf_selected_window)))
+      || !EQ (d1->focus_frame, d2->focus_frame)
+      /* Verify that the two configurations have the same number of windows.  */
+      || sws1->header.size != sws2->header.size)
     return 0;
 
-  for (i = 0; i < sw1->header.size; i++)
-    {
-      struct saved_window *p1, *p2;
-      int w1_is_current, w2_is_current;
-
-      p1 = SAVED_WINDOW_N (sw1, i);
-      p2 = SAVED_WINDOW_N (sw2, i);
-
-      /* Verify that the current windows in the two
-         configurations correspond to each other.  */
-      w1_is_current = EQ (d1->current_window, p1->window);
-      w2_is_current = EQ (d2->current_window, p2->window);
-
-      if (w1_is_current != w2_is_current)
-        return 0;
-
-      /* Verify that the corresponding windows do match.  */
-      if (! EQ (p1->buffer, p2->buffer))
-        return 0;
-      if (! EQ (p1->left_col, p2->left_col))
-        return 0;
-      if (! EQ (p1->top_line, p2->top_line))
-        return 0;
-      if (! EQ (p1->total_cols, p2->total_cols))
-        return 0;
-      if (! EQ (p1->total_lines, p2->total_lines))
-        return 0;
-      if (! EQ (p1->display_table, p2->display_table))
-        return 0;
-      if (! EQ (p1->parent, p2->parent))
-        return 0;
-      if (! EQ (p1->prev, p2->prev))
-        return 0;
-      if (! ignore_positions)
-        {
-          if (! EQ (p1->hscroll, p2->hscroll))
-            return 0;
-          if (!EQ (p1->min_hscroll, p2->min_hscroll))
-            return 0;
-          if (! EQ (p1->start_at_line_beg, p2->start_at_line_beg))
-            return 0;
-          if (NILP (Fequal (p1->start, p2->start)))
-            return 0;
-          if (NILP (Fequal (p1->pointm, p2->pointm)))
-            return 0;
-          if (NILP (Fequal (p1->mark, p2->mark)))
-            return 0;
-        }
-      if (! EQ (p1->left_margin_cols, p2->left_margin_cols))
-        return 0;
-      if (! EQ (p1->right_margin_cols, p2->right_margin_cols))
-        return 0;
-      if (! EQ (p1->left_fringe_width, p2->left_fringe_width))
-        return 0;
-      if (! EQ (p1->right_fringe_width, p2->right_fringe_width))
-        return 0;
-      if (! EQ (p1->fringes_outside_margins, p2->fringes_outside_margins))
-        return 0;
-      if (! EQ (p1->scroll_bar_width, p2->scroll_bar_width))
-        return 0;
-      if (! EQ (p1->vertical_scroll_bar_type, p2->vertical_scroll_bar_type))
+  for (i = 0; i < sws1->header.size; i++)
+    {
+      struct saved_window *sw1, *sw2;
+
+      sw1 = SAVED_WINDOW_N (sws1, i);
+      sw2 = SAVED_WINDOW_N (sws2, i);
+
+      if (
+           /* The "current" windows in the two configurations must
+              correspond to each other.  */
+          EQ (d1->current_window, sw1->window)
+          != EQ (d2->current_window, sw2->window)
+          /* Windows' buffers must match.  */
+          || !EQ (sw1->buffer, sw2->buffer)
+          || !EQ (sw1->left_col, sw2->left_col)
+          || !EQ (sw1->top_line, sw2->top_line)
+          || !EQ (sw1->total_cols, sw2->total_cols)
+          || !EQ (sw1->total_lines, sw2->total_lines)
+          || !EQ (sw1->display_table, sw2->display_table)
+          /* The next two disjuncts check the window structure for
+             equality.  */
+          || !EQ (sw1->parent, sw2->parent)
+          || !EQ (sw1->prev, sw2->prev)
+          || (!ignore_positions
+              && (!EQ (sw1->hscroll, sw2->hscroll)
+                  || !EQ (sw1->min_hscroll, sw2->min_hscroll)
+                  || !EQ (sw1->start_at_line_beg, sw2->start_at_line_beg)
+                  || NILP (Fequal (sw1->start, sw2->start))
+                  || NILP (Fequal (sw1->pointm, sw2->pointm))
+                  || NILP (Fequal (sw1->mark, sw2->mark))))
+          || !EQ (sw1->left_margin_cols, sw2->left_margin_cols)
+          || !EQ (sw1->right_margin_cols, sw2->right_margin_cols)
+          || !EQ (sw1->left_fringe_width, sw2->left_fringe_width)
+          || !EQ (sw1->right_fringe_width, sw2->right_fringe_width)
+          || !EQ (sw1->fringes_outside_margins, sw2->fringes_outside_margins)
+          || !EQ (sw1->scroll_bar_width, sw2->scroll_bar_width)
+          || !EQ (sw1->vertical_scroll_bar_type, sw2->vertical_scroll_bar_type))
         return 0;
     }
 
@@ -6719,6 +6523,16 @@ If this function is used, then it must do the entire job of showing
 the buffer; `temp-buffer-show-hook' is not run unless this function runs it.  */);
   Vtemp_buffer_show_function = Qnil;
 
+  DEFVAR_LISP ("temp-buffer-show-specifiers", Vtemp_buffer_show_specifiers,
+               doc: /* Buffer display specifiers used by `with-output-to-temp-buffer'.
+These specifiers are passed by `with-output-to-temp-buffer' as second
+argument to `display-buffer'.  Applications should only let-bind this
+around a call to `with-output-to-temp-buffer'.
+
+For a description of buffer display specifiers see the variable
+`display-buffer-alist'.  */);
+  Vtemp_buffer_show_specifiers = Qnil;
+
   DEFVAR_LISP ("minibuffer-scroll-window", Vminibuf_scroll_window,
                doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll.  */);
   Vminibuf_scroll_window = Qnil;
@@ -6734,16 +6548,16 @@ is displayed in the `mode-line' face.  */);
   Vother_window_scroll_buffer = Qnil;
 
   DEFVAR_BOOL ("auto-window-vscroll", auto_window_vscroll_p,
-               doc: /* *Non-nil means to automatically adjust `window-vscroll' to view tall lines.  */);
+               doc: /* Non-nil means to automatically adjust `window-vscroll' to view tall lines.  */);
   auto_window_vscroll_p = 1;
 
   DEFVAR_INT ("next-screen-context-lines", next_screen_context_lines,
-              doc: /* *Number of lines of continuity when scrolling by screenfuls.  */);
+              doc: /* Number of lines of continuity when scrolling by screenfuls.  */);
   next_screen_context_lines = 2;
 
   DEFVAR_LISP ("scroll-preserve-screen-position",
                Vscroll_preserve_screen_position,
-               doc: /* *Controls if scroll commands move point to keep its screen position unchanged.
+               doc: /* Controls if scroll commands move point to keep its screen position unchanged.
 A value of nil means point does not keep its screen position except
 at the scroll margin or window boundary respectively.
 A value of t means point keeps its screen position if the scroll
@@ -6865,10 +6679,7 @@ function `window-nest' and altered by the function `set-window-nest'.  */);
   defsubr (&Sset_window_display_table);
   defsubr (&Snext_window);
   defsubr (&Sprevious_window);
-  defsubr (&Sother_window);
   defsubr (&Sget_buffer_window);
-  defsubr (&Sdelete_windows_on);
-  defsubr (&Sreplace_buffer_in_windows);
   defsubr (&Sdelete_other_windows_internal);
   defsubr (&Sdelete_window_internal);
   defsubr (&Sresize_mini_window_internal);
@@ -6893,7 +6704,6 @@ function `window-nest' and altered by the function `set-window-nest'.  */);
   defsubr (&Swindow_configuration_frame);
   defsubr (&Sset_window_configuration);
   defsubr (&Scurrent_window_configuration);
-  defsubr (&Swindow_tree);
   defsubr (&Sset_window_margins);
   defsubr (&Swindow_margins);
   defsubr (&Sset_window_fringes);
@@ -6917,7 +6727,6 @@ function `window-nest' and altered by the function `set-window-nest'.  */);
 void
 keys_of_window (void)
 {
-  initial_define_key (control_x_map, 'o', "other-window");
   initial_define_key (control_x_map, '<', "scroll-left");
   initial_define_key (control_x_map, '>', "scroll-right");
 
diff --git a/src/window.h b/src/window.h
index 1ebc99055a5..c3f59e4b116 100644
--- a/src/window.h
+++ b/src/window.h
@@ -827,6 +827,7 @@ extern Lisp_Object make_window (void);
 extern Lisp_Object window_from_coordinates (struct frame *, int, int,
                                             enum window_part *, int);
 EXFUN (Fwindow_dedicated_p, 1);
+extern void resize_frame_windows (struct frame *, int, int);
 extern void delete_all_subwindows (Lisp_Object);
 extern void freeze_window_starts (struct frame *, int);
 extern void grow_mini_window (struct window *, int);
@@ -902,7 +903,6 @@ extern Lisp_Object Qwindowp, Qwindow_live_p;
 extern Lisp_Object Vwindow_list;
 
 EXFUN (Fwindow_buffer, 1);
-EXFUN (Fwindow_frame, 1);
 EXFUN (Fget_buffer_window, 2);
 EXFUN (Fwindow_minibuffer_p, 1);
 EXFUN (Fselected_window, 0);
@@ -918,12 +918,11 @@ extern int window_internal_height (struct window *);
 extern int window_body_cols (struct window *w);
 EXFUN (Frecenter, 1);
 extern void temp_output_buffer_show (Lisp_Object);
-extern void replace_buffer_in_all_windows (Lisp_Object);
+extern void replace_buffer_in_windows (Lisp_Object);
+extern void replace_buffer_in_windows_safely (Lisp_Object);
 extern void init_window_once (void);
 extern void init_window (void);
 extern void syms_of_window (void);
 extern void keys_of_window (void);
-extern void resize_frame_windows (struct frame *, int, int);
-
 
 #endif /* not WINDOW_H_INCLUDED */
diff --git a/src/xmenu.c b/src/xmenu.c
index 0aad8f454af..1cb71187c0c 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -347,6 +347,8 @@ for instance using the window manager, then this produces a quit and
 
 #ifndef MSDOS
 
+#if defined USE_GTK || defined USE_MOTIF
+
 /* Set menu_items_inuse so no other popup menu or dialog is created.  */
 
 void
@@ -360,6 +362,8 @@ x_menu_set_in_use (int in_use)
 #endif
 }
 
+#endif
+
 /* Wait for an X event to arrive or for a timer to expire.  */
 
 #ifndef USE_MOTIF
diff --git a/src/xterm.c b/src/xterm.c
index 1c1c8e3f107..914cdc429d6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1446,6 +1446,8 @@ x_frame_of_widget (Widget widget)
 }
 
 
+#ifdef USE_LUCID
+
 /* Allocate a color which is lighter or darker than *PIXEL by FACTOR
    or DELTA.  Try a color with RGB values multiplied by FACTOR first.
    If this produces the same color as PIXEL, try a color where all RGB
@@ -1461,6 +1463,8 @@ x_alloc_lighter_color_for_widget (Widget widget, Display *display, Colormap cmap
   return x_alloc_lighter_color (f, display, cmap, pixel, factor, delta);
 }
 
+#endif
+
 
 /* Structure specifying which arguments should be passed by Xt to
    cvt_string_to_pixel.  We want the widget's screen and colormap.  */
diff --git a/src/xterm.h b/src/xterm.h
index 2938de9b339..47d7e533769 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -973,10 +973,12 @@ extern void x_delete_terminal (struct terminal *terminal);
 extern unsigned long x_copy_color (struct frame *, unsigned long);
 #ifdef USE_X_TOOLKIT
 extern XtAppContext Xt_app_con;
+extern void x_activate_timeout_atimer (void);
+#endif
+#ifdef USE_LUCID
 extern int x_alloc_lighter_color_for_widget (Widget, Display *, Colormap,
                                              unsigned long *,
                                              double, int);
-extern void x_activate_timeout_atimer (void);
 #endif
 extern int x_alloc_nearest_color (struct frame *, Colormap, XColor *);
 extern void x_query_colors (struct frame *f, XColor *, int);
@@ -1069,7 +1071,9 @@ extern void x_free_dpy_colors (Display *, Screen *, Colormap,
 
 /* Defined in xmenu.c */
 
+#if defined USE_GTK || defined USE_MOTIF
 extern void x_menu_set_in_use (int);
+#endif
 #ifdef USE_MOTIF
 extern void x_menu_wait_for_event (void *data);
 #endif