aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-12-05 00:55:25 -0800
committerPaul Eggert2011-12-05 00:55:25 -0800
commitfa46310344375ef5c114cbb94d4acea39ac29239 (patch)
tree4d74de9694db1c199cd9301a27c48b4d4137cf0c /src
parentc3c9e25e5d2c222d9f79a503c714b48c06078c08 (diff)
downloademacs-fa46310344375ef5c114cbb94d4acea39ac29239.tar.gz
emacs-fa46310344375ef5c114cbb94d4acea39ac29239.zip
Spelling fixes.
Diffstat (limited to 'src')
-rw-r--r--src/fileio.c2
-rw-r--r--src/ftxfont.c9
-rw-r--r--src/nsterm.m2
-rw-r--r--src/regex.c2
-rw-r--r--src/regex.h4
-rw-r--r--src/textprop.c4
-rw-r--r--src/w32select.c7
-rw-r--r--src/w32term.c2
-rw-r--r--src/xdisp.c2
-rw-r--r--src/xselect.c8
-rw-r--r--src/xterm.c2
11 files changed, 22 insertions, 22 deletions
diff --git a/src/fileio.c b/src/fileio.c
index c0f6c1d2e8e..fb021cee5a4 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4186,7 +4186,7 @@ variable `last-coding-system-used' to the coding system actually used. */)
4186 /* If REPLACE is non-nil and we succeeded in not replacing the 4186 /* If REPLACE is non-nil and we succeeded in not replacing the
4187 beginning or end of the buffer text with the file's contents, 4187 beginning or end of the buffer text with the file's contents,
4188 call format-decode with `point' positioned at the beginning 4188 call format-decode with `point' positioned at the beginning
4189 of the buffer and `inserted' equalling the number of 4189 of the buffer and `inserted' equaling the number of
4190 characters in the buffer. Otherwise, format-decode might 4190 characters in the buffer. Otherwise, format-decode might
4191 fail to correctly analyze the beginning or end of the buffer. 4191 fail to correctly analyze the beginning or end of the buffer.
4192 Hence we temporarily save `point' and `inserted' here and 4192 Hence we temporarily save `point' and `inserted' here and
diff --git a/src/ftxfont.c b/src/ftxfont.c
index 608cfd8d44d..e04e802a3db 100644
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -48,8 +48,8 @@ static GC *ftxfont_get_gcs (FRAME_PTR, unsigned long, unsigned long);
48static int ftxfont_draw_bitmap (FRAME_PTR, GC, GC *, struct font *, 48static int ftxfont_draw_bitmap (FRAME_PTR, GC, GC *, struct font *,
49 unsigned, int, int, XPoint *, int, int *, 49 unsigned, int, int, XPoint *, int, int *,
50 int); 50 int);
51static void ftxfont_draw_backgrond (FRAME_PTR, struct font *, GC, 51static void ftxfont_draw_background (FRAME_PTR, struct font *, GC,
52 int, int, int); 52 int, int, int);
53 53
54struct ftxfont_frame_data 54struct ftxfont_frame_data
55{ 55{
@@ -219,7 +219,8 @@ ftxfont_draw_bitmap (FRAME_PTR f, GC gc_fore, GC *gcs, struct font *font, unsign
219} 219}
220 220
221static void 221static void
222ftxfont_draw_backgrond (FRAME_PTR f, struct font *font, GC gc, int x, int y, int width) 222ftxfont_draw_background (FRAME_PTR f, struct font *font, GC gc, int x, int y,
223 int width)
223{ 224{
224 XGCValues xgcv; 225 XGCValues xgcv;
225 226
@@ -296,7 +297,7 @@ ftxfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_b
296 297
297 BLOCK_INPUT; 298 BLOCK_INPUT;
298 if (with_background) 299 if (with_background)
299 ftxfont_draw_backgrond (f, font, s->gc, x, y, s->width); 300 ftxfont_draw_background (f, font, s->gc, x, y, s->width);
300 code = alloca (sizeof (unsigned) * len); 301 code = alloca (sizeof (unsigned) * len);
301 for (i = 0; i < len; i++) 302 for (i = 0; i < len; i++)
302 code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8) 303 code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8)
diff --git a/src/nsterm.m b/src/nsterm.m
index 5e19a397c34..17fd5a93f63 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2108,7 +2108,7 @@ ns_scroll_run (struct window *w, struct run *run)
2108 } 2108 }
2109 else 2109 else
2110 { 2110 {
2111 /* Scolling down. Make sure we don't copy over the mode line. 2111 /* Scrolling down. Make sure we don't copy over the mode line.
2112 at the bottom. */ 2112 at the bottom. */
2113 if (to_y + run->height > bottom_y) 2113 if (to_y + run->height > bottom_y)
2114 height = bottom_y - to_y; 2114 height = bottom_y - to_y;
diff --git a/src/regex.c b/src/regex.c
index b7699378f5a..0ba05a95fdb 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -53,7 +53,7 @@
53 (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs) 53 (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs)
54#endif 54#endif
55 55
56/* For platform which support the ISO C amendement 1 functionality we 56/* For platform which support the ISO C amendment 1 functionality we
57 support user defined character classes. */ 57 support user defined character classes. */
58#if WIDE_CHAR_SUPPORT 58#if WIDE_CHAR_SUPPORT
59/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ 59/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */
diff --git a/src/regex.h b/src/regex.h
index eba62f2e769..32ccfb7ddef 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -582,7 +582,7 @@ extern void regfree _RE_ARGS ((regex_t *__preg));
582} 582}
583#endif /* C++ */ 583#endif /* C++ */
584 584
585/* For platform which support the ISO C amendement 1 functionality we 585/* For platform which support the ISO C amendment 1 functionality we
586 support user defined character classes. */ 586 support user defined character classes. */
587#if WIDE_CHAR_SUPPORT 587#if WIDE_CHAR_SUPPORT
588/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ 588/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */
@@ -592,7 +592,7 @@ extern void regfree _RE_ARGS ((regex_t *__preg));
592 592
593#if WIDE_CHAR_SUPPORT 593#if WIDE_CHAR_SUPPORT
594/* The GNU C library provides support for user-defined character classes 594/* The GNU C library provides support for user-defined character classes
595 and the functions from ISO C amendement 1. */ 595 and the functions from ISO C amendment 1. */
596# ifdef CHARCLASS_NAME_MAX 596# ifdef CHARCLASS_NAME_MAX
597# define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX 597# define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX
598# else 598# else
diff --git a/src/textprop.c b/src/textprop.c
index 29425f7a550..a1c7593f568 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1625,7 +1625,7 @@ Return t if any property was actually removed, nil otherwise. */)
1625 1625
1626DEFUN ("text-property-any", Ftext_property_any, 1626DEFUN ("text-property-any", Ftext_property_any,
1627 Stext_property_any, 4, 5, 0, 1627 Stext_property_any, 4, 5, 0,
1628 doc: /* Check text from START to END for property PROPERTY equalling VALUE. 1628 doc: /* Check text from START to END for property PROPERTY equaling VALUE.
1629If so, return the position of the first character whose property PROPERTY 1629If so, return the position of the first character whose property PROPERTY
1630is `eq' to VALUE. Otherwise return nil. 1630is `eq' to VALUE. Otherwise return nil.
1631If the optional fifth argument OBJECT is a buffer (or nil, which means 1631If the optional fifth argument OBJECT is a buffer (or nil, which means
@@ -1661,7 +1661,7 @@ markers). If OBJECT is a string, START and END are 0-based indices into it. */
1661 1661
1662DEFUN ("text-property-not-all", Ftext_property_not_all, 1662DEFUN ("text-property-not-all", Ftext_property_not_all,
1663 Stext_property_not_all, 4, 5, 0, 1663 Stext_property_not_all, 4, 5, 0,
1664 doc: /* Check text from START to END for property PROPERTY not equalling VALUE. 1664 doc: /* Check text from START to END for property PROPERTY not equaling VALUE.
1665If so, return the position of the first character whose property PROPERTY 1665If so, return the position of the first character whose property PROPERTY
1666is not `eq' to VALUE. Otherwise, return nil. 1666is not `eq' to VALUE. Otherwise, return nil.
1667If the optional fifth argument OBJECT is a buffer (or nil, which means 1667If the optional fifth argument OBJECT is a buffer (or nil, which means
diff --git a/src/w32select.c b/src/w32select.c
index e3225c3f996..392cb07a96d 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -39,7 +39,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
39 * 39 *
40 * When copying or cutting (sending data to the OS), the data is 40 * When copying or cutting (sending data to the OS), the data is
41 * announced and stored internally, but only actually rendered on 41 * announced and stored internally, but only actually rendered on
42 * request. The requester determines the format provided. The 42 * request. The requestor determines the format provided. The
43 * {next-}selection-coding-system is only used, when its corresponding 43 * {next-}selection-coding-system is only used, when its corresponding
44 * clipboard type matches the type requested. 44 * clipboard type matches the type requested.
45 * 45 *
@@ -335,7 +335,7 @@ render_all (Lisp_Object ignore)
335 335
336 OpenClipboard (NULL); 336 OpenClipboard (NULL);
337 337
338 /* There is no usefull means to report errors here, there are none 338 /* There is no useful means to report errors here, there are none
339 expected anyway, and even if there were errors, they wouldn't do 339 expected anyway, and even if there were errors, they wouldn't do
340 any harm. So we just go ahead and do what has to be done without 340 any harm. So we just go ahead and do what has to be done without
341 bothering with error handling. */ 341 bothering with error handling. */
@@ -750,7 +750,7 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data,
750 else 750 else
751 { 751 {
752 /* Advertise all supported formats so that whatever the 752 /* Advertise all supported formats so that whatever the
753 requester chooses, only one encoding step needs to be 753 requestor chooses, only one encoding step needs to be
754 made. This is intentionally different from what we do in 754 made. This is intentionally different from what we do in
755 the handler for WM_RENDERALLFORMATS. */ 755 the handler for WM_RENDERALLFORMATS. */
756 SetClipboardData (CF_UNICODETEXT, NULL); 756 SetClipboardData (CF_UNICODETEXT, NULL);
@@ -1138,4 +1138,3 @@ globals_of_w32select (void)
1138 1138
1139 clipboard_owner = create_owner (); 1139 clipboard_owner = create_owner ();
1140} 1140}
1141
diff --git a/src/w32term.c b/src/w32term.c
index a2ccdd21f7d..6df218326d1 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2665,7 +2665,7 @@ x_scroll_run (struct window *w, struct run *run)
2665 } 2665 }
2666 else 2666 else
2667 { 2667 {
2668 /* Scolling down. Make sure we don't copy over the mode line. 2668 /* Scrolling down. Make sure we don't copy over the mode line.
2669 at the bottom. */ 2669 at the bottom. */
2670 if (to_y + run->height > bottom_y) 2670 if (to_y + run->height > bottom_y)
2671 height = bottom_y - to_y; 2671 height = bottom_y - to_y;
diff --git a/src/xdisp.c b/src/xdisp.c
index 52f73785e2d..3ac5651975b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1915,7 +1915,7 @@ get_glyph_string_clip_rects (struct glyph_string *s, NativeRectangle *rects, int
1915 environments with anti-aliased text: if the same text is 1915 environments with anti-aliased text: if the same text is
1916 drawn onto the same place multiple times, it gets thicker. 1916 drawn onto the same place multiple times, it gets thicker.
1917 If the overlap we are processing is for the erased cursor, we 1917 If the overlap we are processing is for the erased cursor, we
1918 take the intersection with the rectagle of the cursor. */ 1918 take the intersection with the rectangle of the cursor. */
1919 if (s->for_overlaps & OVERLAPS_ERASED_CURSOR) 1919 if (s->for_overlaps & OVERLAPS_ERASED_CURSOR)
1920 { 1920 {
1921 XRectangle rc, r_save = r; 1921 XRectangle rc, r_save = r;
diff --git a/src/xselect.c b/src/xselect.c
index 4bfab4143cc..f9ebdf730d4 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -516,7 +516,7 @@ static struct selection_data *converted_selections;
516static Atom conversion_fail_tag; 516static Atom conversion_fail_tag;
517 517
518/* Used as an unwind-protect clause so that, if a selection-converter signals 518/* Used as an unwind-protect clause so that, if a selection-converter signals
519 an error, we tell the requester that we were unable to do what they wanted 519 an error, we tell the requestor that we were unable to do what they wanted
520 before we throw to top-level or go into the debugger or whatever. */ 520 before we throw to top-level or go into the debugger or whatever. */
521 521
522static Lisp_Object 522static Lisp_Object
@@ -693,7 +693,7 @@ x_reply_selection_request (struct input_event *event,
693 bytes_remaining = cs->size; 693 bytes_remaining = cs->size;
694 bytes_remaining *= format_bytes; 694 bytes_remaining *= format_bytes;
695 695
696 /* Wait for the requester to ack by deleting the property. 696 /* Wait for the requestor to ack by deleting the property.
697 This can run Lisp code (process handlers) or signal. */ 697 This can run Lisp code (process handlers) or signal. */
698 if (! had_errors) 698 if (! had_errors)
699 { 699 {
@@ -732,7 +732,7 @@ x_reply_selection_request (struct input_event *event,
732 732
733 if (had_errors) break; 733 if (had_errors) break;
734 734
735 /* Wait for the requester to ack this chunk by deleting 735 /* Wait for the requestor to ack this chunk by deleting
736 the property. This can run Lisp code or signal. */ 736 the property. This can run Lisp code or signal. */
737 TRACE1 ("Waiting for increment ACK (deletion of %s)", 737 TRACE1 ("Waiting for increment ACK (deletion of %s)",
738 XGetAtomName (display, cs->property)); 738 XGetAtomName (display, cs->property));
@@ -740,7 +740,7 @@ x_reply_selection_request (struct input_event *event,
740 } 740 }
741 741
742 /* Now write a zero-length chunk to the property to tell the 742 /* Now write a zero-length chunk to the property to tell the
743 requester that we're done. */ 743 requestor that we're done. */
744 BLOCK_INPUT; 744 BLOCK_INPUT;
745 if (! waiting_for_other_props_on_window (display, window)) 745 if (! waiting_for_other_props_on_window (display, window))
746 XSelectInput (display, window, 0L); 746 XSelectInput (display, window, 0L);
diff --git a/src/xterm.c b/src/xterm.c
index 290acdd9ca4..abe52238415 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3317,7 +3317,7 @@ x_scroll_run (struct window *w, struct run *run)
3317 } 3317 }
3318 else 3318 else
3319 { 3319 {
3320 /* Scolling down. Make sure we don't copy over the mode line. 3320 /* Scrolling down. Make sure we don't copy over the mode line.
3321 at the bottom. */ 3321 at the bottom. */
3322 if (to_y + run->height > bottom_y) 3322 if (to_y + run->height > bottom_y)
3323 height = bottom_y - to_y; 3323 height = bottom_y - to_y;