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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 62b400c00846205ba14195f2b0356b9dc2e0ae36..ce28a2bedb1b15fb452683c62f869ff89fd6bcb7 100644 (file)
--- 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 ea64d9c3f36d957a73bcbae8313ca0d3aaa05e07..7b91d6f69b9f14313864e2ff5460455ecbc82225 100644 (file)
--- 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 277c32df6ee3cabf2835fb2ba985052464bf25c4..331ff9ab4a9f2a666d7f27630f714dc5846f21fa 100644 (file)
--- 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