From a2130fb7e2e89027da661af5d71a9d3d2d8ef2b7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20Dj=C3=A4rv?= <jan.h.d@swipnet.se>
Date: Sun, 1 Jun 2014 10:23:18 +0200
Subject: [PATCH] * nsfns.m (ns_appkit_version_str): Add os version for Cocoa.

---
 src/ChangeLog | 4 ++++
 src/nsfns.m   | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index a9b1e8e3f4..517a226b8d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-01  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsfns.m (ns_appkit_version_str): Add os version for Cocoa.
+
 2014-05-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* w32heap.c (malloc_before_dump, malloc_after_dump)
diff --git a/src/nsfns.m b/src/nsfns.m
index 00a488079c..5f9588aea6 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -873,12 +873,16 @@ x_set_mouse_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 static Lisp_Object
 ns_appkit_version_str (void)
 {
-  char tmp[80];
+  char tmp[256];
 
 #ifdef NS_IMPL_GNUSTEP
   sprintf(tmp, "gnustep-gui-%s", Xstr(GNUSTEP_GUI_VERSION));
 #elif defined (NS_IMPL_COCOA)
-  sprintf(tmp, "apple-appkit-%.2f", NSAppKitVersionNumber);
+  NSString *osversion
+    = [[NSProcessInfo processInfo] operatingSystemVersionString];
+  sprintf(tmp, "appkit-%.2f %s",
+          NSAppKitVersionNumber,
+          [osversion UTF8String]);
 #else
   tmp = "ns-unknown";
 #endif
-- 
2.20.1