Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
7d100a81
Commit
7d100a81
authored
Jun 17, 2011
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* composite.c (get_composition_id, composition_gstring_put_cache): Use EMACS_INT,
not EMACS_UINT, for indexes.
parent
5eb55db9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
src/ChangeLog
src/ChangeLog
+2
-0
src/composite.c
src/composite.c
+3
-3
No files found.
src/ChangeLog
View file @
7d100a81
...
...
@@ -3,6 +3,8 @@
* composite.c: Don't truncate sizes to 'int'.
(composition_gstring_p, composition_reseat_it)
(composition_adjust_point): Use EMACS_INT, not int.
(get_composition_id, composition_gstring_put_cache): Use EMACS_INT,
not EMACS_UINT, for indexes.
* category.h (CATEGORY_SET_P): Remove unnecessary cast to EMACS_INT.
...
...
src/composite.c
View file @
7d100a81
...
...
@@ -285,7 +285,7 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars,
&&
VECTORP
(
AREF
(
components
,
0
)))
{
/* COMPONENTS is a glyph-string. */
EMACS_
U
INT
len
=
ASIZE
(
key
);
EMACS_INT
len
=
ASIZE
(
key
);
for
(
i
=
1
;
i
<
len
;
i
++
)
if
(
!
VECTORP
(
AREF
(
key
,
i
)))
...
...
@@ -293,7 +293,7 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars,
}
else
if
(
VECTORP
(
components
)
||
CONSP
(
components
))
{
EMACS_
U
INT
len
=
ASIZE
(
key
);
EMACS_INT
len
=
ASIZE
(
key
);
/* The number of elements should be odd. */
if
((
len
%
2
)
==
0
)
...
...
@@ -673,7 +673,7 @@ composition_gstring_put_cache (Lisp_Object gstring, EMACS_INT len)
hash
=
h
->
hashfn
(
h
,
header
);
if
(
len
<
0
)
{
EMACS_
U
INT
j
,
glyph_len
=
LGSTRING_GLYPH_LEN
(
gstring
);
EMACS_INT
j
,
glyph_len
=
LGSTRING_GLYPH_LEN
(
gstring
);
for
(
j
=
0
;
j
<
glyph_len
;
j
++
)
if
(
NILP
(
LGSTRING_GLYPH
(
gstring
,
j
)))
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment