aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2010-10-13 01:25:19 +0200
committerJuanma Barranquero2010-10-13 01:25:19 +0200
commitc0943d3db2b2737d5092e887fd22d7088c3ca43d (patch)
treeee909e2f48e5315a883802b75866b7df861c60f5 /src
parent51e4f4a88de94846f6b44b3e11496c7b67aa2f5e (diff)
downloademacs-c0943d3db2b2737d5092e887fd22d7088c3ca43d.tar.gz
emacs-c0943d3db2b2737d5092e887fd22d7088c3ca43d.zip
Fix typos in docstrings, comments and ChangeLogs.
* etc/tutorials/TUTORIAL.es: Fix typos. * lisp/cedet/semantic/symref/list.el (semantic-symref-list-rename-open-hits): Fix typo in message. (semantic-symref-list-map-open-hits): Fix typo in docstring. * lisp/erc/erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring. * lisp/gnus/nnmail.el (nnmail-fancy-expiry-targets): Fix typo in docstring. * lisp/international/mule.el (define-coding-system): * lisp/international/titdic-cnv.el (quail-cxterm-package-ext-info): * composite.el (compose-region): Fix typo in docstring. * lisp/org/org-agenda.el (org-prefix-category-length) (org-prefix-category-max-length): Fix typos in docstrings. * src/font.c (Ffont_variation_glyphs): * ccl.c (Fccl_execute_on_string): Fix typo in docstring.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog9
-rw-r--r--src/ChangeLog.232
-rw-r--r--src/ChangeLog.38
-rw-r--r--src/ChangeLog.56
-rw-r--r--src/ChangeLog.72
-rw-r--r--src/ChangeLog.82
-rw-r--r--src/ChangeLog.916
-rw-r--r--src/font.c2
-rw-r--r--src/frame.h2
-rw-r--r--src/nsterm.m10
10 files changed, 45 insertions, 44 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 01ecd37eec7..7c1faad6aab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,6 @@
12010-10-12 Juanma Barranquero <lekktu@gmail.com> 12010-10-12 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * font.c (Ffont_variation_glyphs):
3 * ccl.c (Fccl_execute_on_string): Fix typo in docstring. 4 * ccl.c (Fccl_execute_on_string): Fix typo in docstring.
4 5
52010-10-10 Jan Djärv <jan.h.d@swipnet.se> 62010-10-10 Jan Djärv <jan.h.d@swipnet.se>
@@ -138,7 +139,7 @@
138 (x_produce_glyphs): Simplify by using the same code for ASCII and 139 (x_produce_glyphs): Simplify by using the same code for ASCII and
139 non-ASCII characters. Don't set it->char_to_display here. 140 non-ASCII characters. Don't set it->char_to_display here.
140 Don't handle unibyte-display-via-language-environment here. For a 141 Don't handle unibyte-display-via-language-environment here. For a
141 charater of no glyph, use font->space_width instead of FONT_WIDTH. 142 character of no glyph, use font->space_width instead of FONT_WIDTH.
142 143
1432010-08-29 Kenichi Handa <handa@m17n.org> 1442010-08-29 Kenichi Handa <handa@m17n.org>
144 145
@@ -175,7 +176,7 @@
175 * charset.c: Include <stdlib.h> 176 * charset.c: Include <stdlib.h>
176 (struct charset_sort_data): New struct. 177 (struct charset_sort_data): New struct.
177 (charset_compare): New function. 178 (charset_compare): New function.
178 (Fsort_charsets): New funciton. 179 (Fsort_charsets): New function.
179 (syms_of_charset): Declare Fsort_charsets as a Lisp function. 180 (syms_of_charset): Declare Fsort_charsets as a Lisp function.
180 181
181 * coding.c (decode_coding_iso_2022): Fix checking of dimension 182 * coding.c (decode_coding_iso_2022): Fix checking of dimension
@@ -13876,7 +13877,7 @@
13876 (Ffont_shape_text): New function. 13877 (Ffont_shape_text): New function.
13877 (Fopen_font): If the font size is not given, use 12-pixel. 13878 (Fopen_font): If the font size is not given, use 12-pixel.
13878 (Ffont_at): New arg STRING. 13879 (Ffont_at): New arg STRING.
13879 (syms_of_font): Initalize font_charset_alist. 13880 (syms_of_font): Initialize font_charset_alist.
13880 Declare Ffont_shape_text as a Lisp function. Call syms_of_XXfont 13881 Declare Ffont_shape_text as a Lisp function. Call syms_of_XXfont
13881 conditionally. 13882 conditionally.
13882 13883
@@ -14873,7 +14874,7 @@
14873 14874
14874 * font.c (font_unparse_fcname): Fix typo (swidth->width). 14875 * font.c (font_unparse_fcname): Fix typo (swidth->width).
14875 (font_list_entities): Check driver_list->on. 14876 (font_list_entities): Check driver_list->on.
14876 (register_font_driver): Initalize `on' member to 0. 14877 (register_font_driver): Initialize `on' member to 0.
14877 (font_update_drivers): New function. 14878 (font_update_drivers): New function.
14878 (Fclear_font_cache): Check driver_list->on. 14879 (Fclear_font_cache): Check driver_list->on.
14879 14880
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 265cc95e60d..d90e326f970 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -683,7 +683,7 @@
683 (That `select' saw something on channel 0 doesn't mean it is 683 (That `select' saw something on channel 0 doesn't mean it is
684 kbd input; it could be an expose event.) 684 kbd input; it could be an expose event.)
685 685
686 * keyboard.c (read_avail_input) [FIONREAD]: Now static. 686 * keyboard.c (read_avail_input) [FIONREAD]: Now static.
687 New arg specifies value of NREAD; 687 New arg specifies value of NREAD;
688 if it is nonzero, don't call get_input_pending to get it. 688 if it is nonzero, don't call get_input_pending to get it.
689 Use kbd_buffer_store_char to put chars into kbd_buffer. 689 Use kbd_buffer_store_char to put chars into kbd_buffer.
@@ -1210,7 +1210,7 @@
1210 Remove #ifndef VMS around the sleep when buffer is full. 1210 Remove #ifndef VMS around the sleep when buffer is full.
1211 * s-vms.h: Define nonstandard PENDING_OUTPUT_COUNT for VMS use. 1211 * s-vms.h: Define nonstandard PENDING_OUTPUT_COUNT for VMS use.
1212 1212
1213 * fileio.c (file_name_as_directory) [VMS]: Fix 3rd arg to strncmp. 1213 * fileio.c (file_name_as_directory) [VMS]: Fix 3rd arg to strncmp.
1214 1214
12151987-07-17 Paul Rubin (phr@prep) 12151987-07-17 Paul Rubin (phr@prep)
1216 1216
@@ -1442,7 +1442,7 @@
1442 Turn on call to vmserrstr. 1442 Turn on call to vmserrstr.
1443 * sysdep.c (vmserrstr) [VMS]: Define this function. 1443 * sysdep.c (vmserrstr) [VMS]: Define this function.
1444 1444
1445 * process.c (create_process) [IRIS]: Don't open the pty's tty 1445 * process.c (create_process) [IRIS]: Don't open the pty's tty
1446 in the parent process. Open only once, in the child. 1446 in the parent process. Open only once, in the child.
1447 1447
1448 * xdisp.c (redisplay_window): If window-start points nowhere, 1448 * xdisp.c (redisplay_window): If window-start points nowhere,
@@ -1544,8 +1544,8 @@
1544 1544
15451987-05-05 Richard Mlynarik (mly@prep) 15451987-05-05 Richard Mlynarik (mly@prep)
1546 1546
1547 * m-irist.h: New version from raible@orville.arpa 1547 * m-irist.h: New version from raible@orville.arpa
1548 * s-iris3-5.h: New file. (s-usg5-2 with additions) 1548 * s-iris3-5.h: New file. (s-usg5-2 with additions)
1549 1549
1550 * keyboard.c: 1550 * keyboard.c:
1551 IRIS, like HPUX, #defines but does not implement FIONREAD. 1551 IRIS, like HPUX, #defines but does not implement FIONREAD.
@@ -1563,10 +1563,10 @@
15631987-04-27 Richard Mlynarik (mly@prep) 15631987-04-27 Richard Mlynarik (mly@prep)
1564 1564
1565 * fileio.c (APOLLO from lnz): 1565 * fileio.c (APOLLO from lnz):
1566 Fcopy_file, Fset_file_modes: Don't use un*x modes if 1566 (Fcopy_file, Fset_file_modes): Don't use un*x modes if
1567 env var USE_DOMAIN_ACLS is set. 1567 env var USE_DOMAIN_ACLS is set.
1568 Fset_file_modes: utimes fix. 1568 (Fset_file_modes): utimes fix.
1569 Finsert_file_contents: Must do fstat after open for Apollo. 1569 (Finsert_file_contents): Must do fstat after open for Apollo.
1570 1570
1571 * emacs.c (main): (APOLLO from lnz): 1571 * emacs.c (main): (APOLLO from lnz):
1572 Don't use un*x modes if env var USE_DOMAIN_ACLS set. 1572 Don't use un*x modes if env var USE_DOMAIN_ACLS set.
@@ -1675,7 +1675,7 @@
1675 1675
16761987-03-20 Richard Mlynarik (mly@prep) 16761987-03-20 Richard Mlynarik (mly@prep)
1677 1677
1678 * filemode.c: Hacks for set-uid/gid but not executable. 1678 * filemode.c: Hacks for set-uid/gid but not executable.
1679 1679
16801987-03-20 Richard M. Stallman (rms@prep) 16801987-03-20 Richard M. Stallman (rms@prep)
1681 1681
@@ -1966,7 +1966,7 @@
1966 1966
19671987-02-22 Richard M. Stallman (rms@prep) 19671987-02-22 Richard M. Stallman (rms@prep)
1968 1968
1969 * dispnew.c (Fopen_termscript): Close existing termscript 1969 * dispnew.c (Fopen_termscript): Close existing termscript
1970 file before trying to open a new one. Report open failure 1970 file before trying to open a new one. Report open failure
1971 with report_file_error. 1971 with report_file_error.
1972 1972
@@ -2071,9 +2071,9 @@
2071 2071
20721987-02-10 Richard Mlynarik (mly@prep) 20721987-02-10 Richard Mlynarik (mly@prep)
2073 2073
2074 * xfns.c (Fx_get_default): Add (unsigned char *) cast. 2074 * xfns.c (Fx_get_default): Add (unsigned char *) cast.
2075 2075
2076 * window.c: typo. 2076 * window.c: Typo.
2077 2077
20781987-02-09 Richard M. Stallman (rms@prep) 20781987-02-09 Richard M. Stallman (rms@prep)
2079 2079
@@ -2853,7 +2853,7 @@
2853 local variables for more register decls. Compute 2853 local variables for more register decls. Compute
2854 and pass `envlen' arg to child_setup. 2854 and pass `envlen' arg to child_setup.
2855 2855
2856 * process.c (create_process): Compute and pass `envlen' arg 2856 * process.c (create_process): Compute and pass `envlen' arg
2857 to child_setup. 2857 to child_setup.
2858 2858
2859 * xterm.c (x_term_init): Don't call XPopUpWindow at all. 2859 * xterm.c (x_term_init): Don't call XPopUpWindow at all.
@@ -3998,7 +3998,7 @@
3998 * editfns.c (Fuser_uid, Fuser_real_uid): 3998 * editfns.c (Fuser_uid, Fuser_real_uid):
3999 New functions that return values of geteuid and getuid system calls. 3999 New functions that return values of geteuid and getuid system calls.
4000 4000
4001 * dired.c (Ffile_attributes): Value has additional element 4001 * dired.c (Ffile_attributes): Value has additional element
4002 t iff file gid would change if Emacs deletes it and recreates it. 4002 t iff file gid would change if Emacs deletes it and recreates it.
4003 4003
4004 * xdisp.c (display_mode_element): 4004 * xdisp.c (display_mode_element):
@@ -4078,7 +4078,7 @@
4078 being unbound. struct catchtag has two new fields, 4078 being unbound. struct catchtag has two new fields,
4079 gcpro and pdlcount. 4079 gcpro and pdlcount.
4080 4080
4081 * eval.c (Fthrow, Fsignal): Use unbind_catch before longjmp. 4081 * eval.c (Fthrow, Fsignal): Use unbind_catch before longjmp.
4082 4082
4083 * eval.c (internal_catch): No need to restore anything 4083 * eval.c (internal_catch): No need to restore anything
4084 from the catchtag after throw, because unbind_catch does it all. 4084 from the catchtag after throw, because unbind_catch does it all.
@@ -4657,7 +4657,7 @@
4657 4657
4658 * fileio.c (Ffile_newer_than_file_p): New Lisp primitive. 4658 * fileio.c (Ffile_newer_than_file_p): New Lisp primitive.
4659 4659
4660 * fileio.c (Ffile_exists_p): this is now distinct from 4660 * fileio.c (Ffile_exists_p): This is now distinct from
4661 Ffile_readable_p; it checks only for existence, not for 4661 Ffile_readable_p; it checks only for existence, not for
4662 readability. 4662 readability.
4663 4663
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index fbe3f752aed..11c818f18d9 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -5146,7 +5146,7 @@
5146 Change mouse movement events to be arranged like click events. 5146 Change mouse movement events to be arranged like click events.
5147 (format_modifiers): Note that the click modifier has no 5147 (format_modifiers): Note that the click modifier has no
5148 written representation. 5148 written representation.
5149 (modifier_names, modifer_symbols): New variables, used to 5149 (modifier_names, modifier_symbols): New variables, used to
5150 create the Qevent_symbol_elements property. 5150 create the Qevent_symbol_elements property.
5151 (modify_event_symbol): Change the format of the modified 5151 (modify_event_symbol): Change the format of the modified
5152 symbol cache; there are too many modifier bits now to use a 5152 symbol cache; there are too many modifier bits now to use a
@@ -5154,8 +5154,8 @@
5154 Document the format of the cache. 5154 Document the format of the cache.
5155 Put the Qevent_symbol_elements property on each new symbol, 5155 Put the Qevent_symbol_elements property on each new symbol,
5156 instead of a Qevent_unmodified property. 5156 instead of a Qevent_unmodified property.
5157 (symbols_of_keyboard): Put Qevent_symbol_elements properties on 5157 (symbols_of_keyboard): Put Qevent_symbol_elements properties on the
5158 the symbols specified in head_table, not Qevent_unmodifed properties. 5158 symbols specified in head_table, not Qevent_unmodified properties.
5159 Initialize and staticpro modifier_symbols, and staticpro the 5159 Initialize and staticpro modifier_symbols, and staticpro the
5160 window elements of button_down_location. 5160 window elements of button_down_location.
5161 5161
@@ -11207,7 +11207,7 @@
11207 events to send the function key number instead of a symbol. 11207 events to send the function key number instead of a symbol.
11208 * keyboard.c (modify_event_symbol): Re-arranged to work well 11208 * keyboard.c (modify_event_symbol): Re-arranged to work well
11209 with function key/mouse button numbers instead of symbols. 11209 with function key/mouse button numbers instead of symbols.
11210 And if (MODIFIERS & up_modifer), prepend "U-" to the name of the 11210 And if (MODIFIERS & up_modifier), prepend "U-" to the name of the
11211 symbol being constructed. 11211 symbol being constructed.
11212 (make_lispy_event): Use the new modify_event_symbol. 11212 (make_lispy_event): Use the new modify_event_symbol.
11213 11213
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index d30bd1bdb00..89d43526609 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -3107,7 +3107,7 @@
3107 3107
3108 * lisp.h (enum Lisp_Type): Lisp_Process, Lisp_Window, Lisp_Frame, 3108 * lisp.h (enum Lisp_Type): Lisp_Process, Lisp_Window, Lisp_Frame,
3109 Lisp_Subr deleted. 3109 Lisp_Subr deleted.
3110 (PSEUDOVECTORP, GC_PSEUDOVECTORP): Add paren for proper nesting. 3110 (PSEUDOVECTORP, GC_PSEUDOVECTORP): Add paren for proper nesting.
3111 (PROCESSP, GC_PROCESSP, XSETPROCESS): Rewrite to use pseudovectors. 3111 (PROCESSP, GC_PROCESSP, XSETPROCESS): Rewrite to use pseudovectors.
3112 (WINDOWP, GC_WINDOWP, XSETWINDOW): Likewise. 3112 (WINDOWP, GC_WINDOWP, XSETWINDOW): Likewise.
3113 (FRAMEP, GC_FRAMEP): Likewise. 3113 (FRAMEP, GC_FRAMEP): Likewise.
@@ -4093,7 +4093,7 @@
4093 4093
4094 * xterm.h: Delete X10 code. 4094 * xterm.h: Delete X10 code.
4095 4095
4096 * xfns.c (Fx_create_frame): Don't increment refernce_count 4096 * xfns.c (Fx_create_frame): Don't increment reference_count
4097 until the frame is put on the frame list. 4097 until the frame is put on the frame list.
4098 4098
4099 * xterm.c (x_initialize): Init x_noop_count, x_focus_frame 4099 * xterm.c (x_initialize): Init x_noop_count, x_focus_frame
@@ -7039,7 +7039,7 @@
7039 7039
70401994-06-07 Richard Stallman (rms@mole.gnu.ai.mit.edu) 70401994-06-07 Richard Stallman (rms@mole.gnu.ai.mit.edu)
7041 7041
7042 * mips-siemens.h: Include pyramid.h, not mips.h. 7042 * mips-siemens.h: Include pyramid.h, not mips.h.
7043 (LOAD_AVE_TYPE, LOAD_AVE_CVT): Definitions deleted. 7043 (LOAD_AVE_TYPE, LOAD_AVE_CVT): Definitions deleted.
7044 (NO_ARG_ARRAY, HAVE_ALLOCA): Defined. 7044 (NO_ARG_ARRAY, HAVE_ALLOCA): Defined.
7045 (BROKEN_FIONREAD): Add #undef. 7045 (BROKEN_FIONREAD): Add #undef.
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index a334b4806da..b5927108808 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -1040,7 +1040,7 @@
1040 1040
1041 * lread.c: Remember the last TWO strings skipped with #@. 1041 * lread.c: Remember the last TWO strings skipped with #@.
1042 (prev_saved_doc_string*): New variables. 1042 (prev_saved_doc_string*): New variables.
1043 (Fload): Initalize prev_saved_doc_string. 1043 (Fload): Initialize prev_saved_doc_string.
1044 (read1): Copy saved_doc_string to prev_saved_doc_string 1044 (read1): Copy saved_doc_string to prev_saved_doc_string
1045 before storing a new string in saved_doc_string. 1045 before storing a new string in saved_doc_string.
1046 (read_list): Look in prev_saved_doc_string as well as 1046 (read_list): Look in prev_saved_doc_string as well as
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 6da7b6862a5..eeaae29db52 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -3686,7 +3686,7 @@
3686 * lread.c (read_escape): For Control modifier, pay attention to 3686 * lread.c (read_escape): For Control modifier, pay attention to
3687 multibyte character. 3687 multibyte character.
3688 (read1): Likewise. Signal error or a multibyte character which 3688 (read1): Likewise. Signal error or a multibyte character which
3689 has a modifer bit. Check validity of Shift modifer. 3689 has a modifier bit. Check validity of Shift modifier.
3690 3690
3691 * charset.c (non_ascii_char_to_string): Handle modifier bits as 3691 * charset.c (non_ascii_char_to_string): Handle modifier bits as
3692 the same as Lisp reader. 3692 the same as Lisp reader.
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index b161a21eb72..a56c1a2c088 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -3896,7 +3896,7 @@
3896 3896
38972001-01-07 Dave Love <fx@gnu.org> 38972001-01-07 Dave Love <fx@gnu.org>
3898 3898
3899 * keyboard.c (Fread_key_sequence_vector): Avoid newline in 3899 * keyboard.c (Fread_key_sequence_vector): Avoid newline in
3900 arglist, for documentation's sake. 3900 arglist, for documentation's sake.
3901 3901
39022001-01-06 Andrew Innes <andrewi@gnu.org> 39022001-01-06 Andrew Innes <andrewi@gnu.org>
@@ -4180,7 +4180,7 @@
4180 what's displayed in the window. 4180 what's displayed in the window.
4181 4181
4182 * xdisp.c (try_window_reusing_current_matrix) 4182 * xdisp.c (try_window_reusing_current_matrix)
4183 <new start <= old start>: Disable rows in the current matrix 4183 <new start <= old start>: Disable rows in the current matrix
4184 which are below the window after scrolling. 4184 which are below the window after scrolling.
4185 4185
4186 * xdisp.c (move_it_by_lines): Don't do optimizations if NEED_Y_P 4186 * xdisp.c (move_it_by_lines): Don't do optimizations if NEED_Y_P
@@ -5480,7 +5480,7 @@
5480 * lisp.h (pos_visible_p): Change prototype. 5480 * lisp.h (pos_visible_p): Change prototype.
5481 5481
5482 * dispextern.h (CURRENT_MODE_LINE_HEIGHT) 5482 * dispextern.h (CURRENT_MODE_LINE_HEIGHT)
5483 (CURRENT_HEADER_LINE_HEIGHT): Look at current_mode_line_height 5483 (CURRENT_HEADER_LINE_HEIGHT): Look at current_mode_line_height
5484 and current_header_line_height first. 5484 and current_header_line_height first.
5485 (current_mode_line_height, current_header_line_height): 5485 (current_mode_line_height, current_header_line_height):
5486 Declare extern. 5486 Declare extern.
@@ -6683,7 +6683,7 @@
6683 (create_offscreen_bitmap): New function. 6683 (create_offscreen_bitmap): New function.
6684 (w32_BDF_TextOut): Use it. Draw glyphs as DIBs. 6684 (w32_BDF_TextOut): Use it. Draw glyphs as DIBs.
6685 6685
6686 * w32term.c (x_produce_glyphs): If the distance from the current 6686 * w32term.c (x_produce_glyphs): If the distance from the current
6687 position to the next tab stop is less than a canonical character 6687 position to the next tab stop is less than a canonical character
6688 width, use the tab stop after that. 6688 width, use the tab stop after that.
6689 (x_draw_glyphs): Handle case START and END are out of bounds more 6689 (x_draw_glyphs): Handle case START and END are out of bounds more
@@ -7536,7 +7536,7 @@
7536 CYCLE_CHECK arguments. 7536 CYCLE_CHECK arguments.
7537 (merge_face_vector_with_property, Finternal_merge_in_global_face) 7537 (merge_face_vector_with_property, Finternal_merge_in_global_face)
7538 (lookup_named_face, lookup_derived_face, realize_named_face) 7538 (lookup_named_face, lookup_derived_face, realize_named_face)
7539 (face_at_string_position, face_at_buffer_position): Supply 7539 (face_at_string_position, face_at_buffer_position): Supply
7540 new F and CYCLE_CHECK arguments to merge_face_vectors. 7540 new F and CYCLE_CHECK arguments to merge_face_vectors.
7541 (merge_face_heights): New function. 7541 (merge_face_heights): New function.
7542 (merge_face_vectors, merge_face_vector_with_property) 7542 (merge_face_vectors, merge_face_vector_with_property)
@@ -7826,7 +7826,7 @@
7826 (x_compute_glyph_string_overhangs): Incomplete body removed, as 7826 (x_compute_glyph_string_overhangs): Incomplete body removed, as
7827 the X way of doing this will not work for W32. 7827 the X way of doing this will not work for W32.
7828 (w32_intersect_rectangles): Removed. Use IntersectRect API call. 7828 (w32_intersect_rectangles): Removed. Use IntersectRect API call.
7829 (x_draw_image_foreground): Avoid drawing outside of the clip area 7829 (x_draw_image_foreground): Avoid drawing outside of the clip area
7830 when image doesn't have a mask. 7830 when image doesn't have a mask.
7831 (note_mouse_highlight): Process overlays in the right order of 7831 (note_mouse_highlight): Process overlays in the right order of
7832 priority. Set help_echo_window. 7832 priority. Set help_echo_window.
@@ -10156,7 +10156,7 @@
10156 (encode_coding_string): Likewise. 10156 (encode_coding_string): Likewise.
10157 10157
10158 * ccl.c (ccl_driver) <CCL_ReadMultibyteChar2> 10158 * ccl.c (ccl_driver) <CCL_ReadMultibyteChar2>
10159 <CCL_WriteMultibyteChar2>: Handle charsets eight-bit-control and 10159 <CCL_WriteMultibyteChar2>: Handle charsets eight-bit-control and
10160 eight-bit-graphic correctly. 10160 eight-bit-graphic correctly.
10161 10161
101622000-05-24 Kenichi HANDA <handa@etl.go.jp> 101622000-05-24 Kenichi HANDA <handa@etl.go.jp>
@@ -12812,7 +12812,7 @@
12812 (xim_destroy_callback, xim_open_dpy, xim_instantiate_callback) 12812 (xim_destroy_callback, xim_open_dpy, xim_instantiate_callback)
12813 (xim_initialize, xim_close) 12813 (xim_initialize, xim_close)
12814 [HAVE_X_I18N && HAVE_X11R6]: New functions. 12814 [HAVE_X_I18N && HAVE_X11R6]: New functions.
12815 (x_destroy_window) [HAVE_X_I18N]: Call xic_destroy_frame. 12815 (x_destroy_window) [HAVE_X_I18N]: Call xic_destroy_frame.
12816 (x_term_init) [HAVE_X_I18N]: Call xim_initialize. 12816 (x_term_init) [HAVE_X_I18N]: Call xim_initialize.
12817 (x_delete_display) [HAVE_X_I18N]: Call xim_close. 12817 (x_delete_display) [HAVE_X_I18N]: Call xim_close.
12818 12818
diff --git a/src/font.c b/src/font.c
index 765712198fe..c72f189d87f 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4634,7 +4634,7 @@ DEFUN ("font-variation-glyphs", Ffont_variation_glyphs, Sfont_variation_glyphs,
4634 doc: /* Return a list of variation glyphs for CHAR in FONT-OBJECT. 4634 doc: /* Return a list of variation glyphs for CHAR in FONT-OBJECT.
4635Each element of the value is a cons (VARIATION-SELECTOR . GLYPH-ID), 4635Each element of the value is a cons (VARIATION-SELECTOR . GLYPH-ID),
4636where 4636where
4637 VARIATION-SELECTOR is a chracter code of variation selection 4637 VARIATION-SELECTOR is a character code of variation selection
4638 (#xFE00..#xFE0F or #xE0100..#xE01EF) 4638 (#xFE00..#xFE0F or #xE0100..#xE01EF)
4639 GLYPH-ID is a glyph code of the corresponding variation glyph. */) 4639 GLYPH-ID is a glyph code of the corresponding variation glyph. */)
4640 (font_object, character) 4640 (font_object, character)
diff --git a/src/frame.h b/src/frame.h
index 887d47eff21..8f5e47c40a5 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -306,7 +306,7 @@ struct frame
306 /* Canonical X unit. Width of default font, in pixels. */ 306 /* Canonical X unit. Width of default font, in pixels. */
307 int column_width; 307 int column_width;
308 308
309 /* Widht of space glyph of default font, in pixels. */ 309 /* Width of space glyph of default font, in pixels. */
310 int space_width; 310 int space_width;
311 311
312 /* Canonical Y unit. Height of a line, in pixels. */ 312 /* Canonical Y unit. Height of a line, in pixels. */
diff --git a/src/nsterm.m b/src/nsterm.m
index fc933c099e8..d1b984d5382 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -145,24 +145,24 @@ Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper, Qnone;
145extern Lisp_Object Qcursor_color, Qcursor_type, Qns, Qleft; 145extern Lisp_Object Qcursor_color, Qcursor_type, Qns, Qleft;
146 146
147/* Specifies which emacs modifier should be generated when NS receives 147/* Specifies which emacs modifier should be generated when NS receives
148 the Alternate modifer. May be Qnone or any of the modifier lisp symbols. */ 148 the Alternate modifier. May be Qnone or any of the modifier lisp symbols. */
149Lisp_Object ns_alternate_modifier; 149Lisp_Object ns_alternate_modifier;
150 150
151/* Specifies which emacs modifier should be generated when NS receives 151/* Specifies which emacs modifier should be generated when NS receives
152 the right Alternate modifer. Has same values as ns_alternate_modifier plus 152 the right Alternate modifier. Has same values as ns_alternate_modifier plus
153 the value Qleft which means whatever value ns_alternate_modifier has. */ 153 the value Qleft which means whatever value ns_alternate_modifier has. */
154Lisp_Object ns_right_alternate_modifier; 154Lisp_Object ns_right_alternate_modifier;
155 155
156/* Specifies which emacs modifier should be generated when NS receives 156/* Specifies which emacs modifier should be generated when NS receives
157 the Command modifer. May be any of the modifier lisp symbols. */ 157 the Command modifier. May be any of the modifier lisp symbols. */
158Lisp_Object ns_command_modifier; 158Lisp_Object ns_command_modifier;
159 159
160/* Specifies which emacs modifier should be generated when NS receives 160/* Specifies which emacs modifier should be generated when NS receives
161 the Control modifer. May be any of the modifier lisp symbols. */ 161 the Control modifier. May be any of the modifier lisp symbols. */
162Lisp_Object ns_control_modifier; 162Lisp_Object ns_control_modifier;
163 163
164/* Specifies which emacs modifier should be generated when NS receives 164/* Specifies which emacs modifier should be generated when NS receives
165 the Function modifer (laptops). May be any of the modifier lisp symbols. */ 165 the Function modifier (laptops). May be any of the modifier lisp symbols. */
166Lisp_Object ns_function_modifier; 166Lisp_Object ns_function_modifier;
167 167
168/* Control via default 'GSFontAntiAlias' on OS X and GNUstep. */ 168/* Control via default 'GSFontAntiAlias' on OS X and GNUstep. */