aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorEli Zaretskii2007-10-13 12:48:57 +0000
committerEli Zaretskii2007-10-13 12:48:57 +0000
commit1ea40aa2f3b0809c27c4f095a7f8dde432fcc89d (patch)
tree5ff3410aecc837cec234cc3bb8f463a0b00de8eb /src/xterm.c
parent555b10b098c1f9a0450e385d291386caae1dda4f (diff)
downloademacs-1ea40aa2f3b0809c27c4f095a7f8dde432fcc89d.tar.gz
emacs-1ea40aa2f3b0809c27c4f095a7f8dde432fcc89d.zip
Replace `abs' with `eabs'.
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 5a5d4e42d8b..29c840ff799 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1322,7 +1322,7 @@ x_draw_glyph_string_foreground (s)
1322 of S to the right of that box line. */ 1322 of S to the right of that box line. */
1323 if (s->face->box != FACE_NO_BOX 1323 if (s->face->box != FACE_NO_BOX
1324 && s->first_glyph->left_box_line_p) 1324 && s->first_glyph->left_box_line_p)
1325 x = s->x + abs (s->face->box_line_width); 1325 x = s->x + eabs (s->face->box_line_width);
1326 else 1326 else
1327 x = s->x; 1327 x = s->x;
1328 1328
@@ -1404,7 +1404,7 @@ x_draw_composite_glyph_string_foreground (s)
1404 of S to the right of that box line. */ 1404 of S to the right of that box line. */
1405 if (s->face->box != FACE_NO_BOX 1405 if (s->face->box != FACE_NO_BOX
1406 && s->first_glyph->left_box_line_p) 1406 && s->first_glyph->left_box_line_p)
1407 x = s->x + abs (s->face->box_line_width); 1407 x = s->x + eabs (s->face->box_line_width);
1408 else 1408 else
1409 x = s->x; 1409 x = s->x;
1410 1410
@@ -2200,7 +2200,7 @@ x_draw_glyph_string_box (s)
2200 ? s->first_glyph 2200 ? s->first_glyph
2201 : s->first_glyph + s->nchars - 1); 2201 : s->first_glyph + s->nchars - 1);
2202 2202
2203 width = abs (s->face->box_line_width); 2203 width = eabs (s->face->box_line_width);
2204 raised_p = s->face->box == FACE_RAISED_BOX; 2204 raised_p = s->face->box == FACE_RAISED_BOX;
2205 left_x = s->x; 2205 left_x = s->x;
2206 right_x = (s->row->full_width_p && s->extends_to_end_of_line_p 2206 right_x = (s->row->full_width_p && s->extends_to_end_of_line_p
@@ -2246,7 +2246,7 @@ x_draw_image_foreground (s)
2246 if (s->face->box != FACE_NO_BOX 2246 if (s->face->box != FACE_NO_BOX
2247 && s->first_glyph->left_box_line_p 2247 && s->first_glyph->left_box_line_p
2248 && s->slice.x == 0) 2248 && s->slice.x == 0)
2249 x += abs (s->face->box_line_width); 2249 x += eabs (s->face->box_line_width);
2250 2250
2251 /* If there is a margin around the image, adjust x- and y-position 2251 /* If there is a margin around the image, adjust x- and y-position
2252 by that margin. */ 2252 by that margin. */
@@ -2339,7 +2339,7 @@ x_draw_image_relief (s)
2339 if (s->face->box != FACE_NO_BOX 2339 if (s->face->box != FACE_NO_BOX
2340 && s->first_glyph->left_box_line_p 2340 && s->first_glyph->left_box_line_p
2341 && s->slice.x == 0) 2341 && s->slice.x == 0)
2342 x += abs (s->face->box_line_width); 2342 x += eabs (s->face->box_line_width);
2343 2343
2344 /* If there is a margin around the image, adjust x- and y-position 2344 /* If there is a margin around the image, adjust x- and y-position
2345 by that margin. */ 2345 by that margin. */
@@ -2356,7 +2356,7 @@ x_draw_image_relief (s)
2356 } 2356 }
2357 else 2357 else
2358 { 2358 {
2359 thick = abs (s->img->relief); 2359 thick = eabs (s->img->relief);
2360 raised_p = s->img->relief > 0; 2360 raised_p = s->img->relief > 0;
2361 } 2361 }
2362 2362
@@ -2391,7 +2391,7 @@ x_draw_image_foreground_1 (s, pixmap)
2391 if (s->face->box != FACE_NO_BOX 2391 if (s->face->box != FACE_NO_BOX
2392 && s->first_glyph->left_box_line_p 2392 && s->first_glyph->left_box_line_p
2393 && s->slice.x == 0) 2393 && s->slice.x == 0)
2394 x += abs (s->face->box_line_width); 2394 x += eabs (s->face->box_line_width);
2395 2395
2396 /* If there is a margin around the image, adjust x- and y-position 2396 /* If there is a margin around the image, adjust x- and y-position
2397 by that margin. */ 2397 by that margin. */
@@ -2491,7 +2491,7 @@ static void
2491x_draw_image_glyph_string (s) 2491x_draw_image_glyph_string (s)
2492 struct glyph_string *s; 2492 struct glyph_string *s;
2493{ 2493{
2494 int box_line_hwidth = abs (s->face->box_line_width); 2494 int box_line_hwidth = eabs (s->face->box_line_width);
2495 int box_line_vwidth = max (s->face->box_line_width, 0); 2495 int box_line_vwidth = max (s->face->box_line_width, 0);
2496 int height; 2496 int height;
2497 Pixmap pixmap = None; 2497 Pixmap pixmap = None;
@@ -4385,7 +4385,7 @@ xaw_jump_callback (widget, client_data, call_data)
4385 whole = 10000000; 4385 whole = 10000000;
4386 portion = shown < 1 ? top * whole : 0; 4386 portion = shown < 1 ? top * whole : 0;
4387 4387
4388 if (shown < 1 && (abs (top + shown - 1) < 1.0/height)) 4388 if (shown < 1 && (eabs (top + shown - 1) < 1.0/height))
4389 /* Some derivatives of Xaw refuse to shrink the thumb when you reach 4389 /* Some derivatives of Xaw refuse to shrink the thumb when you reach
4390 the bottom, so we force the scrolling whenever we see that we're 4390 the bottom, so we force the scrolling whenever we see that we're
4391 too close to the bottom (in x_set_toolkit_scroll_bar_thumb 4391 too close to the bottom (in x_set_toolkit_scroll_bar_thumb
@@ -4426,12 +4426,12 @@ xaw_scroll_callback (widget, client_data, call_data)
4426 XtVaGetValues (widget, XtNheight, &height, NULL); 4426 XtVaGetValues (widget, XtNheight, &height, NULL);
4427 UNBLOCK_INPUT; 4427 UNBLOCK_INPUT;
4428 4428
4429 if (abs (position) >= height) 4429 if (eabs (position) >= height)
4430 part = (position < 0) ? scroll_bar_above_handle : scroll_bar_below_handle; 4430 part = (position < 0) ? scroll_bar_above_handle : scroll_bar_below_handle;
4431 4431
4432 /* If Xaw3d was compiled with ARROW_SCROLLBAR, 4432 /* If Xaw3d was compiled with ARROW_SCROLLBAR,
4433 it maps line-movement to call_data = max(5, height/20). */ 4433 it maps line-movement to call_data = max(5, height/20). */
4434 else if (xaw3d_arrow_scroll && abs (position) <= max (5, height / 20)) 4434 else if (xaw3d_arrow_scroll && eabs (position) <= max (5, height / 20))
4435 part = (position < 0) ? scroll_bar_up_arrow : scroll_bar_down_arrow; 4435 part = (position < 0) ? scroll_bar_up_arrow : scroll_bar_down_arrow;
4436 else 4436 else
4437 part = scroll_bar_move_ratio; 4437 part = scroll_bar_move_ratio;
@@ -8747,7 +8747,8 @@ x_sync_with_move (f, left, top, fuzzy)
8747 /* The left fuzz-factor is 10 pixels. The top fuzz-factor is 40 8747 /* The left fuzz-factor is 10 pixels. The top fuzz-factor is 40
8748 pixels. */ 8748 pixels. */
8749 8749
8750 if (abs (current_left - left) <= 10 && abs (current_top - top) <= 40) 8750 if (eabs (current_left - left) <= 10
8751 && eabs (current_top - top) <= 40)
8751 return; 8752 return;
8752 } 8753 }
8753 else if (current_left == left && current_top == top) 8754 else if (current_left == left && current_top == top)