From 947003b598285cf9cbc4878524167cd98d718994 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Sat, 7 Dec 2013 18:48:52 +0100 Subject: [PATCH] Fix int/Lisp_Object type mixup in w32_read_socket. * w32term.c (w32_read_socket): Fix int/Lisp_Object type mixup. --- src/ChangeLog | 4 ++++ src/w32term.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 950938f43df..3072e2dcdec 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-12-07 Martin Rudalics + + * w32term.c (w32_read_socket): Fix int/Lisp_Object type mixup. + 2013-12-07 Jan Djärv * gtkutil.c (tb_size_cb): Call xg_height_or_width_changed. diff --git a/src/w32term.c b/src/w32term.c index 42a11e1eff6..ba336b5c65b 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -4743,9 +4743,9 @@ w32_read_socket (struct terminal *terminal, record_asynch_buffer_change (); } - if (get_frame_param (f, Qfullscreen) == Qnil) + if (EQ (get_frame_param (f, Qfullscreen), Qnil)) set_frame_param (f, Qfullscreen, Qmaximized); - else if (get_frame_param (f, Qfullscreen) != Qmaximized) + else if (! EQ (get_frame_param (f, Qfullscreen), Qmaximized)) set_frame_param (f, Qmaximized, Qmaximized); break; @@ -4782,9 +4782,9 @@ w32_read_socket (struct terminal *terminal, record_asynch_buffer_change (); } - if (get_frame_param (f, Qfullscreen) == Qmaximized) + if (EQ (get_frame_param (f, Qfullscreen), Qmaximized)) set_frame_param (f, Qfullscreen, Qnil); - else if (get_frame_param (f, Qmaximized) != Qnil) + else if (! EQ (get_frame_param (f, Qmaximized), Qnil)) set_frame_param (f, Qmaximized, Qnil); break; -- 2.39.2