Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362
   Support " [...]" style defaults in minibuffer-electric-default-mode

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363
   (read-number): Use canonical format for default in prompt.

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

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


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

1 files changed, 23 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4be50d1108d..fd108641f22 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2004-06-03  Juanma Barranquero  <lektu@terra.es>
+
+        * w32fns.c (Fx_display_grayscale_p, Fw32_send_sys_command)
+        (Vw32_color_map): Fix typo in docstring.
+        (Fx_create_frame, Fw32_find_bdf_fonts, Fx_show_tip)
+        (Fw32_unregister_hot_key, Fw32_reconstruct_hot_key):
+        Make argument names match their use in docstring.
+
+2004-06-02  Juanma Barranquero  <lektu@terra.es>
+
+        Work around bugs/problems with MinGW builds of graphics libraries
+        called from MSVC builds of Emacs.
+
+        * image.c (lookup_image): Make pointer to img static.
+        (png_read_from_memory): Disable "global" optimization.
+
+2004-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mem-limits.h (EXCEEDS_LISP_PTR) [USE_LSB_TAG]: Never true.
+
 2004-05-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macfns.c: Don't include ccl.h.
@@ -13,7 +33,7 @@
         (x_create_tip_frame, Fx_show_tip, Fx_hide_tip): Sync with xfns.c.
         (syms_of_macfns): Initialize Qcancel_timer, Vx_max_tooltip_size,
         and last_show_tip_args.
-        
+
         * macgui.h [!MAC_OSX]: Include Gestalt.h.
         (Cursor, No_Cursor): New defines.
         [!TARGET_API_MAC_CARBON] (SetPortWindowPort): New compatibility
@@ -2012,7 +2032,7 @@
         completion-regexp-list.  Define Qcase_fold_search and staticpro it.
         (read_minibuf): Fix initial comment.
         (Ftry_completion, Fall_completions, Ftest_completion): Bind
-        case-fold-serach to the value of completion-ignore-case when
+        case-fold-search to the value of completion-ignore-case when
         checking completion-regexp-list.
         (Fdisplay_completion_list): Make it handle arguments that are
         symbols.  Doc fix.
@@ -8620,7 +8640,7 @@
 
 2002-08-19  Kim F. Storm  <storm@cua.dk>
 
-        * keyboard.c (Fclear_this_command_keys): Added optional arg
+        * keyboard.c (Fclear_this_command_keys): Add optional arg
         KEEP-RECORD to avoid clearing lossage when we just want to clear
         the current key sequence (kmacro needs this).