aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2006-10-19 08:01:25 +0000
committerYAMAMOTO Mitsuharu2006-10-19 08:01:25 +0000
commit9346531434a0091a5655d83f9436fa011431bcfd (patch)
tree9f6450bd08650898f7658f2df6fb898e7b5c3461 /src
parent766685555910db4c38476a5e5d203ac9ab7bb993 (diff)
downloademacs-9346531434a0091a5655d83f9436fa011431bcfd.tar.gz
emacs-9346531434a0091a5655d83f9436fa011431bcfd.zip
(Vmac_carbon_version_string) [TARGET_API_MAC_CARBON]:
New variable. (syms_of_macfns) [TARGET_API_MAC_CARBON]: Defvar it.
Diffstat (limited to 'src')
-rw-r--r--src/macfns.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/macfns.c b/src/macfns.c
index 49c72e1bf4f..1b3a7223b63 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -51,6 +51,14 @@ Boston, MA 02110-1301, USA. */
51 51
52extern void free_frame_menubar (); 52extern void free_frame_menubar ();
53 53
54#if TARGET_API_MAC_CARBON
55
56/* Carbon version info */
57
58static Lisp_Object Vmac_carbon_version_string;
59
60#endif /* TARGET_API_MAC_CARBON */
61
54/* Non-zero means we're allowed to display an hourglass cursor. */ 62/* Non-zero means we're allowed to display an hourglass cursor. */
55 63
56int display_hourglass_p; 64int display_hourglass_p;
@@ -4718,6 +4726,22 @@ such a font. This is especially effective for such large fonts as
4718Chinese, Japanese, and Korean. */); 4726Chinese, Japanese, and Korean. */);
4719 Vx_pixel_size_width_font_regexp = Qnil; 4727 Vx_pixel_size_width_font_regexp = Qnil;
4720 4728
4729#if TARGET_API_MAC_CARBON
4730 DEFVAR_LISP ("mac-carbon-version-string", &Vmac_carbon_version_string,
4731 doc: /* Version info for Carbon API. */);
4732 {
4733 OSErr err;
4734 UInt32 response;
4735 char carbon_version[16] = "Unknown";
4736
4737 err = Gestalt (gestaltCarbonVersion, &response);
4738 if (err == noErr)
4739 sprintf (carbon_version, "%u.%u.%u",
4740 (response >> 8) & 0xf, (response >> 4) & 0xf, response & 0xf);
4741 Vmac_carbon_version_string = build_string (carbon_version);
4742 }
4743#endif /* TARGET_API_MAC_CARBON */
4744
4721 /* X window properties. */ 4745 /* X window properties. */
4722 defsubr (&Sx_change_window_property); 4746 defsubr (&Sx_change_window_property);
4723 defsubr (&Sx_delete_window_property); 4747 defsubr (&Sx_delete_window_property);