* nsfns.m (ns_appkit_version_str): Add os version for Cocoa.

diff --git a/src/ChangeLog b/src/ChangeLog
index a9b1e8e3f4d0542384b4a0694cf7600943eb098a..517a226b8dad7a62cf49ce0a4b58282d5a323696 100644 (file)
--- 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 00a488079c4090c015a0df20404b460bd53f961c..5f9588aea6456f6ced15c3d7f244a02e4e4186e9 100644 (file)
--- 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