[Emacs-diffs] /srv/bzr/emacs/trunk r102387: Fix last cons in set_wm_state, remove unused variables.

[Jan D]

------------------------------------------------------------
revno: 102387
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Sun 2010-11-14 11:21:16 +0100
message:
  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.
modified:
  src/ChangeLog
  src/xselect.c
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-14 06:55:27 +0000
+++ b/src/ChangeLog     2010-11-14 10:21:16 +0000
@@ -1,3 +1,10 @@
+2010-11-14  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * keyboard.c (modify_event_symbol) : Add const to array elements of

=== modified file 'src/xselect.c'
--- a/src/xselect.c     2010-11-13 18:59:28 +0000
+++ b/src/xselect.c     2010-11-14 10:21:16 +0000
@@ -2544,8 +2544,6 @@
   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 @@
   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;

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2010-11-13 18:59:28 +0000
+++ b/src/xterm.c       2010-11-14 10:21:16 +0000
@@ -8382,7 +8382,8 @@
                         Fcons
                         (make_fixnum_or_float (atom),
                          value != 0
-                         ? make_fixnum_or_float (value) : Qnil)));
+                         ? Fcons (make_fixnum_or_float (value), Qnil)
+                         : Qnil)));
 }
 
 void