Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 18:37:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

(x_encode_text): Return stringp non-NULL if coding_system

Browse source 
is Qcompound_text_with_extensions.
This commit is contained in:
Eli Zaretskii 2002-05-31 17:43:45 +00:00
parent f326600bb8
commit 43dc73f18f
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,5 +1,11 @@
2002-05-31 Eli Zaretskii <eliz@is.elta.co.il>
* xfns.c (x_encode_text): Return stringp non-NULL if coding_system
is Qcompound_text_with_extensions.
* xselect.c (lisp_data_to_selection_data): Always set selection
type as string if x_encode_text returns streingp non-NULL.
* s/netbsd.h: Include /usr/pkg in the run time shared library path.
2002-05-30 Richard M. Stallman <rms@gnu.org>

5
src/xfns.c
View file

@ -2387,6 +2387,7 @@ x_encode_text (string, coding_system, selectionp, text_bytes, stringp)
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,7 +2419,9 @@ x_encode_text (string, coding_system, selectionp, text_bytes, stringp)
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));
*stringp = (charset_info == 1
|| (!EQ (coding_system, Qcompound_text)
&& !EQ (coding_system, Qcompound_text_with_extensions)));
return buf;
}