[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115410: Fix int/Lisp_Object type mixup in w32_read_
From: |
Martin Rudalics |
Subject: |
[Emacs-diffs] trunk r115410: Fix int/Lisp_Object type mixup in w32_read_socket. |
Date: |
Sat, 07 Dec 2013 17:49:04 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115410
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sat 2013-12-07 18:48:52 +0100
message:
Fix int/Lisp_Object type mixup in w32_read_socket.
* w32term.c (w32_read_socket): Fix int/Lisp_Object type mixup.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/w32term.c w32term.c-20091113204419-o5vbwnq5f7feedwu-950
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-12-07 17:41:02 +0000
+++ b/src/ChangeLog 2013-12-07 17:48:52 +0000
@@ -1,3 +1,7 @@
+2013-12-07 Martin Rudalics <address@hidden>
+
+ * w32term.c (w32_read_socket): Fix int/Lisp_Object type mixup.
+
2013-12-07 Jan Djärv <address@hidden>
* gtkutil.c (tb_size_cb): Call xg_height_or_width_changed.
=== modified file 'src/w32term.c'
--- a/src/w32term.c 2013-12-05 13:46:30 +0000
+++ b/src/w32term.c 2013-12-07 17:48:52 +0000
@@ -4743,9 +4743,9 @@
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 @@
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115410: Fix int/Lisp_Object type mixup in w32_read_socket.,
Martin Rudalics <=