summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsfns.m2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2e9e19fd547..4245a1f0256 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-01 David Reitter <david.reitter@gmail.com>
+
+ * nsfns.m (ns_tooltip): Initialize.
+
2013-04-28 Eli Zaretskii <eliz@gnu.org>
* coding.c (decode_coding_gap): Don't remove the character before
diff --git a/src/nsfns.m b/src/nsfns.m
index 0d6d0e72835..0d9ebe0ef50 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -88,7 +88,7 @@ Lisp_Object Qfontsize;
/* hack for OS X file panels */
char panelOK = 0;
-EmacsTooltip *ns_tooltip;
+EmacsTooltip *ns_tooltip = nil;
/* Need forward declaration here to preserve organizational integrity of file */
Lisp_Object Fx_open_connection (Lisp_Object, Lisp_Object, Lisp_Object);