aboutsummaryrefslogtreecommitdiffstats
path: root/src/mac.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mac.c')
-rw-r--r--src/mac.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/mac.c b/src/mac.c
index be6953a0d55..d127422ccde 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -4611,6 +4611,7 @@ otherwise. */)
4611 CFStringRef app_id, key_str; 4611 CFStringRef app_id, key_str;
4612 CFPropertyListRef app_plist = NULL, plist; 4612 CFPropertyListRef app_plist = NULL, plist;
4613 Lisp_Object result = Qnil, tmp; 4613 Lisp_Object result = Qnil, tmp;
4614 struct gcpro gcpro1, gcpro2;
4614 4615
4615 if (STRINGP (key)) 4616 if (STRINGP (key))
4616 key = Fcons (key, Qnil); 4617 key = Fcons (key, Qnil);
@@ -4627,6 +4628,8 @@ otherwise. */)
4627 if (!NILP (hash_bound)) 4628 if (!NILP (hash_bound))
4628 CHECK_NUMBER (hash_bound); 4629 CHECK_NUMBER (hash_bound);
4629 4630
4631 GCPRO2 (key, format);
4632
4630 BLOCK_INPUT; 4633 BLOCK_INPUT;
4631 4634
4632 app_id = kCFPreferencesCurrentApplication; 4635 app_id = kCFPreferencesCurrentApplication;
@@ -4681,6 +4684,8 @@ otherwise. */)
4681 4684
4682 UNBLOCK_INPUT; 4685 UNBLOCK_INPUT;
4683 4686
4687 UNGCPRO;
4688
4684 return result; 4689 return result;
4685} 4690}
4686 4691
@@ -4846,6 +4851,7 @@ On successful conversion, return the result string, else return nil. */)
4846 Lisp_Object string, source, target, normalization_form; 4851 Lisp_Object string, source, target, normalization_form;
4847{ 4852{
4848 Lisp_Object result = Qnil; 4853 Lisp_Object result = Qnil;
4854 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
4849 CFStringEncoding src_encoding, tgt_encoding; 4855 CFStringEncoding src_encoding, tgt_encoding;
4850 CFStringRef str = NULL; 4856 CFStringRef str = NULL;
4851 4857
@@ -4856,6 +4862,8 @@ On successful conversion, return the result string, else return nil. */)
4856 CHECK_SYMBOL (target); 4862 CHECK_SYMBOL (target);
4857 CHECK_SYMBOL (normalization_form); 4863 CHECK_SYMBOL (normalization_form);
4858 4864
4865 GCPRO4 (string, source, target, normalization_form);
4866
4859 BLOCK_INPUT; 4867 BLOCK_INPUT;
4860 4868
4861 src_encoding = get_cfstring_encoding_from_lisp (source); 4869 src_encoding = get_cfstring_encoding_from_lisp (source);
@@ -4896,6 +4904,8 @@ On successful conversion, return the result string, else return nil. */)
4896 4904
4897 UNBLOCK_INPUT; 4905 UNBLOCK_INPUT;
4898 4906
4907 UNGCPRO;
4908
4899 return result; 4909 return result;
4900} 4910}
4901 4911