Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1095

4 files changed, 21 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d7f8e5b9c19..0678ed7488e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2008-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Fsubstitute_in_file_name): Fix up computation of maximum
+        size of resulting string.
+
+2008-03-05  Jason Rumney  <jasonr@gnu.org>
+
+        * dispnew.c (adjust_glyph_matrix): Initialize window_height.
+
+2008-03-03  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xdisp.c (handle_single_display_spec): Undo 2007-10-16 changes.
+        Don't pretend as if characters with display property haven't been
+        consumed for string-replacing-string case.
+
 2008-03-08  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (GET_NEXT_DISPLAY_ELEMENT): New macro.
diff --git a/src/dispnew.c b/src/dispnew.c
index 096bca9d460..4f6e6374da3 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -633,7 +633,7 @@ adjust_glyph_matrix (w, matrix, x, y, dim)
   int header_line_changed_p = 0;
   int header_line_p = 0;
   int left = -1, right = -1;
-  int window_width = -1, window_height;
+  int window_width = -1, window_height = -1;
 
   /* See if W had a header line that has disappeared now, or vice versa.
      Get W's size.  */
diff --git a/src/fileio.c b/src/fileio.c
index 4430cf4db57..f478b4a1fad 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2224,8 +2224,8 @@ duplicates what `expand-file-name' does.  */)
         /* Get variable value */
         o = (unsigned char *) egetenv (target);
         if (o)
-          {
-            total += strlen (o);
+          { /* Eight-bit chars occupy upto 2 bytes in multibyte.  */
+            total += strlen (o) * (STRING_MULTIBYTE (filename) ? 2 : 1);
             substituted = 1;
           }
         else if (*p == '}')
diff --git a/src/xdisp.c b/src/xdisp.c
index b7a5ceec495..add712fc85b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4331,15 +4331,13 @@ handle_single_display_spec (it, spec, object, overlay, position,
              `display' property yet.  The call to pop_it in
              set_iterator_to_next will clean this up.  */
           if (BUFFERP (object))
-            it->current.pos = start_pos;
+            *position = start_pos;
         }
       else if (CONSP (value) && EQ (XCAR (value), Qspace))
         {
           it->method = GET_FROM_STRETCH;
           it->object = value;
-          it->position = start_pos;
-          if (BUFFERP (object))
-            it->current.pos = start_pos;
+          *position = it->position = start_pos;
         }
 #ifdef HAVE_WINDOW_SYSTEM
       else
@@ -4353,8 +4351,7 @@ handle_single_display_spec (it, spec, object, overlay, position,
           /* Say that we haven't consumed the characters with
              `display' property yet.  The call to pop_it in
              set_iterator_to_next will clean this up.  */
-          if (BUFFERP (object))
-            it->current.pos = start_pos;
+          *position = start_pos;
         }
 #endif /* HAVE_WINDOW_SYSTEM */