diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2021-01-04 20:57:42 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2021-01-04 20:57:42 -0500 |
| commit | 898a94a9be06a3ab51116778f6b4a263f832759d (patch) | |
| tree | 5435a6d3711606dbb778c7d655b8d743de477cef /lisp/composite.el | |
| parent | 80e26472206cc44837521ba594cd50e724d9af5c (diff) | |
| download | emacs-898a94a9be06a3ab51116778f6b4a263f832759d.tar.gz emacs-898a94a9be06a3ab51116778f6b4a263f832759d.tar.bz2 emacs-898a94a9be06a3ab51116778f6b4a263f832759d.zip | |
Use lexical-binding in the remaining preloaded files
* lisp/widget.el:
* lisp/w32-fns.el:
* lisp/textmodes/fill.el:
* lisp/term/common-win.el:
* lisp/scroll-bar.el:
* lisp/rfn-eshadow.el:
* lisp/menu-bar.el:
* lisp/language/tibetan.el:
* lisp/language/thai.el:
* lisp/language/misc-lang.el:
* lisp/language/lao.el:
* lisp/language/korean.el:
* lisp/language/japanese.el:
* lisp/language/indian.el:
* lisp/language/hebrew.el:
* lisp/language/european.el:
* lisp/language/ethiopic.el:
* lisp/language/english.el:
* lisp/language/cyrillic.el:
* lisp/language/chinese.el:
* lisp/jka-cmpr-hook.el:
* lisp/international/ucs-normalize.el:
* lisp/international/mule.el:
* lisp/international/mule-conf.el:
* lisp/international/iso-transl.el:
* lisp/international/fontset.el:
* lisp/international/characters.el:
* lisp/format.el:
* lisp/facemenu.el:
* lisp/electric.el:
* lisp/dos-w32.el:
* lisp/dos-fns.el:
* lisp/disp-table.el:
* lisp/cus-face.el:
* lisp/composite.el:
* lisp/bindings.el:
* admin/unidata/blocks.awk:
* admin/charsets/eucjp-ms.awk:
* admin/charsets/cp51932.awk: Use `lexical-binding`.
Diffstat (limited to 'lisp/composite.el')
| -rw-r--r-- | lisp/composite.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/composite.el b/lisp/composite.el index 7337605d4a9..6f654df15aa 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -1,4 +1,4 @@ -;;; composite.el --- support character composition +;;; composite.el --- support character composition -*- lexical-binding: t; -*- ;; Copyright (C) 2001-2021 Free Software Foundation, Inc. @@ -593,7 +593,6 @@ 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)) @@ -653,7 +652,8 @@ All non-spacing characters have this function in ((and (= class 0) (eq (get-char-code-property (lglyph-char glyph) ;; Me = enclosing mark - 'general-category) 'Me)) + 'general-category) + 'Me)) ;; Artificially laying out glyphs in an enclosing ;; mark is difficult. All we can do is to adjust ;; the x-offset and width of the base glyph to @@ -695,9 +695,7 @@ 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) |