From: jave <joakim@verona.se>
Date: Wed, 31 Dec 2008 23:21:04 +0000 (+0100)
Subject: a missing merge, trailing whitespace
X-Git-Tag: emacs-25.0.90~2621
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=35c2e62acf3ccc4741b4fc57fc96a2917e5f3cb1;p=emacs.git

a missing merge, trailing whitespace
---

diff --git a/src/dispnew.c b/src/dispnew.c
index a44d2460dd0..9a8ab3ae2b4 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -17,6 +17,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+
 #include <config.h>
 
 #include "sysstdio.h"
@@ -198,7 +199,8 @@ add_window_display_history (struct window *w, const char *msg, bool paused_p)
    PAUSED_P means that the update has been interrupted for
    pending input.  */
 
-static void add_frame_display_history (struct frame *f, int paused_p)
+static void
+add_frame_display_history (struct frame *f, bool paused_p)
 {
   char *buf;
   void *ptr = f;
@@ -4137,7 +4139,7 @@ scrolling_window (struct window *w, bool header_line_p)
   //printf("scrolling_window\n");
     return 0;
 #endif
-  
+
   /* Give up if some rows in the desired matrix are not enabled.  */
   if (! MATRIX_ROW_ENABLED_P (desired_matrix, i))
     return -1;