Mercurial > emacs

comparison src/ChangeLog @ 112375:b7555c0e51fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Paul Eggert <eggert@cs.ucla.edu>
date Wed, 19 Jan 2011 15:02:04 -0800
parents 1a3d4c7ba327
children 4d90cea362a3
comparison
equal deleted inserted replaced
112369:47cb827a3b2a 112375:b7555c0e51fe
1 2011-01-19 Jan Djärv <jan.h.d@swipnet.se>
2
3 * unexmacosx.c: Include config.h before unistd.h (Bug#7859).
4
5 * nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize)
6 (ns_input_line, ns_input_color, ns_input_text, ns_working_text)
7 (ns_input_spi_name, ns_input_spi_arg)
8 (ns_alternate_modifier, ns_right_alternate_modifier)
9 (ns_command_modifier, ns_right_command_modifier, ns_control_modifier)
10 (ns_right_control_modifier, ns_function_modifier)
11 (ns_antialias_text, ns_confirm_quit): Move to globals.h.
12 (Vx_toolkit_scroll_bars, x_use_underline_position_properties)
13 (x_underline_at_descent_line): Remove declaration.
14 (syms_of_nsterm): Remove & from DEFVAR_LISP and DEFVAR_BOOL.
15
16 * nsselect.m (Vns_sent_selection_hooks, Vns_lost_selection_hooks
17 (Vselection_alist, Vselection_converter_alist): Move to globals.h.
18 (syms_of_nsselect): Remove & from DEFVAR_LISP.
19
20 * nsmenu.m (Voverriding_local_map, Voverriding_local_map_menu_flag):
21 Remove declaration.
22
23 * nsfont.m (Vns_reg_to_script, ns_antialias_text): Move to
24 globals.h.
25 (syms_of_nsfont): Remove & from DEFVAR_LISP.
26
27 * nsfns.m (Vmenu_bar_mode, Vtool_bar_mode): Remove declaration.
28 (Vns_icon_type_alist, Vns_version_string): Move to globals.h.
29 (syms_of_nsfns): Remove & from DEFVAR_LISP calls.
30
31 * globals.h (struct emacs_globals): Add f_ns_input_file,
32 f_ns_input_font, f_ns_input_fontsize, f_ns_input_line,
33 f_ns_input_color, f_ns_input_text, f_ns_working_text,
34 f_ns_input_spi_name, f_ns_input_spi_arg, f_ns_alternate_modifier,
35 f_ns_right_alternate_modifier, f_ns_command_modifier,
36 f_ns_right_command_modifier, f_ns_control_modifier,
37 f_ns_right_control_modifier, f_ns_function_modifier,
38 f_ns_antialias_text, f_ns_confirm_quit, f_Vns_icon_type_alist,
39 f_Vns_version_string, f_Vns_sent_selection_hooks,
40 f_Vns_lost_selection_hooks, f_Vselection_alist, f_Vns_reg_to_script
41 and corresponding defines.
42
43
1 2011-01-19 Sam Steingold <sds@gnu.org> 44 2011-01-19 Sam Steingold <sds@gnu.org>
2 45
3 * w32.c (check_windows_init_file): Remove declarations of 46 * w32.c (check_windows_init_file): Remove declarations of
4 Vwindow_system, Vload_path, Qfile_exists_p to fix compilation. 47 Vwindow_system, Vload_path, Qfile_exists_p to fix compilation.
5 * w32fns.c: Fix an error introduced by the previous patch. 48 * w32fns.c: Fix an error introduced by the previous patch.