mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00
Code Issues Releases Activity

(lisp_data_to_selection_data): New arg NOFREE_RET.

Browse Source 
For a string, just return its data's address.
(x_handle_selection_request): Pass new arg.
If value comes back 1, don't call xfree.
This commit is contained in:
Richard M. Stallman 1993-07-25 22:00:25 +00:00
parent c83febd71f
commit aca39f42ae
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/xselect.c
View File

@ -640,8 +640,10 @@ x_handle_selection_request (event)
unsigned int size;
int format;
Atom type;
int nofree;
lisp_data_to_selection_data (reply.display, converted_selection,
&data, &type, &size, &format);
&data, &type, &size, &format, &nofree);
x_reply_selection_request (event, format, data, size, type);
successful_p = Qt;
@ -649,7 +651,8 @@ x_handle_selection_request (event)
/* Indicate we have successfully processed this event. */
x_selection_current_request = 0;
xfree (data);
if (!nofree)
xfree (data);
}
unbind_to (count, Qnil);
@ -1310,15 +1313,20 @@ selection_data_to_lisp_data (display, data, size, type, format)
static void
lisp_data_to_selection_data (display, obj,
data_ret, type_ret, size_ret, format_ret)
data_ret, type_ret, size_ret,
format_ret, nofree_ret)
Display *display;
Lisp_Object obj;
unsigned char **data_ret;
Atom *type_ret;
unsigned int *size_ret;
int *format_ret;
int *nofree_ret;
{
Lisp_Object type = Qnil;
*nofree_ret = 0;
if (CONSP (obj) && SYMBOLP (XCONS (obj)->car))
{
type = XCONS (obj)->car;
@ -1338,8 +1346,8 @@ lisp_data_to_selection_data (display, obj,
{
*format_ret = 8;
*size_ret = XSTRING (obj)->size;
*data_ret = (unsigned char *) xmalloc (*size_ret);
memcpy (*data_ret, (char *) XSTRING (obj)->data, *size_ret);
*data_ret = XSTRING (obj)->data;
*nofree_ret = 1;
if (NILP (type)) type = QSTRING;
}
else if (SYMBOLP (obj))