emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r117617: * frame.c (x_set_frame_parameters): Fix typ


From: Paul Eggert
Subject: [Emacs-diffs] trunk r117617: * frame.c (x_set_frame_parameters): Fix typo in previous patch.
Date: Fri, 01 Aug 2014 00:01:48 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 117617
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2014-07-31 17:01:44 -0700
message:
  * frame.c (x_set_frame_parameters): Fix typo in previous patch.
  
  I had confused && with ||.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-31 20:17:01 +0000
+++ b/src/ChangeLog     2014-08-01 00:01:44 +0000
@@ -1,3 +1,8 @@
+2014-08-01  Paul Eggert  <address@hidden>
+
+       * frame.c (x_set_frame_parameters): Fix typo in previous patch.
+       I had confused && with ||.
+
 2014-07-31  Paul Eggert  <address@hidden>
 
        Simplify timerfd configuration and fix some minor glitches.

=== modified file 'src/frame.c'
--- a/src/frame.c       2014-07-31 13:55:12 +0000
+++ b/src/frame.c       2014-08-01 00:01:44 +0000
@@ -3200,7 +3200,7 @@
 
     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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]