Merge: omit auto-generated aclocal.m4 from repository

[bpt/emacs.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 0288771..7227d2e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,68 @@
+2011-01-20  Chong Yidong  <cyd@stupidchicken.com>
+
+       * fns.c (Fyes_or_no_p): Revert 2011-01-07 change, removing ARGS.
+
+2011-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix X11 compilation failure.
+       * globals.h (struct emacs_globals): Document f_Vselection_alist.
+       * xselect.c (Vselection_alist): Remove declaration, moving its
+       documentation to globals.h.  This fixes a compilation failure
+       induced by the earlier change to globals.h today.
+
+2011-01-19  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * unexmacosx.c: Include config.h before unistd.h (Bug#7859).
+
+       * nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize)
+       (ns_input_line, ns_input_color, ns_input_text, ns_working_text)
+       (ns_input_spi_name, ns_input_spi_arg)
+       (ns_alternate_modifier, ns_right_alternate_modifier)
+       (ns_command_modifier, ns_right_command_modifier, ns_control_modifier)
+       (ns_right_control_modifier, ns_function_modifier)
+       (ns_antialias_text, ns_confirm_quit): Move to globals.h.
+       (Vx_toolkit_scroll_bars, x_use_underline_position_properties)
+       (x_underline_at_descent_line): Remove declaration.
+       (syms_of_nsterm): Remove & from DEFVAR_LISP and DEFVAR_BOOL.
+
+       * nsselect.m (Vns_sent_selection_hooks, Vns_lost_selection_hooks
+       (Vselection_alist, Vselection_converter_alist): Move to globals.h.
+       (syms_of_nsselect): Remove & from DEFVAR_LISP.
+
+       * nsmenu.m (Voverriding_local_map, Voverriding_local_map_menu_flag):
+       Remove declaration.
+
+       * nsfont.m (Vns_reg_to_script, ns_antialias_text): Move to
+       globals.h.
+       (syms_of_nsfont): Remove & from DEFVAR_LISP.
+
+       * nsfns.m (Vmenu_bar_mode, Vtool_bar_mode): Remove declaration.
+       (Vns_icon_type_alist, Vns_version_string): Move to globals.h.
+       (syms_of_nsfns): Remove & from DEFVAR_LISP calls.
+
+       * globals.h (struct emacs_globals): Add f_ns_input_file,
+       f_ns_input_font, f_ns_input_fontsize, f_ns_input_line,
+       f_ns_input_color, f_ns_input_text, f_ns_working_text,
+       f_ns_input_spi_name, f_ns_input_spi_arg, f_ns_alternate_modifier,
+       f_ns_right_alternate_modifier, f_ns_command_modifier,
+       f_ns_right_command_modifier, f_ns_control_modifier,
+       f_ns_right_control_modifier, f_ns_function_modifier,
+       f_ns_antialias_text, f_ns_confirm_quit, f_Vns_icon_type_alist,
+       f_Vns_version_string, f_Vns_sent_selection_hooks,
+       f_Vns_lost_selection_hooks, f_Vselection_alist, f_Vns_reg_to_script
+       and corresponding defines.
+
+
+2011-01-19  Sam Steingold  <sds@gnu.org>
+
+       * w32.c (check_windows_init_file): Remove declarations of
+       Vwindow_system, Vload_path, Qfile_exists_p to fix compilation.
+       * w32fns.c: Fix an error introduced by the previous patch.
+
+2011-01-19  Tom Tromey  <tromey@redhat.com>
+
+       * window.c: Fix error introduced by previous patch.
+
 2011-01-18  Tom Tromey  <tromey@parfait>
 
        * globals.h: New file.