Merged from miles@gnu.org--gnu-2005 (patch 70-73, 320-331)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-320
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-321
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-322
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-323
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-324
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-325
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-326
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-327
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-328
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-329
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-330
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-331
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-70
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-71
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-72
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-73
   Update from CVS

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

20 files changed, 432 insertions, 108 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 951bf142541..8c64defd5db 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,110 @@
+2005-05-28  Masatake YAMATO  <jet@gyve.org>
+
+        * xdisp.c (note_mode_line_or_margin_highlight): Change the
+        pointer to a hand cursor when hoovering over a mouse-face.
+
+2005-05-27  Kenichi Handa  <handa@m17n.org>
+
+        * xterm.c (x_encode_char): Call check_ccl_update in advance.
+
+        * ccl.c: Now an element of Vccl_program_table is a vector of
+        length 4, not 3.
+        (ccl_get_compiled_code): New arg idx.  Caller changed.  Adjusted
+        for the change of Vccl_program_table.
+        (setup_ccl_program): Adjusted for the change of
+        Vccl_program_table.
+        (check_ccl_update): New function.
+        (Fregister_ccl_program): Use ASET to set an element of a vector.
+        Adjusted for the change of Vccl_program_table.
+
+        * ccl.h (struct ccl_program): New member idx.
+        (check_ccl_update): Extern it.
+
+2005-05-27  Juanma Barranquero  <lekktu@gmail.com>
+
+        * image.c (Vimage_library_alist): Moved from image.el.
+        (syms_of_image): Defvar it.
+        (lookup_image_type): Use it.
+
+        * buffer.c (Fbuffer_local_value): Make argument name match its use
+        in docstring.
+
+2005-05-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * keyboard.c (Frecursive_edit): Fix typo in docstring.
+        (Fposn_at_x_y): Make argument name match its use in docstring.
+
+2005-05-26  Lute Kamstra  <lute@gnu.org>
+
+        * eval.c (Frun_hooks): Mention run-mode-hooks in docstring.
+
+2005-05-24  Masatake YAMATO  <jet@gyve.org>
+
+        * xdisp.c (note_mode_line_or_margin_highlight): Use b and e
+        as loop sentinels.
+
+2005-05-24  Nick Roberts  <nickrob@snap.net.nz>
+
+        * xmenu.c (Fx_popup_dialog): Add a third boolean argument to
+        select frame title ("Question"/"Information").
+        (xdialog_show): Use it.
+
+        * macmenu.c (Fx_popup_dialog, mac_dialog_show): As for xmenu.c.
+
+        * w32menu.c (Fx_popup_dialog, w32_dialog_show): As for xmenu.c.
+
+        * fns.c (Fyes_or_no_p, Fy_or_n_p): Call Fx_popup_dialog with
+        a third argument (Qnil).
+
+        * lisp.h: x-popup-dialog can have three arguments.
+
+        * editfns.c (Fmessage_box): Use "Information" for frame title.
+
+2005-05-23  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * termcap.c [VMS]: Include <starlet.h>.
+
+2005-05-23  Masatake YAMATO  <jet@gyve.org>
+
+        * xdisp.c (note_mode_line_or_margin_highlight): Add code
+        for mouse-face.  Change the type of the first argument from `window'
+        to `Lisp_Object'.
+        (note_mouse_highlight): Call note_mode_line_or_margin_highlight with
+        window instead of w.
+
+2005-05-22  Andreas Schwab  <schwab@suse.de>
+
+        * process.c (send_process): Move misplaced volatile.
+
+2005-05-21  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (display_mode_element): If we're processing a list and
+        padding is specified, put it after the last element.
+
+2005-05-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (Fexpand_file_name) [DOS_NT]: Don't try to support
+        "superroot" on DOS_NT systems.
+
+2005-05-21  David Hunter  <hunterd42@comcast.net>  (tiny change)
+
+        * process.c (send_process): Restore the SIGPIPE handler if we
+        catch a SIGPIPE.
+
+2005-05-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * image.c (lookup_image, png_read_from_memory): Remove hacks (and
+        misleading comments).
+        (DEF_IMGLIB_FN): Use C calling convention for image libraries.
+
+2005-05-20  KOBAYASHI Yasuhiro  <kobayays@otsukakj.co.jp>
+
+        * window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges):
+        Correct the right value.
+
 2005-05-19  Nick Roberts  <nickrob@snap.net.nz>
 
-        * keyboard.c (syms_of_keyboard): Remove lisp variables
+        * keyboard.c (syms_of_keyboard): Remove Lisp variables
         post-command-idle-hook and post-command-idle-delay.
         (command_loop_1): Don't try to execute post-command-idle-hook.
 
diff --git a/src/alloc.c b/src/alloc.c
index 35ce8a5cfa1..98fa4be6953 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1685,7 +1685,7 @@ static int total_string_size;
 
 /* We check for overrun in string data blocks by appending a small
    "cookie" after each allocated string data block, and check for the
-   presense of this cookie during GC.  */
+   presence of this cookie during GC.  */
 
 #define GC_STRING_OVERRUN_COOKIE_SIZE   4
 static char string_overrun_cookie[GC_STRING_OVERRUN_COOKIE_SIZE] =
diff --git a/src/buffer.c b/src/buffer.c
index e9567841c8e..dfcf4a9a0b9 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -877,20 +877,20 @@ DEFUN ("buffer-local-value", Fbuffer_local_value,
        Sbuffer_local_value, 2, 2, 0,
        doc: /* Return the value of VARIABLE in BUFFER.
 If VARIABLE does not have a buffer-local binding in BUFFER, the value
-is the default binding of variable. */)
-     (symbol, buffer)
-     register Lisp_Object symbol;
+is the default binding of the variable. */)
+     (variable, buffer)
+     register Lisp_Object variable;
      register Lisp_Object buffer;
 {
   register struct buffer *buf;
   register Lisp_Object result;
 
-  CHECK_SYMBOL (symbol);
+  CHECK_SYMBOL (variable);
   CHECK_BUFFER (buffer);
   buf = XBUFFER (buffer);
 
   /* Look in local_var_list */
-  result = Fassoc (symbol, buf->local_var_alist);
+  result = Fassoc (variable, buf->local_var_alist);
   if (NILP (result))
     {
       int offset, idx;
@@ -905,7 +905,7 @@ is the default binding of variable. */)
           idx = PER_BUFFER_IDX (offset);
           if ((idx == -1 || PER_BUFFER_VALUE_P (buf, idx))
               && SYMBOLP (PER_BUFFER_SYMBOL (offset))
-              && EQ (PER_BUFFER_SYMBOL (offset), symbol))
+              && EQ (PER_BUFFER_SYMBOL (offset), variable))
             {
               result = PER_BUFFER_VALUE (buf, offset);
               found = 1;
@@ -914,7 +914,7 @@ is the default binding of variable. */)
         }
 
       if (!found)
-        result = Fdefault_value (symbol);
+        result = Fdefault_value (variable);
     }
   else
     {
@@ -922,7 +922,7 @@ is the default binding of variable. */)
       Lisp_Object current_alist_element;
 
       /* What binding is loaded right now?  */
-      valcontents = SYMBOL_VALUE (symbol);
+      valcontents = SYMBOL_VALUE (variable);
       current_alist_element
         = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
 
@@ -939,7 +939,7 @@ is the default binding of variable. */)
     }
 
   if (EQ (result, Qunbound))
-    return Fsignal (Qvoid_variable, Fcons (symbol, Qnil));
+    return Fsignal (Qvoid_variable, Fcons (variable, Qnil));
 
   return result;
 }
@@ -5276,19 +5276,19 @@ This is the same as (default-value 'abbrev-mode).  */);
                      doc: /* Default value of `ctl-arrow' for buffers that do not override it.
 This is the same as (default-value 'ctl-arrow).  */);
 
-   DEFVAR_LISP_NOPRO ("default-direction-reversed",
-                      &buffer_defaults.direction_reversed,
-                      doc: /* Default value of `direction-reversed' for buffers that do not override it.
+  DEFVAR_LISP_NOPRO ("default-direction-reversed",
+                     &buffer_defaults.direction_reversed,
+                     doc: /* Default value of `direction-reversed' for buffers that do not override it.
 This is the same as (default-value 'direction-reversed).  */);
 
-   DEFVAR_LISP_NOPRO ("default-enable-multibyte-characters",
-                      &buffer_defaults.enable_multibyte_characters,
-                      doc: /* *Default value of `enable-multibyte-characters' for buffers not overriding it.
+  DEFVAR_LISP_NOPRO ("default-enable-multibyte-characters",
+                     &buffer_defaults.enable_multibyte_characters,
+                     doc: /* *Default value of `enable-multibyte-characters' for buffers not overriding it.
 This is the same as (default-value 'enable-multibyte-characters).  */);
 
-   DEFVAR_LISP_NOPRO ("default-buffer-file-coding-system",
-                      &buffer_defaults.buffer_file_coding_system,
-                      doc: /* Default value of `buffer-file-coding-system' for buffers not overriding it.
+  DEFVAR_LISP_NOPRO ("default-buffer-file-coding-system",
+                     &buffer_defaults.buffer_file_coding_system,
+                     doc: /* Default value of `buffer-file-coding-system' for buffers not overriding it.
 This is the same as (default-value 'buffer-file-coding-system).  */);
 
   DEFVAR_LISP_NOPRO ("default-truncate-lines",
diff --git a/src/ccl.c b/src/ccl.c
index 5bff1f3a0ad..3ce0eb77f70 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -49,10 +49,12 @@ Lisp_Object Qcode_conversion_map_id;
 Lisp_Object Qccl_program_idx;
 
 /* Table of registered CCL programs.  Each element is a vector of
-   NAME, CCL_PROG, and RESOLVEDP where NAME (symbol) is the name of
-   the program, CCL_PROG (vector) is the compiled code of the program,
-   RESOLVEDP (t or nil) is the flag to tell if symbols in CCL_PROG is
-   already resolved to index numbers or not.  */
+   NAME, CCL_PROG, RESOLVEDP, and UPDATEDP, where NAME (symbol) is the
+   name of the program, CCL_PROG (vector) is the compiled code of the
+   program, RESOLVEDP (t or nil) is the flag to tell if symbols in
+   CCL_PROG is already resolved to index numbers or not, UPDATEDP (t
+   or nil) is the flat to tell if the CCL program is updated after it
+   was once used.  */
 Lisp_Object Vccl_program_table;
 
 /* Vector of registered hash tables for translation.  */
@@ -2028,14 +2030,16 @@ resolve_symbol_ccl_program (ccl)
    symbols, return Qnil.  */
 
 static Lisp_Object
-ccl_get_compiled_code (ccl_prog)
+ccl_get_compiled_code (ccl_prog, idx)
      Lisp_Object ccl_prog;
+     int *idx;
 {
   Lisp_Object val, slot;
 
   if (VECTORP (ccl_prog))
     {
       val = resolve_symbol_ccl_program (ccl_prog);
+      *idx = -1;
       return (VECTORP (val) ? val : Qnil);
     }
   if (!SYMBOLP (ccl_prog))
@@ -2047,9 +2051,10 @@ ccl_get_compiled_code (ccl_prog)
     return Qnil;
   slot = AREF (Vccl_program_table, XINT (val));
   if (! VECTORP (slot)
-      || ASIZE (slot) != 3
+      || ASIZE (slot) != 4
       || ! VECTORP (AREF (slot, 1)))
     return Qnil;
+  *idx = XINT (val);
   if (NILP (AREF (slot, 2)))
     {
       val = resolve_symbol_ccl_program (AREF (slot, 1));
@@ -2078,7 +2083,7 @@ setup_ccl_program (ccl, ccl_prog)
     {
       struct Lisp_Vector *vp;
 
-      ccl_prog = ccl_get_compiled_code (ccl_prog);
+      ccl_prog = ccl_get_compiled_code (ccl_prog, &ccl->idx);
       if (! VECTORP (ccl_prog))
         return -1;
       vp = XVECTOR (ccl_prog);
@@ -2086,6 +2091,13 @@ setup_ccl_program (ccl, ccl_prog)
       ccl->prog = vp->contents;
       ccl->eof_ic = XINT (vp->contents[CCL_HEADER_EOF]);
       ccl->buf_magnification = XINT (vp->contents[CCL_HEADER_BUF_MAG]);
+      if (ccl->idx >= 0)
+        {
+          Lisp_Object slot;
+
+          slot = AREF (Vccl_program_table, ccl->idx);
+          ASET (slot, 3, Qnil);
+        }
     }
   ccl->ic = CCL_HEADER_MAIN;
   for (i = 0; i < 8; i++)
@@ -2100,6 +2112,33 @@ setup_ccl_program (ccl, ccl_prog)
   return 0;
 }
 
+
+/* Check if CCL is updated or not.  If not, re-setup members of CCL.  */
+
+int
+check_ccl_update (ccl)
+     struct ccl_program *ccl;
+{
+  struct Lisp_Vector *vp;
+  Lisp_Object slot, ccl_prog;
+
+  if (ccl->idx < 0)
+    return 0;
+  slot = AREF (Vccl_program_table, ccl->idx);
+  if (NILP (AREF (slot, 3)))
+    return 0;
+  ccl_prog = ccl_get_compiled_code (AREF (slot, 0), &ccl->idx);
+  if (! VECTORP (ccl_prog))
+    return -1;
+  ccl->size = ASIZE (ccl_prog);
+  ccl->prog = XVECTOR (ccl_prog)->contents;
+  ccl->eof_ic = XINT (AREF (ccl_prog, CCL_HEADER_EOF));
+  ccl->buf_magnification = XINT (AREF (ccl_prog, CCL_HEADER_BUF_MAG));
+  ASET (slot, 3, Qnil);
+  return 0;
+}
+
+
 DEFUN ("ccl-program-p", Fccl_program_p, Sccl_program_p, 1, 1, 0,
        doc: /* Return t if OBJECT is a CCL program name or a compiled CCL program code.
 See the documentation of  `define-ccl-program' for the detail of CCL program.  */)
@@ -2298,8 +2337,9 @@ Return index number of the registered CCL program.  */)
       if (EQ (name, AREF (slot, 0)))
         {
           /* Update this slot.  */
-          AREF (slot, 1) = ccl_prog;
-          AREF (slot, 2) = resolved;
+          ASET (slot, 1, ccl_prog);
+          ASET (slot, 2, resolved);
+          ASET (slot, 3, Qt);
           return make_number (idx);
         }
     }
@@ -2312,19 +2352,19 @@ Return index number of the registered CCL program.  */)
 
       new_table = Fmake_vector (make_number (len * 2), Qnil);
       for (j = 0; j < len; j++)
-        AREF (new_table, j)
-          = AREF (Vccl_program_table, j);
+        ASET (new_table, j, AREF (Vccl_program_table, j));
       Vccl_program_table = new_table;
     }
 
   {
     Lisp_Object elt;
 
-    elt = Fmake_vector (make_number (3), Qnil);
-    AREF (elt, 0) = name;
-    AREF (elt, 1) = ccl_prog;
-    AREF (elt, 2) = resolved;
-    AREF (Vccl_program_table, idx) = elt;
+    elt = Fmake_vector (make_number (4), Qnil);
+    ASET (elt, 0, name);
+    ASET (elt, 1, ccl_prog);
+    ASET (elt, 2, resolved);
+    ASET (elt, 3, Qt);
+    ASET (Vccl_program_table, idx, elt);
   }
 
   Fput (name, Qccl_program_idx, make_number (idx));
diff --git a/src/ccl.h b/src/ccl.h
index cda611007f8..1c9c1b3b34e 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -33,6 +33,10 @@ Boston, MA 02111-1307, USA.  */
 /* Structure to hold information about running CCL code.  Read
    comments in the file ccl.c for the detail of each field.  */
 struct ccl_program {
+  int idx;                      /* Index number of the CCL program.
+                                   -1 means that the program was given
+                                   by a vector, not by a program
+                                   name.  */
   int size;                     /* Size of the compiled code.  */
   Lisp_Object *prog;            /* Pointer into the compiled code.  */
   int ic;                       /* Instruction Counter (index for PROG).  */
@@ -90,6 +94,9 @@ extern Lisp_Object Vfont_ccl_encoder_alist;
    execution of ccl program CCL_PROG (symbol or vector).  */
 extern int setup_ccl_program P_ ((struct ccl_program *, Lisp_Object));
 
+/* Check if CCL is updated or not.  If not, re-setup members of CCL.  */
+extern int check_ccl_update P_ ((struct ccl_program *));
+
 extern int ccl_driver P_ ((struct ccl_program *, unsigned char *,
                            unsigned char *, int, int, int *));
 
diff --git a/src/editfns.c b/src/editfns.c
index ddf080a0359..4bc5336e997 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3175,7 +3175,7 @@ usage: (message-box STRING &rest ARGS)  */)
         pane = Fcons (Fcons (build_string ("OK"), Qt), Qnil);
         GCPRO1 (pane);
         menu = Fcons (val, pane);
-        obj = Fx_popup_dialog (Qt, menu);
+        obj = Fx_popup_dialog (Qt, menu, Qt);
         UNGCPRO;
         return val;
       }
diff --git a/src/eval.c b/src/eval.c
index 7f043daa555..8bb201c5df5 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2292,7 +2292,7 @@ static Lisp_Object run_hook_with_args P_ ((int, Lisp_Object *,
                                            enum run_hooks_condition));
 
 DEFUN ("run-hooks", Frun_hooks, Srun_hooks, 0, MANY, 0,
-       doc: /* Run each hook in HOOKS.  Major mode functions use this.
+       doc: /* Run each hook in HOOKS.
 Each argument should be a symbol, a hook variable.
 These symbols are processed in the order specified.
 If a hook symbol has a non-nil value, that value may be a function
@@ -2300,6 +2300,9 @@ or a list of functions to be called to run the hook.
 If the value is a function, it is called with no arguments.
 If it is a list, the elements are called, in order, with no arguments.
 
+Major modes should not use this function directly to run their mode
+hook; they should use `run-mode-hooks' instead.
+
 Do not use `make-local-variable' to make a hook variable buffer-local.
 Instead, use `add-hook' and specify t for the LOCAL argument.
 usage: (run-hooks &rest HOOKS)  */)
diff --git a/src/fileio.c b/src/fileio.c
index eaa2d184f1d..a31b434c1de 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1653,8 +1653,16 @@ See also the function `substitute-in-file-name'.  */)
           p += 2;
         }
       else if (IS_DIRECTORY_SEP (p[0]) && p[1] == '.' && p[2] == '.'
-               /* `/../' is the "superroot" on certain file systems.  */
+               /* `/../' is the "superroot" on certain file systems.
+                  Turned off on DOS_NT systems because they have no
+                  "superroot" and because this causes us to produce
+                  file names like "d:/../foo" which fail file-related
+                  functions of the underlying OS.  (To reproduce, try a
+                  long series of "../../" in default_directory, longer
+                  than the number of levels from the root.)  */
+#ifndef DOS_NT
                && o != target
+#endif
                && (IS_DIRECTORY_SEP (p[3]) || p[3] == 0))
         {
           while (o != target && (--o) && !IS_DIRECTORY_SEP (*o))
diff --git a/src/fns.c b/src/fns.c
index 216852f893e..bd3893f7538 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3276,7 +3276,7 @@ is nil and `use-dialog-box' is non-nil.  */)
                         Fcons (Fcons (build_string ("No"), Qnil),
                                Qnil));
           menu = Fcons (prompt, pane);
-          obj = Fx_popup_dialog (Qt, menu);
+          obj = Fx_popup_dialog (Qt, menu, Qnil);
           answer = !NILP (obj);
           break;
         }
@@ -3408,7 +3408,7 @@ is nil, and `use-dialog-box' is non-nil.  */)
                            Qnil));
       GCPRO1 (pane);
       menu = Fcons (prompt, pane);
-      obj = Fx_popup_dialog (Qt, menu);
+      obj = Fx_popup_dialog (Qt, menu, Qnil);
       UNGCPRO;
       return obj;
     }
diff --git a/src/image.c b/src/image.c
index f03adfdc48f..15e835fef3b 100644
--- a/src/image.c
+++ b/src/image.c
@@ -616,6 +616,10 @@ static struct image_type *image_types;
 
 Lisp_Object Vimage_types;
 
+/* An alist of image types and libraries that implement the type.  */
+
+Lisp_Object Vimage_library_alist;
+
 /* Cache for delayed-loading image types.  */
 
 static Lisp_Object Vimage_type_cache;
@@ -696,7 +700,7 @@ lookup_image_type (symbol)
   struct image_type *type;
 
   /* We must initialize the image-type if it hasn't been already.  */
-  if (NILP (Finit_image_library (symbol, Qnil)))
+  if (NILP (Finit_image_library (symbol, Vimage_library_alist)))
     return 0;                   /* unimplemented */
 
   for (type = image_types; type; type = type->next)
@@ -1631,11 +1635,6 @@ lookup_image (f, spec)
      Lisp_Object spec;
 {
   struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
-#ifdef _MSC_VER
-  /* Work around a problem with MinGW builds of graphics libraries
-     not honoring calling conventions.  */
-  static
-#endif
   struct image *img;
   int i;
   unsigned hash;
@@ -1815,7 +1814,7 @@ forall_images_in_image_cache (f, fn)
 #ifdef HAVE_NTGUI
 
 /* Macro for defining functions that will be loaded from image DLLs.  */
-#define DEF_IMGLIB_FN(func) FARPROC fn_##func
+#define DEF_IMGLIB_FN(func) int (FAR CDECL *fn_##func)()
 
 /* Macro for loading those image functions from the library.  */
 #define LOAD_IMGLIB_FN(lib,func) {                                      \
@@ -5744,12 +5743,6 @@ struct png_memory_storage
    PNG_PTR is a pointer to the PNG control structure.  Copy LENGTH
    bytes from the input to DATA.  */
 
-#ifdef _MSC_VER
-  /* Work around a problem with MinGW builds of graphics libraries
-     not honoring calling conventions.  */
-#pragma optimize("g", off)
-#endif
-
 static void
 png_read_from_memory (png_ptr, data, length)
      png_structp png_ptr;
@@ -5766,10 +5759,6 @@ png_read_from_memory (png_ptr, data, length)
   tbr->index = tbr->index + length;
 }
 
-#ifdef _MSC_VER
-/* Restore normal optimization, as specified on the command line.  */
-#pragma optimize("", on)
-#endif
 
 /* Load PNG image IMG for use on frame F.  Value is non-zero if
    successful.  */
@@ -8000,6 +7989,8 @@ of `image-library-alist', which see).  */)
 void
 syms_of_image ()
 {
+  extern Lisp_Object Qrisky_local_variable;   /* Syms_of_xdisp has already run.  */
+
   /* Must be defined now becase we're going to update it below, while
      defining the supported image types.  */
   DEFVAR_LISP ("image-types", &Vimage_types,
@@ -8008,6 +7999,20 @@ Each element of the list is a symbol for a image type, like 'jpeg or 'png.
 To check whether it is really supported, use `image-type-available-p'.  */);
   Vimage_types = Qnil;
 
+  DEFVAR_LISP ("image-library-alist", &Vimage_library_alist,
+    doc: /* Alist of image types vs external libraries needed to display them.
+
+Each element is a list (IMAGE-TYPE LIBRARY...), where the car is a symbol
+representing a supported image type, and the rest are strings giving
+alternate filenames for the corresponding external libraries.
+
+Emacs tries to load the libraries in the order they appear on the
+list; if none is loaded, the running session of Emacs won't
+support the image type.  Types 'pbm and 'xbm don't need to be
+listed; they're always supported.  */);
+  Vimage_library_alist = Qnil;
+  Fput (intern ("image-library-alist"), Qrisky_local_variable, Qt);
+
   Vimage_type_cache = Qnil;
   staticpro (&Vimage_type_cache);
 
diff --git a/src/keyboard.c b/src/keyboard.c
index 490593750d3..2ccf444964b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1009,7 +1009,7 @@ DEFUN ("recursive-edit", Frecursive_edit, Srecursive_edit, 0, 0, "",
        doc: /* Invoke the editor command loop recursively.
 To get out of the recursive edit, a command can do `(throw 'exit nil)';
 that tells this function to return.
-Alternately, `(throw 'exit t)' makes this function signal an error.
+Alternatively, `(throw 'exit t)' makes this function signal an error.
 This function is called by the editor initialization to begin editing.  */)
      ()
 {
@@ -10677,7 +10677,7 @@ The elements of this list correspond to the arguments of
 DEFUN ("posn-at-x-y", Fposn_at_x_y, Sposn_at_x_y, 2, 4, 0,
        doc: /* Return position information for pixel coordinates X and Y.
 By default, X and Y are relative to text area of the selected window.
-Optional third arg FRAME_OR_WINDOW non-nil specifies frame or window.
+Optional third arg FRAME-OR-WINDOW non-nil specifies frame or window.
 If optional fourth arg WHOLE is non-nil, X is relative to the left
 edge of the window.
 
@@ -10983,7 +10983,7 @@ syms_of_keyboard ()
   staticpro (&Qdrag_n_drop);
 
   Qsave_session = intern ("save-session");
-  staticpro(&Qsave_session);
+  staticpro (&Qsave_session);
 
   Qusr1_signal = intern ("usr1-signal");
   staticpro (&Qusr1_signal);
diff --git a/src/lisp.h b/src/lisp.h
index 58923377f2b..2e356985cdb 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3099,7 +3099,7 @@ extern Lisp_Object next_single_char_property_change P_ ((Lisp_Object,
 
 /* defined in xmenu.c */
 EXFUN (Fx_popup_menu, 2);
-EXFUN (Fx_popup_dialog, 2);
+EXFUN (Fx_popup_dialog, 3);
 extern void syms_of_xmenu P_ ((void));
 
 /* defined in termchar.h */
diff --git a/src/macmenu.c b/src/macmenu.c
index eb870176f12..54393bca594 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -823,7 +823,7 @@ cached information about equivalent key sequences.  */)
 
 #ifdef HAVE_MENUS
 
-DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 2, 0,
+DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
        doc: /* Pop up a dialog box and return user's selection.
 POSITION specifies which frame to use.
 This is normally a mouse button event or a window or frame.
@@ -838,9 +838,12 @@ The return value is VALUE from the chosen item.
 An ITEM may also be just a string--that makes a nonselectable item.
 An ITEM may also be nil--that means to put all preceding items
 on the left of the dialog box and all following items on the right.
-\(By default, approximately half appear on each side.)  */)
-  (position, contents)
-     Lisp_Object position, contents;
+\(By default, approximately half appear on each side.)
+
+If HEADER is non-nil, the frame title for the box is "Information",
+otherwise it is "Question". */)
+  (position, contents, header)
+     Lisp_Object position, contents, header;
 {
   FRAME_PTR f = NULL;
   Lisp_Object window;
@@ -927,7 +930,7 @@ on the left of the dialog box and all following items on the right.
 
     /* Display them in a dialog box.  */
     BLOCK_INPUT;
-    selection = mac_dialog_show (f, 0, title, &error_name);
+    selection = mac_dialog_show (f, 0, title, header, &error_name);
     UNBLOCK_INPUT;
 
     discard_menu_items ();
@@ -2046,10 +2049,10 @@ static char * button_names [] = {
   "button6", "button7", "button8", "button9", "button10" };
 
 static Lisp_Object
-mac_dialog_show (f, keymaps, title, error)
+mac_dialog_show (f, keymaps, title, header, error)
      FRAME_PTR f;
      int keymaps;
-     Lisp_Object title;
+     Lisp_Object title, header;
      char **error;
 {
   int i, nb_buttons=0;
@@ -2152,11 +2155,17 @@ mac_dialog_show (f, keymaps, title, error)
     wv->name = dialog_name;
     wv->help = Qnil;
 
+    /*  Frame title: 'Q' = Question, 'I' = Information.
+        Can also have 'E' = Error if, one day, we want
+        a popup for errors. */
+    if (NILP(header))
+      dialog_name[0] = 'Q';
+    else
+      dialog_name[0] = 'I';
+
     /* Dialog boxes use a really stupid name encoding
        which specifies how many buttons to use
-       and how many buttons are on the right.
-       The Q means something also.  */
-    dialog_name[0] = 'Q';
+       and how many buttons are on the right. */
     dialog_name[1] = '0' + nb_buttons;
     dialog_name[2] = 'B';
     dialog_name[3] = 'R';
diff --git a/src/process.c b/src/process.c
index a557ee30c27..41e46c53dc9 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5134,6 +5134,7 @@ send_process (proc, buf, len, object)
   int rv;
   struct coding_system *coding;
   struct gcpro gcpro1;
+  SIGTYPE (*volatile old_sigpipe) ();
 
   GCPRO1 (object);
 
@@ -5258,7 +5259,6 @@ send_process (proc, buf, len, object)
       while (len > 0)
         {
           int this = len;
-          SIGTYPE (*old_sigpipe)();
 
           /* Decide how much data we can send in one batch.
              Long lines need to be split into multiple batches.  */
@@ -5401,6 +5401,7 @@ send_process (proc, buf, len, object)
 #endif /* not VMS */
   else
     {
+      signal (SIGPIPE, old_sigpipe);
 #ifndef VMS
       proc = process_sent_to;
       p = XPROCESS (proc);
diff --git a/src/termcap.c b/src/termcap.c
index a1c068e0964..aa30aaa0615 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -458,6 +458,7 @@ static int name_match ();
 #include <rmsdef.h>
 #include <fab.h>
 #include <nam.h>
+#include <starlet.h>
 
 static int
 valid_filename_p (fn)
diff --git a/src/w32menu.c b/src/w32menu.c
index 4553895d829..8a90eae7ec7 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -845,7 +845,7 @@ cached information about equivalent key sequences.  */)
 
 #ifdef HAVE_MENUS
 
-DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 2, 0,
+DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
        doc: /* Pop up a dialog box and return user's selection.
 POSITION specifies which frame to use.
 This is normally a mouse button event or a window or frame.
@@ -860,9 +860,12 @@ The return value is VALUE from the chosen item.
 An ITEM may also be just a string--that makes a nonselectable item.
 An ITEM may also be nil--that means to put all preceding items
 on the left of the dialog box and all following items on the right.
-\(By default, approximately half appear on each side.)  */)
-  (position, contents)
-     Lisp_Object position, contents;
+\(By default, approximately half appear on each side.)
+
+If HEADER is non-nil, the frame title for the box is "Information",
+otherwise it is "Question". */)
+  (position, contents, header)
+     Lisp_Object position, contents, header;
 {
   FRAME_PTR f = NULL;
   Lisp_Object window;
@@ -949,7 +952,7 @@ on the left of the dialog box and all following items on the right.
 
     /* Display them in a dialog box.  */
     BLOCK_INPUT;
-    selection = w32_dialog_show (f, 0, title, &error_name);
+    selection = w32_dialog_show (f, 0, title, header, &error_name);
     UNBLOCK_INPUT;
 
     discard_menu_items ();
@@ -1995,10 +1998,10 @@ static char * button_names [] = {
   "button6", "button7", "button8", "button9", "button10" };
 
 static Lisp_Object
-w32_dialog_show (f, keymaps, title, error)
+w32_dialog_show (f, keymaps, title, header, error)
      FRAME_PTR f;
      int keymaps;
-     Lisp_Object title;
+     Lisp_Object title, header;
      char **error;
 {
   int i, nb_buttons=0;
@@ -2099,11 +2102,17 @@ w32_dialog_show (f, keymaps, title, error)
     wv->name = dialog_name;
     wv->help = Qnil;
 
+    /*  Frame title: 'Q' = Question, 'I' = Information.
+        Can also have 'E' = Error if, one day, we want
+        a popup for errors. */
+    if (NILP(header))
+      dialog_name[0] = 'Q';
+    else
+      dialog_name[0] = 'I';
+
     /* Dialog boxes use a really stupid name encoding
        which specifies how many buttons to use
-       and how many buttons are on the right.
-       The Q means something also.  */
-    dialog_name[0] = 'Q';
+       and how many buttons are on the right. */
     dialog_name[1] = '0' + nb_buttons;
     dialog_name[2] = 'B';
     dialog_name[3] = 'R';
diff --git a/src/window.c b/src/window.c
index 67cbd73bc50..83d99cf67ba 100644
--- a/src/window.c
+++ b/src/window.c
@@ -546,7 +546,7 @@ display margins, fringes, header line, and/or mode line.  */)
                              + WINDOW_LEFT_FRINGE_COLS (w)),
                 make_number (WINDOW_TOP_EDGE_LINE (w)
                              + WINDOW_HEADER_LINE_LINES (w)),
-                make_number (WINDOW_RIGHT_EDGE_COL (w)
+                make_number (WINDOW_BOX_RIGHT_EDGE_COL (w)
                              - WINDOW_RIGHT_MARGIN_COLS (w)
                              - WINDOW_RIGHT_FRINGE_COLS (w)),
                 make_number (WINDOW_BOTTOM_EDGE_LINE (w)
@@ -570,7 +570,7 @@ display margins, fringes, header line, and/or mode line.  */)
                              + WINDOW_LEFT_FRINGE_WIDTH (w)),
                 make_number (WINDOW_TOP_EDGE_Y (w)
                              + WINDOW_HEADER_LINE_HEIGHT (w)),
-                make_number (WINDOW_RIGHT_EDGE_X (w)
+                make_number (WINDOW_BOX_RIGHT_EDGE_X (w)
                              - WINDOW_RIGHT_MARGIN_WIDTH (w)
                              - WINDOW_RIGHT_FRINGE_WIDTH (w)),
                 make_number (WINDOW_BOTTOM_EDGE_Y (w)
diff --git a/src/xdisp.c b/src/xdisp.c
index 6bde1970bf3..fe2d2e7020a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16041,7 +16041,12 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
                    && --limit > 0
                    && (precision <= 0 || n < precision))
               {
-                n += display_mode_element (it, depth, field_width - n,
+                n += display_mode_element (it, depth,
+                                           /* Do padding only after the last
+                                              element in the list.  */
+                                           (! CONSP (XCDR (elt))
+                                            ? field_width - n
+                                            : 0),
                                            precision - n, XCAR (elt),
                                            props, risky);
                 elt = XCDR (elt);
@@ -21238,11 +21243,12 @@ define_frame_cursor1 (f, cursor, pointer)
    position relative to the start of the mode line.  */
 
 static void
-note_mode_line_or_margin_highlight (w, x, y, area)
-     struct window *w;
+note_mode_line_or_margin_highlight (window, x, y, area)
+     Lisp_Object window;
      int x, y;
      enum window_part area;
 {
+  struct window *w = XWINDOW (window);
   struct frame *f = XFRAME (w->frame);
   Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
   Cursor cursor = FRAME_X_OUTPUT (f)->nontext_cursor;
@@ -21251,9 +21257,38 @@ note_mode_line_or_margin_highlight (w, x, y, area)
   Lisp_Object string, object = Qnil;
   Lisp_Object pos, help;
 
+  Lisp_Object mouse_face;
+  int original_x_pixel = x;
+  struct glyph * glyph = NULL;
+  struct glyph_row *row;
+
   if (area == ON_MODE_LINE || area == ON_HEADER_LINE)
-    string = mode_line_string (w, area, &x, &y, &charpos,
-                               &object, &dx, &dy, &width, &height);
+    {
+      int x0;
+      struct glyph *end;
+
+      string = mode_line_string (w, area, &x, &y, &charpos,
+                                 &object, &dx, &dy, &width, &height);
+
+      row = (area == ON_MODE_LINE
+             ? MATRIX_MODE_LINE_ROW (w->current_matrix)
+             : MATRIX_HEADER_LINE_ROW (w->current_matrix));
+
+      /* Find glyph */
+      if (row->mode_line_p && row->enabled_p)
+        {
+          glyph = row->glyphs[TEXT_AREA];
+          end = glyph + row->used[TEXT_AREA];
+
+          for (x0 = original_x_pixel;
+               glyph < end && x0 >= glyph->pixel_width;
+               ++glyph)
+            x0 -= glyph->pixel_width;
+
+          if (glyph >= end)
+            glyph = NULL;
+        }
+    }
   else
     {
       x -= WINDOW_LEFT_SCROLL_BAR_AREA_WIDTH (w);
@@ -21331,6 +21366,94 @@ note_mode_line_or_margin_highlight (w, x, y, area)
           if (!KEYMAPP (map))
             cursor = dpyinfo->vertical_scroll_bar_cursor;
         }
+
+     /* Change the mouse face according to what is under X/Y.  */
+      mouse_face = Fget_text_property (pos, Qmouse_face, string);
+      if (!NILP (mouse_face)
+          && ((area == ON_MODE_LINE) || (area == ON_HEADER_LINE))
+          && glyph)
+        {
+          Lisp_Object b, e;
+
+          struct glyph * tmp_glyph;
+
+          int gpos;
+          int gseq_length;
+          int total_pixel_width;
+          int ignore;
+
+
+          if (clear_mouse_face (dpyinfo))
+            cursor = No_Cursor;
+
+          b = Fprevious_single_property_change (make_number (charpos + 1),
+                                                Qmouse_face, string, Qnil);
+          if (NILP (b))
+            b = make_number (0);
+
+          e = Fnext_single_property_change (pos, Qmouse_face, string, Qnil);
+          if (NILP (e))
+            e = make_number (SCHARS (string));
+
+          /* Calculate the position(glyph position: GPOS) of GLYPH in
+             displayed string. GPOS is different from CHARPOS.
+
+             CHARPOS is the position of glyph in internal string
+             object. A mode line string format has structures which
+             is converted to a flatten by emacs lisp interpreter.
+             The internal string is an element of the structures.
+             The displayed string is the flatten string. */
+          for (tmp_glyph = glyph - 1, gpos = 0;
+               tmp_glyph->charpos >= XINT (b);
+               tmp_glyph--, gpos++)
+            {
+              if (tmp_glyph->object != glyph->object)
+                break;
+            }
+
+          /* Calculate the lenght(glyph sequence length: GSEQ_LENGTH) of
+             displayed string holding GLYPH.
+
+             GSEQ_LENGTH is different from SCHARS (STRING).
+             SCHARS (STRING) returns the length of the internal string. */
+          for (tmp_glyph = glyph, gseq_length = gpos;
+               tmp_glyph->charpos < XINT (e);
+               tmp_glyph++, gseq_length++)
+              {
+                if (tmp_glyph->object != glyph->object)
+                  break;
+              }
+
+          total_pixel_width = 0;
+          for (tmp_glyph = glyph - gpos; tmp_glyph != glyph; tmp_glyph++)
+            total_pixel_width += tmp_glyph->pixel_width;
+
+          dpyinfo->mouse_face_beg_col = (x - gpos);
+          dpyinfo->mouse_face_beg_row = (area == ON_MODE_LINE
+                                         ? (w->current_matrix)->nrows - 1
+                                         : 0);
+
+          dpyinfo->mouse_face_beg_x   = original_x_pixel - (total_pixel_width + dx);
+          dpyinfo->mouse_face_beg_y   = 0;
+
+          dpyinfo->mouse_face_end_col = (x - gpos) + gseq_length;
+          dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_beg_row;
+
+          dpyinfo->mouse_face_end_x   = 0;
+          dpyinfo->mouse_face_end_y   = 0;
+
+          dpyinfo->mouse_face_past_end = 0;
+          dpyinfo->mouse_face_window  = window;
+
+          dpyinfo->mouse_face_face_id = face_at_string_position (w, string,
+                                                                 charpos,
+                                                                 0, 0, 0, &ignore,
+                                                                 glyph->face_id, 1);
+          show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
+
+          if (NILP (pointer))
+            pointer = Qhand;
+        }
     }
 
   define_frame_cursor1 (f, cursor, pointer);
@@ -21411,7 +21534,7 @@ note_mouse_highlight (f, x, y)
   if (part == ON_MODE_LINE || part == ON_HEADER_LINE
       || part == ON_LEFT_MARGIN || part == ON_RIGHT_MARGIN)
     {
-      note_mode_line_or_margin_highlight (w, x, y, part);
+      note_mode_line_or_margin_highlight (window, x, y, part);
       return;
     }
 
@@ -21671,6 +21794,7 @@ note_mouse_highlight (f, x, y)
                 b = make_number (0);
               if (NILP (e))
                 e = make_number (SCHARS (object) - 1);
+
               fast_find_string_pos (w, XINT (b), object,
                                     &dpyinfo->mouse_face_beg_col,
                                     &dpyinfo->mouse_face_beg_row,
diff --git a/src/xmenu.c b/src/xmenu.c
index 931d2a87904..6e46accbe8d 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -116,7 +116,8 @@ extern Lisp_Object Qmenu_bar_update_hook;
 extern void set_frame_menubar P_ ((FRAME_PTR, int, int));
 extern XtAppContext Xt_app_con;
 
-static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **));
+static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, Lisp_Object,
+                                     char **));
 static void popup_get_selection P_ ((XEvent *, struct x_display_info *,
                                      LWLIB_ID, int));
 
@@ -129,7 +130,8 @@ static void popup_get_selection P_ ((XEvent *, struct x_display_info *,
 #include "gtkutil.h"
 #define HAVE_BOXES 1
 extern void set_frame_menubar P_ ((FRAME_PTR, int, int));
-static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **));
+static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, Lisp_Object,
+                                     char **));
 #endif
 
 /* This is how to deal with multibyte text if HAVE_MULTILINGUAL_MENU
@@ -999,7 +1001,7 @@ no quit occurs and `x-popup-menu' returns nil.  */)
 
 #ifdef HAVE_MENUS
 
-DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 2, 0,
+DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
        doc: /* Pop up a dialog box and return user's selection.
 POSITION specifies which frame to use.
 This is normally a mouse button event or a window or frame.
@@ -1007,7 +1009,7 @@ If POSITION is t, it means to use the frame the mouse is on.
 The dialog box appears in the middle of the specified frame.
 
 CONTENTS specifies the alternatives to display in the dialog box.
-It is a list of the form (TITLE ITEM1 ITEM2...).
+It is a list of the form (DIALOG ITEM1 ITEM2...).
 Each ITEM is a cons cell (STRING . VALUE).
 The return value is VALUE from the chosen item.
 
@@ -1016,11 +1018,14 @@ An ITEM may also be nil--that means to put all preceding items
 on the left of the dialog box and all following items on the right.
 \(By default, approximately half appear on each side.)
 
+If HEADER is non-nil, the frame title for the box is "Information",
+otherwise it is "Question".
+
 If the user gets rid of the dialog box without making a valid choice,
 for instance using the window manager, then this produces a quit and
 `x-popup-dialog' does not return.  */)
-     (position, contents)
-     Lisp_Object position, contents;
+     (position, contents, header)
+     Lisp_Object position, contents, header;
 {
   FRAME_PTR f = NULL;
   Lisp_Object window;
@@ -1115,7 +1120,7 @@ for instance using the window manager, then this produces a quit and
 
     /* Display them in a dialog box.  */
     BLOCK_INPUT;
-    selection = xdialog_show (f, 0, title, &error_name);
+    selection = xdialog_show (f, 0, title, header, &error_name);
     UNBLOCK_INPUT;
 
     unbind_to (specpdl_count, Qnil);
@@ -3020,11 +3025,11 @@ static char * button_names [] = {
   "button6", "button7", "button8", "button9", "button10" };
 
 static Lisp_Object
-xdialog_show (f, keymaps, title, error)
+xdialog_show (f, keymaps, title, header, error_name)
      FRAME_PTR f;
      int keymaps;
-     Lisp_Object title;
-     char **error;
+     Lisp_Object title, header;
+     char **error_name;
 {
   int i, nb_buttons=0;
   char dialog_name[6];
@@ -3036,11 +3041,11 @@ xdialog_show (f, keymaps, title, error)
   /* 1 means we've seen the boundary between left-hand elts and right-hand.  */
   int boundary_seen = 0;
 
-  *error = NULL;
+  *error_name = NULL;
 
   if (menu_items_n_panes > 1)
     {
-      *error = "Multiple panes in dialog box";
+      *error_name = "Multiple panes in dialog box";
       return Qnil;
     }
 
@@ -3077,7 +3082,7 @@ xdialog_show (f, keymaps, title, error)
         if (NILP (item_name))
           {
             free_menubar_widget_value_tree (first_wv);
-            *error = "Submenu in dialog items";
+            *error_name = "Submenu in dialog items";
             return Qnil;
           }
         if (EQ (item_name, Qquote))
@@ -3091,7 +3096,7 @@ xdialog_show (f, keymaps, title, error)
         if (nb_buttons >= 9)
           {
             free_menubar_widget_value_tree (first_wv);
-            *error = "Too many dialog items";
+            *error_name = "Too many dialog items";
             return Qnil;
           }
 
@@ -3121,11 +3126,18 @@ xdialog_show (f, keymaps, title, error)
     wv = xmalloc_widget_value ();
     wv->name = dialog_name;
     wv->help = Qnil;
+
+    /*  Frame title: 'Q' = Question, 'I' = Information.
+        Can also have 'E' = Error if, one day, we want
+        a popup for errors. */
+    if (NILP(header))
+      dialog_name[0] = 'Q';
+    else
+      dialog_name[0] = 'I';
+
     /* Dialog boxes use a really stupid name encoding
        which specifies how many buttons to use
-       and how many buttons are on the right.
-       The Q means something also.  */
-    dialog_name[0] = 'Q';
+       and how many buttons are on the right. */
     dialog_name[1] = '0' + nb_buttons;
     dialog_name[2] = 'B';
     dialog_name[3] = 'R';
diff --git a/src/xterm.c b/src/xterm.c
index aa5f9829105..c24802bab6b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -915,6 +915,7 @@ x_encode_char (c, char2b, font_info, two_byte_p)
       /* It's a program.  */
       struct ccl_program *ccl = font_info->font_encoder;
 
+      check_ccl_update (ccl);
       if (CHARSET_DIMENSION (charset) == 1)
         {
           ccl->reg[0] = charset;