summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-05-09 10:17:27 -0700
committerGlenn Morris <rgm@gnu.org>2020-05-09 10:17:27 -0700
commit94224c4addc999ad798cc690051498bcce199555 (patch)
treee08ae797360b23dbe368f4333f23fc3e28584682
parent5c890bfc191d0cf18dccbbf50ebdcde946a0d7fb (diff)
downloademacs-94224c4addc999ad798cc690051498bcce199555.tar.gz
* src/xdisp.c (Fwindow_text_pixel_size): Fix previous merge.
-rw-r--r--src/xdisp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 3ff4365ea61..d65bb388699 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10511,13 +10511,13 @@ include the height of both, if present, in the return value. */)
bpos = BEGV_BYTE;
while (bpos < ZV_BYTE)
{
- FETCH_CHAR_ADVANCE (c, start, bpos);
+ c = fetch_char_advance (&start, &bpos);
if (!(c == ' ' || c == '\t' || c == '\n' || c == '\r'))
break;
}
while (bpos > BEGV_BYTE)
{
- DEC_BOTH (start, bpos);
+ dec_both (&start, &bpos);
c = FETCH_CHAR (bpos);
if (!(c == ' ' || c == '\t'))
break;
@@ -10539,14 +10539,14 @@ include the height of both, if present, in the return value. */)
bpos = ZV_BYTE;
while (bpos > BEGV_BYTE)
{
- DEC_BOTH (end, bpos);
+ dec_both (&end, &bpos);
c = FETCH_CHAR (bpos);
if (!(c == ' ' || c == '\t' || c == '\n' || c == '\r'))
break;
}
while (bpos < ZV_BYTE)
{
- FETCH_CHAR_ADVANCE (c, end, bpos);
+ c = fetch_char_advance (&end, &bpos);
if (!(c == ' ' || c == '\t'))
break;
}