Commit cb3c2e3e authored by Paul Eggert's avatar Paul Eggert
Browse files

composite.c: use 'double' consistently

* composite.c (get_composition_id): Use 'double' consistently
instead of converting 'float' to 'double' and vice versa; this is
easier to understand and avoids a GCC warning.
parent 50fe702a
2012-04-09 Paul Eggert <eggert@cs.ucla.edu>
composite.c: use 'double' consistently
* composite.c (get_composition_id): Use 'double' consistently
instead of converting 'float' to 'double' and vice versa; this is
easier to understand and avoids a GCC warning.
2012-04-09 Glenn Morris <rgm@gnu.org> 2012-04-09 Glenn Morris <rgm@gnu.org>
* Makefile.in: Generate leim-list with bootstrap-emacs, in * Makefile.in: Generate leim-list with bootstrap-emacs, in
......
...@@ -355,7 +355,7 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars, ...@@ -355,7 +355,7 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars,
else else
{ {
/* Rule-base composition. */ /* Rule-base composition. */
float leftmost = 0.0, rightmost; double leftmost = 0.0, rightmost;
ch = XINT (key_contents[0]); ch = XINT (key_contents[0]);
rightmost = ch != '\t' ? CHAR_WIDTH (ch) : 1; rightmost = ch != '\t' ? CHAR_WIDTH (ch) : 1;
...@@ -364,7 +364,7 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars, ...@@ -364,7 +364,7 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars,
{ {
int rule, gref, nref; int rule, gref, nref;
int this_width; int this_width;
float this_left; double this_left;
rule = XINT (key_contents[i]); rule = XINT (key_contents[i]);
ch = XINT (key_contents[i + 1]); ch = XINT (key_contents[i + 1]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment