# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1274318869 -7200
# Node ID f7d37c2787ad211700260b40ab99d39fd1bd5ac2
# Parent  665253a7d3f65c922ce79fc4357e8f7ba644f103
* composite.el: Require cl when compiling; fix typos in docstrings.

diff -r 665253a7d3f6 -r f7d37c2787ad lisp/ChangeLog
--- 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
diff -r 665253a7d3f6 -r f7d37c2787ad lisp/composite.el
--- 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))