[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfns.c,v [EMACS_22_BASE]
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfns.c,v [EMACS_22_BASE] |
Date: |
Fri, 01 Jun 2007 12:14:35 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Richard M. Stallman <rms> 07/06/01 12:14:35
Index: xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.681.2.1
retrieving revision 1.681.2.2
diff -u -b -r1.681.2.1 -r1.681.2.2
--- xfns.c 1 Jun 2007 03:58:05 -0000 1.681.2.1
+++ xfns.c 1 Jun 2007 12:14:34 -0000 1.681.2.2
@@ -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);
@@ -1601,22 +1607,20 @@
BLOCK_INPUT;
#ifdef HAVE_X11R4
{
- XTextProperty text, icon;
- int bytes, stringp;
- int do_free_icon_value = 0, do_free_text_value = 0;
- Lisp_Object coding_system;
#ifdef USE_GTK
Lisp_Object encoded_name;
- struct gcpro gcpro1;
- /* As ENCODE_UTF_8 may cause GC and relocation of string data,
- we use it before x_encode_text that may return string data. */
- GCPRO1 (name);
encoded_name = ENCODE_UTF_8 (name);
- UNGCPRO;
-#endif
+ gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
+ (char *) SDATA (encoded_name));
+#else /* not USE_GTK */
+ XTextProperty text, icon;
+ int bytes, stringp;
+ int do_free_icon_value = 0, do_free_text_value = 0;
+ Lisp_Object coding_system;
coding_system = Qcompound_text;
+
/* Note: Encoding strategy
We encode NAME by compound-text and use "COMPOUND-TEXT" in
@@ -1653,12 +1657,7 @@
icon.nitems = bytes;
}
-#ifdef USE_GTK
- gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
- (char *) SDATA (encoded_name));
-#else /* not USE_GTK */
XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
-#endif /* not USE_GTK */
XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &icon);
@@ -1666,6 +1665,7 @@
xfree (icon.value);
if (do_free_text_value)
xfree (text.value);
+#endif /* not USE_GTK */
}
#else /* not HAVE_X11R4 */
XSetIconName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
- [Emacs-diffs] Changes to emacs/src/xfns.c,v [EMACS_22_BASE],
Richard M. Stallman <=