diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2011-11-14 22:00:24 +0100 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2011-11-14 22:00:24 +0100 |
commit | 0b381c7eb83c635f39159168a48c869d632d8081 (patch) | |
tree | 32ad79519ce958dc2dbcdcd357d37d652314edb1 /src | |
parent | 8350f087efe62e2ce0ded434534629a56cdc4e8c (diff) | |
download | emacs-0b381c7eb83c635f39159168a48c869d632d8081.tar.gz |
Fix typos.
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog | 2 | ||||
-rw-r--r-- | src/ChangeLog.10 | 4 | ||||
-rw-r--r-- | src/ChangeLog.11 | 2 | ||||
-rw-r--r-- | src/ChangeLog.3 | 2 | ||||
-rw-r--r-- | src/ChangeLog.7 | 2 | ||||
-rw-r--r-- | src/charset.c | 4 | ||||
-rw-r--r-- | src/charset.h | 6 | ||||
-rw-r--r-- | src/chartab.c | 2 | ||||
-rw-r--r-- | src/composite.c | 2 | ||||
-rw-r--r-- | src/fontset.c | 2 | ||||
-rw-r--r-- | src/image.c | 2 | ||||
-rw-r--r-- | src/unexelf.c | 2 | ||||
-rw-r--r-- | src/xfont.c | 6 |
13 files changed, 19 insertions, 19 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3c93caec5d8..860c019eb01 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -44,7 +44,7 @@ 2011-11-11 Dmitry Antipov <dmantipov@yandex.ru> - * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext. + * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext. 2011-11-11 Kenichi Handa <handa@m17n.org> diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index 9b61d107059..beb66847253 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -19139,7 +19139,7 @@ (font_rescale_ratio): New function. (split_font_name): If NUMERIC_P is nonzero, set font->rescale_ratio. (better_font_p): On comparing point sized, pay attention to - recale_ratio member of fonts. + rescale_ratio member of fonts. (build_scalable_font_name): Reflect font->rescale_ratio in the font name. (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp variable. @@ -22780,7 +22780,7 @@ 2002-07-23 Kenichi Handa <handa@etl.go.jp> * xdisp.c (face_before_or_after_it_pos): - Call FETCH_MULTIBYTE_CHAR with byte postion, not char position. + Call FETCH_MULTIBYTE_CHAR with byte position, not char position. 2002-07-22 Juanma Barranquero <lektu@terra.es> diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index 49bafda36a0..4e894cb3644 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -26748,7 +26748,7 @@ 2008-02-01 Kenichi Handa <handa@m17n.org> * xdisp.c (face_before_or_after_it_pos): - Call FETCH_MULTIBYTE_CHAR with byte postion, not char position. + Call FETCH_MULTIBYTE_CHAR with byte position, not char position. 2008-02-01 Kenichi Handa <handa@m17n.org> diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 2b63ed11bcc..cdfe63fc59c 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -15414,7 +15414,7 @@ * xfns.c (Fx_create_screen): If user has specified `x-iconic-startup' then start emacs in iconic form. Look for icon position in `icon-left' and `icon-top', or use - window postion. + window position. * xterm.c (x_term_init): If server doesn't respond, use fatal instead of error. Also tell user about -d option. diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index fa55d6974ad..699b2bf817e 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 @@ -7485,7 +7485,7 @@ 1997-06-09 Kenichi Handa <handa@etl.go.jp> - * buffer.c (init_buffer_once): Inititialize the member + * buffer.c (init_buffer_once): Initialize the member buffer_file_coding_system. (syms_of_buffer): Declare Lisp variables default-buffer-file-coding-system and buffer-file-coding-system. diff --git a/src/charset.c b/src/charset.c index 8d6a3982d14..266753f9d05 100644 --- a/src/charset.c +++ b/src/charset.c @@ -162,8 +162,8 @@ static struct /* 1 iff the following table is used for encoder. */ short for_encoder; - /* When the following table is used for encoding, mininum and - maxinum character of the current charset. */ + /* When the following table is used for encoding, minimum and + maximum character of the current charset. */ int min_char, max_char; /* A Unicode character correspoinding to the code indice 0 (i.e. the diff --git a/src/charset.h b/src/charset.h index be02bc0feae..fc35d6bb991 100644 --- a/src/charset.h +++ b/src/charset.h @@ -153,7 +153,7 @@ struct charset /* Dimension of the charset: 1, 2, 3, or 4. */ int dimension; - /* Byte code range of each dimension. <code_space>[4N] is a mininum + /* Byte code range of each dimension. <code_space>[4N] is a minimum byte code of the (N+1)th dimension, <code_space>[4N+1] is a maximum byte code of the (N+1)th dimension, <code_space>[4N+2] is (<code_space>[4N+1] - <code_space>[4N] + 1), <code_space>[4N+3] @@ -199,14 +199,14 @@ struct charset /* The method for encoding/decoding characters of the charset. */ enum charset_method method; - /* Mininum and Maximum code points of the charset. */ + /* Minimum and Maximum code points of the charset. */ unsigned min_code, max_code; /* Offset value used by macros CODE_POINT_TO_INDEX and INDEX_TO_CODE_POINT. . */ unsigned char_index_offset; - /* Mininum and Maximum character codes of the charset. If the + /* Minimum and Maximum character codes of the charset. If the charset is compatible with ASCII, min_char is a minimum non-ASCII character of the charset. If the method of charset is CHARSET_METHOD_OFFSET, even if the charset is unified, min_char diff --git a/src/chartab.c b/src/chartab.c index 1d4ac04312a..7e8161461f3 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -758,7 +758,7 @@ map_sub_char_table (void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object), { /* Depth of TABLE. */ int depth; - /* Minimum and maxinum characters covered by TABLE. */ + /* Minimum and maximum characters covered by TABLE. */ int min_char, max_char; /* Number of characters covered by one element of TABLE. */ int chars_in_block; diff --git a/src/composite.c b/src/composite.c index c8e4dd082ae..885e0262673 100644 --- a/src/composite.c +++ b/src/composite.c @@ -1307,7 +1307,7 @@ composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I if (cmp_it->lookback == 0) goto no_composition; lgstring = Qnil; - /* Try to find a shorter compostion that starts after CPOS. */ + /* Try to find a shorter composition that starts after CPOS. */ composition_compute_stop_pos (cmp_it, charpos, bytepos, cpos, string); if (cmp_it->ch == -2 || cmp_it->stop_pos < charpos) diff --git a/src/fontset.c b/src/fontset.c index 5c9ebf8440a..d802d235962 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1702,7 +1702,7 @@ static Lisp_Object auto_fontset_alist; /* Number of automatically created fontsets. */ static printmax_t num_auto_fontsets; -/* Retun a fontset synthesized from FONT-OBJECT. This is called from +/* Return a fontset synthesized from FONT-OBJECT. This is called from x_new_font when FONT-OBJECT is used for the default ASCII font of a frame, and the returned fontset is used for the default fontset of that frame. The fontset specifies a font of the same registry as diff --git a/src/image.c b/src/image.c index 14c74f10607..1869b83ac2a 100644 --- a/src/image.c +++ b/src/image.c @@ -7824,7 +7824,7 @@ imagemagick_load_image (struct frame *f, struct image *img, if (imagemagick_rendermethod == 1) { - /* Magicexportimage is normaly faster than pixelpushing. This + /* Magicexportimage is normally faster than pixelpushing. This method is also well tested. Some aspects of this method are ad-hoc and needs to be more researched. */ int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/ diff --git a/src/unexelf.c b/src/unexelf.c index 979d6dce629..04c029f7e80 100644 --- a/src/unexelf.c +++ b/src/unexelf.c @@ -1019,7 +1019,7 @@ temacs: /* The conditional bit below was in Oliva's original code (1999-08-25) and seems to have been dropped by mistake subsequently. It prevents a crash at startup under X in - `IRIX64 6.5 6.5.17m', whether compiled on that relase or + `IRIX64 6.5 6.5.17m', whether compiled on that release or an earlier one. It causes no trouble on the other ELF platforms I could test (Irix 6.5.15m, Solaris 8, Debian Potato x86, Debian Woody SPARC); however, it's reported diff --git a/src/xfont.c b/src/xfont.c index 2c3ca911623..60e5aa6e98e 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -272,8 +272,8 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont, return 0; } -/* A hash table recoding which font supports which scritps. Each key - is a vector of characteristic font propertis FOUNDRY to WIDTH and +/* A hash table recoding which font supports which scripts. Each key + is a vector of characteristic font properties FOUNDRY to WIDTH and ADDSTYLE, and each value is a list of script symbols. We assume that fonts that have the same value in the above @@ -281,7 +281,7 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont, static Lisp_Object xfont_scripts_cache; -/* Re-usable vector to store characteristic font properites. */ +/* Re-usable vector to store characteristic font properties. */ static Lisp_Object xfont_scratch_props; /* Return a list of scripts supported by the font of FONTNAME whose |