Index: emacs/src/ChangeLog
diff -c emacs/src/ChangeLog:1.4472 emacs/src/ChangeLog:1.4473
*** emacs/src/ChangeLog:1.4472 Wed Jun 22 23:19:20 2005
--- emacs/src/ChangeLog Thu Jun 23 07:54:12 2005
***************
*** 1,3 ****
--- 1,10 ----
+ 2005-06-23 Juanma Barranquero <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* search.c (Fmatch_data): Remove evaporate option.
***************
*** 2806,2812 ****
* xdisp.c (expose_window, expose_frame): Remove kludges for Mac.
! * xfaces.c (clear_font_table) [MAC_OS]: call mac_unload_font.
2004-12-27 Richard M. Stallman <[EMAIL PROTECTED]>
--- 2813,2819 ----
* xdisp.c (expose_window, expose_frame): Remove kludges for Mac.
! * xfaces.c (clear_font_table) [MAC_OS]: Call mac_unload_font.
2004-12-27 Richard M. Stallman <[EMAIL PROTECTED]>
***************
*** 2845,2851 ****
(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.
* gtkutil.c (xg_initialize): Install bindings for C-g so that
dialogs and menus pop down.
--- 2852,2858 ----
(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.
* gtkutil.c (xg_initialize): Install bindings for C-g so that
dialogs and menus pop down.
***************
*** 3631,3637 ****
2004-11-12 Jan Dj,Ad(Brv <[EMAIL PROTECTED]>
* xmenu.c (x_menu_wait_for_event): New function.
! (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
--- 3638,3644 ----
2004-11-12 Jan Dj,Ad(Brv <[EMAIL PROTECTED]>
* xmenu.c (x_menu_wait_for_event): New function.
! (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,4015 ****
2004-10-28 Will <[EMAIL PROTECTED]>
! * macterm.c: allow user to assign key modifiers to the Mac Option
key via a 'mac-option-modifier' variable.
2004-10-28 Stefan Monnier <[EMAIL PROTECTED]>
--- 4016,4022 ----
2004-10-28 Will <[EMAIL PROTECTED]>
! * macterm.c: Allow user to assign key modifiers to the Mac Option
key via a 'mac-option-modifier' variable.
2004-10-28 Stefan Monnier <[EMAIL PROTECTED]>
***************
*** 4871,4877 ****
* keymap.c (Fset_keymap_parent, Fdefine_prefix_command): Doc fixes.
! * keyboard.c (syms_of_keyboard) <disable-point-adjustment>: Doc fix.
* callint.c (Fcall_interactively): Doc fix.
--- 4878,4884 ----
* keymap.c (Fset_keymap_parent, Fdefine_prefix_command): Doc fixes.
! * keyboard.c (syms_of_keyboard) <disable-point-adjustment>: Doc fix.
* callint.c (Fcall_interactively): Doc fix.
***************
*** 8198,8204 ****
* fileio.c (Fread_file_name): Check use_file_dialog also before
calling Fx_file_dialog.
! * fns.c: use_file_dialog: New variable.
(syms_of_fns): DEFVAR_BOOL use-file-dialog.
2003-11-29 Kim F. Storm <[EMAIL PROTECTED]>
--- 8205,8211 ----
* fileio.c (Fread_file_name): Check use_file_dialog also before
calling Fx_file_dialog.
! * fns.c (use_file_dialog): New variable.
(syms_of_fns): DEFVAR_BOOL use-file-dialog.
2003-11-29 Kim F. Storm <[EMAIL PROTECTED]>
***************
*** 11644,11650 ****
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
scrollbar and control is pressed, call x_scroll_bar_handle_click.
* gtkutil.h (xg_get_scroll_id_for_window): Declare.
--- 11651,11657 ----
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
scrollbar and control is pressed, call x_scroll_bar_handle_click.
* gtkutil.h (xg_get_scroll_id_for_window): Declare.
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
