# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1119513252 0
# Node ID 8166221bcd71c035c712ce2e517cee492eabffed
# Parent  c95dbbf82d1952400e55cfb0ef6982ff100de66c
*** empty log message ***

diff -r c95dbbf82d19 -r 8166221bcd71 lispref/ChangeLog
--- a/lispref/ChangeLog	Thu Jun 23 07:48:13 2005 +0000
+++ b/lispref/ChangeLog	Thu Jun 23 07:54:12 2005 +0000
@@ -1,3 +1,7 @@
+2005-06-23  Juanma Barranquero  <lekktu@gmail.com>
+
+	* markers.texi (The Mark): Texinfo usage fix.
+
 2005-06-23  Kim F. Storm  <storm@cua.dk>
 
 	* searching.texi (Entire Match Data): Remove evaporate option for
diff -r c95dbbf82d19 -r 8166221bcd71 src/ChangeLog
--- a/src/ChangeLog	Thu Jun 23 07:48:13 2005 +0000
+++ b/src/ChangeLog	Thu Jun 23 07:54:12 2005 +0000
@@ -1,3 +1,10 @@
+2005-06-23  Juanma Barranquero  <lekktu@gmail.com>
+
+	* image.c (fn_png_init_io): Don't define it.
+	(init_png_functions) [HAVE_NTGUI]: Don't initialize fn_png_init_io.
+	(png_read_from_file): New function, based on png_read_from_memory.
+	(png_load): Use it, instead of fn_png_init_io.
+
 2005-06-23  Kim F. Storm  <storm@cua.dk>
 
 	* search.c (Fmatch_data): Remove evaporate option.
@@ -2806,7 +2813,7 @@
 
 	* xdisp.c (expose_window, expose_frame): Remove kludges for Mac.
 
-	* xfaces.c (clear_font_table) [MAC_OS]: call mac_unload_font.
+	* xfaces.c (clear_font_table) [MAC_OS]: Call mac_unload_font.
 
 2004-12-27  Richard M. Stallman  <rms@gnu.org>
 
@@ -2845,7 +2852,7 @@
 	(xmenu_show): In no toolkit version, if menu returns NO_SELECT call
 	Fsignal to quit.
 
-	* xfns.c (Fx_file_dialog): Motif/Lesstif version:  Pop down on C-g.
+	* xfns.c (Fx_file_dialog): Motif/Lesstif version: Pop down on C-g.
 
 	* gtkutil.c (xg_initialize): Install bindings for C-g so that
 	dialogs and menus pop down.
@@ -3631,7 +3638,7 @@
 2004-11-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* xmenu.c (x_menu_wait_for_event): New function.
-	(popup_get_selection, popup_widget_loop):  Call x_menu_wait_for_event
+	(popup_get_selection, popup_widget_loop): Call x_menu_wait_for_event
 	to handle timers.
 	(popup_widget_loop): Add argument do_timers.
 	(create_and_show_popup_menu, create_and_show_dialog): Pass 1 for
@@ -4009,7 +4016,7 @@
 
 2004-10-28  Will  <will@glozer.net>
 
-	* macterm.c: allow user to assign key modifiers to the Mac Option
+	* macterm.c: Allow user to assign key modifiers to the Mac Option
 	key via a 'mac-option-modifier' variable.
 
 2004-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -4871,7 +4878,7 @@
 
 	* keymap.c (Fset_keymap_parent, Fdefine_prefix_command): Doc fixes.
 
-	* keyboard.c (syms_of_keyboard) <disable-point-adjustment>:  Doc fix.
+	* keyboard.c (syms_of_keyboard) <disable-point-adjustment>: Doc fix.
 
 	* callint.c (Fcall_interactively): Doc fix.
 
@@ -8198,7 +8205,7 @@
 	* fileio.c (Fread_file_name): Check use_file_dialog also before
 	calling Fx_file_dialog.
 
-	* fns.c: use_file_dialog: New variable.
+	* fns.c (use_file_dialog): New variable.
 	(syms_of_fns): DEFVAR_BOOL use-file-dialog.
 
 2003-11-29  Kim F. Storm  <storm@cua.dk>
@@ -11644,7 +11651,7 @@
 	for USE_GTK.
 	(x_scroll_bar_handle_click): Use this function for toolkit scrollbars
 	also.
-	(handle_one_xevent): ButtonPress/Release:  If event is for a toolkit
+	(handle_one_xevent): ButtonPress/Release: If event is for a toolkit
 	scrollbar and control is pressed, call x_scroll_bar_handle_click.
 
 	* gtkutil.h (xg_get_scroll_id_for_window): Declare.