[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] xwidget 35c2e62 05/13: a missing merge, trailing whitespac
From: |
Joakim Verona |
Subject: |
[Emacs-diffs] xwidget 35c2e62 05/13: a missing merge, trailing whitespace |
Date: |
Fri, 02 Jan 2015 12:22:38 +0000 |
branch: xwidget
commit 35c2e62acf3ccc4741b4fc57fc96a2917e5f3cb1
Author: jave <address@hidden>
Commit: jave <address@hidden>
a missing merge, trailing whitespace
---
src/dispnew.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/dispnew.c b/src/dispnew.c
index a44d246..9a8ab3a 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;
- [Emacs-diffs] xwidget updated (4423b6a -> c089503), Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 9b7d9c0 04/13: trailing whitespace, better ifdef of xwidget code, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 35c2e62 05/13: a missing merge, trailing whitespace,
Joakim Verona <=
- [Emacs-diffs] xwidget 2cef979 07/13: whitespace cleanup, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 6d1cade 06/13: whitespace cleanup, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 79030ea 08/13: whitespace, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget e93fd42 10/13: whitespace cleanup, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 659a0a5 11/13: whitespace cleanup, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 1048722 03/13: Doc strings, and whitespace, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget c089503 13/13: moved xwidget test to the test dir, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget fe27c32 12/13: a missing merge, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 8f0cf0a 01/13: removed msysconfig.sh, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget aae452a 09/13: whitespace cleanup, Joakim Verona, 2015/01/02