aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/nsterm.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 94808c76c15..2e1a3b19b1d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-12-10 Jan Djärv <jan.h.d@swipnet.se> 12011-12-10 Jan Djärv <jan.h.d@swipnet.se>
2 2
3 * nsterm.h (x_free_frame_resources): Declare.
4
3 * nsfns.m (ns_get_defaults_value): New function (Bug#10103). 5 * nsfns.m (ns_get_defaults_value): New function (Bug#10103).
4 (Fns_get_resource, x_get_string_resource): Call ns_get_defaults_value. 6 (Fns_get_resource, x_get_string_resource): Call ns_get_defaults_value.
5 7
diff --git a/src/nsterm.h b/src/nsterm.h
index e6c070fcaad..14918cca90d 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -795,6 +795,7 @@ extern void x_set_tool_bar_lines (struct frame *f,
795 Lisp_Object oldval); 795 Lisp_Object oldval);
796extern void x_activate_menubar (struct frame *); 796extern void x_activate_menubar (struct frame *);
797extern void free_frame_menubar (struct frame *); 797extern void free_frame_menubar (struct frame *);
798extern void x_free_frame_resources (struct frame *);
798 799
799#define NSAPP_DATA2_RUNASSCRIPT 10 800#define NSAPP_DATA2_RUNASSCRIPT 10
800extern void ns_run_ascript (void); 801extern void ns_run_ascript (void);