[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/mac.c,v
From: |
YAMAMOTO Mitsuharu |
Subject: |
[Emacs-diffs] Changes to emacs/src/mac.c,v |
Date: |
Mon, 16 Oct 2006 08:58:39 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: YAMAMOTO Mitsuharu <mituharu> 06/10/16 08:58:39
Index: mac.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/mac.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- mac.c 19 Sep 2006 03:18:01 -0000 1.69
+++ mac.c 16 Oct 2006 08:58:39 -0000 1.70
@@ -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;
}
- [Emacs-diffs] Changes to emacs/src/mac.c,v,
YAMAMOTO Mitsuharu <=