diff options
| author | Eli Zaretskii | 2017-11-30 19:55:41 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2017-11-30 19:55:41 +0200 |
| commit | bdbcdbac431d672915c92fc77dbf7326f338cecb (patch) | |
| tree | 9893c109d8dbdc0aed12b1cdd4fc27873000a77f /lisp | |
| parent | 408862f02a874dcd9cfc2599adb35dec522b3ef4 (diff) | |
| download | emacs-bdbcdbac431d672915c92fc77dbf7326f338cecb.tar.gz emacs-bdbcdbac431d672915c92fc77dbf7326f338cecb.zip | |
Avoid assertions in find-composition
* src/font.c (font_range): If called with STRING non-nil and FACE
a NULL pointer, compute face by calling face_at_string_position.
(Bug#29506)
* lisp/composite.el (find-composition): Doc fix.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/composite.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/composite.el b/lisp/composite.el index 72b0ffc8f48..f7e0c4a0912 100644 --- a/lisp/composite.el +++ b/lisp/composite.el | |||
| @@ -337,8 +337,9 @@ When Automatic Composition mode is on, this function also finds a | |||
| 337 | chunk of text that is automatically composed. If such a chunk is | 337 | chunk of text that is automatically composed. If such a chunk is |
| 338 | found closer to POS than the position that has `composition' | 338 | found closer to POS than the position that has `composition' |
| 339 | property, the value is a list of FROM, TO, and a glyph-string | 339 | property, the value is a list of FROM, TO, and a glyph-string |
| 340 | that specifies how the chunk is to be composed. See the function | 340 | that specifies how the chunk is to be composed; DETAIL-P is |
| 341 | `composition-get-gstring' for the format of the glyph-string." | 341 | inored this case. See the function `composition-get-gstring' |
| 342 | for the format of the glyph-string." | ||
| 342 | (let ((result (find-composition-internal pos limit string detail-p))) | 343 | (let ((result (find-composition-internal pos limit string detail-p))) |
| 343 | (if (and detail-p (> (length result) 3) (nth 2 result) (not (nth 3 result))) | 344 | (if (and detail-p (> (length result) 3) (nth 2 result) (not (nth 3 result))) |
| 344 | ;; This is a valid rule-base composition. | 345 | ;; This is a valid rule-base composition. |