summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2012-07-21 13:34:19 +0200
committerJan Djärv <jan.h.d@swipnet.se>2012-07-21 13:34:19 +0200
commit4b17afa7a423faeb352c4c578046127a4c5470ed (patch)
tree75e41be44365aaa31e1a388aa0445fa5fc4a7abe
parentf1e8a7f1a52f13291bf8e45106233059add14e89 (diff)
downloademacs-4b17afa7a423faeb352c4c578046127a4c5470ed.tar.gz
emacs-4b17afa7a423faeb352c4c578046127a4c5470ed.tar.bz2
emacs-4b17afa7a423faeb352c4c578046127a4c5470ed.zip
* nsterm.m (conversationIdentifier): Return value is NSInteger.
-rw-r--r--src/ChangeLog1
-rw-r--r--src/nsterm.m4
2 files changed, 3 insertions, 2 deletions
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;
}