Merge from trunk.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/composite.c b/src/composite.c
index 0d1ab266309..50aca156ba4 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -355,7 +355,7 @@ get_composition_id (ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t nchars,
   else
     {
       /* Rule-base composition.  */
-      float leftmost = 0.0, rightmost;
+      double leftmost = 0.0, rightmost;
 
       ch = XINT (key_contents[0]);
       rightmost = ch != '\t' ? CHAR_WIDTH (ch) : 1;
@@ -364,7 +364,7 @@ get_composition_id (ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t nchars,
         {
           int rule, gref, nref;
           int this_width;
-          float this_left;
+          double this_left;
 
           rule = XINT (key_contents[i]);
           ch = XINT (key_contents[i + 1]);