diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-06-26 10:24:59 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-06-26 10:24:59 -0400 |
| commit | 0b4e003766f15225dede9bdba4ead33e493856e2 (patch) | |
| tree | 99de57fe8feeca540f398acb232b75e9c802418c /lisp/composite.el | |
| parent | 699fce296b13d7db386b1cb5cecf2710e5196691 (diff) | |
| download | emacs-0b4e003766f15225dede9bdba4ead33e493856e2.tar.gz | |
Revert "* lisp/calc/calc-ext.el (math-scalarp): Fix typo"
This reverts commit 698ff554ac2699ec48fefc85a1307cbc4a183b0d.
Diffstat (limited to 'lisp/composite.el')
| -rw-r--r-- | lisp/composite.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/composite.el b/lisp/composite.el index 926fa44c88e..e0d0721f16d 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -1,4 +1,4 @@ -;;; composite.el --- support character composition -*- lexical-binding:t -*- +;;; composite.el --- support character composition ;; Copyright (C) 2001-2019 Free Software Foundation, Inc. @@ -588,6 +588,7 @@ All non-spacing characters have this function in (as (lglyph-ascent glyph)) (de (lglyph-descent glyph)) (ce (/ (+ lb rb) 2)) + (w (lglyph-width glyph)) xoff yoff) (cond ((and class (>= class 200) (<= class 240)) @@ -688,7 +689,9 @@ All non-spacing characters have this function in (defun compose-gstring-for-dotted-circle (gstring direction) (let* ((dc (lgstring-glyph gstring 0)) ; glyph of dotted-circle + (dc-id (lglyph-code dc)) (fc (lgstring-glyph gstring 1)) ; glyph of the following char + (fc-id (lglyph-code fc)) (gstr (and nil (font-shape-gstring gstring direction)))) (if (and gstr (or (= (lgstring-glyph-len gstr) 1) |