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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 562-568)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 125-128)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

12 files changed, 80 insertions, 39 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4012f446f99..cd25ba97e90 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,46 @@
+2005-09-29  Juri Linkov  <juri@jurta.org>
+
+        * editfns.c (Fmessage, Fmessage_box, Fmessage_or_box):
+        Rename argument name `string' to `format-string'.
+        (Fformat): Doc fix.
+
+2005-09-28  Kim F. Storm  <storm@cua.dk>
+
+        * image.c (gif_load): Fix size of allocated image buffer
+        for images where a sub-image may be larger than the image's
+        total height/width specifications.
+
+2005-09-28  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macgui.h (struct _XCharStruct): Each member now takes short value.
+
+2005-09-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * xfaces.c (lookup_derived_face): Add parameter type.
+
+        * xdisp.c (cursor_row_fully_visible_p): Add parameter type.
+
+        * marker.c (verify_bytepos): Add parameter type.
+
+        * process.c (get_operating_system_release): Move prototype ...
+
+        * systime.h (get_operating_system_release): ... here.
+
+        * xterm.c (set_vertical_scroll_bar): Move prototype ...
+        (handle_one_xevent): Refer to union field to match the type
+        required by the function definition.
+
+        * xterm.h: ... here.
+
+        * fns.c (internal_equal, seed_random): Fix prototypes.
+        (internal_equal): Add missing parameter.
+
+2005-09-25  Richard M. Stallman  <rms@gnu.org>
+
+        * keyboard.c (update_menu_bindings): Variable deleted.
+        (syms_of_keyboard): Don't defvar it.
+        (parse_menu_item): Don't test it.
+
 2005-09-23  Richard M. Stallman  <rms@gnu.org>
 
         * editfns.c (Fformat): Explicitly test for end of format string
@@ -9,7 +52,7 @@
         BROKEN_GET_CURRENT_DIR_NAME.
 
         * sysdep.c (get_current_dir_name): Also define if
-        BROKEN_GET_CURRENT_DIR_NAME. 
+        BROKEN_GET_CURRENT_DIR_NAME.
 
         * m/ibmrs6000.h: Test for USG5, not USG5_4.
 
diff --git a/src/editfns.c b/src/editfns.c
index 98828352375..2fa6ffcca5c 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3256,7 +3256,7 @@ If the first argument is nil or the empty string, the function clears
 any existing message; this lets the minibuffer contents show.  See
 also `current-message'.
 
-usage: (message STRING &rest ARGS)  */)
+usage: (message FORMAT-STRING &rest ARGS)  */)
      (nargs, args)
      int nargs;
      Lisp_Object *args;
@@ -3286,7 +3286,7 @@ to be formatted under control of the string.  See `format' for details.
 If the first argument is nil or the empty string, clear any existing
 message; let the minibuffer contents show.
 
-usage: (message-box STRING &rest ARGS)  */)
+usage: (message-box FORMAT-STRING &rest ARGS)  */)
      (nargs, args)
      int nargs;
      Lisp_Object *args;
@@ -3348,7 +3348,7 @@ to be formatted under control of the string.  See `format' for details.
 If the first argument is nil or the empty string, clear any existing
 message; let the minibuffer contents show.
 
-usage: (message-or-box STRING &rest ARGS)  */)
+usage: (message-or-box FORMAT-STRING &rest ARGS)  */)
      (nargs, args)
      int nargs;
      Lisp_Object *args;
@@ -3413,8 +3413,8 @@ usage: (propertize STRING &rest PROPERTIES)  */)
    : SBYTES (STRING))
 
 DEFUN ("format", Fformat, Sformat, 1, MANY, 0,
-       doc: /* Format a string out of a control-string and arguments.
-The first argument is a control string.
+       doc: /* Format a string out of a format-string and arguments.
+The first argument is a format control string.
 The other arguments are substituted into it to make the result, a string.
 It may contain %-sequences meaning to substitute the next argument.
 %s means print a string argument.  Actually, prints any object, with `princ'.
diff --git a/src/fns.c b/src/fns.c
index 12474dc87a4..b21af2b22f2 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -77,10 +77,10 @@ Lisp_Object Qcodeset, Qdays, Qmonths, Qpaper;
 
 extern Lisp_Object Qinput_method_function;
 
-static int internal_equal ();
+static int internal_equal P_ ((Lisp_Object , Lisp_Object, int, int));
 
 extern long get_random ();
-extern void seed_random ();
+extern void seed_random P_ ((long));
 
 #ifndef HAVE_UNISTD_H
 extern long time ();
@@ -2169,7 +2169,7 @@ internal_equal (o1, o2, depth, props)
           if (!internal_equal (OVERLAY_START (o1), OVERLAY_START (o2),
                                depth + 1, props)
               || !internal_equal (OVERLAY_END (o1), OVERLAY_END (o2),
-                                  depth + 1))
+                                  depth + 1, props))
             return 0;
           o1 = XOVERLAY (o1)->plist;
           o2 = XOVERLAY (o2)->plist;
diff --git a/src/image.c b/src/image.c
index 6ec0734e785..bdc78c2d718 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7369,8 +7369,17 @@ gif_load (f, img)
       return 0;
     }
 
-  width = img->width = max (gif->SWidth, gif->Image.Left + gif->Image.Width);
-  height = img->height = max (gif->SHeight, gif->Image.Top + gif->Image.Height);
+  image_top = gif->SavedImages[ino].ImageDesc.Top;
+  image_left = gif->SavedImages[ino].ImageDesc.Left;
+  image_width = gif->SavedImages[ino].ImageDesc.Width;
+  image_height = gif->SavedImages[ino].ImageDesc.Height;
+
+  width = img->width = max (gif->SWidth,
+                            max (gif->Image.Left + gif->Image.Width,
+                                 image_left + image_width));
+  height = img->height = max (gif->SHeight,
+                              max (gif->Image.Top + gif->Image.Height,
+                                   image_top + image_height));
 
   /* Create the X image and pixmap.  */
   if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
@@ -7405,11 +7414,6 @@ gif_load (f, img)
      requires more than can be done here (see the gif89 spec,
      disposal methods).  Let's simply assume that the part
      not covered by a sub-image is in the frame's background color.  */
-  image_top = gif->SavedImages[ino].ImageDesc.Top;
-  image_left = gif->SavedImages[ino].ImageDesc.Left;
-  image_width = gif->SavedImages[ino].ImageDesc.Width;
-  image_height = gif->SavedImages[ino].ImageDesc.Height;
-
   for (y = 0; y < image_top; ++y)
     for (x = 0; x < width; ++x)
       XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f));
diff --git a/src/keyboard.c b/src/keyboard.c
index 64b6b86244c..3eabf6a5a8a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -474,10 +474,6 @@ int input_pending;
 
 int meta_key;
 
-/* Non-zero means force key bindings update in parse_menu_item.  */
-
-int update_menu_bindings;
-
 extern char *pending_malloc_warning;
 
 /* Circular buffer for pre-read keyboard input.  */
@@ -7402,9 +7398,7 @@ parse_menu_item (item, notreal, inmenubar)
       else
         def = AREF (item_properties, ITEM_PROPERTY_DEF);
 
-      if (!update_menu_bindings)
-        chkcache = 0;
-      else if (NILP (XCAR (cachelist))) /* Have no saved key.  */
+      if (NILP (XCAR (cachelist))) /* Have no saved key.  */
         {
           if (newcache          /* Always check first time.  */
               /* Should we check everything when precomputing key
@@ -11407,12 +11401,6 @@ suppressed only after special commands that set
 `disable-point-adjustment' (which see) to non-nil.  */);
   Vglobal_disable_point_adjustment = Qnil;
 
-  DEFVAR_BOOL ("update-menu-bindings", &update_menu_bindings,
-               doc: /* Non-nil means updating menu bindings is allowed.
-A value of nil means menu bindings should not be updated.
-Used during Emacs' startup.  */);
-  update_menu_bindings = 1;
-
   DEFVAR_LISP ("minibuffer-message-timeout", &Vminibuffer_message_timeout,
                doc: /* *How long to display an echo-area message when the minibuffer is active.
 If the value is not a number, such messages don't time out.  */);
diff --git a/src/macgui.h b/src/macgui.h
index 607890317e1..fc777de03ba 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -95,11 +95,14 @@ typedef GWorldPtr Pixmap;
 /* Emulate XCharStruct.  */
 typedef struct _XCharStruct
 {
-  int rbearing;
-  int lbearing;
-  int width;
-  int ascent;
-  int descent;
+  short lbearing;               /* origin to left edge of raster */
+  short rbearing;               /* origin to right edge of raster */
+  short width;                  /* advance to next char's origin */
+  short ascent;                 /* baseline to top edge of raster */
+  short descent;                /* baseline to bottom edge of raster */
+#if 0
+  unsigned short attributes;    /* per char flags (not predefined) */
+#endif
 } XCharStruct;
 
 #define STORE_XCHARSTRUCT(xcs, w, bds)                  \
diff --git a/src/marker.c b/src/marker.c
index 9b85930f357..882054b74f9 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -256,6 +256,7 @@ buf_charpos_to_bytepos (b, charpos)
 
 int
 verify_bytepos (charpos)
+     int charpos;
 {
   int below = 1;
   int below_byte = 1;
diff --git a/src/process.c b/src/process.c
index 5bab9684a7a..bebced812e8 100644
--- a/src/process.c
+++ b/src/process.c
@@ -187,7 +187,6 @@ extern Lisp_Object QCfilter;
 
 #include "syswait.h"
 
-extern void set_waiting_for_input P_ ((EMACS_TIME *));
 extern char *get_operating_system_release ();
 
 #ifndef USE_CRT_DLL
diff --git a/src/systime.h b/src/systime.h
index 12d8d406d8e..1d0022e93d7 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -154,6 +154,9 @@ extern time_t timezone;
 
 extern int set_file_times __P ((const char *, EMACS_TIME, EMACS_TIME));
 
+/* defined in keyboard.c */
+extern void set_waiting_for_input __P ((EMACS_TIME *));
+
 /* Compare times T1 and T2.  Value is 0 if T1 and T2 are the same.
    Value is < 0 if T1 is less than T2.  Value is > 0 otherwise.  */
 
diff --git a/src/xdisp.c b/src/xdisp.c
index dddea77b572..27ab728502a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11470,6 +11470,7 @@ static int
 cursor_row_fully_visible_p (w, force_p, current_matrix_p)
      struct window *w;
      int force_p;
+     int current_matrix_p;
 {
   struct glyph_matrix *matrix;
   struct glyph_row *row;
diff --git a/src/xterm.c b/src/xterm.c
index 8eead3d566c..655627abded 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4030,8 +4030,6 @@ static Boolean xaw3d_arrow_scroll;
 
 static Boolean xaw3d_pick_top;
 
-extern void set_vertical_scroll_bar P_ ((struct window *));
-
 /* Action hook installed via XtAppAddActionHook when toolkit scroll
    bars are used..  The hook is responsible for detecting when
    the user ends an interaction with the scroll bar, and generates
@@ -6759,13 +6757,13 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
                               && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0)
                             {
                               ignore_next_mouse_click_timeout = 0;
-                              construct_mouse_click (&inev.ie, &event, f);
+                              construct_mouse_click (&inev.ie, &event.xbutton, f);
                             }
                           if (event.type == ButtonRelease)
                             ignore_next_mouse_click_timeout = 0;
                         }
                       else
-                        construct_mouse_click (&inev.ie, &event, f);
+                        construct_mouse_click (&inev.ie, &event.xbutton, f);
                     }
                 }
           }
diff --git a/src/xterm.h b/src/xterm.h
index da474beef58..8f15184e09a 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1006,6 +1006,7 @@ extern XtAppContext Xt_app_con;
 extern void x_query_colors P_ ((struct frame *f, XColor *, int));
 extern void x_query_color P_ ((struct frame *f, XColor *));
 extern void x_clear_area P_ ((Display *, Window, int, int, int, int, int));
+extern void set_vertical_scroll_bar P_ ((struct window *));
 
 extern int x_dispatch_event P_ ((XEvent *, Display *));