Fix last cons in set_wm_state, remove unused variables.

* src/xselect.c (x_send_client_event): Remove unused variables cons and
size.

* src/xterm.c (set_wm_state): Add Qnil to final cons.
This commit is contained in:
Jan D 2010-11-14 11:21:16 +01:00
parent 24021b384e
commit 5a232ffb73
3 changed files with 9 additions and 6 deletions

View file

@ -1,3 +1,10 @@
2010-11-14 Jan Djärv <jan.h.d@swipnet.se>
* xterm.c (set_wm_state): Add Qnil to final cons.
* xselect.c (x_send_client_event): Remove unused variables cons and
size.
2010-11-14 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* keyboard.c (modify_event_symbol) : Add const to array elements of

View file

@ -2544,8 +2544,6 @@ x_send_client_event (Lisp_Object display, Lisp_Object dest, Lisp_Object from, At
struct x_display_info *dpyinfo = check_x_display_info (display);
Window wdest;
XEvent event;
Lisp_Object cons;
int size;
struct frame *f = check_x_frame (from);
int to_root;
@ -2593,9 +2591,6 @@ x_send_client_event (Lisp_Object display, Lisp_Object dest, Lisp_Object from, At
if (wdest == 0) wdest = dpyinfo->root_window;
to_root = wdest == dpyinfo->root_window;
for (cons = values, size = 0; CONSP (cons); cons = XCDR (cons), ++size)
;
BLOCK_INPUT;
event.xclient.message_type = message_type;

View file

@ -8382,7 +8382,8 @@ set_wm_state (Lisp_Object frame, int add, Atom atom, Atom value)
Fcons
(make_fixnum_or_float (atom),
value != 0
? make_fixnum_or_float (value) : Qnil)));
? Fcons (make_fixnum_or_float (value), Qnil)
: Qnil)));
}
void