From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sat, 21 Jul 2012 11:34:19 +0000 (+0200)
Subject: * nsterm.m (conversationIdentifier): Return value is NSInteger.
X-Git-Tag: emacs-24.2.90~1111
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b17afa7a423faeb352c4c578046127a4c5470ed;p=emacs.git

* nsterm.m (conversationIdentifier): Return value is NSInteger.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f5c8b2093e1..ab1f136e6cc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2012-07-21  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* nsterm.m (accessibilityAttributeValue): New function. (Bug#11134).
+	(conversationIdentifier): Return value is NSInteger.
 
 2012-07-21  Chong Yidong  <cyd@gnu.org>
 
diff --git a/src/nsterm.m b/src/nsterm.m
index e4c9147dd0e..09bbe2c3f5a 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5059,9 +5059,9 @@ ns_term_shutdown (int sig)
 }
 
 
-- (long)conversationIdentifier
+- (NSInteger)conversationIdentifier
 {
-  return (long)self;
+  return (NSInteger)self;
 }