diff options
| author | Martin Rudalics | 2013-12-07 18:48:52 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2013-12-07 18:48:52 +0100 |
| commit | 947003b598285cf9cbc4878524167cd98d718994 (patch) | |
| tree | 8142f13b25f41675029f93882120d62b2b88c1e2 /src | |
| parent | c4142a830206e97d2d793c2ad73c5d51d9bf1bf0 (diff) | |
| download | emacs-947003b598285cf9cbc4878524167cd98d718994.tar.gz emacs-947003b598285cf9cbc4878524167cd98d718994.zip | |
Fix int/Lisp_Object type mixup in w32_read_socket.
* w32term.c (w32_read_socket): Fix int/Lisp_Object type mixup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2013-12-07 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * w32term.c (w32_read_socket): Fix int/Lisp_Object type mixup. | ||
| 4 | |||
| 1 | 2013-12-07 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2013-12-07 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * gtkutil.c (tb_size_cb): Call xg_height_or_width_changed. | 7 | * 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, | |||
| 4743 | record_asynch_buffer_change (); | 4743 | record_asynch_buffer_change (); |
| 4744 | } | 4744 | } |
| 4745 | 4745 | ||
| 4746 | if (get_frame_param (f, Qfullscreen) == Qnil) | 4746 | if (EQ (get_frame_param (f, Qfullscreen), Qnil)) |
| 4747 | set_frame_param (f, Qfullscreen, Qmaximized); | 4747 | set_frame_param (f, Qfullscreen, Qmaximized); |
| 4748 | else if (get_frame_param (f, Qfullscreen) != Qmaximized) | 4748 | else if (! EQ (get_frame_param (f, Qfullscreen), Qmaximized)) |
| 4749 | set_frame_param (f, Qmaximized, Qmaximized); | 4749 | set_frame_param (f, Qmaximized, Qmaximized); |
| 4750 | 4750 | ||
| 4751 | break; | 4751 | break; |
| @@ -4782,9 +4782,9 @@ w32_read_socket (struct terminal *terminal, | |||
| 4782 | record_asynch_buffer_change (); | 4782 | record_asynch_buffer_change (); |
| 4783 | } | 4783 | } |
| 4784 | 4784 | ||
| 4785 | if (get_frame_param (f, Qfullscreen) == Qmaximized) | 4785 | if (EQ (get_frame_param (f, Qfullscreen), Qmaximized)) |
| 4786 | set_frame_param (f, Qfullscreen, Qnil); | 4786 | set_frame_param (f, Qfullscreen, Qnil); |
| 4787 | else if (get_frame_param (f, Qmaximized) != Qnil) | 4787 | else if (! EQ (get_frame_param (f, Qmaximized), Qnil)) |
| 4788 | set_frame_param (f, Qmaximized, Qnil); | 4788 | set_frame_param (f, Qmaximized, Qnil); |
| 4789 | 4789 | ||
| 4790 | break; | 4790 | break; |