Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
fcebfc6a
Commit
fcebfc6a
authored
Apr 26, 2010
by
Kenichi Handa
Browse files
composite.c (Ffind_composition_internal): Fix the return value for an automatic composition.
parent
39e2ad1b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
src/ChangeLog
src/ChangeLog
+5
-0
src/composite.c
src/composite.c
+1
-1
No files found.
src/ChangeLog
View file @
fcebfc6a
2010-04-26 Kenichi Handa <handa@m17n.org>
* composite.c (Ffind_composition_internal): Fix the return value
for an automatic composition.
2010-04-25 Dan Nicolaescu <dann@ics.uci.edu>
Remove all NO_ARG_ARRAY uses.
...
...
src/composite.c
View file @
fcebfc6a
...
...
@@ -1674,7 +1674,7 @@ See `find-composition' for more details. */)
if
(
find_automatic_composition
(
from
,
to
,
&
s
,
&
e
,
&
gstring
,
string
)
&&
(
e
<=
XINT
(
pos
)
?
e
>
end
:
s
<
start
))
return
list3
(
make_number
(
s
tart
),
make_number
(
e
nd
),
gstring
);
return
list3
(
make_number
(
s
),
make_number
(
e
),
gstring
);
}
if
(
!
COMPOSITION_VALID_P
(
start
,
end
,
prop
))
return
Fcons
(
make_number
(
start
),
Fcons
(
make_number
(
end
),
...
...
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