Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-57

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 226-238)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo.

 * gnus--rel--5.10  (patch 86-90)

   - Update from CVS
   - Merge from emacs--devo--0

13 files changed, 286 insertions, 174 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 88492417723..5c66a6b5c7d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,66 @@
+2006-04-21  Nick Roberts  <nickrob@snap.net.nz>
+
+        * xdisp.c (note_mouse_highlight): Use build_string.
+
+2006-04-20  Lars Hansen  <larsh@soem.dk>
+
+        * textprop.c (Fremove_list_of_text_properties): Ensure
+        modify_region is called only when buffer is modified and that
+        signal_after_change is allways called in that case.
+
+        * print.c (PRINTFINISH): Call signal_after_change.
+
+2006-04-20  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (redisplay_window): Fix last change.
+
+        * xdisp.c (redisplay_window): If current window start is not at the
+        beginning of a line, select a new window start if buffer is modified
+        and window start is in the modified region, but the first change is
+        before window start.
+
+2006-04-18  Richard Stallman  <rms@gnu.org>
+
+        * xmenu.c (restore_menu_items, save_menu_items): New fns.
+        (set_frame_menubar): Use save_menu_items.  Save updated vector in
+        the frame before unwinding it.  Don't use unuse_menu_items.  Don't
+        use discard_menu_items.
+        (digest_single_submenu): Abort if an item is not in a pane.
+        (init_menu_items): Put the error check at the top.
+
+        * keymap.c (describe_map): Make "shadowed" warning more verbose.
+
+        * window.c (adjust_window_trailing_edge): Correctly distinguish
+        series vs parallel cases, even when window has no parent.
+
+        * abbrev.c (record_symbol): New function.
+        (Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
+
+2006-04-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * image.c (x_create_bitmap_from_data) [MAC_OS]: Don't check return
+        value of xmalloc.
+
+        * mac.c (mac_coerce_file_name_ptr, mac_coerce_file_name_desc)
+        (create_apple_event_from_event_ref, xrm_get_preference_database)
+        (cfstring_create_normalized): Don't check return value of xmalloc.
+
+        * macselect.c (get_scrap_target_type_list, defer_apple_events)
+        (copy_scrap_flavor_data, mac_handle_service_event): Don't check
+        return value of xmalloc/xrealloc.
+
+        * macterm.c (XCreateGC, x_per_char_metric, xlfdpat_create)
+        (init_font_name_table, init_font_name_table, mac_do_list_fonts)
+        (XLoadQueryFont, mac_store_apple_event): Don't check
+        return value of xmalloc.
+
 2006-04-17  Kim F. Storm  <storm@cua.dk>
 
         * window.c (coordinates_in_window): On the vertical border,
         calculate the row number measured from the top of the window, not
         the top of the frame.
+        (window_loop): Test w->dedicated with !NILP instead of EQ Qt.
+        (window_scroll_pixel_based): Fix off-by-one bug in 2002-12-23 change.
 
 2006-04-16  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/abbrev.c b/src/abbrev.c
index 13da66f5801..f47a83b0bfe 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -537,6 +537,13 @@ describe_abbrev (sym, stream)
   Fterpri (stream);
 }
 
+static void
+record_symbol (sym, list)
+     Lisp_Object sym, list;
+{
+  XSETCDR (list, Fcons (sym, XCDR (list)));
+}
+
 DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,
        Sinsert_abbrev_table_description, 1, 2, 0,
        doc: /* Insert before point a full description of abbrev table named NAME.
@@ -552,6 +559,7 @@ READABLE is non-nil, they are listed.  */)
      Lisp_Object name, readable;
 {
   Lisp_Object table;
+  Lisp_Object symbols;
   Lisp_Object stream;
 
   CHECK_SYMBOL (name);
@@ -560,12 +568,22 @@ READABLE is non-nil, they are listed.  */)
 
   XSETBUFFER (stream, current_buffer);
 
+  symbols = Fcons (Qnil, Qnil);
+  map_obarray (table, record_symbol, symbols);
+  symbols = XCDR (symbols);
+  symbols = Fsort (symbols, Qstring_lessp);
+
   if (!NILP (readable))
     {
       insert_string ("(");
       Fprin1 (name, stream);
       insert_string (")\n\n");
-      map_obarray (table, describe_abbrev, stream);
+      while (! NILP (symbols))
+        {
+          describe_abbrev (XCAR (symbols), stream);
+          symbols = XCDR (symbols);
+        }
+
       insert_string ("\n\n");
     }
   else
@@ -573,7 +591,11 @@ READABLE is non-nil, they are listed.  */)
       insert_string ("(define-abbrev-table '");
       Fprin1 (name, stream);
       insert_string (" '(\n");
-      map_obarray (table, write_abbrev, stream);
+      while (! NILP (symbols))
+        {
+          write_abbrev (XCAR (symbols), stream);
+          symbols = XCDR (symbols);
+        }
       insert_string ("    ))\n\n");
     }
 
diff --git a/src/eval.c b/src/eval.c
index 86ee384896c..20f29b5f06b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -204,6 +204,7 @@ init_eval_once ()
   specpdl_size = 50;
   specpdl = (struct specbinding *) xmalloc (specpdl_size * sizeof (struct specbinding));
   specpdl_ptr = specpdl;
+  /* Don't forget to update docs (lispref node "Local Variables").  */
   max_specpdl_size = 1000;
   max_lisp_eval_depth = 300;
 
diff --git a/src/image.c b/src/image.c
index 91aa1198769..10c402be119 100644
--- a/src/image.c
+++ b/src/image.c
@@ -201,7 +201,7 @@ XPutPixel (ximage, x, y, pixel)
     }
   else
 #endif
- if (depth == 1)
+  if (depth == 1)
     {
       char *base_addr = GetPixBaseAddr (pixmap);
       short row_bytes = GetPixRowBytes (pixmap);
@@ -444,8 +444,6 @@ x_create_bitmap_from_data (f, bits, width, height)
   id = x_allocate_bitmap_record (f);
 #ifdef MAC_OS
   dpyinfo->bitmaps[id - 1].bitmap_data = (char *) xmalloc (height * width);
-  if (! dpyinfo->bitmaps[id - 1].bitmap_data)
-    return -1;
   bcopy (bits, dpyinfo->bitmaps[id - 1].bitmap_data, height * width);
 #endif  /* MAC_OS */
 
diff --git a/src/keymap.c b/src/keymap.c
index e5122c84efc..6930ed08d8c 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3391,7 +3391,7 @@ describe_map (map, prefix, elt_describer, partial, shadow,
       if (vect[i].shadowed)
         {
           SET_PT (PT - 1);
-          insert_string ("  (shadowed)");
+          insert_string ("\n  (that binding is currently shadowed by another mode)");
           SET_PT (PT + 1);
         }
     }
diff --git a/src/mac.c b/src/mac.c
index 2b4e8dcbc64..7172301b6b0 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -453,15 +453,10 @@ mac_coerce_file_name_ptr (type_code, data_ptr, data_size,
       char *buf;
 
       buf = xmalloc (data_size + 1);
-      if (buf)
-        {
-          memcpy (buf, data_ptr, data_size);
-          buf[data_size] = '\0';
-          err = posix_pathname_to_fsspec (buf, &fs);
-          xfree (buf);
-        }
-      else
-        err = memFullErr;
+      memcpy (buf, data_ptr, data_size);
+      buf[data_size] = '\0';
+      err = posix_pathname_to_fsspec (buf, &fs);
+      xfree (buf);
       if (err == noErr)
         err = AECoercePtr (typeFSS, &fs, sizeof (FSSpec), to_type, result);
 #endif
@@ -489,14 +484,11 @@ mac_coerce_file_name_ptr (type_code, data_ptr, data_size,
             {
               size = AEGetDescDataSize (&desc);
               buf = xmalloc (size);
-              if (buf)
-                {
-                  err = AEGetDescData (&desc, buf, size);
-                  if (err == noErr)
-                    url = CFURLCreateWithBytes (NULL, buf, size,
-                                                kCFStringEncodingUTF8, NULL);
-                  xfree (buf);
-                }
+              err = AEGetDescData (&desc, buf, size);
+              if (err == noErr)
+                url = CFURLCreateWithBytes (NULL, buf, size,
+                                            kCFStringEncodingUTF8, NULL);
+              xfree (buf);
               AEDisposeDesc (&desc);
             }
         }
@@ -581,21 +573,16 @@ mac_coerce_file_name_desc (from_desc, to_type, handler_refcon, result)
       data_size = GetHandleSize (from_desc->dataHandle);
 #endif
       data_ptr = xmalloc (data_size);
-      if (data_ptr)
-        {
 #if TARGET_API_MAC_CARBON
-          err = AEGetDescData (from_desc, data_ptr, data_size);
+      err = AEGetDescData (from_desc, data_ptr, data_size);
 #else
-          memcpy (data_ptr, *(from_desc->dataHandle), data_size);
+      memcpy (data_ptr, *(from_desc->dataHandle), data_size);
 #endif
-          if (err == noErr)
-            err = mac_coerce_file_name_ptr (from_type, data_ptr,
-                                            data_size, to_type,
-                                            handler_refcon, result);
-          xfree (data_ptr);
-        }
-      else
-        err = memFullErr;
+      if (err == noErr)
+        err = mac_coerce_file_name_ptr (from_type, data_ptr,
+                                        data_size, to_type,
+                                        handler_refcon, result);
+      xfree (data_ptr);
     }
 
   if (err != noErr)
@@ -691,8 +678,6 @@ create_apple_event_from_event_ref (event, num_params, names, types, result)
         if (err != noErr)
           break;
         buf = xmalloc (size);
-        if (buf == NULL)
-          break;
         err = GetEventParameter (event, names[i], types[i], NULL,
                                  size, NULL, buf);
         if (err == noErr)
@@ -1596,8 +1581,6 @@ xrm_get_preference_database (application)
 
   count = CFSetGetCount (key_set);
   keys = xmalloc (sizeof (CFStringRef) * count);
-  if (keys == NULL)
-    goto out;
   CFSetGetValues (key_set, (const void **)keys);
   for (index = 0; index < count; index++)
     {
@@ -4547,11 +4530,8 @@ cfstring_create_normalized (str, symbol)
       if (in_text == NULL)
         {
           buffer = xmalloc (sizeof (UniChar) * length);
-          if (buffer)
-            {
-              CFStringGetCharacters (str, CFRangeMake (0, length), buffer);
-              in_text = buffer;
-            }
+          CFStringGetCharacters (str, CFRangeMake (0, length), buffer);
+          in_text = buffer;
         }
 
       if (in_text)
@@ -4559,15 +4539,12 @@ cfstring_create_normalized (str, symbol)
       while (err == noErr)
         {
           out_buf = xmalloc (out_size);
-          if (out_buf == NULL)
-            err = mFulErr;
-          else
-            err = ConvertFromUnicodeToText (uni, length * sizeof (UniChar),
-                                            in_text,
-                                            kUnicodeDefaultDirectionMask,
-                                            0, NULL, NULL, NULL,
-                                            out_size, &out_read, &out_len,
-                                            out_buf);
+          err = ConvertFromUnicodeToText (uni, length * sizeof (UniChar),
+                                          in_text,
+                                          kUnicodeDefaultDirectionMask,
+                                          0, NULL, NULL, NULL,
+                                          out_size, &out_read, &out_len,
+                                          out_buf);
           if (err == noErr && out_read < length * sizeof (UniChar))
             {
               xfree (out_buf);
diff --git a/src/macselect.c b/src/macselect.c
index 8312197181f..fe4a7c8eccc 100644
--- a/src/macselect.c
+++ b/src/macselect.c
@@ -373,14 +373,11 @@ get_scrap_target_type_list (scrap)
   err = GetScrapFlavorCount (scrap, &count);
   if (err == noErr)
     flavor_info = xmalloc (sizeof (ScrapFlavorInfo) * count);
-  if (flavor_info)
+  err = GetScrapFlavorInfoList (scrap, &count, flavor_info);
+  if (err != noErr)
     {
-      err = GetScrapFlavorInfoList (scrap, &count, flavor_info);
-      if (err != noErr)
-        {
-          xfree (flavor_info);
-          flavor_info = NULL;
-        }
+      xfree (flavor_info);
+      flavor_info = NULL;
     }
   if (flavor_info == NULL)
     count = 0;
@@ -1021,20 +1018,13 @@ defer_apple_events (apple_event, reply)
           deferred_apple_events.count = 0;
           deferred_apple_events.buf =
             xmalloc (sizeof (AppleEvent) * deferred_apple_events.size);
-          if (deferred_apple_events.buf == NULL)
-            err = memFullErr;
         }
       else if (deferred_apple_events.count == deferred_apple_events.size)
         {
-          AppleEvent *newbuf;
-
           deferred_apple_events.size *= 2;
-          newbuf = xrealloc (deferred_apple_events.buf,
-                             sizeof (AppleEvent) * deferred_apple_events.size);
-          if (newbuf)
-            deferred_apple_events.buf = newbuf;
-          else
-            err = memFullErr;
+          deferred_apple_events.buf
+            = xrealloc (deferred_apple_events.buf,
+                        sizeof (AppleEvent) * deferred_apple_events.size);
         }
     }
 
@@ -1192,17 +1182,7 @@ copy_scrap_flavor_data (from_scrap, to_scrap, flavor_type)
           buf = NULL;
         }
       else if (size_allocated < size)
-        {
-          char *newbuf = xrealloc (buf, size);
-
-          if (newbuf)
-            buf = newbuf;
-          else
-            {
-              xfree (buf);
-              buf = NULL;
-            }
-        }
+        buf = xrealloc (buf, size);
       else
         break;
     }
@@ -1302,14 +1282,11 @@ mac_handle_service_event (call_ref, event, data)
         err = GetScrapFlavorCount (cur_scrap, &count);
         if (err == noErr)
           flavor_info = xmalloc (sizeof (ScrapFlavorInfo) * count);
-        if (flavor_info)
+        err = GetScrapFlavorInfoList (cur_scrap, &count, flavor_info);
+        if (err != noErr)
           {
-            err = GetScrapFlavorInfoList (cur_scrap, &count, flavor_info);
-            if (err != noErr)
-              {
-                xfree (flavor_info);
-                flavor_info = NULL;
-              }
+            xfree (flavor_info);
+            flavor_info = NULL;
           }
         if (flavor_info == NULL)
           break;
diff --git a/src/macterm.c b/src/macterm.c
index 5c3787c2a51..b7a7fadeab2 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -1510,11 +1510,8 @@ XCreateGC (display, window, mask, xgcv)
 {
   GC gc = xmalloc (sizeof (*gc));
 
-  if (gc)
-    {
-      bzero (gc, sizeof (*gc));
-      XChangeGC (display, gc, mask, xgcv);
-    }
+  bzero (gc, sizeof (*gc));
+  XChangeGC (display, gc, mask, xgcv);
 
   return gc;
 }
@@ -2163,21 +2160,17 @@ x_per_char_metric (font, char2b)
       if (*row == NULL)
         {
           *row = xmalloc (sizeof (XCharStructRow));
-          if (*row)
-            bzero (*row, sizeof (XCharStructRow));
+          bzero (*row, sizeof (XCharStructRow));
         }
-      if (*row)
+      pcm = (*row)->per_char + char2b->byte2;
+      if (!XCHARSTRUCTROW_CHAR_VALID_P (*row, char2b->byte2))
         {
-          pcm = (*row)->per_char + char2b->byte2;
-          if (!XCHARSTRUCTROW_CHAR_VALID_P (*row, char2b->byte2))
-            {
-              BLOCK_INPUT;
-              mac_query_char_extents (font->mac_style,
-                                      (char2b->byte1 << 8) + char2b->byte2,
-                                      NULL, NULL, pcm, NULL);
-              UNBLOCK_INPUT;
-              XCHARSTRUCTROW_SET_CHAR_VALID (*row, char2b->byte2);
-            }
+          BLOCK_INPUT;
+          mac_query_char_extents (font->mac_style,
+                                  (char2b->byte1 << 8) + char2b->byte2,
+                                  NULL, NULL, pcm, NULL);
+          UNBLOCK_INPUT;
+          XCHARSTRUCTROW_SET_CHAR_VALID (*row, char2b->byte2);
         }
     }
   else
@@ -6582,12 +6575,7 @@ xlfdpat_create (pattern)
   struct xlfdpat_block *blk;
 
   pat = xmalloc (sizeof (struct xlfdpat));
-  if (pat == NULL)
-    goto error;
-
   pat->buf = xmalloc (strlen (pattern) + 1);
-  if (pat->buf == NULL)
-    goto error;
 
   /* Normalize the pattern string and store it to `pat->buf'.  */
   nblocks = 0;
@@ -6651,8 +6639,6 @@ xlfdpat_create (pattern)
     }
 
   pat->blocks = xmalloc (sizeof (struct xlfdpat_block) * nblocks);
-  if (pat->blocks == NULL)
-    goto error;
 
   /* Divide the normalized pattern into blocks.  */
   p = pat->buf;
@@ -7112,9 +7098,10 @@ init_font_name_table ()
                          Qnil, Qnil, Qnil);;
       err = ATSUFontCount (&nfonts);
       if (err == noErr)
-        font_ids = xmalloc (sizeof (ATSUFontID) * nfonts);
-      if (font_ids)
-        err = ATSUGetFontIDs (font_ids, nfonts, NULL);
+        {
+          font_ids = xmalloc (sizeof (ATSUFontID) * nfonts);
+          err = ATSUGetFontIDs (font_ids, nfonts, NULL);
+        }
       if (err == noErr)
         for (i = 0; i < nfonts; i++)
           {
@@ -7124,8 +7111,6 @@ init_font_name_table ()
             if (err != noErr)
               continue;
             name = xmalloc (name_len + 1);
-            if (name == NULL)
-              continue;
             name[name_len] = '\0';
             err = ATSUFindFontName (font_ids[i], kFontFamilyName,
                                     kFontMacintoshPlatform, kFontNoScript,
@@ -7455,8 +7440,6 @@ mac_do_list_fonts (pattern, maxnames)
           int former_len = ptr - font_name_table[i];
 
           scaled = xmalloc (strlen (font_name_table[i]) + 20 + 1);
-          if (scaled == NULL)
-            continue;
           memcpy (scaled, font_name_table[i], former_len);
           sprintf (scaled + former_len,
                    "-%d-%d-72-72-m-%d-%s",
@@ -7789,18 +7772,8 @@ XLoadQueryFont (Display *dpy, char *fontname)
       font->max_char_or_byte2 = 0xff;
 
       font->bounds.rows = xmalloc (sizeof (XCharStructRow *) * 0x100);
-      if (font->bounds.rows == NULL)
-        {
-          mac_unload_font (&one_mac_display_info, font);
-          return NULL;
-        }
       bzero (font->bounds.rows, sizeof (XCharStructRow *) * 0x100);
       font->bounds.rows[0] = xmalloc (sizeof (XCharStructRow));
-      if (font->bounds.rows[0] == NULL)
-        {
-          mac_unload_font (&one_mac_display_info, font);
-          return NULL;
-        }
       bzero (font->bounds.rows[0], sizeof (XCharStructRow));
 
 #if USE_CG_TEXT_DRAWING
@@ -7822,9 +7795,10 @@ XLoadQueryFont (Display *dpy, char *fontname)
       }
 
       if (font->cg_font)
-        font->cg_glyphs = xmalloc (sizeof (CGGlyph) * 0x100);
-      if (font->cg_glyphs)
-        bzero (font->cg_glyphs, sizeof (CGGlyph) * 0x100);
+        {
+          font->cg_glyphs = xmalloc (sizeof (CGGlyph) * 0x100);
+          bzero (font->cg_glyphs, sizeof (CGGlyph) * 0x100);
+        }
 #endif
       space_bounds = font->bounds.rows[0]->per_char + 0x20;
       err = mac_query_char_extents (font->mac_style, 0x20,
@@ -7970,11 +7944,6 @@ XLoadQueryFont (Display *dpy, char *fontname)
 
           font->bounds.per_char =
             xmalloc (sizeof (XCharStruct) * (0xff - 0x20 + 1));
-          if (font->bounds.per_char == NULL)
-            {
-              mac_unload_font (&one_mac_display_info, font);
-              return NULL;
-            }
           bzero (font->bounds.per_char,
                  sizeof (XCharStruct) * (0xff - 0x20 + 1));
 
@@ -8979,15 +8948,12 @@ mac_store_apple_event (class, id, desc)
      Lisp_Object class, id;
      const AEDesc *desc;
 {
-  OSErr err = noErr;
+  OSErr err;
   struct input_event buf;
   AEDesc *desc_copy;
 
   desc_copy = xmalloc (sizeof (AEDesc));
-  if (desc_copy == NULL)
-    err = memFullErr;
-  else
-    err = AEDuplicateDesc (desc, desc_copy);
+  err = AEDuplicateDesc (desc, desc_copy);
   if (err == noErr)
     {
       EVENT_INIT (buf);
diff --git a/src/print.c b/src/print.c
index 0eb82b663d6..0db9780e314 100644
--- a/src/print.c
+++ b/src/print.c
@@ -276,6 +276,7 @@ int print_output_debug_flag = 1;
        else                                                             \
          insert_1_both (print_buffer, print_buffer_pos,                 \
                         print_buffer_pos_byte, 0, 1, 0);                \
+       signal_after_change (PT - print_buffer_pos, 0, print_buffer_pos);\
      }                                                                  \
    if (free_print_buffer)                                               \
      {                                                                  \
diff --git a/src/textprop.c b/src/textprop.c
index 65823d9fa3f..e2f9c531735 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1602,10 +1602,12 @@ Return t if any property was actually removed, nil otherwise.  */)
         }
     }
 
-  if (BUFFERP (object))
-    modify_region (XBUFFER (object), XINT (start), XINT (end));
-
-  /* We are at the beginning of an interval, with len to scan */
+  /* We are at the beginning of an interval, with len to scan.
+     The flag `modified' records if changes have been made.
+     When object is a buffer, we must call modify_region before changes are
+     made and signal_after_change when we are done.
+     We call modify_region before calling remove_properties iff modified == 0,
+     and we call signal_after_change before returning iff modified != 0. */
   for (;;)
     {
       if (i == 0)
@@ -1614,10 +1616,20 @@ Return t if any property was actually removed, nil otherwise.  */)
       if (LENGTH (i) >= len)
         {
           if (! interval_has_some_properties_list (properties, i))
-            return modified ? Qt : Qnil;
+            if (modified)
+              {
+                if (BUFFERP (object))
+                  signal_after_change (XINT (start), XINT (end) - XINT (start),
+                                       XINT (end) - XINT (start));
+                return Qt;
+              }
+            else
+              return Qnil;
 
           if (LENGTH (i) == len)
             {
+              if (!modified && BUFFERP (object))
+                modify_region (XBUFFER (object), XINT (start), XINT (end));
               remove_properties (Qnil, properties, i, object);
               if (BUFFERP (object))
                 signal_after_change (XINT (start), XINT (end) - XINT (start),
@@ -1629,6 +1641,8 @@ Return t if any property was actually removed, nil otherwise.  */)
           unchanged = i;
           i = split_interval_left (i, len);
           copy_properties (unchanged, i);
+          if (!modified && BUFFERP (object))
+            modify_region (XBUFFER (object), XINT (start), XINT (end));
           remove_properties (Qnil, properties, i, object);
           if (BUFFERP (object))
             signal_after_change (XINT (start), XINT (end) - XINT (start),
@@ -1636,8 +1650,14 @@ Return t if any property was actually removed, nil otherwise.  */)
           return Qt;
         }
 
+      if (interval_has_some_properties_list (properties, i))
+        {
+          if (!modified && BUFFERP (object))
+            modify_region (XBUFFER (object), XINT (start), XINT (end));
+          remove_properties (Qnil, properties, i, object);
+          modified = 1;
+        }
       len -= LENGTH (i);
-      modified += remove_properties (Qnil, properties, i, object);
       i = next_interval (i);
     }
 }
diff --git a/src/window.c b/src/window.c
index d4e6ac3569f..1bd8c3924a1 100644
--- a/src/window.c
+++ b/src/window.c
@@ -662,6 +662,8 @@ coordinates_in_window (w, x, y)
         {
           if (!WINDOW_LEFTMOST_P (w) && abs (*x - x0) < grabbable_width)
             {
+              /* Convert X and Y to window relative coordinates.
+                 Vertical border is at the left edge of window.  */
               *x = max (0, *x - x0);
               *y -= top_y;
               return ON_VERTICAL_BORDER;
@@ -671,6 +673,8 @@ coordinates_in_window (w, x, y)
         {
           if (abs (*x - x1) < grabbable_width)
             {
+              /* Convert X and Y to window relative coordinates.
+                 Vertical border is at the right edge of window.  */
               *x = min (x1, *x) - x0;
               *y -= top_y;
               return ON_VERTICAL_BORDER;
@@ -717,6 +721,8 @@ coordinates_in_window (w, x, y)
           && !WINDOW_RIGHTMOST_P (w)
           && (abs (*x - right_x) < grabbable_width))
         {
+          /* Convert X and Y to window relative coordinates.
+             Vertical border is at the right edge of window.  */
           *x = min (right_x, *x) - left_x;
           *y -= top_y;
           return ON_VERTICAL_BORDER;
@@ -2027,7 +2033,7 @@ window_loop (type, obj, mini, frames)
                `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))
+                || (!(XINT (obj) & 2) && !NILP (w->dedicated))
                 /* Minibuffer windows are always ignored.  */
                 || MINI_WINDOW_P (w))
               break;
@@ -2082,7 +2088,7 @@ window_loop (type, obj, mini, frames)
           case GET_LARGEST_WINDOW:
             { /* nil `obj' means to ignore dedicated windows.  */
               /* Ignore dedicated windows and minibuffers.  */
-              if (MINI_WINDOW_P (w) || (NILP (obj) && EQ (w->dedicated, Qt)))
+              if (MINI_WINDOW_P (w) || (NILP (obj) && !NILP (w->dedicated)))
                 break;
 
               if (NILP (best_window))
@@ -4269,18 +4275,30 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
 
   while (1)
     {
+      Lisp_Object first_parallel = Qnil;
+
       p = XWINDOW (window);
       parent = p->parent;
 
-      /* Make sure there is a following window.  */
-      if (NILP (parent)
-          && (horiz_flag ? 1
-              : NILP (XWINDOW (window)->next)))
+      if (NILP (XWINDOW (window)->next))
         {
           Fset_window_configuration (old_config);
           error ("No other window following this one");
         }
 
+      /* See if this level has windows in parallel in the specified
+         direction.  If so, set FIRST_PARALLEL to the first one.  */
+      if (horiz_flag)
+        {
+          if (! NILP (parent) && !NILP (XWINDOW (parent)->vchild))
+            first_parallel = XWINDOW (parent)->vchild;
+        }
+      else
+        {
+          if (! NILP (parent) && !NILP (XWINDOW (parent)->hchild))
+            first_parallel = XWINDOW (parent)->hchild;
+        }
+
       /* Don't make this window too small.  */
       if (XINT (CURSIZE (window)) + delta
           < (horiz_flag ? window_min_width : window_min_height))
@@ -4298,12 +4316,11 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
                XINT (CURSIZE (window)) + delta);
 
       /* If this window has following siblings in the desired dimension,
-         make them smaller.
+         make them smaller, and exit the loop.
+
          (If we reach the top of the tree and can never do this,
          we will fail and report an error, above.)  */
-      if (horiz_flag
-          ? !NILP (XWINDOW (parent)->hchild)
-          : !NILP (XWINDOW (parent)->vchild))
+      if (NILP (first_parallel))
         {
           if (!NILP (XWINDOW (window)->next))
             {
@@ -4325,9 +4342,7 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
       else
         /* Here we have a chain of parallel siblings, in the other dimension.
            Change the size of the other siblings.  */
-        for (child = (horiz_flag
-                      ? XWINDOW (parent)->vchild
-                      : XWINDOW (parent)->hchild);
+        for (child = first_parallel;
              ! NILP (child);
              child = XWINDOW (child)->next)
           if (! EQ (child, window))
@@ -4868,7 +4883,7 @@ window_scroll_pixel_based (window, n, whole, noerror)
         {
           if (it.current_y < it.last_visible_y
               && (it.current_y + it.max_ascent + it.max_descent
-                  >= it.last_visible_y))
+                  > it.last_visible_y))
             {
               /* The last line was only partially visible, make it fully
                  visible.  */
diff --git a/src/xdisp.c b/src/xdisp.c
index ca5137bb4ff..1689ec88be5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12784,8 +12784,6 @@ redisplay_window (window, just_this_one_p)
       /* IT may overshoot PT if text at PT is invisible.  */
       else if (IT_CHARPOS (it) > PT && CHARPOS (startp) <= PT)
         w->force_start = Qt;
-
-
     }
 
   /* Handle case where place to start displaying has been specified,
@@ -12955,6 +12953,35 @@ redisplay_window (window, just_this_one_p)
                || (XFASTINT (w->last_modified) >= MODIFF
                    && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)))
     {
+
+      /* If first window line is a continuation line, and window start
+         is inside the modified region, but the first change is before
+         current window start, we must select a new window start.*/
+      if (NILP (w->start_at_line_beg))
+        {
+          /* Make sure beg_unchanged and end_unchanged are up to date.
+             Do it only if buffer has really changed.  This may or may
+             not have been done by try_window_id (see which) already. */
+          if (MODIFF > SAVE_MODIFF
+              /* This seems to happen sometimes after saving a buffer.  */
+              || BEG_UNCHANGED + END_UNCHANGED > Z_BYTE)
+            {
+              if (GPT - BEG < BEG_UNCHANGED)
+                BEG_UNCHANGED = GPT - BEG;
+              if (Z - GPT < END_UNCHANGED)
+                END_UNCHANGED = Z - GPT;
+            }
+
+          if (CHARPOS (startp) > BEG + BEG_UNCHANGED
+              && CHARPOS (startp) <= Z - END_UNCHANGED)
+            {
+              /* There doesn't seems to be a simple way to find a new
+                 window start that is near the old window start, so
+                 we just recenter.  */
+              goto recenter;
+            }
+        }
+
 #if GLYPH_DEBUG
       debug_method_add (w, "same window start");
 #endif
@@ -22535,7 +22562,7 @@ note_mouse_highlight (f, x, y)
   if (part == ON_VERTICAL_BORDER)
     {
       cursor = FRAME_X_OUTPUT (f)->horizontal_drag_cursor;
-      help_echo_string = make_string ("drag-mouse-1: resize", 20);
+      help_echo_string = build_string ("drag-mouse-1: resize");
     }
   else if (part == ON_LEFT_FRINGE || part == ON_RIGHT_FRINGE
            || part == ON_SCROLL_BAR)
diff --git a/src/xmenu.c b/src/xmenu.c
index 156c44c9bb0..8558e113863 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -266,14 +266,15 @@ menubar_id_to_frame (id)
 static void
 init_menu_items ()
 {
+  if (!NILP (menu_items_inuse))
+    error ("Trying to use a menu from within a menu-entry");
+
   if (NILP (menu_items))
     {
       menu_items_allocated = 60;
       menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil);
     }
 
-  if (!NILP (menu_items_inuse))
-    error ("Trying to use a menu from within a menu-entry");
   menu_items_inuse = Qt;
   menu_items_used = 0;
   menu_items_n_panes = 0;
@@ -310,6 +311,39 @@ discard_menu_items ()
   xassert (NILP (menu_items_inuse));
 }
 
+/* This undoes save_menu_items, and it is called by the specpdl unwind
+   mechanism.  */
+
+static Lisp_Object
+restore_menu_items (saved)
+     Lisp_Object saved;
+{
+  menu_items = XCAR (saved);
+  menu_items_inuse = (! NILP (menu_items) ? Qt : Qnil);
+  menu_items_allocated = (VECTORP (menu_items) ? ASIZE (menu_items) : 0);
+  saved = XCDR (saved);
+  menu_items_used = XINT (XCAR (saved));
+  saved = XCDR (saved);
+  menu_items_n_panes = XINT (XCAR (saved));
+  saved = XCDR (saved);  
+  menu_items_submenu_depth = XINT (XCAR (saved));
+}
+
+/* Push the whole state of menu_items processing onto the specpdl.
+   It will be restored when the specpdl is unwound.  */
+
+static void
+save_menu_items ()
+{
+  Lisp_Object saved = list4 (!NILP (menu_items_inuse) ? menu_items : Qnil,
+                             make_number (menu_items_used),
+                             make_number (menu_items_n_panes),
+                             make_number (menu_items_submenu_depth));
+  record_unwind_protect (restore_menu_items, saved);
+  menu_items_inuse = Qnil;
+  menu_items = Qnil;
+}
+
 /* Make the menu_items vector twice as large.  */
 
 static void
@@ -320,6 +354,7 @@ grow_menu_items ()
   old = menu_items;
 
   menu_items_allocated *= 2;
+
   menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil);
   bcopy (XVECTOR (old)->contents, XVECTOR (menu_items)->contents,
          old_size * sizeof (Lisp_Object));
@@ -1728,6 +1763,7 @@ digest_single_submenu (start, end, top_level_items)
   int i;
   int submenu_depth = 0;
   widget_value **submenu_stack;
+  int panes_seen = 0;
 
   submenu_stack
     = (widget_value **) alloca (menu_items_used * sizeof (widget_value *));
@@ -1774,6 +1810,8 @@ digest_single_submenu (start, end, top_level_items)
           Lisp_Object pane_name, prefix;
           char *pane_string;
 
+          panes_seen++;
+
           pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME];
           prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];
 
@@ -1821,6 +1859,10 @@ digest_single_submenu (start, end, top_level_items)
           Lisp_Object item_name, enable, descrip, def, type, selected;
           Lisp_Object help;
 
+          /* All items should be contained in panes.  */
+          if (panes_seen == 0)
+            abort ();
+
           item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME);
           enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE);
           descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY);
@@ -2046,7 +2088,6 @@ set_frame_menubar (f, first_time, deep_p)
       specbind (Qdebug_on_next_call, Qnil);
 
       record_unwind_save_match_data ();
-      record_unwind_protect (unuse_menu_items, Qnil);
       if (NILP (Voverriding_local_map_menu_flag))
         {
           specbind (Qoverriding_terminal_local_map, Qnil);
@@ -2074,6 +2115,8 @@ set_frame_menubar (f, first_time, deep_p)
 
       /* Fill in menu_items with the current menu bar contents.
          This can evaluate Lisp code.  */
+      save_menu_items ();
+
       menu_items = f->menu_bar_vector;
       menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0;
       submenu_start = (int *) alloca (XVECTOR (items)->size * sizeof (int *));
@@ -2133,23 +2176,33 @@ set_frame_menubar (f, first_time, deep_p)
         }
 
       set_buffer_internal_1 (prev);
-      unbind_to (specpdl_count, Qnil);
 
       /* If there has been no change in the Lisp-level contents
          of the menu bar, skip redisplaying it.  Just exit.  */
 
+      /* Compare the new menu items with the ones computed last time.  */
       for (i = 0; i < previous_menu_items_used; i++)
         if (menu_items_used == i
             || (!EQ (previous_items[i], XVECTOR (menu_items)->contents[i])))
           break;
       if (i == menu_items_used && i == previous_menu_items_used && i != 0)
         {
+          /* The menu items have not changed.  Don't bother updating
+             the menus in any form, since it would be a no-op.  */
           free_menubar_widget_value_tree (first_wv);
           discard_menu_items ();
-
+          unbind_to (specpdl_count, Qnil);
           return;
         }
 
+      /* The menu items are different, so store them in the frame.  */
+      f->menu_bar_vector = menu_items;
+      f->menu_bar_items_used = menu_items_used;
+
+      /* This calls restore_menu_items to restore menu_items, etc.,
+         as they were outside.  */
+      unbind_to (specpdl_count, Qnil);
+
       /* Now GC cannot happen during the lifetime of the widget_value,
          so it's safe to store data from a Lisp_String.  */
       wv = first_wv->contents;
@@ -2164,9 +2217,6 @@ set_frame_menubar (f, first_time, deep_p)
           wv = wv->next;
         }
 
-      f->menu_bar_vector = menu_items;
-      f->menu_bar_items_used = menu_items_used;
-      discard_menu_items ();
     }
   else
     {