aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Antipov2013-08-06 20:51:41 +0400
committerDmitry Antipov2013-08-06 20:51:41 +0400
commit56b5d5b1a191ed6f50d3358e464ffa4c40ae4fe9 (patch)
tree7a1b21c695024c8c98bf6d89ebce4357f67aa26b
parented4fd9c52765d5f0aa411eecd563143c38d547ba (diff)
downloademacs-56b5d5b1a191ed6f50d3358e464ffa4c40ae4fe9.tar.gz
emacs-56b5d5b1a191ed6f50d3358e464ffa4c40ae4fe9.zip
* window.c (window_scroll, window_scroll_pixel_based)
(window_scroll_line_based): Use bool for booleans.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/window.c14
2 files changed, 12 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 03420788a64..034926f1fae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-08-06 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * window.c (window_scroll, window_scroll_pixel_based)
4 (window_scroll_line_based): Use bool for booleans.
5
12013-08-06 Paul Eggert <eggert@cs.ucla.edu> 62013-08-06 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * process.c: Fix minor off-by-one issues in descriptor counts. 8 * process.c: Fix minor off-by-one issues in descriptor counts.
diff --git a/src/window.c b/src/window.c
index 1b288368884..33d7dab7ec0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -66,9 +66,9 @@ static Lisp_Object Qsafe, Qabove, Qbelow, Qwindow_size, Qclone_of;
66static int displayed_window_lines (struct window *); 66static int displayed_window_lines (struct window *);
67static int count_windows (struct window *); 67static int count_windows (struct window *);
68static int get_leaf_windows (struct window *, struct window **, int); 68static int get_leaf_windows (struct window *, struct window **, int);
69static void window_scroll (Lisp_Object, EMACS_INT, int, int); 69static void window_scroll (Lisp_Object, EMACS_INT, bool, int);
70static void window_scroll_pixel_based (Lisp_Object, int, int, int); 70static void window_scroll_pixel_based (Lisp_Object, int, bool, int);
71static void window_scroll_line_based (Lisp_Object, int, int, int); 71static void window_scroll_line_based (Lisp_Object, int, bool, int);
72static int freeze_window_start (struct window *, void *); 72static int freeze_window_start (struct window *, void *);
73static Lisp_Object window_list (void); 73static Lisp_Object window_list (void);
74static int add_window_to_list (struct window *, void *); 74static int add_window_to_list (struct window *, void *);
@@ -4336,7 +4336,7 @@ window_internal_height (struct window *w)
4336 respectively. */ 4336 respectively. */
4337 4337
4338static void 4338static void
4339window_scroll (Lisp_Object window, EMACS_INT n, int whole, int noerror) 4339window_scroll (Lisp_Object window, EMACS_INT n, bool whole, int noerror)
4340{ 4340{
4341 immediate_quit = 1; 4341 immediate_quit = 1;
4342 n = clip_to_bounds (INT_MIN, n, INT_MAX); 4342 n = clip_to_bounds (INT_MIN, n, INT_MAX);
@@ -4357,7 +4357,7 @@ window_scroll (Lisp_Object window, EMACS_INT n, int whole, int noerror)
4357 descriptions. */ 4357 descriptions. */
4358 4358
4359static void 4359static void
4360window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror) 4360window_scroll_pixel_based (Lisp_Object window, int n, bool whole, int noerror)
4361{ 4361{
4362 struct it it; 4362 struct it it;
4363 struct window *w = XWINDOW (window); 4363 struct window *w = XWINDOW (window);
@@ -4725,7 +4725,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror)
4725 See the comment of window_scroll for parameter descriptions. */ 4725 See the comment of window_scroll for parameter descriptions. */
4726 4726
4727static void 4727static void
4728window_scroll_line_based (Lisp_Object window, int n, int whole, int noerror) 4728window_scroll_line_based (Lisp_Object window, int n, bool whole, int noerror)
4729{ 4729{
4730 register struct window *w = XWINDOW (window); 4730 register struct window *w = XWINDOW (window);
4731 /* Fvertical_motion enters redisplay, which can trigger 4731 /* Fvertical_motion enters redisplay, which can trigger
@@ -4737,7 +4737,7 @@ window_scroll_line_based (Lisp_Object window, int n, int whole, int noerror)
4737 register ptrdiff_t pos, pos_byte; 4737 register ptrdiff_t pos, pos_byte;
4738 register int ht = window_internal_height (w); 4738 register int ht = window_internal_height (w);
4739 register Lisp_Object tem; 4739 register Lisp_Object tem;
4740 int lose; 4740 bool lose;
4741 Lisp_Object bolp; 4741 Lisp_Object bolp;
4742 ptrdiff_t startpos = marker_position (w->start); 4742 ptrdiff_t startpos = marker_position (w->start);
4743 ptrdiff_t startbyte = marker_byte_position (w->start); 4743 ptrdiff_t startbyte = marker_byte_position (w->start);