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

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/cus-start.el
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/textmodes/ispell.el
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/ccl.c
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/fontset.c
index a9cf53c4913de8a516043adb57ef0274abe33c9e,2c0f0ac161ce6820020e36e84e9f8e8d856b21f1..045e632778ebfeb7abf22980f25dbc6312b0837b
--- 1/src/fontset.c
--- 2/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/frame.c
Simple merge

diff --cc src/intervals.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/macfns.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/msdos.c
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32menu.c
Simple merge

diff --cc src/w32term.c
index a7fca780d3c26a9877a1c0bc5f71bb347cedf7e7,80ea9983cef11eb47559726f99398e3b9b520004..f174d25720add024816b2eca582e9d69de0ad084
--- 1/src/w32term.c
--- 2/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/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xmenu.c
Simple merge

diff --cc src/xterm.c
index a1beab492eee7f29f3524706e75c9502b3d1c07c,29c840ff79948ef3f54002d55653f7cde8f02ba6..68670795fa374210a13b4b7657c296d9057cf2c4
--- 1/src/xterm.c
--- 2/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;