[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101593: Fix EMACS_INT/int conversion
From: |
Lars Magne Ingebrigtsen |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101593: Fix EMACS_INT/int conversion in scroll.c. |
Date: |
Fri, 24 Sep 2010 17:20:58 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101593
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Fri 2010-09-24 17:20:58 +0200
message:
Fix EMACS_INT/int conversion in scroll.c.
modified:
src/ChangeLog
src/scroll.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-09-24 15:13:43 +0000
+++ b/src/ChangeLog 2010-09-24 15:20:58 +0000
@@ -1,5 +1,9 @@
2010-09-24 Lars Magne Ingebrigtsen <address@hidden>
+ * scroll.c (calculate_scrolling, line_ins_del)
+ (calculate_direct_scrolling, scroll_cost): Fix EMACS_INT/int
+ conversion.
+
* region-cache.c (move_cache_gap, set_cache_region, pp_cache)
(region_cache_backward, region_cache_forward)
(revalidate_region_cache, set_cache_region): FIX EMACS_INT/int
=== modified file 'src/scroll.c'
--- a/src/scroll.c 2010-07-12 17:47:17 +0000
+++ b/src/scroll.c 2010-09-24 15:20:58 +0000
@@ -94,7 +94,7 @@
int free_at_end)
{
register int i, j;
- int frame_lines = FRAME_LINES (frame);
+ EMACS_INT frame_lines = FRAME_LINES (frame);
register struct matrix_elt *p, *p1;
register int cost, cost1;
@@ -115,7 +115,7 @@
/* Discourage long scrolls on fast lines.
Don't scroll nearly a full frame height unless it saves
at least 1/4 second. */
- int extra_cost = baud_rate / (10 * 4 * FRAME_LINES (frame));
+ int extra_cost = (int) (baud_rate / (10 * 4 * FRAME_LINES (frame)));
if (baud_rate <= 0)
extra_cost = 1;
@@ -428,7 +428,7 @@
int free_at_end)
{
register int i, j;
- int frame_lines = FRAME_LINES (frame);
+ EMACS_INT frame_lines = FRAME_LINES (frame);
register struct matrix_elt *p, *p1;
register int cost, cost1, delta;
@@ -448,7 +448,7 @@
/* Discourage long scrolls on fast lines.
Don't scroll nearly a full frame height unless it saves
at least 1/4 second. */
- int extra_cost = baud_rate / (10 * 4 * FRAME_LINES (frame));
+ int extra_cost = (int) (baud_rate / (10 * 4 * FRAME_LINES (frame)));
if (baud_rate <= 0)
extra_cost = 1;
@@ -886,9 +886,9 @@
{
/* Compute how many lines, at bottom of frame,
will not be involved in actual motion. */
- int limit = to;
- int offset;
- int height = FRAME_LINES (frame);
+ EMACS_INT limit = to;
+ EMACS_INT offset;
+ EMACS_INT height = FRAME_LINES (frame);
if (amount == 0)
return 0;
@@ -921,8 +921,8 @@
static void
line_ins_del (FRAME_PTR frame, int ov1, int pf1, int ovn, int pfn, register
int *ov, register int *mf)
{
- register int i;
- register int frame_lines = FRAME_LINES (frame);
+ register EMACS_INT i;
+ register EMACS_INT frame_lines = FRAME_LINES (frame);
register int insert_overhead = ov1 * 10;
register int next_insert_cost = ovn * 10;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101593: Fix EMACS_INT/int conversion in scroll.c.,
Lars Magne Ingebrigtsen <=