diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/xselect.c | 5 | ||||
| -rw-r--r-- | src/xterm.c | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 62b400c0084..ce28a2bedb1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 diff --git a/src/xselect.c b/src/xselect.c index ea64d9c3f36..7b91d6f69b9 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -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; diff --git a/src/xterm.c b/src/xterm.c index 277c32df6ee..331ff9ab4a9 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -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 |