Mercurial > emacs

changeset 111540:ca297dbe1d56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Jan D <jan.h.d@swipnet.se>
date Sun, 14 Nov 2010 11:21:16 +0100
parents ad93f2dd2d38
children ca0d9a916432
files src/ChangeLog src/xselect.c src/xterm.c
diffstat 3 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sun Nov 14 15:55:27 2010 +0900
+++ b/src/ChangeLog	Sun Nov 14 11:21:16 2010 +0100
@@ -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
--- a/src/xselect.c	Sun Nov 14 15:55:27 2010 +0900
+++ b/src/xselect.c	Sun Nov 14 11:21:16 2010 +0100
@@ -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;
--- a/src/xterm.c	Sun Nov 14 15:55:27 2010 +0900
+++ b/src/xterm.c	Sun Nov 14 11:21:16 2010 +0100
@@ -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