Commit 36649e01 authored by Paul Eggert's avatar Paul Eggert

Spelling and grammar fixes

parent 50b8c556
......@@ -26,7 +26,7 @@ thing, but search for patterns instead of fixed strings.
* Regexps:: Syntax of regular expressions.
* Regexp Backslash:: Regular expression constructs starting with `\'.
* Regexp Example:: A complex regular expression explained.
* Lax Search:: Search ignores some distinctions between
* Lax Search:: Search ignores some distinctions among
similar characters, like letter-case.
* Replace:: Search, and replace some or all matches.
* Other Repeating Search:: Operating on all matches for some regexp.
......@@ -1144,7 +1144,7 @@ close-brackets, quotes, or parentheses, repeated zero or more times.
@cindex lax search
@cindex character equivalence in search
Normally, you'd want search commands to disregard certain minor
differences between the search string you types and the text being
differences between the search string you type and the text being
searched. For example, sequences of whitespace characters of
different length are usually perceived as equivalent; letter-case
differences usually don't matter; etc. This is known as
......@@ -1226,13 +1226,13 @@ apropos-variable @key{RET} case-fold-search @key{RET}}.
@cindex character folding in search
@cindex equivalent character sequences
Case folding disregards case distinctions between characters, making
Case folding disregards case distinctions among characters, making
upper-case characters match lower-case variants, and vice versa. A
generalization of case folding is @dfn{character folding}, which
disregards wider classes of distinctions between similar characters.
disregards wider classes of distinctions among similar characters.
For instance, under character folding the letter @code{a} matches all
of its accented cousins like @code{@"a} and @code{@'a}, i.e., the
match disregards the diacriticals that distinguish between these
match disregards the diacritics that distinguish these
variants. In addition, @code{a} matches other characters that
resemble it, or have it as part of their graphical representation,
such as @sc{u+249c parenthesized latin small letter a} and @sc{u+2100
......
......@@ -2366,7 +2366,7 @@ list that represents a doc string reference.
hist-new prov-cons)
(apply 'require args)
;; Record the functions defined by the require in `byte-compille-new-defuns'.
;; Record the functions defined by the require in `byte-compile-new-defuns'.
(setq hist-new load-history)
(setq prov-cons (cons 'provide (car args)))
(while (and hist-new
......
......@@ -811,7 +811,7 @@ Possible return values:
(indirect-function smie-backward-token-function)
(lambda (n)
(if (bobp)
;; Arguably backward-sexp hould signal this error for us.
;; Arguably backward-sexp should signal this error for us.
(signal 'scan-error
(list "Beginning of buffer" (point) (point)))
(backward-sexp n)))
......
......@@ -315,7 +315,7 @@ CONDITION should not be quoted."
'(progn)))
(defmacro cc-conditional-require-after-load (cc-part file condition)
"If the CONDITION is satified at compile time, (i) force the
"If the CONDITION is satisfied at compile time, (i) force the
file CC-PART.el in the current directory to be loaded at compile
time, (ii) generate an `eval-after-load' form to load CC-PART.el
after the loading of FILE.
......
......@@ -8065,7 +8065,7 @@ brace.
Note that this function might do hidden buffer changes. See the
comment at the start of cc-engine.el for more info."
;; Note to maintainers: this function consumes a great mass of CPU cycles.
;; It's use should thus be minimised as far as possible.
;; Its use should thus be minimized as far as possible.
(let ((paren-state (c-parse-state)))
(or (not (c-most-enclosing-brace paren-state))
(c-search-uplist-for-classkey paren-state))))
......
......@@ -318,7 +318,7 @@ to be replaced will match a sequence of whitespace chars defined by the
regexp in `search-whitespace-regexp'.
If `replace-character-fold' is non-nil, matching uses character folding,
i.e. it ignores diacriticals and other differences between equivalent
i.e. it ignores diacritics and other differences between equivalent
character strings.
Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace
......@@ -563,7 +563,7 @@ to be replaced will match a sequence of whitespace chars defined by the
regexp in `search-whitespace-regexp'.
If `replace-character-fold' is non-nil, matching uses character folding,
i.e. it ignores diacriticals and other differences between equivalent
i.e. it ignores diacritics and other differences between equivalent
character strings.
Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace
......
......@@ -39,7 +39,7 @@
# dllexport
# init_priority
#
# Unsuppored variable attributes will be tested against a global integer
# Unsupported variable attributes will be tested against a global integer
# variable and without any arguments given to the attribute itself; the
# result of this check might be wrong or meaningless so use with care.
#
......
......@@ -116,7 +116,7 @@ Fmod_test_non_local_exit_funcall (emacs_env *env, ptrdiff_t nargs,
}
/* Return a global referrence. */
/* Return a global reference. */
static emacs_value
Fmod_test_globref_make (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
void *data)
......
......@@ -121,7 +121,7 @@ def main():
initp = subp.add_parser('init', help='create a test module from a template')
initp.add_argument('module', help='name of the new module')
initp.add_argument('-f', '--fun', default='fun',
help='overide name of the default function')
help='override name of the default function')
initp.set_defaults(func=cmd_init)
args = mainp.parse_args()
......
......@@ -16566,7 +16566,7 @@
(ns_draw_fringe_bitmap): Remove unused rowY.
Change #if to COCOA && >= 10_6.
(ns_draw_window_cursor): Remove unused overspill.
(ns_draw_underwave): width and x are EamcsCGFloat.
(ns_draw_underwave): width and x are EmacsCGFloat.
(ns_draw_box): thickness is CGFloat.
(ns_dumpglyphs_image): Change #if to COCOA && >= 10_6.
(ns_send_appdefined): When NS_IMPL_GNUSTEP, redirect to main thread
......
......@@ -1074,7 +1074,7 @@ syms_of_module (void)
{
DEFSYM (Qmodule_refs_hash, "module-refs-hash");
DEFVAR_LISP ("module-refs-hash", Vmodule_refs_hash,
doc: /* Module global referrence table. */);
doc: /* Module global reference table. */);
Vmodule_refs_hash
= make_hash_table (hashtest_eq, make_number (DEFAULT_HASH_SIZE),
......
......@@ -75,7 +75,7 @@ typedef float EmacsCGFloat;
/* #define NSTRACE_ENABLED 1 */
/* When non-zero, trace output is enbled for all parts, except those
/* When non-zero, trace output is enabled for all parts, except those
explicitly disabled. */
/* #define NSTRACE_ALL_GROUPS 1 */
......
......@@ -1141,7 +1141,7 @@ static NSRect constrain_frame_rect(NSRect frameRect)
/* ==========================================================================
Visibel bell and beep.
Visible bell and beep.
========================================================================== */
......@@ -7029,7 +7029,7 @@ - (void)windowDidExitFullScreen:(NSNotification *)notification
- (void)windowDidExitFullScreen /* provided for direct calls */
{
NSTRACE ("[EamcsView windowDidExitFullScreen]");
NSTRACE ("[EmacsView windowDidExitFullScreen]");
if (!FRAME_LIVE_P (emacsframe))
{
NSTRACE_MSG ("Ignored (frame dead)");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment