From 07d7c3bdc994e1def11a20b9f0a173fefaafb9bd Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 20 May 2010 03:27:49 +0200 Subject: [PATCH] * composite.el: Require cl when compiling; fix typos in docstrings. --- lisp/ChangeLog | 6 ++++++ lisp/composite.el | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c1c1a1faef8..d8f961471b8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-05-20 Juanma Barranquero + + * 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 * emacs-lisp/cl-macs.el (window-parameter): Add defsetf with diff --git a/lisp/composite.el b/lisp/composite.el index 0afb2864879..d886be5a463 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -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 @@ follows (the point `*' corresponds to both reference points): +----+-----+ <--- 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 @@ character. If the preceding character is not a base character, 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 @@ All non-spacing characters has this function in 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)) -- 2.39.2