* src/xdisp.c (Fwindow_text_pixel_size): Fix previous merge.

diff --git a/src/xdisp.c b/src/xdisp.c
index 3ff4365ea61d8eb6bf6c8379d96b70b52616fa68..d65bb388699c28cb8109b996dfacbce7e1e1dea1 100644 (file)
--- 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;
        }