aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bc3cbaa1282..ad50d5bb3d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -896,7 +896,7 @@
896 896
897 * nsfns.m (as_script, as_result, as_status): New static variables. 897 * nsfns.m (as_script, as_result, as_status): New static variables.
898 (ns_run_ascript): New function. 898 (ns_run_ascript): New function.
899 (Fns_do_applescript): Set variables as_*. Make an NSApplicationDefined 899 (Fns_do_applescript): Set variables as_*. Make an NSApplicationDefined
900 event with data2 set to NSAPP_DATA2_RUNASSCRIPT, post it and then start 900 event with data2 set to NSAPP_DATA2_RUNASSCRIPT, post it and then start
901 the event loop. Get status from as_status (Bug#7276). 901 the event loop. Get status from as_status (Bug#7276).
902 902
@@ -1072,7 +1072,7 @@
1072 1072
1073 * xdisp.c: Remove one-slot cache of display string positions. 1073 * xdisp.c: Remove one-slot cache of display string positions.
1074 (compute_display_string_pos): Accept an additional argument 1074 (compute_display_string_pos): Accept an additional argument
1075 DISP_PROP_P; callers changed. Scan at most 5K characters forward 1075 DISP_PROP_P; callers changed. Scan at most 5K characters forward
1076 for a display string or property. If found, set DISP_PROP_P 1076 for a display string or property. If found, set DISP_PROP_P
1077 non-zero. 1077 non-zero.
1078 1078
@@ -2090,7 +2090,7 @@
2090 (Fput_unicode_property_internal): New functions. 2090 (Fput_unicode_property_internal): New functions.
2091 (syms_of_chartab): DEFSYM Qchar_code_property_table, defsubr 2091 (syms_of_chartab): DEFSYM Qchar_code_property_table, defsubr
2092 Sunicode_property_table_internal, Sget_unicode_property_internal, 2092 Sunicode_property_table_internal, Sget_unicode_property_internal,
2093 and Sput_unicode_property_internal. Defvar_lisp 2093 and Sput_unicode_property_internal. Defvar_lisp
2094 char-code-property-alist. 2094 char-code-property-alist.
2095 2095
2096 * composite.c (CHAR_COMPOSABLE_P): Adjust for the change of 2096 * composite.c (CHAR_COMPOSABLE_P): Adjust for the change of
@@ -2122,7 +2122,7 @@
2122 (store_config_changed_event): Add comment. 2122 (store_config_changed_event): Add comment.
2123 (dpyinfo_valid, store_font_name_changed, map_tool_bar_style) 2123 (dpyinfo_valid, store_font_name_changed, map_tool_bar_style)
2124 (store_tool_bar_style_changed): New functions. 2124 (store_tool_bar_style_changed): New functions.
2125 (store_monospaced_changed): Add comment. Call dpyinfo_valid. 2125 (store_monospaced_changed): Add comment. Call dpyinfo_valid.
2126 (struct xsettings): Move font inside HAVE_XFT. 2126 (struct xsettings): Move font inside HAVE_XFT.
2127 (GSETTINGS_TOOL_BAR_STYLE, GSETTINGS_FONT_NAME): New defines. 2127 (GSETTINGS_TOOL_BAR_STYLE, GSETTINGS_FONT_NAME): New defines.
2128 (GSETTINGS_MONO_FONT): Rename from SYSTEM_MONO_FONT. 2128 (GSETTINGS_MONO_FONT): Rename from SYSTEM_MONO_FONT.
@@ -2131,7 +2131,7 @@
2131 Check for changes in GSETTINGS_TOOL_BAR_STYLE and GSETTINGS_FONT_NAME 2131 Check for changes in GSETTINGS_TOOL_BAR_STYLE and GSETTINGS_FONT_NAME
2132 also. 2132 also.
2133 (GCONF_TOOL_BAR_STYLE, GCONF_FONT_NAME): New defines. 2133 (GCONF_TOOL_BAR_STYLE, GCONF_FONT_NAME): New defines.
2134 (GCONF_MONO_FONT): Rename from SYSTEM_MONO_FONT. Move inside HAVE_XFT. 2134 (GCONF_MONO_FONT): Rename from SYSTEM_MONO_FONT. Move inside HAVE_XFT.
2135 (something_changed_gconfCB): Rename from something_changedCB. 2135 (something_changed_gconfCB): Rename from something_changedCB.
2136 Check for changes in GCONF_TOOL_BAR_STYLE and GCONF_FONT_NAME also. 2136 Check for changes in GCONF_TOOL_BAR_STYLE and GCONF_FONT_NAME also.
2137 (parse_settings): Move check for font inside HAVE_XFT. 2137 (parse_settings): Move check for font inside HAVE_XFT.