[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfns.c,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfns.c,v |
Date: |
Sat, 09 Jun 2007 03:19:12 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 07/06/09 03:19:04
Index: src/xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.683
retrieving revision 1.684
diff -u -b -r1.683 -r1.684
--- src/xfns.c 8 Jun 2007 20:01:38 -0000 1.683
+++ src/xfns.c 9 Jun 2007 03:19:02 -0000 1.684
@@ -1516,6 +1516,8 @@
/* Encode Lisp string STRING as a text in a format appropriate for
XICCC (X Inter Client Communication Conventions).
+ This can call Lisp code, so callers must GCPRO.
+
If STRING contains only ASCII characters, do no conversion and
return the string data of STRING. Otherwise, encode the text by
CODING_SYSTEM, and return a newly allocated memory area which
@@ -1563,7 +1565,11 @@
&& SYMBOLP (coding.pre_write_conversion)
&& !NILP (Ffboundp (coding.pre_write_conversion)))
{
+ struct gcpro gcpro1;
+ /* We don't need to GCPRO string. */
+ GCPRO1 (coding_system);
string = run_pre_post_conversion_on_str (string, &coding, 1);
+ UNGCPRO;
str = SDATA (string);
chars = SCHARS (string);
bytes = SBYTES (string);
- [Emacs-diffs] Changes to emacs/src/xfns.c,v, Chong Yidong, 2007/06/01
- [Emacs-diffs] Changes to emacs/src/xfns.c,v, Juanma Barranquero, 2007/06/08
- [Emacs-diffs] Changes to emacs/src/xfns.c,v,
Miles Bader <=
- [Emacs-diffs] Changes to emacs/src/xfns.c,v, Chong Yidong, 2007/06/13
- [Emacs-diffs] Changes to emacs/src/xfns.c,v, Chong Yidong, 2007/06/13