procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* frame.c (x_set_frame_parameters): Fix typo in previous patch.

Browse source 
I had confused && with ||.
This commit is contained in:
Paul Eggert 2014-07-31 17:01:44 -07:00
parent 5c6476b48a
commit 43a762dae9
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-08-01 Paul Eggert <eggert@cs.ucla.edu>
* frame.c (x_set_frame_parameters): Fix typo in previous patch.
I had confused && with ||.
2014-07-31 Paul Eggert <eggert@cs.ucla.edu>
Simplify timerfd configuration and fix some minor glitches.

2
src/frame.c
View file

@ -3200,7 +3200,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
if (((width_change && width != FRAME_TEXT_WIDTH (f))
|| (height_change && height != FRAME_TEXT_HEIGHT (f)))
&& (f->new_height || f->new_width))
|| f->new_height || f->new_width)
{
/* If necessary provide default values for HEIGHT and WIDTH. Do
that here since otherwise a size change implied by an