procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* composite.el: Require cl when compiling; fix typos in docstrings.

Browse source
This commit is contained in:
Juanma Barranquero 2010-05-20 03:27:49 +02:00
parent 7bce851099
commit 07d7c3bdc9
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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

8
lisp/composite.el
View file

@ -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))