summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2010-10-12 17:16:57 +0200
committerJuanma Barranquero <lekktu@gmail.com>2010-10-12 17:16:57 +0200
commit51e4f4a88de94846f6b44b3e11496c7b67aa2f5e (patch)
tree0eeaf52c6c802c1ac20b70b917927788f94500e3 /src
parentad1746f5db1b4c52da8d7bdc52359d6b0a5a5e24 (diff)
downloademacs-51e4f4a88de94846f6b44b3e11496c7b67aa2f5e.tar.gz
Fix typos in docstrings, comments and ChangeLogs.
* lisp/composite.el (compose-region): * src/ccl.c (Fccl_execute_on_string): Fix typo in docstring.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/ChangeLog.74
-rw-r--r--src/ccl.c4
-rw-r--r--src/dispextern.h2
-rw-r--r--src/font.h2
-rw-r--r--src/print.c2
-rw-r--r--src/regex.c2
-rw-r--r--src/w32font.c2
-rw-r--r--src/w32uniscribe.c2
9 files changed, 14 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9ce5007d3b3..01ecd37eec7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-12 Juanma Barranquero <lekktu@gmail.com>
+
+ * ccl.c (Fccl_execute_on_string): Fix typo in docstring.
+
2010-10-10 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (Qleft): Declare.
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 6cc3d0f9e3e..a334b4806da 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -491,7 +491,7 @@
* xselect.c (selection_data_to_lisp_data): Set
Vlast_coding_system_used.
- (lisp_data_to_selection_data): Likewize.
+ (lisp_data_to_selection_data): Likesize.
1998-07-07 Richard Stallman <rms@psilocin.ai.mit.edu>
@@ -502,7 +502,7 @@
* editfns.c (Fformat): Replace explicit numeric constants with
proper macros.
- * fns.c (concat): Likewize.
+ * fns.c (concat): Likewise.
1998-07-06 Kenichi Handa <handa@etl.go.jp>
diff --git a/src/ccl.c b/src/ccl.c
index c33df9e56de..ac1d7be621c 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -450,7 +450,7 @@ extern int charset_unicode;
Therefore, the instruction code range is 0..16384(0x3fff).
*/
-/* Read a multibyte characeter.
+/* Read a multibyte character.
A code point is stored into reg[rrr]. A charset ID is stored into
reg[RRR]. */
@@ -2058,7 +2058,7 @@ If R0..R7 are nil, they are initialized to 0.
If IC is nil, it is initialized to head of the CCL program.
If optional 4th arg CONTINUE is non-nil, keep IC on read operation
-when read buffer is exausted, else, IC is always set to the end of
+when read buffer is exhausted, else, IC is always set to the end of
CCL-PROGRAM on exit.
It returns the contents of write buffer as a string,
diff --git a/src/dispextern.h b/src/dispextern.h
index 076d9055859..ca91c5b6812 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1873,7 +1873,7 @@ struct composition_it
are not iterating over a composition now. */
int id;
/* If non-negative, character that triggers the automatic
- composition at `stop_pos', and this is an automatic compositoin.
+ composition at `stop_pos', and this is an automatic composition.
If negative, this is a static composition. This is set to -2
temporarily if searching of composition reach a limit or a
newline. */
diff --git a/src/font.h b/src/font.h
index 952ea269495..96227ffe40b 100644
--- a/src/font.h
+++ b/src/font.h
@@ -574,7 +574,7 @@ struct font_driver
FONT-ENTITY and it must be opened to check it, return -1. */
int (*has_char) P_ ((Lisp_Object font, int c));
- /* Return a glyph code of FONT for characer C (Unicode code point).
+ /* Return a glyph code of FONT for character C (Unicode code point).
If FONT doesn't have such a glyph, return FONT_INVALID_CODE. */
unsigned (*encode_char) P_ ((struct font *font, int c));
diff --git a/src/print.c b/src/print.c
index ccbf8d8c0c7..43f17a7c15d 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1450,7 +1450,7 @@ static void print_check_string_charset_prop ();
#define PRINT_STRING_NON_CHARSET_FOUND 1
#define PRINT_STRING_UNSAFE_CHARSET_FOUND 2
-/* Bitwize or of the abobe macros. */
+/* Bitwise or of the above macros. */
static int print_check_string_result;
static void
diff --git a/src/regex.c b/src/regex.c
index 85ff9b99604..7d12089fea2 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -4145,7 +4145,7 @@ analyse_first (p, pend, fastmap, multibyte)
&& match_any_multibyte_characters == false)
{
/* Set fastmap[I] to 1 where I is a leading code of each
- multibyte characer in the range table. */
+ multibyte character in the range table. */
int c, count;
unsigned char lc1, lc2;
diff --git a/src/w32font.c b/src/w32font.c
index e93dbca2ddb..a07762e970f 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -346,7 +346,7 @@ w32font_has_char (entity, c)
}
/* w32 implementation of encode_char for font backend.
- Return a glyph code of FONT for characer C (Unicode code point).
+ Return a glyph code of FONT for character C (Unicode code point).
If FONT doesn't have such a glyph, return FONT_INVALID_CODE.
For speed, the gdi backend uses unicode (Emacs calls encode_char
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index cfdf629ceee..9cd1ac6426c 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -448,7 +448,7 @@ uniscribe_shape (lgstring)
}
/* Uniscribe implementation of encode_char for font backend.
- Return a glyph code of FONT for characer C (Unicode code point).
+ Return a glyph code of FONT for character C (Unicode code point).
If FONT doesn't have such a glyph, return FONT_INVALID_CODE. */
static unsigned
uniscribe_encode_char (font, c)