aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-11-29 21:50:59 -0800
committerPaul Eggert2015-11-29 21:52:17 -0800
commit36649e0150fa7be91040b9d74009ccc085f8a363 (patch)
treedc4b50ef757c194423c72352b8a21e8936441713
parent50b8c55617931e64c666eec99c6c7e6b4fdb24ea (diff)
downloademacs-36649e0150fa7be91040b9d74009ccc085f8a363.tar.gz
emacs-36649e0150fa7be91040b9d74009ccc085f8a363.zip
Spelling and grammar fixes
-rw-r--r--doc/emacs/search.texi10
-rw-r--r--lisp/emacs-lisp/bytecomp.el2
-rw-r--r--lisp/emacs-lisp/smie.el2
-rw-r--r--lisp/progmodes/cc-bytecomp.el2
-rw-r--r--lisp/progmodes/cc-engine.el2
-rw-r--r--lisp/replace.el4
-rw-r--r--m4/ax_gcc_var_attribute.m42
-rw-r--r--modules/mod-test/mod-test.c2
-rwxr-xr-xmodules/modhelp.py2
-rw-r--r--src/ChangeLog.132
-rw-r--r--src/emacs-module.c2
-rw-r--r--src/nsterm.h2
-rw-r--r--src/nsterm.m4
13 files changed, 19 insertions, 19 deletions
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index bcf1beaa355..88ec68c43ec 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -26,7 +26,7 @@ thing, but search for patterns instead of fixed strings.
26* Regexps:: Syntax of regular expressions. 26* Regexps:: Syntax of regular expressions.
27* Regexp Backslash:: Regular expression constructs starting with `\'. 27* Regexp Backslash:: Regular expression constructs starting with `\'.
28* Regexp Example:: A complex regular expression explained. 28* Regexp Example:: A complex regular expression explained.
29* Lax Search:: Search ignores some distinctions between 29* Lax Search:: Search ignores some distinctions among
30 similar characters, like letter-case. 30 similar characters, like letter-case.
31* Replace:: Search, and replace some or all matches. 31* Replace:: Search, and replace some or all matches.
32* Other Repeating Search:: Operating on all matches for some regexp. 32* Other Repeating Search:: Operating on all matches for some regexp.
@@ -1144,7 +1144,7 @@ close-brackets, quotes, or parentheses, repeated zero or more times.
1144@cindex lax search 1144@cindex lax search
1145@cindex character equivalence in search 1145@cindex character equivalence in search
1146 Normally, you'd want search commands to disregard certain minor 1146 Normally, you'd want search commands to disregard certain minor
1147differences between the search string you types and the text being 1147differences between the search string you type and the text being
1148searched. For example, sequences of whitespace characters of 1148searched. For example, sequences of whitespace characters of
1149different length are usually perceived as equivalent; letter-case 1149different length are usually perceived as equivalent; letter-case
1150differences usually don't matter; etc. This is known as 1150differences usually don't matter; etc. This is known as
@@ -1226,13 +1226,13 @@ apropos-variable @key{RET} case-fold-search @key{RET}}.
1226 1226
1227@cindex character folding in search 1227@cindex character folding in search
1228@cindex equivalent character sequences 1228@cindex equivalent character sequences
1229 Case folding disregards case distinctions between characters, making 1229 Case folding disregards case distinctions among characters, making
1230upper-case characters match lower-case variants, and vice versa. A 1230upper-case characters match lower-case variants, and vice versa. A
1231generalization of case folding is @dfn{character folding}, which 1231generalization of case folding is @dfn{character folding}, which
1232disregards wider classes of distinctions between similar characters. 1232disregards wider classes of distinctions among similar characters.
1233For instance, under character folding the letter @code{a} matches all 1233For instance, under character folding the letter @code{a} matches all
1234of its accented cousins like @code{@"a} and @code{@'a}, i.e., the 1234of its accented cousins like @code{@"a} and @code{@'a}, i.e., the
1235match disregards the diacriticals that distinguish between these 1235match disregards the diacritics that distinguish these
1236variants. In addition, @code{a} matches other characters that 1236variants. In addition, @code{a} matches other characters that
1237resemble it, or have it as part of their graphical representation, 1237resemble it, or have it as part of their graphical representation,
1238such as @sc{u+249c parenthesized latin small letter a} and @sc{u+2100 1238such as @sc{u+249c parenthesized latin small letter a} and @sc{u+2100
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 14173494eeb..b5b618e87d7 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2366,7 +2366,7 @@ list that represents a doc string reference.
2366 hist-new prov-cons) 2366 hist-new prov-cons)
2367 (apply 'require args) 2367 (apply 'require args)
2368 2368
2369 ;; Record the functions defined by the require in `byte-compille-new-defuns'. 2369 ;; Record the functions defined by the require in `byte-compile-new-defuns'.
2370 (setq hist-new load-history) 2370 (setq hist-new load-history)
2371 (setq prov-cons (cons 'provide (car args))) 2371 (setq prov-cons (cons 'provide (car args)))
2372 (while (and hist-new 2372 (while (and hist-new
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 197861fbae2..25ea4bbb588 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -811,7 +811,7 @@ Possible return values:
811 (indirect-function smie-backward-token-function) 811 (indirect-function smie-backward-token-function)
812 (lambda (n) 812 (lambda (n)
813 (if (bobp) 813 (if (bobp)
814 ;; Arguably backward-sexp hould signal this error for us. 814 ;; Arguably backward-sexp should signal this error for us.
815 (signal 'scan-error 815 (signal 'scan-error
816 (list "Beginning of buffer" (point) (point))) 816 (list "Beginning of buffer" (point) (point)))
817 (backward-sexp n))) 817 (backward-sexp n)))
diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index 1470b080264..d3b4db74c16 100644
--- a/lisp/progmodes/cc-bytecomp.el
+++ b/lisp/progmodes/cc-bytecomp.el
@@ -315,7 +315,7 @@ CONDITION should not be quoted."
315 '(progn))) 315 '(progn)))
316 316
317(defmacro cc-conditional-require-after-load (cc-part file condition) 317(defmacro cc-conditional-require-after-load (cc-part file condition)
318 "If the CONDITION is satified at compile time, (i) force the 318 "If the CONDITION is satisfied at compile time, (i) force the
319file CC-PART.el in the current directory to be loaded at compile 319file CC-PART.el in the current directory to be loaded at compile
320time, (ii) generate an `eval-after-load' form to load CC-PART.el 320time, (ii) generate an `eval-after-load' form to load CC-PART.el
321after the loading of FILE. 321after the loading of FILE.
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 9e9bee8752f..acc2eddff73 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -8065,7 +8065,7 @@ brace.
8065Note that this function might do hidden buffer changes. See the 8065Note that this function might do hidden buffer changes. See the
8066comment at the start of cc-engine.el for more info." 8066comment at the start of cc-engine.el for more info."
8067 ;; Note to maintainers: this function consumes a great mass of CPU cycles. 8067 ;; Note to maintainers: this function consumes a great mass of CPU cycles.
8068 ;; It's use should thus be minimised as far as possible. 8068 ;; Its use should thus be minimized as far as possible.
8069 (let ((paren-state (c-parse-state))) 8069 (let ((paren-state (c-parse-state)))
8070 (or (not (c-most-enclosing-brace paren-state)) 8070 (or (not (c-most-enclosing-brace paren-state))
8071 (c-search-uplist-for-classkey paren-state)))) 8071 (c-search-uplist-for-classkey paren-state))))
diff --git a/lisp/replace.el b/lisp/replace.el
index 76f8d312c7c..21a830da9ca 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -318,7 +318,7 @@ to be replaced will match a sequence of whitespace chars defined by the
318regexp in `search-whitespace-regexp'. 318regexp in `search-whitespace-regexp'.
319 319
320If `replace-character-fold' is non-nil, matching uses character folding, 320If `replace-character-fold' is non-nil, matching uses character folding,
321i.e. it ignores diacriticals and other differences between equivalent 321i.e. it ignores diacritics and other differences between equivalent
322character strings. 322character strings.
323 323
324Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace 324Third 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
563regexp in `search-whitespace-regexp'. 563regexp in `search-whitespace-regexp'.
564 564
565If `replace-character-fold' is non-nil, matching uses character folding, 565If `replace-character-fold' is non-nil, matching uses character folding,
566i.e. it ignores diacriticals and other differences between equivalent 566i.e. it ignores diacritics and other differences between equivalent
567character strings. 567character strings.
568 568
569Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace 569Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace
diff --git a/m4/ax_gcc_var_attribute.m4 b/m4/ax_gcc_var_attribute.m4
index 247cc4ab3eb..d12fce8934e 100644
--- a/m4/ax_gcc_var_attribute.m4
+++ b/m4/ax_gcc_var_attribute.m4
@@ -39,7 +39,7 @@
39# dllexport 39# dllexport
40# init_priority 40# init_priority
41# 41#
42# Unsuppored variable attributes will be tested against a global integer 42# Unsupported variable attributes will be tested against a global integer
43# variable and without any arguments given to the attribute itself; the 43# variable and without any arguments given to the attribute itself; the
44# result of this check might be wrong or meaningless so use with care. 44# result of this check might be wrong or meaningless so use with care.
45# 45#
diff --git a/modules/mod-test/mod-test.c b/modules/mod-test/mod-test.c
index b0c535cdd72..184c737652a 100644
--- a/modules/mod-test/mod-test.c
+++ b/modules/mod-test/mod-test.c
@@ -116,7 +116,7 @@ Fmod_test_non_local_exit_funcall (emacs_env *env, ptrdiff_t nargs,
116} 116}
117 117
118 118
119/* Return a global referrence. */ 119/* Return a global reference. */
120static emacs_value 120static emacs_value
121Fmod_test_globref_make (emacs_env *env, ptrdiff_t nargs, emacs_value args[], 121Fmod_test_globref_make (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
122 void *data) 122 void *data)
diff --git a/modules/modhelp.py b/modules/modhelp.py
index 2210030ecd6..7c96f27fee1 100755
--- a/modules/modhelp.py
+++ b/modules/modhelp.py
@@ -121,7 +121,7 @@ def main():
121 initp = subp.add_parser('init', help='create a test module from a template') 121 initp = subp.add_parser('init', help='create a test module from a template')
122 initp.add_argument('module', help='name of the new module') 122 initp.add_argument('module', help='name of the new module')
123 initp.add_argument('-f', '--fun', default='fun', 123 initp.add_argument('-f', '--fun', default='fun',
124 help='overide name of the default function') 124 help='override name of the default function')
125 initp.set_defaults(func=cmd_init) 125 initp.set_defaults(func=cmd_init)
126 126
127 args = mainp.parse_args() 127 args = mainp.parse_args()
diff --git a/src/ChangeLog.13 b/src/ChangeLog.13
index 4643a473c31..fd68f5370ad 100644
--- a/src/ChangeLog.13
+++ b/src/ChangeLog.13
@@ -16566,7 +16566,7 @@
16566 (ns_draw_fringe_bitmap): Remove unused rowY. 16566 (ns_draw_fringe_bitmap): Remove unused rowY.
16567 Change #if to COCOA && >= 10_6. 16567 Change #if to COCOA && >= 10_6.
16568 (ns_draw_window_cursor): Remove unused overspill. 16568 (ns_draw_window_cursor): Remove unused overspill.
16569 (ns_draw_underwave): width and x are EamcsCGFloat. 16569 (ns_draw_underwave): width and x are EmacsCGFloat.
16570 (ns_draw_box): thickness is CGFloat. 16570 (ns_draw_box): thickness is CGFloat.
16571 (ns_dumpglyphs_image): Change #if to COCOA && >= 10_6. 16571 (ns_dumpglyphs_image): Change #if to COCOA && >= 10_6.
16572 (ns_send_appdefined): When NS_IMPL_GNUSTEP, redirect to main thread 16572 (ns_send_appdefined): When NS_IMPL_GNUSTEP, redirect to main thread
diff --git a/src/emacs-module.c b/src/emacs-module.c
index 7d68caddd56..ac12f8789a4 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -1074,7 +1074,7 @@ syms_of_module (void)
1074{ 1074{
1075 DEFSYM (Qmodule_refs_hash, "module-refs-hash"); 1075 DEFSYM (Qmodule_refs_hash, "module-refs-hash");
1076 DEFVAR_LISP ("module-refs-hash", Vmodule_refs_hash, 1076 DEFVAR_LISP ("module-refs-hash", Vmodule_refs_hash,
1077 doc: /* Module global referrence table. */); 1077 doc: /* Module global reference table. */);
1078 1078
1079 Vmodule_refs_hash 1079 Vmodule_refs_hash
1080 = make_hash_table (hashtest_eq, make_number (DEFAULT_HASH_SIZE), 1080 = make_hash_table (hashtest_eq, make_number (DEFAULT_HASH_SIZE),
diff --git a/src/nsterm.h b/src/nsterm.h
index 7a618141c9c..7e6e8efc478 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -75,7 +75,7 @@ typedef float EmacsCGFloat;
75/* #define NSTRACE_ENABLED 1 */ 75/* #define NSTRACE_ENABLED 1 */
76 76
77 77
78/* When non-zero, trace output is enbled for all parts, except those 78/* When non-zero, trace output is enabled for all parts, except those
79 explicitly disabled. */ 79 explicitly disabled. */
80/* #define NSTRACE_ALL_GROUPS 1 */ 80/* #define NSTRACE_ALL_GROUPS 1 */
81 81
diff --git a/src/nsterm.m b/src/nsterm.m
index 5f22405cffc..36e08c60575 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1141,7 +1141,7 @@ ns_clip_to_row (struct window *w, struct glyph_row *row,
1141 1141
1142/* ========================================================================== 1142/* ==========================================================================
1143 1143
1144 Visibel bell and beep. 1144 Visible bell and beep.
1145 1145
1146 ========================================================================== */ 1146 ========================================================================== */
1147 1147
@@ -7029,7 +7029,7 @@ not_in_argv (NSString *arg)
7029 7029
7030- (void)windowDidExitFullScreen /* provided for direct calls */ 7030- (void)windowDidExitFullScreen /* provided for direct calls */
7031{ 7031{
7032 NSTRACE ("[EamcsView windowDidExitFullScreen]"); 7032 NSTRACE ("[EmacsView windowDidExitFullScreen]");
7033 if (!FRAME_LIVE_P (emacsframe)) 7033 if (!FRAME_LIVE_P (emacsframe))
7034 { 7034 {
7035 NSTRACE_MSG ("Ignored (frame dead)"); 7035 NSTRACE_MSG ("Ignored (frame dead)");