Merged from

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-116
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-117
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-118
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-119
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-38
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-39
   Update from CVS

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

4 files changed, 42 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2630efe73b7..d8e0b6fb4e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2006-02-24  Kenichi Handa  <handa@m17n.org>
+
+        * fileio.c (Finsert_file_contents): When a text is replaced
+        partially, be sure to set point before the inserted characters.
+
+2006-02-23  Zhang Wei  <id.brep@gmail.com>  (tiny change)
+
+        * xfns.c (Fx_file_dialog): Return a decoded file name.
+
+2006-02-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * dispnew.c (update_text_area): Avoid needless redraw of rightmost
+        glyph whose face is extended to the text area end.
+
+        * macterm.c (x_set_toolkit_scroll_bar_thumb): Don't set control
+        values if control is not visible or values are not changed.
+
 2006-02-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * window.c (Fwindow_list): Check `window' before doing XWINDOW.
diff --git a/src/dispnew.c b/src/dispnew.c
index 53ea761178f..5f3c8eacc3d 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4361,10 +4361,14 @@ update_text_area (w, vpos)
       int overlapping_glyphs_p = current_row->contains_overlapping_glyphs_p;
       int desired_stop_pos = desired_row->used[TEXT_AREA];
 
-      /* If the desired row extends its face to the text area end,
+      /* If the desired row extends its face to the text area end, and
+         unless the current row also does so at the same position,
          make sure we write at least one glyph, so that the face
          extension actually takes place.  */
-      if (MATRIX_ROW_EXTENDS_FACE_P (desired_row))
+      if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)
+          && (desired_stop_pos < current_row->used[TEXT_AREA]
+              || (desired_stop_pos == current_row->used[TEXT_AREA]
+                  && !MATRIX_ROW_EXTENDS_FACE_P (current_row))))
         --desired_stop_pos;
 
       stop = min (current_row->used[TEXT_AREA], desired_stop_pos);
@@ -4483,7 +4487,10 @@ update_text_area (w, vpos)
              has to be cleared, if and only if we did a write_glyphs
              above.  This is made sure by setting desired_stop_pos
              appropriately above.  */
-          xassert (i < desired_row->used[TEXT_AREA]);
+          xassert (i < desired_row->used[TEXT_AREA]
+                   || ((desired_row->used[TEXT_AREA]
+                        == current_row->used[TEXT_AREA])
+                       && MATRIX_ROW_EXTENDS_FACE_P (current_row)));
         }
       else if (MATRIX_ROW_EXTENDS_FACE_P (current_row))
         {
diff --git a/src/fileio.c b/src/fileio.c
index 1ec443e44e0..e27f87bcbcf 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4416,6 +4416,8 @@ actually used.  */)
 
       /* Set `inserted' to the number of inserted characters.  */
       inserted = PT - temp;
+      /* Set point before the inserted characters.  */
+      SET_PT_BOTH (temp, same_at_start);
 
       xfree (conversion_buffer);
       emacs_close (fd);
diff --git a/src/macterm.c b/src/macterm.c
index 697bfd58556..af9079e919b 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -4529,7 +4529,7 @@ x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole)
      int portion, position, whole;
 {
   ControlHandle ch = SCROLL_BAR_CONTROL_HANDLE (bar);
-  int value, viewsize, maximum, visible_p;
+  int value, viewsize, maximum;
 
   if (whole == 0 || XINT (bar->track_height) == 0)
     value = 0, viewsize = 1, maximum = 0;
@@ -4542,16 +4542,20 @@ x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole)
 
   BLOCK_INPUT;
 
-  /* Temporarily hide the scroll bar to avoid multiple redraws.  */
-  visible_p = IsControlVisible (ch);
-  SetControlVisibility (ch, false, false);
+  if (IsControlVisible (ch)
+      && (GetControlViewSize (ch) != viewsize
+          || GetControl32BitValue (ch) != value
+          || GetControl32BitMaximum (ch) != maximum))
+    {
+      /* Temporarily hide the scroll bar to avoid multiple redraws.  */
+      SetControlVisibility (ch, false, false);
 
-  SetControl32BitMinimum (ch, 0);
-  SetControl32BitMaximum (ch, maximum);
-  SetControl32BitValue (ch, value);
-  SetControlViewSize (ch, viewsize);
+      SetControl32BitMaximum (ch, maximum);
+      SetControl32BitValue (ch, value);
+      SetControlViewSize (ch, viewsize);
 
-  SetControlVisibility (ch, visible_p, true);
+      SetControlVisibility (ch, true, true);
+    }
 
   UNBLOCK_INPUT;
 }