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
38cc06d9
Commit
38cc06d9
authored
Aug 25, 2010
by
Kenichi Handa
Browse files
merge trunk
parents
4e603db3
9bbaf4b0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
2 deletions
+18
-2
doc/lispref/ChangeLog
doc/lispref/ChangeLog
+4
-0
doc/lispref/processes.texi
doc/lispref/processes.texi
+1
-1
src/ChangeLog
src/ChangeLog
+3
-0
src/fontset.c
src/fontset.c
+10
-1
No files found.
doc/lispref/ChangeLog
View file @
38cc06d9
2010-08-25 Eli Zaretskii <eliz@gnu.org>
* processes.texi (Filter Functions): Fix last change.
2010-08-24 Markus Triska <triska@gmx.at>
* processes.texi (Filter Functions): Use `buffer-live-p' instead
...
...
doc/lispref/processes.texi
View file @
38cc06d9
...
...
@@ -1286,7 +1286,7 @@ of point. Here is how to do these things:
@end group
@group
(save-excursion
;;
<at>
r{Insert the text, advancing the process marker.}
;;
@
r{Insert the text, advancing the process marker.}
(goto-char (process-mark proc))
(insert string)
(set-marker (process-mark proc) (point)))
...
...
src/ChangeLog
View file @
38cc06d9
2010-08-25 Kenichi Handa <handa@m17n.org>
* fontset.c (reorder_font_vector): Prefer a font-spec specifying
:otf.
* composite.c (composition_compute_stop_pos): Don't break
composition at PT.
(composition_reseat_it): Likewise. Fix calculation of character
...
...
src/fontset.c
View file @
38cc06d9
...
...
@@ -283,6 +283,10 @@ fontset_id_valid_p (id)
#define RFONT_DEF_OBJECT(rfont_def) AREF (rfont_def, 2)
#define RFONT_DEF_SET_OBJECT(rfont_def, object) \
ASET ((rfont_def), 2, (object))
/* Score of RFONT_DEF is an integer value; the lowest 8 bits represent
the order of listing by font backends, the higher bits represents
the order given by charset priority list. The smaller value is
preferable. */
#define RFONT_DEF_SCORE(rfont_def) XINT (AREF (rfont_def, 3))
#define RFONT_DEF_SET_SCORE(rfont_def, score) \
ASET ((rfont_def), 3, make_number (score))
...
...
@@ -412,8 +416,13 @@ reorder_font_vector (Lisp_Object font_group, struct font *font)
Lisp_Object
font_def
=
RFONT_DEF_FONT_DEF
(
rfont_def
);
Lisp_Object
font_spec
=
FONT_DEF_SPEC
(
font_def
);
int
score
=
RFONT_DEF_SCORE
(
rfont_def
)
&
0xFF
;
Lisp_Object
otf_spec
=
Ffont_get
(
font_spec
,
QCotf
);
if
(
!
font_match_p
(
font_spec
,
font_object
))
if
(
!
NILP
(
otf_spec
))
/* A font-spec with :otf is preferable regardless of encoding
and language.. */
;
else
if
(
!
font_match_p
(
font_spec
,
font_object
))
{
Lisp_Object
encoding
=
FONT_DEF_ENCODING
(
font_def
);
...
...
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