Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-55

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 320-323)

   - Update from CVS

14 files changed, 279 insertions, 69 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 10d3bd31bda..c2cd2dde5f7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,70 @@
+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): Added code
+        for mouse-face. Change the type of the first argument from `window'
+        to `List_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 1eeea72ea7e..a491185a4ed 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1684,7 +1684,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/editfns.c b/src/editfns.c
index df43937d13a..5c6c459bf9d 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3307,7 +3307,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/fileio.c b/src/fileio.c
index 58912a7cb8c..4a22cc0a59e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1655,8 +1655,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 4562eaff02e..ec3c7a7281c 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2629,7 +2629,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;
         }
@@ -2761,7 +2761,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..b61b07876d3 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1631,11 +1631,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 +1810,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 +5739,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 +5755,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.  */
diff --git a/src/lisp.h b/src/lisp.h
index 20270bc357e..fa08ab07dce 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3136,7 +3136,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 sysdep.c */
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 84d373ff37b..34966d35160 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5139,6 +5139,7 @@ send_process (proc, buf, len, object)
   int rv;
   struct coding_system *coding;
   struct gcpro gcpro1;
+  SIGTYPE (*volatile old_sigpipe) ();
 
   GCPRO1 (object);
 
@@ -5256,7 +5257,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.  */
@@ -5399,6 +5399,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 454d712726c..35aeb4411ae 100644
--- a/src/window.c
+++ b/src/window.c
@@ -544,7 +544,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)
@@ -568,7 +568,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 2284c34d3bd..2781d4a1d2c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16134,7 +16134,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);
@@ -21378,11 +21383,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;
@@ -21391,9 +21397,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);
@@ -21471,6 +21506,91 @@ 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);
+        }
     }
 
   define_frame_cursor1 (f, cursor, pointer);
@@ -21551,7 +21671,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;
     }
 
@@ -21811,6 +21931,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 1ecddf211b4..9103d32e1c9 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';