diff options
| author | Juanma Barranquero | 2011-11-14 22:00:24 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2011-11-14 22:00:24 +0100 |
| commit | 0b381c7eb83c635f39159168a48c869d632d8081 (patch) | |
| tree | 32ad79519ce958dc2dbcdcd357d37d652314edb1 /src | |
| parent | 8350f087efe62e2ce0ded434534629a56cdc4e8c (diff) | |
| download | emacs-0b381c7eb83c635f39159168a48c869d632d8081.tar.gz emacs-0b381c7eb83c635f39159168a48c869d632d8081.zip | |
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 @@ | |||
| 44 | 44 | ||
| 45 | 2011-11-11 Dmitry Antipov <dmantipov@yandex.ru> | 45 | 2011-11-11 Dmitry Antipov <dmantipov@yandex.ru> |
| 46 | 46 | ||
| 47 | * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext. | 47 | * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext. |
| 48 | 48 | ||
| 49 | 2011-11-11 Kenichi Handa <handa@m17n.org> | 49 | 2011-11-11 Kenichi Handa <handa@m17n.org> |
| 50 | 50 | ||
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 @@ | |||
| 19139 | (font_rescale_ratio): New function. | 19139 | (font_rescale_ratio): New function. |
| 19140 | (split_font_name): If NUMERIC_P is nonzero, set font->rescale_ratio. | 19140 | (split_font_name): If NUMERIC_P is nonzero, set font->rescale_ratio. |
| 19141 | (better_font_p): On comparing point sized, pay attention to | 19141 | (better_font_p): On comparing point sized, pay attention to |
| 19142 | recale_ratio member of fonts. | 19142 | rescale_ratio member of fonts. |
| 19143 | (build_scalable_font_name): Reflect font->rescale_ratio in the | 19143 | (build_scalable_font_name): Reflect font->rescale_ratio in the |
| 19144 | font name. | 19144 | font name. |
| 19145 | (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp variable. | 19145 | (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp variable. |
| @@ -22780,7 +22780,7 @@ | |||
| 22780 | 2002-07-23 Kenichi Handa <handa@etl.go.jp> | 22780 | 2002-07-23 Kenichi Handa <handa@etl.go.jp> |
| 22781 | 22781 | ||
| 22782 | * xdisp.c (face_before_or_after_it_pos): | 22782 | * xdisp.c (face_before_or_after_it_pos): |
| 22783 | Call FETCH_MULTIBYTE_CHAR with byte postion, not char position. | 22783 | Call FETCH_MULTIBYTE_CHAR with byte position, not char position. |
| 22784 | 22784 | ||
| 22785 | 2002-07-22 Juanma Barranquero <lektu@terra.es> | 22785 | 2002-07-22 Juanma Barranquero <lektu@terra.es> |
| 22786 | 22786 | ||
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 @@ | |||
| 26748 | 2008-02-01 Kenichi Handa <handa@m17n.org> | 26748 | 2008-02-01 Kenichi Handa <handa@m17n.org> |
| 26749 | 26749 | ||
| 26750 | * xdisp.c (face_before_or_after_it_pos): | 26750 | * xdisp.c (face_before_or_after_it_pos): |
| 26751 | Call FETCH_MULTIBYTE_CHAR with byte postion, not char position. | 26751 | Call FETCH_MULTIBYTE_CHAR with byte position, not char position. |
| 26752 | 26752 | ||
| 26753 | 2008-02-01 Kenichi Handa <handa@m17n.org> | 26753 | 2008-02-01 Kenichi Handa <handa@m17n.org> |
| 26754 | 26754 | ||
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 @@ | |||
| 15414 | * xfns.c (Fx_create_screen): If user has specified | 15414 | * xfns.c (Fx_create_screen): If user has specified |
| 15415 | `x-iconic-startup' then start emacs in iconic form. | 15415 | `x-iconic-startup' then start emacs in iconic form. |
| 15416 | Look for icon position in `icon-left' and `icon-top', or use | 15416 | Look for icon position in `icon-left' and `icon-top', or use |
| 15417 | window postion. | 15417 | window position. |
| 15418 | 15418 | ||
| 15419 | * xterm.c (x_term_init): If server doesn't respond, use fatal | 15419 | * xterm.c (x_term_init): If server doesn't respond, use fatal |
| 15420 | instead of error. Also tell user about -d option. | 15420 | 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 @@ | |||
| 7485 | 7485 | ||
| 7486 | 1997-06-09 Kenichi Handa <handa@etl.go.jp> | 7486 | 1997-06-09 Kenichi Handa <handa@etl.go.jp> |
| 7487 | 7487 | ||
| 7488 | * buffer.c (init_buffer_once): Inititialize the member | 7488 | * buffer.c (init_buffer_once): Initialize the member |
| 7489 | buffer_file_coding_system. | 7489 | buffer_file_coding_system. |
| 7490 | (syms_of_buffer): Declare Lisp variables | 7490 | (syms_of_buffer): Declare Lisp variables |
| 7491 | default-buffer-file-coding-system and buffer-file-coding-system. | 7491 | 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 | |||
| 162 | /* 1 iff the following table is used for encoder. */ | 162 | /* 1 iff the following table is used for encoder. */ |
| 163 | short for_encoder; | 163 | short for_encoder; |
| 164 | 164 | ||
| 165 | /* When the following table is used for encoding, mininum and | 165 | /* When the following table is used for encoding, minimum and |
| 166 | maxinum character of the current charset. */ | 166 | maximum character of the current charset. */ |
| 167 | int min_char, max_char; | 167 | int min_char, max_char; |
| 168 | 168 | ||
| 169 | /* A Unicode character correspoinding to the code indice 0 (i.e. the | 169 | /* 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 | |||
| 153 | /* Dimension of the charset: 1, 2, 3, or 4. */ | 153 | /* Dimension of the charset: 1, 2, 3, or 4. */ |
| 154 | int dimension; | 154 | int dimension; |
| 155 | 155 | ||
| 156 | /* Byte code range of each dimension. <code_space>[4N] is a mininum | 156 | /* Byte code range of each dimension. <code_space>[4N] is a minimum |
| 157 | byte code of the (N+1)th dimension, <code_space>[4N+1] is a | 157 | byte code of the (N+1)th dimension, <code_space>[4N+1] is a |
| 158 | maximum byte code of the (N+1)th dimension, <code_space>[4N+2] is | 158 | maximum byte code of the (N+1)th dimension, <code_space>[4N+2] is |
| 159 | (<code_space>[4N+1] - <code_space>[4N] + 1), <code_space>[4N+3] | 159 | (<code_space>[4N+1] - <code_space>[4N] + 1), <code_space>[4N+3] |
| @@ -199,14 +199,14 @@ struct charset | |||
| 199 | /* The method for encoding/decoding characters of the charset. */ | 199 | /* The method for encoding/decoding characters of the charset. */ |
| 200 | enum charset_method method; | 200 | enum charset_method method; |
| 201 | 201 | ||
| 202 | /* Mininum and Maximum code points of the charset. */ | 202 | /* Minimum and Maximum code points of the charset. */ |
| 203 | unsigned min_code, max_code; | 203 | unsigned min_code, max_code; |
| 204 | 204 | ||
| 205 | /* Offset value used by macros CODE_POINT_TO_INDEX and | 205 | /* Offset value used by macros CODE_POINT_TO_INDEX and |
| 206 | INDEX_TO_CODE_POINT. . */ | 206 | INDEX_TO_CODE_POINT. . */ |
| 207 | unsigned char_index_offset; | 207 | unsigned char_index_offset; |
| 208 | 208 | ||
| 209 | /* Mininum and Maximum character codes of the charset. If the | 209 | /* Minimum and Maximum character codes of the charset. If the |
| 210 | charset is compatible with ASCII, min_char is a minimum non-ASCII | 210 | charset is compatible with ASCII, min_char is a minimum non-ASCII |
| 211 | character of the charset. If the method of charset is | 211 | character of the charset. If the method of charset is |
| 212 | CHARSET_METHOD_OFFSET, even if the charset is unified, min_char | 212 | 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), | |||
| 758 | { | 758 | { |
| 759 | /* Depth of TABLE. */ | 759 | /* Depth of TABLE. */ |
| 760 | int depth; | 760 | int depth; |
| 761 | /* Minimum and maxinum characters covered by TABLE. */ | 761 | /* Minimum and maximum characters covered by TABLE. */ |
| 762 | int min_char, max_char; | 762 | int min_char, max_char; |
| 763 | /* Number of characters covered by one element of TABLE. */ | 763 | /* Number of characters covered by one element of TABLE. */ |
| 764 | int chars_in_block; | 764 | 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 | |||
| 1307 | if (cmp_it->lookback == 0) | 1307 | if (cmp_it->lookback == 0) |
| 1308 | goto no_composition; | 1308 | goto no_composition; |
| 1309 | lgstring = Qnil; | 1309 | lgstring = Qnil; |
| 1310 | /* Try to find a shorter compostion that starts after CPOS. */ | 1310 | /* Try to find a shorter composition that starts after CPOS. */ |
| 1311 | composition_compute_stop_pos (cmp_it, charpos, bytepos, cpos, | 1311 | composition_compute_stop_pos (cmp_it, charpos, bytepos, cpos, |
| 1312 | string); | 1312 | string); |
| 1313 | if (cmp_it->ch == -2 || cmp_it->stop_pos < charpos) | 1313 | 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; | |||
| 1702 | /* Number of automatically created fontsets. */ | 1702 | /* Number of automatically created fontsets. */ |
| 1703 | static printmax_t num_auto_fontsets; | 1703 | static printmax_t num_auto_fontsets; |
| 1704 | 1704 | ||
| 1705 | /* Retun a fontset synthesized from FONT-OBJECT. This is called from | 1705 | /* Return a fontset synthesized from FONT-OBJECT. This is called from |
| 1706 | x_new_font when FONT-OBJECT is used for the default ASCII font of a | 1706 | x_new_font when FONT-OBJECT is used for the default ASCII font of a |
| 1707 | frame, and the returned fontset is used for the default fontset of | 1707 | frame, and the returned fontset is used for the default fontset of |
| 1708 | that frame. The fontset specifies a font of the same registry as | 1708 | 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, | |||
| 7824 | 7824 | ||
| 7825 | if (imagemagick_rendermethod == 1) | 7825 | if (imagemagick_rendermethod == 1) |
| 7826 | { | 7826 | { |
| 7827 | /* Magicexportimage is normaly faster than pixelpushing. This | 7827 | /* Magicexportimage is normally faster than pixelpushing. This |
| 7828 | method is also well tested. Some aspects of this method are | 7828 | method is also well tested. Some aspects of this method are |
| 7829 | ad-hoc and needs to be more researched. */ | 7829 | ad-hoc and needs to be more researched. */ |
| 7830 | int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/ | 7830 | 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: | |||
| 1019 | /* The conditional bit below was in Oliva's original code | 1019 | /* The conditional bit below was in Oliva's original code |
| 1020 | (1999-08-25) and seems to have been dropped by mistake | 1020 | (1999-08-25) and seems to have been dropped by mistake |
| 1021 | subsequently. It prevents a crash at startup under X in | 1021 | subsequently. It prevents a crash at startup under X in |
| 1022 | `IRIX64 6.5 6.5.17m', whether compiled on that relase or | 1022 | `IRIX64 6.5 6.5.17m', whether compiled on that release or |
| 1023 | an earlier one. It causes no trouble on the other ELF | 1023 | an earlier one. It causes no trouble on the other ELF |
| 1024 | platforms I could test (Irix 6.5.15m, Solaris 8, Debian | 1024 | platforms I could test (Irix 6.5.15m, Solaris 8, Debian |
| 1025 | Potato x86, Debian Woody SPARC); however, it's reported | 1025 | 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, | |||
| 272 | return 0; | 272 | return 0; |
| 273 | } | 273 | } |
| 274 | 274 | ||
| 275 | /* A hash table recoding which font supports which scritps. Each key | 275 | /* A hash table recoding which font supports which scripts. Each key |
| 276 | is a vector of characteristic font propertis FOUNDRY to WIDTH and | 276 | is a vector of characteristic font properties FOUNDRY to WIDTH and |
| 277 | ADDSTYLE, and each value is a list of script symbols. | 277 | ADDSTYLE, and each value is a list of script symbols. |
| 278 | 278 | ||
| 279 | We assume that fonts that have the same value in the above | 279 | We assume that fonts that have the same value in the above |
| @@ -281,7 +281,7 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont, | |||
| 281 | 281 | ||
| 282 | static Lisp_Object xfont_scripts_cache; | 282 | static Lisp_Object xfont_scripts_cache; |
| 283 | 283 | ||
| 284 | /* Re-usable vector to store characteristic font properites. */ | 284 | /* Re-usable vector to store characteristic font properties. */ |
| 285 | static Lisp_Object xfont_scratch_props; | 285 | static Lisp_Object xfont_scratch_props; |
| 286 | 286 | ||
| 287 | /* Return a list of scripts supported by the font of FONTNAME whose | 287 | /* Return a list of scripts supported by the font of FONTNAME whose |