Mercurial > emacs
changeset 109986:d9cfc4f455fc
merge trunk
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 25 Aug 2010 15:15:12 +0900 |
| parents | d2bad2ecc287 (current diff) 55e2c5cbf29c (diff) |
| children | 2e817b887353 |
| files | |
| diffstat | 4 files changed, 18 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/lispref/ChangeLog Wed Aug 25 14:15:20 2010 +0900 +++ b/doc/lispref/ChangeLog Wed Aug 25 15:15:12 2010 +0900 @@ -1,3 +1,7 @@ +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
--- a/doc/lispref/processes.texi Wed Aug 25 14:15:20 2010 +0900 +++ b/doc/lispref/processes.texi Wed Aug 25 15:15:12 2010 +0900 @@ -1286,7 +1286,7 @@ @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)))
--- a/src/ChangeLog Wed Aug 25 14:15:20 2010 +0900 +++ b/src/ChangeLog Wed Aug 25 15:15:12 2010 +0900 @@ -1,5 +1,8 @@ 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
--- a/src/fontset.c Wed Aug 25 14:15:20 2010 +0900 +++ b/src/fontset.c Wed Aug 25 15:15:12 2010 +0900 @@ -283,6 +283,10 @@ #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 @@ 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);