Commit 38cc06d9 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

merge trunk

parents 4e603db3 9bbaf4b0
2010-08-25 Eli Zaretskii <>
* processes.texi (Filter Functions): Fix last change.
2010-08-24 Markus Triska <>
* processes.texi (Filter Functions): Use `buffer-live-p' instead
......@@ -1286,7 +1286,7 @@ of point. Here is how to do these things:
@end group
;; <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)))
2010-08-25 Kenichi Handa <>
* fontset.c (reorder_font_vector): Prefer a font-spec specifying
* composite.c (composition_compute_stop_pos): Don't break
composition at PT.
(composition_reseat_it): Likewise. Fix calculation of character
......@@ -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);
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