HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove useless if-before-xfree tests.
[bpt/emacs.git]
/
src
/
xselect.c
diff --git
a/src/xselect.c
b/src/xselect.c
index
11ee594
..
5cf4f74
100644
(file)
--- a/
src/xselect.c
+++ b/
src/xselect.c
@@
-1,6
+1,6
@@
/* X Selection processing for Emacs.
Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
/* X Selection processing for Emacs.
Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 2004, 2005, 2006, 2007, 2008
, 2009
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-1015,7
+1015,6
@@
x_handle_selection_clear (event)
TRACE0 ("x_handle_selection_clear");
TRACE0 ("x_handle_selection_clear");
-#ifdef MULTI_KBOARD
/* If the new selection owner is also Emacs,
don't clear the new selection. */
BLOCK_INPUT;
/* If the new selection owner is also Emacs,
don't clear the new selection. */
BLOCK_INPUT;
@@
-1034,7
+1033,6
@@
x_handle_selection_clear (event)
}
}
UNBLOCK_INPUT;
}
}
UNBLOCK_INPUT;
-#endif
selection_symbol = x_atom_to_symbol (display, selection);
selection_symbol = x_atom_to_symbol (display, selection);
@@
-1473,7
+1471,7
@@
x_get_foreign_selection (selection_symbol, target_type, time_stamp)
if (NILP (XCAR (reading_selection_reply)))
error ("Timed out waiting for reply from selection owner");
if (EQ (XCAR (reading_selection_reply), Qlambda))
if (NILP (XCAR (reading_selection_reply)))
error ("Timed out waiting for reply from selection owner");
if (EQ (XCAR (reading_selection_reply), Qlambda))
-
error ("No `%s' selection", SDATA (SYMBOL_NAME (selection_symbol)))
;
+
return Qnil
;
/* Otherwise, the selection is waiting for us on the requested property. */
return
/* Otherwise, the selection is waiting for us on the requested property. */
return
@@
-2371,7
+2369,7
@@
DEFUN ("x-get-cut-buffer-internal", Fx_get_cut_buffer_internal,
{
Window window;
Atom buffer_atom;
{
Window window;
Atom buffer_atom;
- unsigned char *data;
+ unsigned char *data
= NULL
;
int bytes;
Atom type;
int format;
int bytes;
Atom type;
int format;
@@
-2394,8
+2392,12
@@
DEFUN ("x-get-cut-buffer-internal", Fx_get_cut_buffer_internal,
x_get_window_property (display, window, buffer_atom, &data, &bytes,
&type, &format, &size, 0);
x_get_window_property (display, window, buffer_atom, &data, &bytes,
&type, &format, &size, 0);
+
if (!data || !format)
if (!data || !format)
- return Qnil;
+ {
+ xfree (data);
+ return Qnil;
+ }
if (format != 8 || type != XA_STRING)
signal_error ("Cut buffer doesn't contain 8-bit data",
if (format != 8 || type != XA_STRING)
signal_error ("Cut buffer doesn't contain 8-bit data",
@@
-2477,8
+2479,8
@@
DEFUN ("x-store-cut-buffer-internal", Fx_store_cut_buffer_internal,
DEFUN ("x-rotate-cut-buffers-internal", Fx_rotate_cut_buffers_internal,
Sx_rotate_cut_buffers_internal, 1, 1, 0,
DEFUN ("x-rotate-cut-buffers-internal", Fx_rotate_cut_buffers_internal,
Sx_rotate_cut_buffers_internal, 1, 1, 0,
- doc: /* Rotate the values of the cut buffers by
the given number of step
.
-Positive means shift the values forward, negative means backward. */)
+ doc: /* Rotate the values of the cut buffers by
N steps
.
+Positive
N
means shift the values forward, negative means backward. */)
(n)
Lisp_Object n;
{
(n)
Lisp_Object n;
{
@@
-2826,7
+2828,7
@@
If DEST is a cons, it is converted to a 32 bit number
with the high 16 bits from the car and the lower 16 bit from the cdr. That
number is then used as a window id.
If DEST is a frame the event is sent to the outer window of that frame.
with the high 16 bits from the car and the lower 16 bit from the cdr. That
number is then used as a window id.
If DEST is a frame the event is sent to the outer window of that frame.
-
N
il means the currently selected frame.
+
A value of n
il means the currently selected frame.
If DEST is the string "PointerWindow" the event is sent to the window that
contains the pointer. If DEST is the string "InputFocus" the event is
sent to the window that has the input focus.
If DEST is the string "PointerWindow" the event is sent to the window that
contains the pointer. If DEST is the string "InputFocus" the event is
sent to the window that has the input focus.