aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2012-02-04 23:10:54 +0800
committerChong Yidong2012-02-04 23:10:54 +0800
commit79c1cc1e971d0f8766e62d60f459d5253b913f05 (patch)
tree9027eacfe6c658f2c9b479f3f408a49942bf2373 /src
parent735cc5ca6fe9b19aa9f69eb696baef2b8b4bd0fb (diff)
downloademacs-79c1cc1e971d0f8766e62d60f459d5253b913f05.tar.gz
emacs-79c1cc1e971d0f8766e62d60f459d5253b913f05.zip
* src/nsterm.m: Declare a global (Bug#10694).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsterm.m1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 14a3f6d4315..0be59675192 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-02-04 Chong Yidong <cyd@gnu.org>
2
3 * nsterm.m: Declare a global (Bug#10694).
4
12012-02-04 Eli Zaretskii <eliz@gnu.org> 52012-02-04 Eli Zaretskii <eliz@gnu.org>
2 6
3 * w32.c (get_emacs_configuration_options): Include 7 * w32.c (get_emacs_configuration_options): Include
diff --git a/src/nsterm.m b/src/nsterm.m
index 277af26f149..a45792fd645 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -65,6 +65,7 @@ int term_trace_num = 0;
65#define NSTRACE(x) 65#define NSTRACE(x)
66#endif 66#endif
67 67
68extern NSString *NSMenuDidBeginTrackingNotification;
68 69
69/* ========================================================================== 70/* ==========================================================================
70 71