From: Miles Bader <miles@gnu.org>
Date: Mon, 15 Oct 2007 05:03:21 +0000 (+0000)
Subject: Merge from emacs--devo--0
X-Git-Tag: emacs-pretest-23.0.90~8295^2~309
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/63655c83146b773b4ef3d9220b4a9d61545fd050

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 887-889)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 116-121)

   - Update from CVS

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

63655c83146b773b4ef3d9220b4a9d61545fd050
diff --cc src/fontset.c
index a9cf53c491,2c0f0ac161..045e632778
--- a/src/fontset.c
+++ b/src/fontset.c
@@@ -859,16 -391,7 +859,7 @@@ make_fontset (frame, name, base
    while (!NILP (AREF (Vfontset_table, id))) id++;
  
    if (id + 1 == size)
-     {
-       /* We must grow Vfontset_table.  */
-       Lisp_Object tem;
-       int i;
- 
-       tem = Fmake_vector (make_number (size + 32), Qnil);
-       for (i = 0; i < size; i++)
- 	AREF (tem, i) = AREF (Vfontset_table, i);
-       Vfontset_table = tem;
-     }
 -    Vfontset_table = larger_vector (Vfontset_table, size + 8, Qnil);
++    Vfontset_table = larger_vector (Vfontset_table, size + 32, Qnil);
  
    fontset = Fmake_char_table (Qfontset, Qnil);
  
diff --cc src/w32term.c
index a7fca780d3,80ea9983ce..f174d25720
--- a/src/w32term.c
+++ b/src/w32term.c
@@@ -1959,9 -1659,9 +1960,9 @@@ x_draw_composite_glyph_string_foregroun
  
    /* If first glyph of S has a left box line, start drawing the text
       of S to the right of that box line.  */
 -  if (s->face->box != FACE_NO_BOX
 +  if (s->face && s->face->box != FACE_NO_BOX
        && s->first_glyph->left_box_line_p)
-     x = s->x + abs (s->face->box_line_width);
+     x = s->x + eabs (s->face->box_line_width);
    else
      x = s->x;
  
diff --cc src/xterm.c
index a1beab492e,29c840ff79..68670795fa
--- a/src/xterm.c
+++ b/src/xterm.c
@@@ -1501,9 -1402,9 +1501,9 @@@ x_draw_composite_glyph_string_foregroun
  
    /* If first glyph of S has a left box line, start drawing the text
       of S to the right of that box line.  */
 -  if (s->face->box != FACE_NO_BOX
 +  if (s->face && s->face->box != FACE_NO_BOX
        && s->first_glyph->left_box_line_p)
-     x = s->x + abs (s->face->box_line_width);
+     x = s->x + eabs (s->face->box_line_width);
    else
      x = s->x;