Mercurial > emacs

changeset 73384:c5a4a949a307

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fmac_get_preference, Fmac_code_convert_string): Add GCPROs.
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Mon, 16 Oct 2006 08:58:39 +0000
parents 015a870c0c9a
children bd82ccfce877
files src/mac.c
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/mac.c	Mon Oct 16 08:58:20 2006 +0000
+++ b/src/mac.c	Mon Oct 16 08:58:39 2006 +0000
@@ -4611,6 +4611,7 @@
   CFStringRef app_id, key_str;
   CFPropertyListRef app_plist = NULL, plist;
   Lisp_Object result = Qnil, tmp;
+  struct gcpro gcpro1, gcpro2;
 
   if (STRINGP (key))
     key = Fcons (key, Qnil);
@@ -4627,6 +4628,8 @@
   if (!NILP (hash_bound))
     CHECK_NUMBER (hash_bound);
 
+  GCPRO2 (key, format);
+
   BLOCK_INPUT;
 
   app_id = kCFPreferencesCurrentApplication;
@@ -4681,6 +4684,8 @@
 
   UNBLOCK_INPUT;
 
+  UNGCPRO;
+
   return result;
 }
 
@@ -4846,6 +4851,7 @@
      Lisp_Object string, source, target, normalization_form;
 {
   Lisp_Object result = Qnil;
+  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
   CFStringEncoding src_encoding, tgt_encoding;
   CFStringRef str = NULL;
 
@@ -4856,6 +4862,8 @@
     CHECK_SYMBOL (target);
   CHECK_SYMBOL (normalization_form);
 
+  GCPRO4 (string, source, target, normalization_form);
+
   BLOCK_INPUT;
 
   src_encoding = get_cfstring_encoding_from_lisp (source);
@@ -4896,6 +4904,8 @@
 
   UNBLOCK_INPUT;
 
+  UNGCPRO;
+
   return result;
 }