Merged from miles@gnu.org--gnu-2005 (patch 149-151, 629-641)

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-150
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-151
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-437

20 files changed, 513 insertions, 183 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 61a10be80dd..e2798ad1268 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,145 @@
+2005-11-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (Fget_lru_window, Fget_largest_window, window_loop):
+        Don't abuse the `mini' arg.  Use the `obj' arg instead.
+
+2005-11-04  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (show_mouse_face): Clear mouse face to eol.
+
+2005-11-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * Makefile.in (lisp, shortlisp): Add emacs-lisp/syntax.elc,
+        font-lock.elc and jit-lock.elc.
+
+2005-11-03  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (Fenlarge_window): Rename SIDE to HORIZONTAL.
+        (enlarge_window): Rename WIDTHFLAG to HORIZ_FLAG.
+        (CURBEG, CURSIZE): Use HORIZ_FLAG instead of WIDTHFLAG.
+
+        * sheap.c (STATIC_HEAP_SIZE): Increment both definitions.
+
+        * alloc.c (refill_memory_reserve): Move decl out of conditionals.
+
+2005-11-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (Fdisplay_buffer): Fix last change to not use
+        a dedicated window.
+
+2005-11-01  Kim F. Storm  <storm@cua.dk>
+
+        * fringe.c (update_window_fringes): Undo 2005-10-27 change.
+        Instead, rotate the bottom angle bitmap 180 degrees to indicate
+        that the bottom row does not end in a newline.
+
+2005-11-01  Andreas Schwab  <schwab@suse.de>
+
+        * unexelf.c (unexec): Handle .plt section in BSS segment.
+
+2005-11-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lread.c (readevalloop): Yet another int/Lisp_Object mixup (YAILOM).
+
+        * window.c (window_loop): For LRU and LARGEST, let the `mini' argument
+        determine whether to consider dedicated windows as well.
+        (Fget_lru_window, Fget_largest_window): Add `dedicated' argument.
+        (Fdisplay_buffer): Do consider dedicated windows in those cases where
+        we will split the window rather than reuse it.
+        Don't try to use windows on other displays.
+
+2005-10-31  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * puresize.h (BASE_PURESIZE): Increment to 1170000.
+
+2005-10-31  Romain Francoise  <romain@orebokech.com>
+
+        * macfns.c: Update copyright year.
+        * m/gould.h: Likewise.
+
+2005-10-30  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (display_line): Restore it->current_x and call
+        extend_face_to_end_of_line when last glyph doesn't fit on line.
+        (set_glyph_string_background_width): Remove specific tests  here
+        to see if face background should extend to end of line.  Simplify.
+
+2005-10-30  Richard M. Stallman  <rms@gnu.org>
+
+        * alloc.c (BYTES_USED): Use uordblks, not arena.
+        (bytes_used_when_reconsidered): New variable.
+        (emacs_blocked_free): Set that.
+
+2005-10-29  Chong Yidong  <cyd@stupidchicken.com>
+
+        * alloc.c (emacs_blocked_free): Fix typo.
+
+2005-10-29  Richard M. Stallman  <rms@gnu.org>
+
+        * data.c (Fmake_variable_frame_local): Doc fix.
+
+        * xdisp.c (handle_fontified_prop): Do nothing if memory full.
+        (format_mode_line_unwind_data): New arg SAVE_PROPTRANS
+        controls whether to save and restore mode_line_proptrans_alist.
+        Callers changed.
+        (unwind_format_mode_line): Work with that feature.
+        (redisplay_internal): Don't call prepare_menu_bars if memory full.
+        (move_elt_to_front): New function.
+        (display_mode_element): Use move_elt_to_front.
+        Don't bother munging text props on a null string.
+        Delete obsolete elts from mode_line_proptrans_alist.
+        (decode_mode_spec): Test Vmemory_full, not spare_memory.
+        (Fformat_mode_line): Clear mode_line_proptrans_alist after saving.
+
+        * lisp.h (memory_full_cons_threshold): Declare.
+        (internal_lisp_condition_case): Declare.
+
+        * alloc.c (syms_of_alloc) <memory-full>: Doc fix.
+        (Fmemory_full_p): Function deleted.
+        (syms_of_alloc): Don't defsubr it.
+        (memory_full_cons_threshold): New variable.
+        (spare_memory): Now a vector of 7 elts.
+        (buffer_memory_full): Don't set Vmemory_full here.
+        (xfree): Don't try to refill here.
+        (emacs_blocked_free): Record BYTES_USED in local var.
+        (memory_full): Now free all the slots in spare_memory.
+        (refill_memory_reserve): Allocate each slot in spare_memory.
+        (init_alloc_once): Call refill_memory_reserve.
+
+        * keyboard.c (command_loop_1): Don't set Vmemory_full here.
+
+        * eval.c (internal_lisp_condition_case): New function.
+        (Fcondition_case): Use internal_lisp_condition_case.
+        (Feval): Test Vmemory_full and memory_full_cons_threshold.
+        (Ffuncall): Likewise.
+
+        * bytecode.c (Fbyte_code): Use internal_lisp_condition_case.
+
+2005-10-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * syntax.c (Fparse_partial_sexp): Fix docstring.
+
+2005-10-28  Romain Francoise  <romain@orebokech.com>
+
+        * puresize.h (BASE_PURESIZE): Increment to 1130000.
+
+2005-10-28  Richard M. Stallman  <rms@gnu.org>
+
+        * xfns.c (syms_of_xfns): Provide `x' as feature.
+
+        * xdisp.c (decode_mode_spec): Define %e to indicate memory full.
+
+        * editfns.c (Fformat): Don't include string padding
+        between info[n].start and info[n].end.
+
+        * alloc.c (spare_memory): No longer static.
+        (xfree) [!SYSTEM_MALLOC]: Call refill_memory_reserve.
+
+        * puresize.h (BASE_PURESIZE): Increment to 1120000.
+
 2005-10-27  Chong Yidong  <cyd@stupidchicken.com>
 
-        * data.c (Fmake_variable_frame_local): Add clarification to
-        docstring.
+        * data.c (Fmake_variable_frame_local): Add clarification to docstring.
 
         * fringe.c (update_window_fringes): Handle case where buffer ends
         with a newline.
@@ -118,8 +256,7 @@
 
 2005-10-20  Aubrey Jaffer  <agj@alum.mit.edu>  (tiny change)
 
-        * unexelf.c (unexec): Fix calls to `fatal' with less than 3
-        arguments.
+        * unexelf.c (unexec): Fix calls to `fatal' with less than 3 arguments.
 
 2005-10-20  Olli Savia  <ops@iki.fi>  (tiny change)
 
@@ -165,7 +302,7 @@
 2005-10-16  Masatake YAMATO  <jet@gyve.org>
 
         * minibuf.c (Fdisplay_completion_list): Add new optional
-        argument COMMON_SUBSTRING. Bind `completion-common-substring'
+        argument COMMON_SUBSTRING.  Bind `completion-common-substring'
         to the optional argument during running `completion-setup-hook'.
 
 2005-10-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
diff --git a/src/Makefile.in b/src/Makefile.in
index e386db3a0e8..30dc5ab030d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -777,6 +777,9 @@ lisp= \
         ${lispsource}subr.elc \
         ${lispsource}term/tty-colors.elc \
         ${lispsource}font-core.elc \
+        ${lispsource}emacs-lisp/syntax.elc \
+        ${lispsource}font-lock.elc \
+        ${lispsource}jit-lock.elc \
         ${lispsource}textmodes/fill.elc \
         ${lispsource}textmodes/page.elc \
         ${lispsource}textmodes/paragraphs.elc \
@@ -871,6 +874,9 @@ shortlisp= \
         ../lisp/subr.elc \
         ../lisp/term/tty-colors.elc \
         ../lisp/font-core.elc \
+        ../lisp/emacs-lisp/syntax.elc \
+        ../lisp/font-lock.elc \
+        ../lisp/jit-lock.elc \
         ../lisp/textmodes/fill.elc \
         ../lisp/textmodes/page.elc \
         ../lisp/textmodes/paragraphs.elc \
diff --git a/src/alloc.c b/src/alloc.c
index ff0c3d46d44..1e95447549b 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -138,6 +138,8 @@ static pthread_mutex_t alloc_mutex;
 
 static __malloc_size_t bytes_used_when_full;
 
+static __malloc_size_t bytes_used_when_reconsidered;
+
 /* Mark, unmark, query mark bit of a Lisp string.  S must be a pointer
    to a struct Lisp_String.  */
 
@@ -182,6 +184,11 @@ EMACS_INT gc_relative_threshold;
 
 static Lisp_Object Vgc_cons_percentage;
 
+/* Minimum number of bytes of consing since GC before next GC,
+   when memory is full.  */
+
+EMACS_INT memory_full_cons_threshold;
+
 /* Nonzero during GC.  */
 
 int gc_in_progress;
@@ -213,11 +220,12 @@ static int total_free_conses, total_free_markers, total_free_symbols;
 static int total_free_floats, total_floats;
 
 /* Points to memory space allocated as "spare", to be freed if we run
-   out of memory.  */
+   out of memory.  We keep one large block, four cons-blocks, and
+   two string blocks.  */
 
-static char *spare_memory;
+char *spare_memory[7];
 
-/* Amount of spare memory to keep in reserve.  */
+/* Amount of spare memory to keep in large reserve block.  */
 
 #define SPARE_MEMORY (1 << 14)
 
@@ -351,6 +359,11 @@ enum mem_type
   MEM_TYPE_WINDOW
 };
 
+static POINTER_TYPE *lisp_align_malloc P_ ((size_t, enum mem_type));
+static POINTER_TYPE *lisp_malloc P_ ((size_t, enum mem_type));
+void refill_memory_reserve ();
+
+
 #if GC_MARK_STACK || defined GC_MALLOC_CHECK
 
 #if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
@@ -451,6 +464,7 @@ static void mem_delete P_ ((struct mem_node *));
 static void mem_delete_fixup P_ ((struct mem_node *));
 static INLINE struct mem_node *mem_find P_ ((void *));
 
+
 #if GC_MARK_STACK == GC_MARK_STACK_CHECK_GCPROS
 static void check_gcpros P_ ((void));
 #endif
@@ -511,57 +525,10 @@ display_malloc_warning ()
 
 
 #ifdef DOUG_LEA_MALLOC
-#  define BYTES_USED (mallinfo ().arena)
+#  define BYTES_USED (mallinfo ().uordblks)
 #else
 #  define BYTES_USED _bytes_used
 #endif
-
-
-/* Called if malloc returns zero.  */
-
-void
-memory_full ()
-{
-  Vmemory_full = Qt;
-
-#ifndef SYSTEM_MALLOC
-  bytes_used_when_full = BYTES_USED;
-#endif
-
-  /* The first time we get here, free the spare memory.  */
-  if (spare_memory)
-    {
-      free (spare_memory);
-      spare_memory = 0;
-    }
-
-  /* This used to call error, but if we've run out of memory, we could
-     get infinite recursion trying to build the string.  */
-  while (1)
-    Fsignal (Qnil, Vmemory_signal_data);
-}
-
-DEFUN ("memory-full-p", Fmemory_full_p, Smemory_full_p, 0, 0, 0,
-       doc: /* t if memory is nearly full, nil otherwise.  */)
-  ()
-{
-  return (spare_memory ? Qnil : Qt);
-}
-
-/* If we released our reserve (due to running out of memory),
-   and we have a fair amount free once again,
-   try to set aside another reserve in case we run out once more.
-
-   This is called when a relocatable block is freed in ralloc.c.  */
-
-void
-refill_memory_reserve ()
-{
-#ifndef SYSTEM_MALLOC
-  if (spare_memory == 0)
-    spare_memory = (char *) malloc ((size_t) SPARE_MEMORY);
-#endif
-}
 
 /* Called if we can't allocate relocatable space for a buffer.  */
 
@@ -579,8 +546,6 @@ buffer_memory_full ()
   memory_full ();
 #endif
 
-  Vmemory_full = Qt;
-
   /* This used to call error, but if we've run out of memory, we could
      get infinite recursion trying to build the string.  */
   while (1)
@@ -806,6 +771,9 @@ xfree (block)
   BLOCK_INPUT;
   free (block);
   UNBLOCK_INPUT;
+  /* We don't call refill_memory_reserve here
+     because that duplicates doing so in emacs_blocked_free
+     and the criterion should go there.  */
 }
 
 
@@ -1179,6 +1147,8 @@ emacs_blocked_free (ptr, ptr2)
      void *ptr;
      const void *ptr2;
 {
+  EMACS_INT bytes_used_now;
+
   BLOCK_INPUT_ALLOC;
 
 #ifdef GC_MALLOC_CHECK
@@ -1207,14 +1177,15 @@ emacs_blocked_free (ptr, ptr2)
   /* If we released our reserve (due to running out of memory),
      and we have a fair amount free once again,
      try to set aside another reserve in case we run out once more.  */
-  if (spare_memory == 0
+  if (! NILP (Vmemory_full)
       /* Verify there is enough space that even with the malloc
          hysteresis this call won't run out again.
          The code here is correct as long as SPARE_MEMORY
          is substantially larger than the block size malloc uses.  */
       && (bytes_used_when_full
-          > BYTES_USED + max (malloc_hysteresis, 4) * SPARE_MEMORY))
-    spare_memory = (char *) malloc ((size_t) SPARE_MEMORY);
+          > ((bytes_used_when_reconsidered = BYTES_USED)
+             + max (malloc_hysteresis, 4) * SPARE_MEMORY)))
+    refill_memory_reserve ();
 
   __free_hook = emacs_blocked_free;
   UNBLOCK_INPUT_ALLOC;
@@ -3381,6 +3352,83 @@ make_event_array (nargs, args)
 
 
 /************************************************************************
+                           Memory Full Handling
+ ************************************************************************/
+
+
+/* Called if malloc returns zero.  */
+
+void
+memory_full ()
+{
+  int i;
+
+  Vmemory_full = Qt;
+
+  memory_full_cons_threshold = sizeof (struct cons_block);
+
+  /* The first time we get here, free the spare memory.  */
+  for (i = 0; i < sizeof (spare_memory) / sizeof (char *); i++)
+    if (spare_memory[i])
+      {
+        if (i == 0)
+          free (spare_memory[i]);
+        else if (i >= 1 && i <= 4)
+          lisp_align_free (spare_memory[i]);
+        else
+          lisp_free (spare_memory[i]);
+        spare_memory[i] = 0;
+      }
+
+  /* Record the space now used.  When it decreases substantially,
+     we can refill the memory reserve.  */
+#ifndef SYSTEM_MALLOC
+  bytes_used_when_full = BYTES_USED;
+#endif
+
+  /* This used to call error, but if we've run out of memory, we could
+     get infinite recursion trying to build the string.  */
+  while (1)
+    Fsignal (Qnil, Vmemory_signal_data);
+}
+
+/* If we released our reserve (due to running out of memory),
+   and we have a fair amount free once again,
+   try to set aside another reserve in case we run out once more.
+
+   This is called when a relocatable block is freed in ralloc.c,
+   and also directly from this file, in case we're not using ralloc.c.  */
+
+void
+refill_memory_reserve ()
+{
+#ifndef SYSTEM_MALLOC
+  if (spare_memory[0] == 0)
+    spare_memory[0] = (char *) malloc ((size_t) SPARE_MEMORY);
+  if (spare_memory[1] == 0)
+    spare_memory[1] = (char *) lisp_align_malloc (sizeof (struct cons_block),
+                                                  MEM_TYPE_CONS);
+  if (spare_memory[2] == 0)
+    spare_memory[2] = (char *) lisp_align_malloc (sizeof (struct cons_block),
+                                                  MEM_TYPE_CONS);
+  if (spare_memory[3] == 0)
+    spare_memory[3] = (char *) lisp_align_malloc (sizeof (struct cons_block),
+                                                  MEM_TYPE_CONS);
+  if (spare_memory[4] == 0)
+    spare_memory[4] = (char *) lisp_align_malloc (sizeof (struct cons_block),
+                                                  MEM_TYPE_CONS);
+  if (spare_memory[5] == 0)
+    spare_memory[5] = (char *) lisp_malloc (sizeof (struct string_block),
+                                            MEM_TYPE_STRING);
+  if (spare_memory[6] == 0)
+    spare_memory[6] = (char *) lisp_malloc (sizeof (struct string_block),
+                                            MEM_TYPE_STRING);
+  if (spare_memory[0] && spare_memory[1] && spare_memory[5])
+    Vmemory_full = Qnil;
+#endif
+}
+
+/************************************************************************
                            C Stack Marking
  ************************************************************************/
 
@@ -6008,7 +6056,7 @@ init_alloc_once ()
   malloc_hysteresis = 0;
 #endif
 
-  spare_memory = (char *) malloc (SPARE_MEMORY);
+  refill_memory_reserve ();
 
   ignore_warnings = 0;
   gcprolist = 0;
@@ -6109,7 +6157,7 @@ This means that certain objects should be allocated in shared (pure) space.  */)
              build_string ("Memory exhausted--use M-x save-some-buffers then exit and restart Emacs"));
 
   DEFVAR_LISP ("memory-full", &Vmemory_full,
-               doc: /* Non-nil means we are handling a memory-full error.  */);
+               doc: /* Non-nil means Emacs cannot get much more Lisp memory.  */);
   Vmemory_full = Qnil;
 
   staticpro (&Qgc_cons_threshold);
@@ -6124,7 +6172,6 @@ The time is in seconds as a floating point value.  */);
   DEFVAR_INT ("gcs-done", &gcs_done,
               doc: /* Accumulated number of garbage collections done.  */);
 
-  defsubr (&Smemory_full_p);
   defsubr (&Scons);
   defsubr (&Slist);
   defsubr (&Svector);
diff --git a/src/bytecode.c b/src/bytecode.c
index e5a3e7b2a7c..e23d835cf10 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -861,11 +861,11 @@ If the third argument is incorrect, Emacs may crash.  */)
 
         case Bcondition_case:
           {
-            Lisp_Object v1;
-            v1 = POP;
-            v1 = Fcons (POP, v1);
+            Lisp_Object handlers, body;
+            handlers = POP;
+            body = POP;
             BEFORE_POTENTIAL_GC ();
-            TOP = Fcondition_case (Fcons (TOP, v1));
+            TOP = internal_lisp_condition_case (TOP, body, handlers);
             AFTER_POTENTIAL_GC ();
             break;
           }
diff --git a/src/data.c b/src/data.c
index 9bb90ad2d6e..bd08368c2fb 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1721,14 +1721,20 @@ From now on the default value will apply in this buffer.  Return VARIABLE.  */)
 DEFUN ("make-variable-frame-local", Fmake_variable_frame_local, Smake_variable_frame_local,
        1, 1, "vMake Variable Frame Local: ",
        doc: /* Enable VARIABLE to have frame-local bindings.
-When a frame-local binding exists in the current frame,
-it is in effect whenever the current buffer has no buffer-local binding.
-A frame-local binding is actually a frame parameter value;
-thus, any given frame has a local binding for VARIABLE if it has
-a value for the frame parameter named VARIABLE.  Return VARIABLE.
-
-This function does not in itself create any frame-local bindings for
-VARIABLE.  See `modify-frame-parameters' for how to set frame parameters.  */)
+This does not create any frame-local bindings for VARIABLE,
+it just makes them possible.
+
+A frame-local binding is actually a frame parameter value.
+If a frame F has a value for the frame parameter named VARIABLE,
+that also acts as a frame-local binding for VARIABLE in F--
+provided this function has been called to enable VARIABLE
+to have frame-local bindings at all.
+
+The only way to create a frame-local binding for VARIABLE in a frame
+is to set the VARIABLE frame parameter of that frame.  See
+`modify-frame-parameters' for how to set frame parameters.
+
+Buffer-local bindings take precedence over frame-local bindings.  */)
      (variable)
      register Lisp_Object variable;
 {
diff --git a/src/editfns.c b/src/editfns.c
index e7b152726e3..5605a25bdd2 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3662,7 +3662,7 @@ usage: (format STRING &rest OBJECTS)  */)
                     ++nchars;
                   }
 
-              start = nchars;
+              info[n].start = start = nchars;
               nchars += nchars_string;
               end = nchars;
 
@@ -3677,6 +3677,8 @@ usage: (format STRING &rest OBJECTS)  */)
                               nbytes,
                               STRING_MULTIBYTE (args[n]), multibyte);
 
+              info[n].end = nchars;
+
               if (negative)
                 while (padding-- > 0)
                   {
@@ -3713,9 +3715,9 @@ usage: (format STRING &rest OBJECTS)  */)
               else
                 p += this_nchars;
               nchars += this_nchars;
+              info[n].end = nchars;
             }
 
-          info[n].end = nchars;
         }
       else if (STRING_MULTIBYTE (args[0]))
         {
diff --git a/src/eval.c b/src/eval.c
index a867d00150e..86859e4ddae 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1343,15 +1343,28 @@ usage: (condition-case VAR BODYFORM &rest HANDLERS)  */)
      (args)
      Lisp_Object args;
 {
-  Lisp_Object val;
-  struct catchtag c;
-  struct handler h;
   register Lisp_Object bodyform, handlers;
   volatile Lisp_Object var;
 
   var      = Fcar (args);
   bodyform = Fcar (Fcdr (args));
   handlers = Fcdr (Fcdr (args));
+
+  return internal_lisp_condition_case (var, bodyform, handlers);
+}
+
+/* Like Fcondition_case, but the args are separate
+   rather than passed in a list.  Used by Fbyte_code.  */
+
+Lisp_Object
+internal_lisp_condition_case (var, bodyform, handlers)
+     volatile Lisp_Object var;
+     Lisp_Object bodyform, handlers;
+{
+  Lisp_Object val;
+  struct catchtag c;
+  struct handler h;
+
   CHECK_SYMBOL (var);
 
   for (val = handlers; CONSP (val); val = XCDR (val))
@@ -2094,8 +2107,10 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
     return form;
 
   QUIT;
-  if (consing_since_gc > gc_cons_threshold
-      && consing_since_gc > gc_relative_threshold)
+  if ((consing_since_gc > gc_cons_threshold
+       && consing_since_gc > gc_relative_threshold)
+      ||
+      (!NILP (Vmemory_full) && consing_since_gc > memory_full_cons_threshold))
     {
       GCPRO1 (form);
       Fgarbage_collect ();
@@ -2795,8 +2810,10 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
   register int i;
 
   QUIT;
-  if (consing_since_gc > gc_cons_threshold
-      && consing_since_gc > gc_relative_threshold)
+  if ((consing_since_gc > gc_cons_threshold
+       && consing_since_gc > gc_relative_threshold)
+      ||
+      (!NILP (Vmemory_full) && consing_since_gc > memory_full_cons_threshold))
     Fgarbage_collect ();
 
   if (++lisp_eval_depth > max_lisp_eval_depth)
diff --git a/src/fringe.c b/src/fringe.c
index 34c58db3674..8c6d47cbade 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -861,7 +861,7 @@ update_window_fringes (w, keep_current_p)
 
               if (!done_bot)
                 {
-                  if (row->ends_at_zv_p
+                  if (MATRIX_ROW_END_CHARPOS (row) >= BUF_ZV (XBUFFER (w->buffer))
                       && !MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row))
                     row->indicate_eob_p = !NILP (boundary_bot), done_bot = 1;
                   else if (y + row->height >= yb)
@@ -907,9 +907,12 @@ update_window_fringes (w, keep_current_p)
         left = LEFT_TRUNCATION_BITMAP;
       else if (row->indicate_bob_p && EQ (boundary_top, Qleft))
         left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft))
-                ? LEFT_BRACKET_BITMAP : TOP_LEFT_ANGLE_BITMAP);
+                ? (row->ends_at_zv_p
+                   ? TOP_RIGHT_ANGLE_BITMAP : LEFT_BRACKET_BITMAP)
+                : TOP_LEFT_ANGLE_BITMAP);
       else if (row->indicate_eob_p && EQ (boundary_bot, Qleft))
-        left = BOTTOM_LEFT_ANGLE_BITMAP;
+        left = (row->ends_at_zv_p
+                ? TOP_RIGHT_ANGLE_BITMAP : BOTTOM_LEFT_ANGLE_BITMAP);
       else if (MATRIX_ROW_CONTINUATION_LINE_P (row))
         left = CONTINUATION_LINE_BITMAP;
       else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft))
@@ -933,9 +936,12 @@ update_window_fringes (w, keep_current_p)
         right = RIGHT_TRUNCATION_BITMAP;
       else if (row->indicate_bob_p && EQ (boundary_top, Qright))
         right = ((row->indicate_eob_p && EQ (boundary_bot, Qright))
-                 ? RIGHT_BRACKET_BITMAP : TOP_RIGHT_ANGLE_BITMAP);
+                 ? (row->ends_at_zv_p
+                    ? TOP_LEFT_ANGLE_BITMAP : RIGHT_BRACKET_BITMAP)
+                 : TOP_RIGHT_ANGLE_BITMAP);
       else if (row->indicate_eob_p && EQ (boundary_bot, Qright))
-        right = BOTTOM_RIGHT_ANGLE_BITMAP;
+        right = (row->ends_at_zv_p
+                 ? TOP_LEFT_ANGLE_BITMAP : BOTTOM_RIGHT_ANGLE_BITMAP);
       else if (row->continued_p)
         right = CONTINUED_LINE_BITMAP;
       else if (row->indicate_top_line_p && EQ (arrow_top, Qright))
diff --git a/src/keyboard.c b/src/keyboard.c
index f6a65560268..7a918608dd7 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1480,8 +1480,6 @@ command_loop_1 ()
         safe_run_hooks (Qdeferred_action_function);
     }
 
-  Vmemory_full = Qnil;
-
   /* Do this after running Vpost_command_hook, for consistency.  */
   current_kboard->Vlast_command = Vthis_command;
   current_kboard->Vreal_last_command = real_this_command;
diff --git a/src/lisp.h b/src/lisp.h
index cba8bd31801..adf53035e98 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1882,6 +1882,8 @@ extern EMACS_INT gc_cons_threshold;
 
 extern EMACS_INT gc_relative_threshold;
 
+extern EMACS_INT memory_full_cons_threshold;
+
 /* Structure for recording stack slots that need marking.  */
 
 /* This is a chain of structures, each of which points at a Lisp_Object variable
@@ -2664,6 +2666,7 @@ extern Lisp_Object call6 P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object
 EXFUN (Fdo_auto_save, 2);
 extern Lisp_Object apply_lambda P_ ((Lisp_Object, Lisp_Object, int));
 extern Lisp_Object internal_catch P_ ((Lisp_Object, Lisp_Object (*) (Lisp_Object), Lisp_Object));
+extern Lisp_Object internal_lisp_condition_case P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
 extern Lisp_Object internal_condition_case P_ ((Lisp_Object (*) (void), Lisp_Object, Lisp_Object (*) (Lisp_Object)));
 extern Lisp_Object internal_condition_case_1 P_ ((Lisp_Object (*) (Lisp_Object), Lisp_Object, Lisp_Object, Lisp_Object (*) (Lisp_Object)));
 extern Lisp_Object internal_condition_case_2 P_ ((Lisp_Object (*) (int, Lisp_Object *), int, Lisp_Object *, Lisp_Object, Lisp_Object (*) (Lisp_Object)));
diff --git a/src/lread.c b/src/lread.c
index d51e6443288..1bae0ea7ddd 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1417,7 +1417,8 @@ readevalloop (readcharfun, stream, sourcename, evalfun,
     }
 
   build_load_history (sourcename, 
-                      stream || (start == BEG && end == Z));
+                      stream || (INTEGERP (start) && INTEGERP (end)
+                                 && XINT (start) == BEG && XINT (end) == Z));
 
   UNGCPRO;
 
diff --git a/src/m/gould.h b/src/m/gould.h
index 3a382ca0c1b..a9168009d47 100644
--- a/src/m/gould.h
+++ b/src/m/gould.h
@@ -5,7 +5,7 @@
 * RELEASE2_1 in config.h. This may also be necessary with un-updated
 * official releases of 2.1
 
-   Copyright (C) 1986, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/macfns.c b/src/macfns.c
index 64e20af4a47..9d23f47b5ed 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -1,5 +1,6 @@
 /* Graphical user interface functions for Mac OS.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/puresize.h b/src/puresize.h
index 7951f7ecbf2..b9942a90753 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -42,7 +42,7 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #ifndef BASE_PURESIZE
-#define BASE_PURESIZE (1200000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (1170000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
 #endif
 
 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */
diff --git a/src/sheap.c b/src/sheap.c
index 635c3dc0144..cc740173a24 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -1,5 +1,5 @@
-/* simulate sbrk() with an array in .bss, for unexec() support for Cygwin;
-   complete rewrite of xemacs Cygwin unexec() code
+/* simulate `sbrk' with an array in .bss, for `unexec' support for Cygwin;
+   complete rewrite of xemacs Cygwin `unexec' code
 
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
@@ -27,9 +27,9 @@ Boston, MA 02110-1301, USA.  */
 #include <unistd.h>
 
 #ifdef HAVE_X_WINDOWS
-#define STATIC_HEAP_SIZE        (7 * 1024 * 1024)
+#define STATIC_HEAP_SIZE        (8 * 1024 * 1024)
 #else
-#define STATIC_HEAP_SIZE        (7 * 1024 * 1024)
+#define STATIC_HEAP_SIZE        (8 * 1024 * 1024)
 #endif
 
 int debug_sheap = 0;
diff --git a/src/syntax.c b/src/syntax.c
index 2043cff63d6..251cc553cdf 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3020,7 +3020,7 @@ Parsing stops at TO or when certain criteria are met;
  point is set to where parsing stops.
 If fifth arg OLDSTATE is omitted or nil,
  parsing assumes that FROM is the beginning of a function.
-Value is a list of ten elements describing final state of parsing:
+Value is a list of elements describing final state of parsing:
  0. depth in parens.
  1. character address of start of innermost containing list; nil if none.
  2. character address of start of last complete sexp terminated.
@@ -3039,7 +3039,7 @@ If third arg TARGETDEPTH is non-nil, parsing stops if the depth
 in parentheses becomes equal to TARGETDEPTH.
 Fourth arg STOPBEFORE non-nil means stop when come to
  any character that starts a sexp.
-Fifth arg OLDSTATE is a nine-element list like what this function returns.
+Fifth arg OLDSTATE is a list like what this function returns.
  It is used to initialize the state of the parse.  Elements number 1, 2, 6
  and 8 are ignored; you can leave off element 8 (the last) entirely.
 Sixth arg COMMENTSTOP non-nil means stop at the start of a comment.
diff --git a/src/unexelf.c b/src/unexelf.c
index f50e849fdcf..c53974be9f2 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -682,7 +682,7 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
   ElfW(Addr) new_data2_addr;
 
   int n, nn;
-  int old_bss_index, old_sbss_index;
+  int old_bss_index, old_sbss_index, old_plt_index;
   int old_data_index, new_data2_index;
   int old_mdebug_index;
   struct stat stat_buf;
@@ -740,15 +740,34 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
   old_sbss_index = find_section (".sbss", old_section_names,
                                  old_name, old_file_h, old_section_h, 1);
   if (old_sbss_index != -1)
-    if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)
+    if (OLD_SECTION_H (old_sbss_index).sh_type != SHT_NOBITS)
       old_sbss_index = -1;
 
-  if (old_sbss_index == -1)
+  /* PowerPC64 has .plt in the BSS section.  */
+  old_plt_index = find_section (".plt", old_section_names,
+                                old_name, old_file_h, old_section_h, 1);
+  if (old_plt_index != -1)
+    if (OLD_SECTION_H (old_plt_index).sh_type != SHT_NOBITS)
+      old_plt_index = -1;
+
+  if (old_sbss_index == -1 && old_plt_index == -1)
     {
       old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
       old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
       new_data2_index = old_bss_index;
     }
+  else if (old_plt_index != -1
+           && (old_sbss_index == -1
+               || (OLD_SECTION_H (old_sbss_index).sh_addr
+                   > OLD_SECTION_H (old_plt_index).sh_addr)))
+    {
+      old_bss_addr = OLD_SECTION_H (old_plt_index).sh_addr;
+      old_bss_size = OLD_SECTION_H (old_bss_index).sh_size
+        + OLD_SECTION_H (old_plt_index).sh_size;
+      if (old_sbss_index != -1)
+        old_bss_size += OLD_SECTION_H (old_sbss_index).sh_size;
+      new_data2_index = old_plt_index;
+    }
   else
     {
       old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr;
@@ -934,7 +953,7 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
       if (n == old_bss_index
           /* The new bss and sbss section's size is zero, and its file offset
              and virtual address should be off by NEW_DATA2_SIZE.  */
-          || n == old_sbss_index
+          || n == old_sbss_index || n == old_plt_index
           )
         {
           /* NN should be `old_s?bss_index + 1' at this point. */
diff --git a/src/window.c b/src/window.c
index 520d5ae8eaa..69cee518ca4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1998,11 +1998,13 @@ window_loop (type, obj, mini, frames)
             break;
 
           case GET_LRU_WINDOW:
-            /* t as arg means consider only full-width windows */
-            if (!NILP (obj) && !WINDOW_FULL_WIDTH_P (w))
-              break;
-            /* Ignore dedicated windows and minibuffers.  */
-            if (MINI_WINDOW_P (w) || EQ (w->dedicated, Qt))
+            /* `obj' is an integer encoding a bitvector.
+               `obj & 1' means consider only full-width windows.
+               `obj & 2' means consider also dedicated windows. */
+            if (((XINT (obj) & 1) && !WINDOW_FULL_WIDTH_P (w))
+                || (!(XINT (obj) & 2) && EQ (w->dedicated, Qt))
+                /* Minibuffer windows are always ignored.  */
+                || MINI_WINDOW_P (w))
               break;
             if (NILP (best_window)
                 || (XFASTINT (XWINDOW (best_window)->use_time)
@@ -2053,9 +2055,9 @@ window_loop (type, obj, mini, frames)
             break;
 
           case GET_LARGEST_WINDOW:
-            {
+            { /* nil `obj' means to ignore dedicated windows.  */
               /* Ignore dedicated windows and minibuffers.  */
-              if (MINI_WINDOW_P (w) || EQ (w->dedicated, Qt))
+              if (MINI_WINDOW_P (w) || (NILP (obj) && EQ (w->dedicated, Qt)))
                 break;
 
               if (NILP (best_window))
@@ -2149,43 +2151,47 @@ check_all_windows ()
   window_loop (CHECK_ALL_WINDOWS, Qnil, 1, Qt);
 }
 
-DEFUN ("get-lru-window", Fget_lru_window, Sget_lru_window, 0, 1, 0,
+DEFUN ("get-lru-window", Fget_lru_window, Sget_lru_window, 0, 2, 0,
        doc: /* Return the window least recently selected or used for display.
 Return a full-width window if possible.
 A minibuffer window is never a candidate.
-A dedicated window is never a candidate, so if all windows are dedicated,
-the value is nil.
+A dedicated window is never a candidate, unless DEDICATED is non-nil,
+  so if all windows are dedicated, the value is nil.
 If optional argument FRAME is `visible', search all visible frames.
 If FRAME is 0, search all visible and iconified frames.
 If FRAME is t, search all frames.
 If FRAME is nil, search only the selected frame.
 If FRAME is a frame, search only that frame.  */)
-     (frame)
-     Lisp_Object frame;
+  (frame, dedicated)
+     Lisp_Object frame, dedicated;
 {
   register Lisp_Object w;
   /* First try for a window that is full-width */
-  w = window_loop (GET_LRU_WINDOW, Qt, 0, frame);
+  w = window_loop (GET_LRU_WINDOW,
+                   NILP (dedicated) ? make_number (1) : make_number (3),
+                   0, frame);
   if (!NILP (w) && !EQ (w, selected_window))
     return w;
   /* If none of them, try the rest */
-  return window_loop (GET_LRU_WINDOW, Qnil, 0, frame);
+  return window_loop (GET_LRU_WINDOW,
+                      NILP (dedicated) ? make_number (0) : make_number (2),
+                      0, frame);
 }
 
-DEFUN ("get-largest-window", Fget_largest_window, Sget_largest_window, 0, 1, 0,
+DEFUN ("get-largest-window", Fget_largest_window, Sget_largest_window, 0, 2, 0,
        doc: /* Return the largest window in area.
 A minibuffer window is never a candidate.
-A dedicated window is never a candidate, so if all windows are dedicated,
-the value is nil.
+A dedicated window is never a candidate unless DEDICATED is non-nil,
+  so if all windows are dedicated, the value is nil.
 If optional argument FRAME is `visible', search all visible frames.
 If FRAME is 0, search all visible and iconified frames.
 If FRAME is t, search all frames.
 If FRAME is nil, search only the selected frame.
 If FRAME is a frame, search only that frame.  */)
-     (frame)
-     Lisp_Object frame;
+    (frame, dedicated)
+     Lisp_Object frame, dedicated;
 {
-  return window_loop (GET_LARGEST_WINDOW, Qnil, 0,
+  return window_loop (GET_LARGEST_WINDOW, dedicated, 0,
                       frame);
 }
 
@@ -3505,15 +3511,17 @@ displayed.  */)
       if (FRAME_NO_SPLIT_P (NILP (frames) ? f : last_nonminibuf_frame))
         {
           /* Try visible frames first.  */
-          window = Fget_largest_window (Qvisible);
+          window = Fget_largest_window (Qvisible, Qt);
           /* If that didn't work, try iconified frames.  */
           if (NILP (window))
-            window = Fget_largest_window (make_number (0));
+            window = Fget_largest_window (make_number (0), Qt);
+#if 0     /* Don't try windows on other displays.  */
           if (NILP (window))
-            window = Fget_largest_window (Qt);
+            window = Fget_largest_window (Qt, Qt);
+#endif
         }
       else
-        window = Fget_largest_window (frames);
+        window = Fget_largest_window (frames, Qt);
 
       /* If we got a tall enough full-width window that can be split,
          split it.  */
@@ -3526,7 +3534,7 @@ displayed.  */)
         {
           Lisp_Object upper, lower, other;
 
-          window = Fget_lru_window (frames);
+          window = Fget_lru_window (frames, Qt);
           /* If the LRU window is selected, and big enough,
              and can be split, split it.  */
           if (!NILP (window)
@@ -3535,23 +3543,27 @@ displayed.  */)
                   || EQ (XWINDOW (window)->parent, Qnil))
               && window_height (window) >= window_min_height << 1)
             window = Fsplit_window (window, Qnil, Qnil);
+          else
+            window = Fget_lru_window (frames, Qnil);
           /* If Fget_lru_window returned nil, try other approaches.  */
 
           /* Try visible frames first.  */
           if (NILP (window))
             window = Fget_buffer_window (buffer, Qvisible);
           if (NILP (window))
-            window = Fget_largest_window (Qvisible);
+            window = Fget_largest_window (Qvisible, Qnil);
           /* If that didn't work, try iconified frames.  */
           if (NILP (window))
             window = Fget_buffer_window (buffer, make_number (0));
           if (NILP (window))
-            window = Fget_largest_window (make_number (0));
-          /* Try invisible frames.  */
+            window = Fget_largest_window (make_number (0), Qnil);
+
+#if 0     /* Don't try frames on other displays.  */
           if (NILP (window))
             window = Fget_buffer_window (buffer, Qt);
           if (NILP (window))
-            window = Fget_largest_window (Qt);
+            window = Fget_largest_window (Qt, Qnil);
+#endif
           /* As a last resort, make a new frame.  */
           if (NILP (window))
             window = Fframe_selected_window (call0 (Vpop_up_frame_function));
@@ -3578,7 +3590,7 @@ displayed.  */)
         }
     }
   else
-    window = Fget_lru_window (Qnil);
+    window = Fget_lru_window (Qnil, Qnil);
 
   Fset_window_buffer (window, buffer, Qnil);
   return display_buffer_1 (window);
@@ -3868,15 +3880,16 @@ DEFUN ("enlarge-window", Fenlarge_window, Senlarge_window, 1, 3, "p",
        doc: /* Make current window ARG lines bigger.
 From program, optional second arg non-nil means grow sideways ARG columns.
 Interactively, if an argument is not given, make the window one line bigger.
+If HORIZONTAL is non-nil, enlarge horizontally instead of vertically.
 
 Optional third arg PRESERVE-BEFORE, if non-nil, means do not change the size
 of the siblings above or to the left of the selected window.  Only
 siblings to the right or below are changed.  */)
-     (arg, side, preserve_before)
-     register Lisp_Object arg, side, preserve_before;
+     (arg, horizontal, preserve_before)
+     register Lisp_Object arg, horizontal, preserve_before;
 {
   CHECK_NUMBER (arg);
-  enlarge_window (selected_window, XINT (arg), !NILP (side),
+  enlarge_window (selected_window, XINT (arg), !NILP (horizontal),
                   !NILP (preserve_before));
 
   if (! NILP (Vwindow_configuration_change_hook))
@@ -3924,40 +3937,43 @@ window_width (window)
 
 
 #define CURBEG(w) \
-  *(widthflag ? &(XWINDOW (w)->left_col) : &(XWINDOW (w)->top_line))
+  *(horiz_flag ? &(XWINDOW (w)->left_col) : &(XWINDOW (w)->top_line))
 
 #define CURSIZE(w) \
-  *(widthflag ? &(XWINDOW (w)->total_cols) : &(XWINDOW (w)->total_lines))
+  *(horiz_flag ? &(XWINDOW (w)->total_cols) : &(XWINDOW (w)->total_lines))
+
 
+/* Enlarge WINDOW by DELTA.
+   HORIZ_FLAG nonzero means enlarge it horizontally;
+   zero means do it vertically.
 
-/* Enlarge WINDOW by DELTA.  WIDTHFLAG non-zero means
-   increase its width.  Siblings of the selected window are resized to
-   fulfill the size request.  If they become too small in the process,
-   they will be deleted.
+   Siblings of the selected window are resized to fulfill the size
+   request.  If they become too small in the process, they will be
+   deleted.
 
    If PRESERVE_BEFORE is nonzero, that means don't alter
    the siblings to the left or above WINDOW.  */
 
 static void
-enlarge_window (window, delta, widthflag, preserve_before)
+enlarge_window (window, delta, horiz_flag, preserve_before)
      Lisp_Object window;
-     int delta, widthflag, preserve_before;
+     int delta, horiz_flag, preserve_before;
 {
   Lisp_Object parent, next, prev;
   struct window *p;
   Lisp_Object *sizep;
   int maximum;
   int (*sizefun) P_ ((Lisp_Object))
-    = widthflag ? window_width : window_height;
+    = horiz_flag ? window_width : window_height;
   void (*setsizefun) P_ ((Lisp_Object, int, int))
-    = (widthflag ? set_window_width : set_window_height);
+    = (horiz_flag ? set_window_width : set_window_height);
 
   /* Check values of window_min_width and window_min_height for
      validity.  */
   check_min_window_sizes ();
 
   /* Give up if this window cannot be resized.  */
-  if (window_fixed_size_p (XWINDOW (window), widthflag, 1))
+  if (window_fixed_size_p (XWINDOW (window), horiz_flag, 1))
     error ("Window is not resizable");
 
   /* Find the parent of the selected window.  */
@@ -3968,12 +3984,12 @@ enlarge_window (window, delta, widthflag, preserve_before)
 
       if (NILP (parent))
         {
-          if (widthflag)
+          if (horiz_flag)
             error ("No other window to side of this one");
           break;
         }
 
-      if (widthflag
+      if (horiz_flag
           ? !NILP (XWINDOW (parent)->hchild)
           : !NILP (XWINDOW (parent)->vchild))
         break;
@@ -3999,7 +4015,7 @@ enlarge_window (window, delta, widthflag, preserve_before)
         else
           maxdelta = (!NILP (p->next) ? ((*sizefun) (p->next)
                                          - window_min_size (XWINDOW (p->next),
-                                                            widthflag, 0, 0))
+                                                            horiz_flag, 0, 0))
                       : (delta = 0));
       }
     else
@@ -4007,11 +4023,11 @@ enlarge_window (window, delta, widthflag, preserve_before)
                   /* This is a main window followed by a minibuffer.  */
                   : !NILP (p->next) ? ((*sizefun) (p->next)
                                        - window_min_size (XWINDOW (p->next),
-                                                          widthflag, 0, 0))
+                                                          horiz_flag, 0, 0))
                   /* This is a minibuffer following a main window.  */
                   : !NILP (p->prev) ? ((*sizefun) (p->prev)
                                        - window_min_size (XWINDOW (p->prev),
-                                                          widthflag, 0, 0))
+                                                          horiz_flag, 0, 0))
                   /* This is a frame with only one window, a minibuffer-only
                      or a minibufferless frame.  */
                   : (delta = 0));
@@ -4023,7 +4039,7 @@ enlarge_window (window, delta, widthflag, preserve_before)
       delta = maxdelta;
   }
 
-  if (XINT (*sizep) + delta < window_min_size (XWINDOW (window), widthflag, 0, 0))
+  if (XINT (*sizep) + delta < window_min_size (XWINDOW (window), horiz_flag, 0, 0))
     {
       delete_window (window);
       return;
@@ -4036,11 +4052,11 @@ enlarge_window (window, delta, widthflag, preserve_before)
   maximum = 0;
   for (next = p->next; ! NILP (next); next = XWINDOW (next)->next)
     maximum += (*sizefun) (next) - window_min_size (XWINDOW (next),
-                                                    widthflag, 0, 0);
+                                                    horiz_flag, 0, 0);
   if (! preserve_before)
     for (prev = p->prev; ! NILP (prev); prev = XWINDOW (prev)->prev)
       maximum += (*sizefun) (prev) - window_min_size (XWINDOW (prev),
-                                                      widthflag, 0, 0);
+                                                      horiz_flag, 0, 0);
 
   /* If we can get it all from them without deleting them, do so.  */
   if (delta <= maximum)
@@ -4062,7 +4078,7 @@ enlarge_window (window, delta, widthflag, preserve_before)
             {
               int this_one = ((*sizefun) (next)
                               - window_min_size (XWINDOW (next),
-                                                 widthflag, 0, &fixed_p));
+                                                 horiz_flag, 0, &fixed_p));
               if (!fixed_p)
                 {
                   if (this_one > delta)
@@ -4084,7 +4100,7 @@ enlarge_window (window, delta, widthflag, preserve_before)
             {
               int this_one = ((*sizefun) (prev)
                               - window_min_size (XWINDOW (prev),
-                                                 widthflag, 0, &fixed_p));
+                                                 horiz_flag, 0, &fixed_p));
               if (!fixed_p)
                 {
                   if (this_one > delta)
@@ -4187,10 +4203,10 @@ enlarge_window (window, delta, widthflag, preserve_before)
           int n = 1;
 
           for (s = w->next; !NILP (s); s = XWINDOW (s)->next)
-            if (!window_fixed_size_p (XWINDOW (s), widthflag, 0))
+            if (!window_fixed_size_p (XWINDOW (s), horiz_flag, 0))
               ++n;
           for (s = w->prev; !NILP (s); s = XWINDOW (s)->prev)
-            if (!window_fixed_size_p (XWINDOW (s), widthflag, 0))
+            if (!window_fixed_size_p (XWINDOW (s), horiz_flag, 0))
               ++n;
 
           delta1 = n * delta;
diff --git a/src/xdisp.c b/src/xdisp.c
index ff3d9f2ca0c..4db562c2283 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3163,6 +3163,9 @@ handle_fontified_prop (it)
   Lisp_Object prop, pos;
   enum prop_handled handled = HANDLED_NORMALLY;
 
+  if (!NILP (Vmemory_full))
+    return handled;
+
   /* Get the value of the `fontified' property at IT's current buffer
      position.  (The `fontified' property doesn't have a special
      meaning in strings.)  If the value is nil, call functions from
@@ -8618,7 +8621,7 @@ static Lisp_Object mode_line_string_face_prop;
 static Lisp_Object Vmode_line_unwind_vector;
 
 static Lisp_Object
-format_mode_line_unwind_data (obuf)
+format_mode_line_unwind_data (obuf, save_proptrans)
      struct buffer *obuf;
 {
   Lisp_Object vector;
@@ -8634,7 +8637,7 @@ format_mode_line_unwind_data (obuf)
   AREF (vector, 0) = make_number (mode_line_target);
   AREF (vector, 1) = make_number (MODE_LINE_NOPROP_LEN (0));
   AREF (vector, 2) = mode_line_string_list;
-  AREF (vector, 3) = mode_line_proptrans_alist;
+  AREF (vector, 3) = (save_proptrans ? mode_line_proptrans_alist : Qt);
   AREF (vector, 4) = mode_line_string_face;
   AREF (vector, 5) = mode_line_string_face_prop;
 
@@ -8653,7 +8656,8 @@ unwind_format_mode_line (vector)
   mode_line_target = XINT (AREF (vector, 0));
   mode_line_noprop_ptr = mode_line_noprop_buf + XINT (AREF (vector, 1));
   mode_line_string_list = AREF (vector, 2);
-  mode_line_proptrans_alist = AREF (vector, 3);
+  if (! EQ (AREF (vector, 3), Qt))
+    mode_line_proptrans_alist = AREF (vector, 3);
   mode_line_string_face = AREF (vector, 4);
   mode_line_string_face_prop = AREF (vector, 5);
 
@@ -8776,7 +8780,7 @@ x_consider_frame_title (frame)
          mode_line_target so that display_mode_element will output into
          mode_line_noprop_buf; then display the title.  */
       record_unwind_protect (unwind_format_mode_line,
-                             format_mode_line_unwind_data (current_buffer));
+                             format_mode_line_unwind_data (current_buffer, 0));
 
       set_buffer_internal_1 (XBUFFER (XWINDOW (f->selected_window)->buffer));
       fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format;
@@ -10575,7 +10579,8 @@ redisplay_internal (preserve_echo_area)
     clear_garbaged_frames ();
 
   /* Build menubar and tool-bar items.  */
-  prepare_menu_bars ();
+  if (NILP (Vmemory_full))
+    prepare_menu_bars ();
 
   if (windows_or_buffers_changed)
     update_mode_lines++;
@@ -15686,7 +15691,9 @@ display_line (it)
                         produce_special_glyphs (it, IT_CONTINUATION);
                       row->continued_p = 1;
 
+                      it->current_x = x_before;
                       it->continuation_lines_width += x;
+                      extend_face_to_end_of_line (it);
 
                       if (nglyphs > 1 && i > 0)
                         {
@@ -16171,7 +16178,7 @@ display_mode_line (w, face_id, format)
     it.base_face_id = it.face_id = DEFAULT_FACE_ID;
 
   record_unwind_protect (unwind_format_mode_line,
-                         format_mode_line_unwind_data (NULL));
+                         format_mode_line_unwind_data (NULL, 0));
 
   mode_line_target = MODE_LINE_DISPLAY;
 
@@ -16206,6 +16213,44 @@ display_mode_line (w, face_id, format)
   return it.glyph_row->height;
 }
 
+/* Move element ELT in LIST to the front of LIST.
+   Return the updated list.  */
+
+static Lisp_Object
+move_elt_to_front (elt, list)
+     Lisp_Object elt, list;
+{
+  register Lisp_Object tail, prev;
+  register Lisp_Object tem;
+
+  tail = list;
+  prev = Qnil;
+  while (CONSP (tail))
+    {
+      tem = XCAR (tail);
+
+      if (EQ (elt, tem))
+        {
+          /* Splice out the link TAIL.  */
+          if (NILP (prev))
+            list = XCDR (tail);
+          else
+            Fsetcdr (prev, XCDR (tail));
+
+          /* Now make it the first.  */
+          Fsetcdr (tail, list);
+          return tail;
+        }
+      else
+        prev = tail;
+      tail = XCDR (tail);
+      QUIT;
+    }
+
+  /* Not found--return unchanged LIST.  */
+  return list;
+}
+
 /* Contribute ELT to the mode line for window IT->w.  How it
    translates into text depends on its data type.
 
@@ -16255,7 +16300,8 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
         unsigned char c;
         int offset = 0;
 
-        if (!NILP (props) || risky)
+        if (SCHARS (elt) > 0
+            && (!NILP (props) || risky))
           {
             Lisp_Object oprops, aelt;
             oprops = Ftext_properties_at (make_number (0), elt);
@@ -16286,14 +16332,22 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
                 aelt = Fassoc (elt, mode_line_proptrans_alist);
                 if (! NILP (aelt) && !NILP (Fequal (props, XCDR (aelt))))
                   {
-                    mode_line_proptrans_alist
-                      = Fcons (aelt, Fdelq (aelt, mode_line_proptrans_alist));
+                    /* AELT is what we want.  Move it to the front
+                       without consing.  */
                     elt = XCAR (aelt);
+                    mode_line_proptrans_alist
+                      = move_elt_to_front (aelt, mode_line_proptrans_alist);
                   }
                 else
                   {
                     Lisp_Object tem;
 
+                    /* If AELT has the wrong props, it is useless.
+                       so get rid of it.  */
+                    if (! NILP (aelt))
+                      mode_line_proptrans_alist
+                        = Fdelq (aelt, mode_line_proptrans_alist);
+
                     elt = Fcopy_sequence (elt);
                     Fset_text_properties (make_number (0), Flength (elt),
                                           props, elt);
@@ -16818,8 +16872,11 @@ are the selected window and the window's buffer).  */)
   if (XBUFFER (buffer) != current_buffer)
     old_buffer = current_buffer;
 
+  /* Save things including mode_line_proptrans_alist,
+     and set that to nil so that we don't alter the outer value.  */
   record_unwind_protect (unwind_format_mode_line,
-                         format_mode_line_unwind_data (old_buffer));
+                         format_mode_line_unwind_data (old_buffer, 1));
+  mode_line_proptrans_alist = Qnil;
 
   if (old_buffer)
     set_buffer_internal_1 (XBUFFER (buffer));
@@ -17204,6 +17261,18 @@ decode_mode_spec (w, c, field_width, precision, multibyte)
         return decode_mode_spec_buf;
       }
 
+    case 'e':
+#ifndef SYSTEM_MALLOC
+      {
+        if (NILP (Vmemory_full))
+          return "";
+        else
+          return "!MEM FULL! ";
+      }
+#else
+      return "";
+#endif
+
     case 'F':
       /* %F displays the frame name.  */
       if (!NILP (f->title))
@@ -18723,19 +18792,15 @@ set_glyph_string_background_width (s, start, last_x)
 {
   /* If the face of this glyph string has to be drawn to the end of
      the drawing area, set S->extends_to_end_of_line_p.  */
-  struct face *default_face = FACE_FROM_ID (s->f, DEFAULT_FACE_ID);
 
   if (start == s->row->used[s->area]
       && s->area == TEXT_AREA
-      && ((s->hl == DRAW_NORMAL_TEXT
-           && (s->row->fill_line_p
-               || s->face->background != default_face->background
-               || s->face->stipple != default_face->stipple
-               || s->row->mouse_face_p))
-          || s->hl == DRAW_MOUSE_FACE
-          || ((s->hl == DRAW_IMAGE_RAISED || s->hl == DRAW_IMAGE_SUNKEN)
-              && s->row->fill_line_p)))
-      s->extends_to_end_of_line_p = 1;
+      && ((s->row->fill_line_p
+           && (s->hl == DRAW_NORMAL_TEXT
+               || s->hl == DRAW_IMAGE_RAISED
+               || s->hl == DRAW_IMAGE_SUNKEN))
+          || s->hl == DRAW_MOUSE_FACE))
+    s->extends_to_end_of_line_p = 1;
 
   /* If S extends its face to the end of the line, set its
      background_width to the distance to the right edge of the drawing
@@ -21279,7 +21344,11 @@ show_mouse_face (dpyinfo, draw)
           if (row == last)
             end_hpos = dpyinfo->mouse_face_end_col;
           else
-            end_hpos = row->used[TEXT_AREA];
+            {
+              end_hpos = row->used[TEXT_AREA];
+              if (draw == DRAW_NORMAL_TEXT)
+                row->fill_line_p = 1; /* Clear to end of line */
+            }
 
           if (end_hpos > start_hpos)
             {
diff --git a/src/xfns.c b/src/xfns.c
index 47c146237a7..d39616429ad 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5743,6 +5743,8 @@ chooser is used instead.  To turn off all file dialogs set the
 variable `use-file-dialog'.  */);
   x_use_old_gtk_file_dialog = 0;
 
+  Fprovide (intern ("x"), Qnil);
+
 #ifdef USE_X_TOOLKIT
   Fprovide (intern ("x-toolkit"), Qnil);
 #ifdef USE_MOTIF