(Fexpt): Manually check for overflows, so that a power

[gnu-emacs] / src / composite.c

diff --git a/src/composite.c b/src/composite.c
index 4e6c08a65ccf9e2f8352de739705d5579280d492..95c19d745601fe20e453506072bd3248726bf391 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -9,7 +9,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -512,7 +512,7 @@ update_compositions (from, to, check_mask)
        }
       else if (from < ZV
               && find_composition (from, -1, &start, &from, &prop, Qnil)
-              && COMPOSITION_VALID_P (start, end, prop))
+              && COMPOSITION_VALID_P (start, from, prop))
        run_composition_function (start, from, prop);
     }
 
@@ -523,7 +523,7 @@ update_compositions (from, to, check_mask)
          (to - 1).  */
       while (from < to - 1
             && find_composition (from, to, &start, &from, &prop, Qnil)
-            && COMPOSITION_VALID_P (start, end, prop)
+            && COMPOSITION_VALID_P (start, from, prop)
             && from < to - 1)
        run_composition_function (start, from, prop);
     }