[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfns.c
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfns.c |
Date: |
Fri, 31 May 2002 13:43:08 -0400 |
Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.548 emacs/src/xfns.c:1.549
*** emacs/src/xfns.c:1.548 Mon May 20 04:06:52 2002
--- emacs/src/xfns.c Fri May 31 13:43:08 2002
***************
*** 2387,2392 ****
--- 2387,2393 ----
int bufsize;
unsigned char *buf;
struct coding_system coding;
+ extern Lisp_Object Qcompound_text_with_extensions;
charset_info = find_charset_in_text (str, chars, bytes, NULL, Qnil);
if (charset_info == 0)
***************
*** 2418,2424 ****
buf = (unsigned char *) xmalloc (bufsize);
encode_coding (&coding, str, buf, bytes, bufsize);
*text_bytes = coding.produced;
! *stringp = (charset_info == 1 || !EQ (coding_system, Qcompound_text));
return buf;
}
--- 2419,2427 ----
buf = (unsigned char *) xmalloc (bufsize);
encode_coding (&coding, str, buf, bytes, bufsize);
*text_bytes = coding.produced;
! *stringp = (charset_info == 1
! || (!EQ (coding_system, Qcompound_text)
! && !EQ (coding_system, Qcompound_text_with_extensions)));
return buf;
}