diff options
| author | Miles Bader | 2004-12-25 02:00:25 +0000 |
|---|---|---|
| committer | Miles Bader | 2004-12-25 02:00:25 +0000 |
| commit | 6a89b7e95a771e5141bb1718e8278dcf892359ea (patch) | |
| tree | 189a864da85f49e73c6f9220b7231f0c54250e6e /src/xselect.c | |
| parent | 054b6b53c3554c83ae02d24a772a74b63ebb08cd (diff) | |
| parent | 70d16390a08dc9d94c961eb380be8e1b5b496963 (diff) | |
| download | emacs-6a89b7e95a771e5141bb1718e8278dcf892359ea.tar.gz emacs-6a89b7e95a771e5141bb1718e8278dcf892359ea.zip | |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-79
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-735
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-747
Update from CVS
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xselect.c b/src/xselect.c index c89347be2cd..38547ea6bbf 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -2324,7 +2324,7 @@ DEFUN ("x-get-cut-buffer-internal", Fx_get_cut_buffer_internal, | |||
| 2324 | Fcons (x_atom_to_symbol (display, type), | 2324 | Fcons (x_atom_to_symbol (display, type), |
| 2325 | Fcons (make_number (format), Qnil)))); | 2325 | Fcons (make_number (format), Qnil)))); |
| 2326 | 2326 | ||
| 2327 | ret = (bytes ? make_string ((char *) data, bytes) : Qnil); | 2327 | ret = (bytes ? make_unibyte_string ((char *) data, bytes) : Qnil); |
| 2328 | /* Use xfree, not XFree, because x_get_window_property | 2328 | /* Use xfree, not XFree, because x_get_window_property |
| 2329 | calls xmalloc itself. */ | 2329 | calls xmalloc itself. */ |
| 2330 | xfree (data); | 2330 | xfree (data); |