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
d04effb3
Commit
d04effb3
authored
May 14, 2008
by
Kenichi Handa
Browse files
(compose-chars-after): Assume that WINDOW is always non-nil.
parent
e096e30e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
lisp/composite.el
lisp/composite.el
+6
-8
No files found.
lisp/composite.el
View file @
d04effb3
...
...
@@ -341,7 +341,7 @@ This function is the default value of `compose-chars-after-function'."
pattern
func
result
)
(
or
limit
(
setq
limit
(
if
(
stringp
object
)
(
length
object
)
(
point-max
))))
(
when
tail
(
when
(
and
font-obj
tail
)
(
save-match-data
(
save-excursion
(
while
tail
...
...
@@ -495,9 +495,8 @@ This function is the default value of `auto-composition-function' (which see)."
(
let*
((
ch
(
aref
string
from
))
(
elt
(
aref
table
ch
))
font-obj
newpos
)
(
when
elt
(
if
window
(
setq
font-obj
(
font-at
from
window
string
)))
(
when
(
and
elt
(
setq
font-obj
(
font-at
from
window
string
)))
(
if
(
functionp
elt
)
(
setq
newpos
(
funcall
elt
from
to
font-obj
string
))
(
while
(
and
elt
...
...
@@ -517,9 +516,8 @@ This function is the default value of `auto-composition-function' (which see)."
(
let*
((
ch
(
char-after
from
))
(
elt
(
aref
table
ch
))
func
pattern
font-obj
newpos
)
(
when
elt
(
if
window
(
setq
font-obj
(
font-at
from
window
)))
(
when
(
and
elt
(
setq
font-obj
(
font-at
from
window
)))
(
if
(
functionp
elt
)
(
setq
newpos
(
funcall
elt
from
to
font-obj
nil
))
(
goto-char
from
)
...
...
@@ -659,7 +657,7 @@ With arg, enable it if and only if arg is positive."
(
font-obj
(
and
(
display-multi-font-p
)
(
font-at
(
point
)
(
selected-window
))))
(
pos
(
point
)))
(
if
(
functionp
func
)
(
if
(
and
(
functionp
func
)
font-obj
)
(
goto-char
(
funcall
func
(
point
)
to
font-obj
nil
)))
(
if
(
<=
(
point
)
pos
)
(
forward-char
1
)))))
...
...
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