diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-05 00:55:25 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-05 00:55:25 -0800 |
commit | fa46310344375ef5c114cbb94d4acea39ac29239 (patch) | |
tree | 4d74de9694db1c199cd9301a27c48b4d4137cf0c /src | |
parent | c3c9e25e5d2c222d9f79a503c714b48c06078c08 (diff) | |
download | emacs-fa46310344375ef5c114cbb94d4acea39ac29239.tar.gz |
Spelling fixes.
Diffstat (limited to 'src')
-rw-r--r-- | src/fileio.c | 2 | ||||
-rw-r--r-- | src/ftxfont.c | 9 | ||||
-rw-r--r-- | src/nsterm.m | 2 | ||||
-rw-r--r-- | src/regex.c | 2 | ||||
-rw-r--r-- | src/regex.h | 4 | ||||
-rw-r--r-- | src/textprop.c | 4 | ||||
-rw-r--r-- | src/w32select.c | 7 | ||||
-rw-r--r-- | src/w32term.c | 2 | ||||
-rw-r--r-- | src/xdisp.c | 2 | ||||
-rw-r--r-- | src/xselect.c | 8 | ||||
-rw-r--r-- | src/xterm.c | 2 |
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. */) /* If REPLACE is non-nil and we succeeded in not replacing the beginning or end of the buffer text with the file's contents, call format-decode with `point' positioned at the beginning - of the buffer and `inserted' equalling the number of + of the buffer and `inserted' equaling the number of characters in the buffer. Otherwise, format-decode might fail to correctly analyze the beginning or end of the buffer. 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); static int ftxfont_draw_bitmap (FRAME_PTR, GC, GC *, struct font *, unsigned, int, int, XPoint *, int, int *, int); -static void ftxfont_draw_backgrond (FRAME_PTR, struct font *, GC, - int, int, int); +static void ftxfont_draw_background (FRAME_PTR, struct font *, GC, + int, int, int); struct ftxfont_frame_data { @@ -219,7 +219,8 @@ ftxfont_draw_bitmap (FRAME_PTR f, GC gc_fore, GC *gcs, struct font *font, unsign } static void -ftxfont_draw_backgrond (FRAME_PTR f, struct font *font, GC gc, int x, int y, int width) +ftxfont_draw_background (FRAME_PTR f, struct font *font, GC gc, int x, int y, + int width) { XGCValues xgcv; @@ -296,7 +297,7 @@ ftxfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_b BLOCK_INPUT; if (with_background) - ftxfont_draw_backgrond (f, font, s->gc, x, y, s->width); + ftxfont_draw_background (f, font, s->gc, x, y, s->width); code = alloca (sizeof (unsigned) * len); for (i = 0; i < len; i++) 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) } else { - /* Scolling down. Make sure we don't copy over the mode line. + /* Scrolling down. Make sure we don't copy over the mode line. at the bottom. */ if (to_y + run->height > bottom_y) 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 @@ (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs) #endif -/* For platform which support the ISO C amendement 1 functionality we +/* For platform which support the ISO C amendment 1 functionality we support user defined character classes. */ #if WIDE_CHAR_SUPPORT /* 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)); } #endif /* C++ */ -/* For platform which support the ISO C amendement 1 functionality we +/* For platform which support the ISO C amendment 1 functionality we support user defined character classes. */ #if WIDE_CHAR_SUPPORT /* 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)); #if WIDE_CHAR_SUPPORT /* The GNU C library provides support for user-defined character classes - and the functions from ISO C amendement 1. */ + and the functions from ISO C amendment 1. */ # ifdef CHARCLASS_NAME_MAX # define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX # 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. */) DEFUN ("text-property-any", Ftext_property_any, Stext_property_any, 4, 5, 0, - doc: /* Check text from START to END for property PROPERTY equalling VALUE. + doc: /* Check text from START to END for property PROPERTY equaling VALUE. If so, return the position of the first character whose property PROPERTY is `eq' to VALUE. Otherwise return nil. If 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. */ DEFUN ("text-property-not-all", Ftext_property_not_all, Stext_property_not_all, 4, 5, 0, - doc: /* Check text from START to END for property PROPERTY not equalling VALUE. + doc: /* Check text from START to END for property PROPERTY not equaling VALUE. If so, return the position of the first character whose property PROPERTY is not `eq' to VALUE. Otherwise, return nil. If 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/>. */ * * When copying or cutting (sending data to the OS), the data is * announced and stored internally, but only actually rendered on - * request. The requester determines the format provided. The + * request. The requestor determines the format provided. The * {next-}selection-coding-system is only used, when its corresponding * clipboard type matches the type requested. * @@ -335,7 +335,7 @@ render_all (Lisp_Object ignore) OpenClipboard (NULL); - /* There is no usefull means to report errors here, there are none + /* There is no useful means to report errors here, there are none expected anyway, and even if there were errors, they wouldn't do any harm. So we just go ahead and do what has to be done without bothering with error handling. */ @@ -750,7 +750,7 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data, else { /* Advertise all supported formats so that whatever the - requester chooses, only one encoding step needs to be + requestor chooses, only one encoding step needs to be made. This is intentionally different from what we do in the handler for WM_RENDERALLFORMATS. */ SetClipboardData (CF_UNICODETEXT, NULL); @@ -1138,4 +1138,3 @@ globals_of_w32select (void) clipboard_owner = create_owner (); } - 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) } else { - /* Scolling down. Make sure we don't copy over the mode line. + /* Scrolling down. Make sure we don't copy over the mode line. at the bottom. */ if (to_y + run->height > bottom_y) 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 environments with anti-aliased text: if the same text is drawn onto the same place multiple times, it gets thicker. If the overlap we are processing is for the erased cursor, we - take the intersection with the rectagle of the cursor. */ + take the intersection with the rectangle of the cursor. */ if (s->for_overlaps & OVERLAPS_ERASED_CURSOR) { 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; static Atom conversion_fail_tag; /* Used as an unwind-protect clause so that, if a selection-converter signals - an error, we tell the requester that we were unable to do what they wanted + an error, we tell the requestor that we were unable to do what they wanted before we throw to top-level or go into the debugger or whatever. */ static Lisp_Object @@ -693,7 +693,7 @@ x_reply_selection_request (struct input_event *event, bytes_remaining = cs->size; bytes_remaining *= format_bytes; - /* Wait for the requester to ack by deleting the property. + /* Wait for the requestor to ack by deleting the property. This can run Lisp code (process handlers) or signal. */ if (! had_errors) { @@ -732,7 +732,7 @@ x_reply_selection_request (struct input_event *event, if (had_errors) break; - /* Wait for the requester to ack this chunk by deleting + /* Wait for the requestor to ack this chunk by deleting the property. This can run Lisp code or signal. */ TRACE1 ("Waiting for increment ACK (deletion of %s)", XGetAtomName (display, cs->property)); @@ -740,7 +740,7 @@ x_reply_selection_request (struct input_event *event, } /* Now write a zero-length chunk to the property to tell the - requester that we're done. */ + requestor that we're done. */ BLOCK_INPUT; if (! waiting_for_other_props_on_window (display, window)) 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) } else { - /* Scolling down. Make sure we don't copy over the mode line. + /* Scrolling down. Make sure we don't copy over the mode line. at the bottom. */ if (to_y + run->height > bottom_y) height = bottom_y - to_y; |