diff options
| author | Jan Djärv | 2014-06-01 10:23:18 +0200 |
|---|---|---|
| committer | Jan Djärv | 2014-06-01 10:23:18 +0200 |
| commit | a2130fb7e2e89027da661af5d71a9d3d2d8ef2b7 (patch) | |
| tree | 1ecdee7ad49dd3bd612b236efb4d0d66cac51014 /src | |
| parent | a383d0913e9e40ee895c8bf95c463df9170c6850 (diff) | |
| download | emacs-a2130fb7e2e89027da661af5d71a9d3d2d8ef2b7.tar.gz emacs-a2130fb7e2e89027da661af5d71a9d3d2d8ef2b7.zip | |
* nsfns.m (ns_appkit_version_str): Add os version for Cocoa.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/nsfns.m | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a9b1e8e3f4d..517a226b8da 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-06-01 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsfns.m (ns_appkit_version_str): Add os version for Cocoa. | ||
| 4 | |||
| 1 | 2014-05-30 Eli Zaretskii <eliz@gnu.org> | 5 | 2014-05-30 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * w32heap.c (malloc_before_dump, malloc_after_dump) | 7 | * w32heap.c (malloc_before_dump, malloc_after_dump) |
diff --git a/src/nsfns.m b/src/nsfns.m index 00a488079c4..5f9588aea64 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) | |||
| 873 | static Lisp_Object | 873 | static Lisp_Object |
| 874 | ns_appkit_version_str (void) | 874 | ns_appkit_version_str (void) |
| 875 | { | 875 | { |
| 876 | char tmp[80]; | 876 | char tmp[256]; |
| 877 | 877 | ||
| 878 | #ifdef NS_IMPL_GNUSTEP | 878 | #ifdef NS_IMPL_GNUSTEP |
| 879 | sprintf(tmp, "gnustep-gui-%s", Xstr(GNUSTEP_GUI_VERSION)); | 879 | sprintf(tmp, "gnustep-gui-%s", Xstr(GNUSTEP_GUI_VERSION)); |
| 880 | #elif defined (NS_IMPL_COCOA) | 880 | #elif defined (NS_IMPL_COCOA) |
| 881 | sprintf(tmp, "apple-appkit-%.2f", NSAppKitVersionNumber); | 881 | NSString *osversion |
| 882 | = [[NSProcessInfo processInfo] operatingSystemVersionString]; | ||
| 883 | sprintf(tmp, "appkit-%.2f %s", | ||
| 884 | NSAppKitVersionNumber, | ||
| 885 | [osversion UTF8String]); | ||
| 882 | #else | 886 | #else |
| 883 | tmp = "ns-unknown"; | 887 | tmp = "ns-unknown"; |
| 884 | #endif | 888 | #endif |