diff options
| author | Miles Bader <miles@gnu.org> | 2004-09-09 09:36:36 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-09-09 09:36:36 +0000 |
| commit | a37d67ddadebe7cbcf6d5c5d2f5f4004797a32eb (patch) | |
| tree | 06645beecd1ea81b98569d82ee5d486a95c3497f /lisp/composite.el | |
| parent | dd6ab82fb5c85168043306deda1fa5a5010183c6 (diff) | |
| parent | 6cb4a8923202a1f00fcbd2f7e3b8e0ee9e9bd3f4 (diff) | |
| download | emacs-a37d67ddadebe7cbcf6d5c5d2f5f4004797a32eb.tar.gz | |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-36
Merge from emacs--cvs-trunk--0, emacs--gnus--5.10, gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Merge from emacs--gnus--5.10, gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-524
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-534
Update from CVS
* miles@gnu.org--gnu-2004/emacs--gnus--5.10--base-0
tag of miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-464
* miles@gnu.org--gnu-2004/emacs--gnus--5.10--patch-1
Import from CVS branch gnus-5_10-branch
* miles@gnu.org--gnu-2004/emacs--gnus--5.10--patch-2
Merge from lorentey@elte.hu--2004/emacs--multi-tty--0, emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/emacs--gnus--5.10--patch-3
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--gnus--5.10--patch-4
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-18
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-19
Remove autoconf-generated files from archive
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-20
Update from CVS
Diffstat (limited to 'lisp/composite.el')
| -rw-r--r-- | lisp/composite.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/composite.el b/lisp/composite.el index 736e94d4d67..8bb3028f778 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -80,12 +80,16 @@ 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.") -;; Encode composition rule RULE into an integer value. RULE is a cons -;; of global and new reference point symbols. -;; This must be compatible with C macro COMPOSITION_ENCODE_RULE -;; defined in composite.h. +;;;###autoload (defun encode-composition-rule (rule) + "Encode composition rule RULE into an integer value. +RULE is a cons of global and new reference point symbols +\(see reference-point-alist)." + + ;; This must be compatible with C macro COMPOSITION_ENCODE_RULE + ;; defined in composite.h. + (if (and (integerp rule) (< rule 144)) ;; Already encoded. rule |