Mercurial > emacs
changeset 108705:f7d37c2787ad
* composite.el: Require cl when compiling; fix typos in docstrings.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 20 May 2010 03:27:49 +0200 |
| parents | 665253a7d3f6 |
| children | 5b8a376c2125 |
| files | lisp/ChangeLog lisp/composite.el |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed May 19 23:37:57 2010 +0300 +++ b/lisp/ChangeLog Thu May 20 03:27:49 2010 +0200 @@ -1,3 +1,9 @@ +2010-05-20 Juanma Barranquero <lekktu@gmail.com> + + * composite.el: Require cl when compiling. + (reference-point-alist, compose-gstring-for-graphic) + (compose-gstring-for-terminal): Fix typos in docstrings. + 2010-05-19 Juri Linkov <juri@jurta.org> * emacs-lisp/cl-macs.el (window-parameter): Add defsetf with
--- a/lisp/composite.el Wed May 19 23:37:57 2010 +0300 +++ b/lisp/composite.el Thu May 20 03:27:49 2010 +0200 @@ -28,6 +28,8 @@ ;;; Code: +(eval-when-compile (require 'cl)) + (defconst reference-point-alist '((tl . 0) (tc . 1) (tr . 2) (Bl . 3) (Bc . 4) (Br . 5) @@ -77,7 +79,7 @@ +----+-----+ <--- new descent A composition rule may have the form \(GLOBAL-REF-POINT -NEW-REF-POINT XOFF YOFF), where XOFF and YOFF specifies how much +NEW-REF-POINT XOFF YOFF), where XOFF and YOFF specify how much to shift NEW-REF-POINT from GLOBAL-REF-POINT. In this case, XOFF and YOFF are integers in the range -100..100 representing the shifting percentage against the font size.") @@ -537,7 +539,7 @@ each combining character is composed as a spacing character by a padding space before and/or after the character. -All non-spacing characters has this function in +All non-spacing characters have this function in `composition-function-table' unless overwritten." (let* ((header (lgstring-header gstring)) (nchars (lgstring-char-len gstring)) @@ -669,7 +671,7 @@ Non-spacing characters are composed with the preceding base character. If the preceding character is not a base character, each non-spacing character is composed as a spacing character by -a prepending a space before it." +prepending a space before it." (let* ((header (lgstring-header gstring)) (nchars (lgstring-char-len gstring)) (nglyphs (lgstring-glyph-len gstring))