aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2010-04-30 15:16:13 +0300
committerEli Zaretskii2010-04-30 15:16:13 +0300
commit4f27f7d26058c74a960819726e90ff8ec4c5e453 (patch)
tree16c36831d7b4f74584e0b464a8659e4ae4830ad7
parent718a19c869d21865f460825fef3c7ccb3aed3123 (diff)
downloademacs-4f27f7d26058c74a960819726e90ff8ec4c5e453.tar.gz
emacs-4f27f7d26058c74a960819726e90ff8ec4c5e453.zip
Fix typos in doc strings of composite.el.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/composite.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03a2376d3cd..ddc0fb8e239 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-04-30 Eli Zaretskii <eliz@gnu.org>
2
3 * composite.el (compose-region, reference-point-alist): Fix typos
4 in the doc strings.
5
12010-04-29 Chong Yidong <cyd@stupidchicken.com> 62010-04-29 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * ido.el (ido-init-completion-maps): Remove C-v binding. 8 * ido.el (ido-init-completion-maps): Remove C-v binding.
diff --git a/lisp/composite.el b/lisp/composite.el
index 15707fd700d..c5a41be23ec 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -44,7 +44,7 @@
44A glyph reference point symbol is to be used to specify a composition 44A glyph reference point symbol is to be used to specify a composition
45rule in COMPONENTS argument to such functions as `compose-region'. 45rule in COMPONENTS argument to such functions as `compose-region'.
46 46
47Meanings of glyph reference point codes are as follows: 47The meaning of glyph reference point codes is as follows:
48 48
49 0----1----2 <---- ascent 0:tl or top-left 49 0----1----2 <---- ascent 0:tl or top-left
50 | | 1:tc or top-center 50 | | 1:tc or top-center
@@ -212,7 +212,7 @@ If it is a string, the elements are alternate characters. In
212this case, TAB element has a special meaning. If the first 212this case, TAB element has a special meaning. If the first
213characer is TAB, the glyphs are displayed with left padding space 213characer is TAB, the glyphs are displayed with left padding space
214so that no pixel overlaps with the previous column. If the last 214so that no pixel overlaps with the previous column. If the last
215character is TAB, the glyphs are displayed with rigth padding 215character is TAB, the glyphs are displayed with right padding
216space so that no pixel overlaps with the following column. 216space so that no pixel overlaps with the following column.
217 217
218If it is a vector or list, it is a sequence of alternate characters and 218If it is a vector or list, it is a sequence of alternate characters and
@@ -222,7 +222,7 @@ elements with previously composed N glyphs.
222 222
223A composition rule is a cons of global and new glyph reference point 223A composition rule is a cons of global and new glyph reference point
224symbols. See the documentation of `reference-point-alist' for more 224symbols. See the documentation of `reference-point-alist' for more
225detail. 225details.
226 226
227Optional 4th argument MODIFICATION-FUNC is a function to call to 227Optional 4th argument MODIFICATION-FUNC is a function to call to
228adjust the composition when it gets invalid because of a change of 228adjust the composition when it gets invalid because of a change of