diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-19 18:29:42 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-19 18:29:42 -0800 |
commit | e1dbe924b53c541fdf238a5a722b7177d5c8760b (patch) | |
tree | cef637ee7849fac3160c668f88e0f761305f87d3 | |
parent | 7fb18e9ef9edb3b47cf463babe83922f9310a473 (diff) | |
download | emacs-e1dbe924b53c541fdf238a5a722b7177d5c8760b.tar.gz |
Spelling fixes.
159 files changed, 291 insertions, 304 deletions
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index 6b2ddfa8359..67516fa78b6 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -585,7 +585,7 @@ DIARY OF CHANGES -- other-frame should cycle through the frames on the `current' terminal only. - (Done, by trivially modifiying next_frame and prev_frame.) + (Done, by trivially modifying next_frame and prev_frame.) -- Support different terminal sizes. diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index 82e33cc5418..c320bbe915d 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@ -254,7 +254,7 @@ See the end of the file for license conditions. Another valuable source of information and help which should not be overlooked is the various Usenet news groups dedicated to Emacs. - These are particuarly good for help with general issues which aren't + These are particularly good for help with general issues which aren't specific to the Windows port of Emacs. The main news groups to use for seeking help are: diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 034d92f78c3..39a81ecc6ad 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -4546,7 +4546,7 @@ you may prefer to use a different one for a given image type (which @c FIXME how is this priority determined? loader will be used in practice depends on the priority of the loaders). @c FIXME why are these uppercase when image-types is lower-case? -@c FIXME what are the possibe options? Are these actually file extensions? +@c FIXME what are the possible options? Are these actually file extensions? For example, if you never want to use the ImageMagick loader to use JPEG files, add @code{JPG} to this list. diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index d2e86a77112..dad1f28026e 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -953,7 +953,7 @@ variable, Emacs uses the latter. By default, The @code{alpha} frame parameter can also be a cons cell @code{(@samp{active} . @samp{inactive})}, where @samp{active} is the opacity of the frame when it is selected, and @samp{inactive} is the -opactity when it is not selected. +opacity when it is not selected. @end table The following frame parameters are semi-obsolete in that they are diff --git a/doc/lispref/spellfile b/doc/lispref/spellfile index 36bbb278794..a98f0427ef6 100644 --- a/doc/lispref/spellfile +++ b/doc/lispref/spellfile @@ -529,7 +529,6 @@ pointer' pointm pos preallocate -predicale preload prepend prepended diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi index 2e66c78a3cb..ecf4c7e47b2 100644 --- a/doc/misc/autotype.texi +++ b/doc/misc/autotype.texi @@ -156,7 +156,7 @@ the point is normally left after that skeleton is inserted (@pxref{Using Skeletons}). The point (@pxref{(emacs)Point}) is left at the next interesting spot in the skeleton instead. - A negative prefix means to do something similar with that many precedingly + A negative prefix means to do something similar with that many previously marked interregions (@pxref{(emacs)Mark}). In the simplest case, if you type @kbd{M--} just before issuing the skeleton command, that will wrap the skeleton around the current region, just like a positive argument would have diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 5a1ee872a2b..56f6b64c20b 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -10666,7 +10666,7 @@ and displayed in any radix just like integers and fractions. Since a float that is entered in a radix other that 10 will be converted to decimal, the number that Calc stores may not be exactly the number that was entered, it will be the closest decimal approximation given the -current precison. The notation @samp{@var{radix}#@var{ddd}.@var{ddd}} +current precision. The notation @samp{@var{radix}#@var{ddd}.@var{ddd}} is a floating-point number whose digits are in the specified radix. Note that the @samp{.} is more aptly referred to as a ``radix point'' than as a decimal point in this case. The number @samp{8#123.4567} is diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi index 62c1663508b..94984e5d3c3 100644 --- a/doc/misc/gnus-news.texi +++ b/doc/misc/gnus-news.texi @@ -107,7 +107,7 @@ EasyPG is included in Emacs 23 and available separately as well. @itemize @bullet @item -Symbols like @code{gcc-self} now has the same presedence rules in +Symbols like @code{gcc-self} now has the same precedence rules in @code{gnus-parameters} as other ``real'' variables: The last match wins instead of the first match. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index a0443a0d88b..3bfa5a89e79 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -21228,7 +21228,7 @@ features (inspired by the Google search input language): AND, OR, and NOT are supported, and parentheses can be used to control operator precedence, e.g. (emacs OR xemacs) AND linux. Note that operators must be written with all capital letters to be -recognised. Also preceding a term with a - sign is equivalent to NOT +recognized. Also preceding a term with a - sign is equivalent to NOT term. @item Automatic AND queries @@ -21273,7 +21273,7 @@ Gmane queries follow a simple query language: AND, OR, NOT (or AND NOT), and XOR are supported, and brackets can be used to control operator precedence, e.g. (emacs OR xemacs) AND linux. Note that operators must be written with all capital letters to be -recognised. +recognized. @item Required and excluded terms + and - can be used to require or exclude terms, e.g. football -american diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index ad6159feb1a..55b60937fb6 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -421,7 +421,7 @@ local variables, and tag lists in scope for various reasons, such as C++ using statements. @item semanticdb-typecache.el -The typecache is part of @code{semanticdb}, but is used primarilly by +The typecache is part of @code{semanticdb}, but is used primarily by the analyzer to look up datatypes and complex names. The typecache is bound across source files and builds a master lookup table for data type names. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 0accc6fac43..e6b0f4fa235 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -3180,7 +3180,7 @@ names: '("^/xy" . "@trampfn{ssh, news, news.my.domain, /opt/news/etc/}")) @end lisp -This shortens the file openening command to @kbd{C-x C-f /xy +This shortens the file opening command to @kbd{C-x C-f /xy @key{RET}}. The disadvantage is, again, that you cannot edit the file name, because the expansion happens after entering the file name only. diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 04084b58488..14d2a22e9f9 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS @@ -1279,7 +1279,7 @@ in XEmacs. ** The module system has again changed a lot. You can now customize the variable `erc-modules' and define once and for all which extension modules you want to use. This unfortunately may require - you to change your current erc initialisation code a bit, if you + you to change your current erc initialization code a bit, if you have some existing customizations. On the other hand, this change makes the configuration of extension modules a lot easier for new users. In theory, you should be able to configure all aspects of diff --git a/etc/NEWS.18 b/etc/NEWS.18 index 6bf854d8b33..ce1f6b12fb3 100644 --- a/etc/NEWS.18 +++ b/etc/NEWS.18 @@ -519,7 +519,7 @@ exist to customize these feature for different Lisp implementations. ** C-x p now disabled. -The command C-x p, a nonrecomended command which narrows to the current +The command C-x p, a nonrecommended command which narrows to the current page, is now initially disabled like C-x n. * Dealing with files. @@ -1620,4 +1620,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. Local variables: mode: text end: - diff --git a/etc/NEWS.19 b/etc/NEWS.19 index 6c1c5483809..90671cee18c 100644 --- a/etc/NEWS.19 +++ b/etc/NEWS.19 @@ -4288,7 +4288,7 @@ filename completion in comint mode apply, together with a variable controlling whether to restrict possible completions to only files that are executable (`shell-command-execonly'). -The input history is initialised from the file name given in the +The input history is initialized from the file name given in the variable `shell-input-ring-file-name'--normally `.history' in your home directory. diff --git a/etc/gnus/news-server.ast b/etc/gnus/news-server.ast index 432f71a50f0..df0bab4519b 100644 --- a/etc/gnus/news-server.ast +++ b/etc/gnus/news-server.ast @@ -7,7 +7,7 @@ @validate (or (assistant-validate-connect-to-server server port) (y-or-n-p "Do you want to use the server anyway, although you can't confirm it's valid?")) @result gnus-select-method (list 'nntp server (list 'nntp-server port)) @text -Usenet news is usually read from your Internet service prodider's news +Usenet news is usually read from your Internet service provider's news server. If you don't know the name of this server, contact your ISP. As a guess, the name of the server might be news.yourisp.com. @@ -61,4 +61,3 @@ Password: @variable{user-name} @c End: @c arch tag is missing - diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt index b296f9dc515..d3dad33a5a2 100644 --- a/etc/srecode/test.srt +++ b/etc/srecode/test.srt @@ -81,7 +81,7 @@ template gapsomething :blank ---- template inlinetext -"Insert text that has no nelines" +"Insert text that has no newlines" ---- *In the middle* ---- diff --git a/leim/quail/ipa.el b/leim/quail/ipa.el index 559841e8905..4c15be2bf42 100644 --- a/leim/quail/ipa.el +++ b/leim/quail/ipa.el @@ -183,7 +183,7 @@ incorrectly, as separate from the modified glyphs.") "˚"]) ;; +Unexploded modifier U+02DA ("<r>" "ʳ") ;; +Rhotacized modifier U+02B3 ("<w>" "ʷ") ;; +Labialized modifier U+02B7 - ("<?>" "ʱ") ;; +Murmured modififer U+02B1 + ("<?>" "ʱ") ;; +Murmured modifier U+02B1 ("b<trl>" "ʙ") ;; Bilabial trill U+0299 ("b`" "ɓ") ;; Bilabial implosive U+0253 @@ -465,8 +465,8 @@ displays them, incorrectly, as separate from the modified glyphs.") ("_}" "̚") ;; No audible release U+031A ;; ` is alternatively; retroflexion in consonants ("`" "˞") ;; Rhotacization in vowels U+02DE - ("_~" "̃") ;; Nasalisation U+0303 - ("~" "̃") ;; Nasalisation U+0303 + ("_~" "̃") ;; Nasalization U+0303 + ("~" "̃") ;; Nasalization U+0303 ("_A" "̘") ;; Advanced tongue root U+0318 ("_a" "̺") ;; Apical U+033A ("_B" "̏") ;; Extra low tone U+030F diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index d043f41962e..983754eb1c3 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -2032,7 +2032,7 @@ * etags.c [ETAGS_REGEXPS]: Now is unconditionally defined. [LONG_OPTIONS]: Changed to NO_LONG_OPTIONS, which is undefined. (Objc_suffixes): Suggest using --lang=c for full help. - (C_entries): Initialise savetoken to 0 to shut up the compiler. + (C_entries): Initialize savetoken to 0 to shut up the compiler. 2006-07-20 Andreas Schwab <schwab@suse.de> @@ -2738,7 +2738,7 @@ (add_regex, regex_tag_multiline, readline): Use it. (main): Free some global structures. (fdesc): New member `written'. - (readline, process_file): Initialise it. + (readline, process_file): Initialize it. (put_entries): Set it. (main): Use it to create entries for files without tags. (total_size_of_entries): Do not count invalid tags. @@ -2849,7 +2849,7 @@ (find_entries): Rewind unconditionally. (find_entries): Do not call language functions directly, now calls itself. - (find_entries): Do general initialisations here. + (find_entries): Do general initializations here. (CNL_SAVE_DEFINEDEF, C_entries, LOOP_ON_INPUT_LINES, F_getit) (Ada_getit, Pascal_functions, Pascal_functions) (prolog_skip_comment): Do not do them here. @@ -3085,7 +3085,7 @@ (TeX_commands): Name tags. Correction of old disabled code. * etags.c (curfiledir, curtagfname): New global variables. - (process_file): Initialise them. + (process_file): Initialize them. (readline): Canonicalize the name found in #line directive. 2002-03-06 Jason Rumney <jasonr@gnu.org> @@ -3175,7 +3175,7 @@ (L_getit): Simplify by using get_tag. (Perl_functions, Postscript_functions, erlang_attribute): Use the modified LOOKING_AT. - (notinname): Remove '[' and added ')' to the recognised chars. + (notinname): Remove '[' and added ')' to the recognized chars. (LOOKING_AT, get_tag, PHP_functions): Use notinname. (Ada_getit, Ada_funcs, Python_functions, Scheme_functions): Clarified, using strneq or notinname. @@ -3242,7 +3242,7 @@ (Scheme_functions, Texinfo_nodes): Use it. (Perl_functions): Use strneq. (prolog_pred): Rename to prolog_pr. - (prolog_pr): Recognise Prolog rules in addition to predicates. + (prolog_pr): Recognize Prolog rules in addition to predicates. [ETAGS_REGEXPS] [!HAVE_CONFIG_H] [__CYGWIN__]: Prevent unmodified compile, as Cygwin's regex.h is incompatible with us. [!HAVE_CONFIG_H] [!__STDC__]: #define const as the empty string. @@ -3516,7 +3516,7 @@ * etags.c (enum sym_type): New label st_C_template. (gperf input): Use it for switching to C++ from C. (consider_token): Do it. - (C_entries): Initialise typdefcblev to quiet compilers. + (C_entries): Initialize typdefcblev to quiet compilers. [!HAVE_CONFIG_H] [!__STDC__]: #define static as nothing. 2001-02-22 Andrew Innes <andrewi@gnu.org> @@ -3967,7 +3967,7 @@ * etags.c (C_entries, consider_token): C++ `operator' now is tagged in most cases. - As before, :: is not recognised if surrounded by spaces. + As before, :: is not recognized if surrounded by spaces. * etags.c (relative_filename): Account for DOS file names such that is impossible to make one relative to another. @@ -4576,7 +4576,7 @@ * etags.c (C_entries): Use "." instead of "::" for Java. (consider_token): is_func renamed to is_func_or_var. (C_entries): is_func renamed to funorvar. - (C_entries): Initialise tok.named. + (C_entries): Initialize tok.named. (sym_type, C_stab_entry, consider_token): st_C_ignore is used to get rid of "import", "package" and "friend". (fvdef): Rename from funcdef. Also some constants renamed. @@ -4630,7 +4630,7 @@ (lang_names): Add Java. (sym_type): Add st_C_javastruct for Java. (C_stab_entry): Add `extends' and `implements' keywords. - (consider_token, C_entries): Recognise Java structures. + (consider_token, C_entries): Recognize Java structures. 1997-05-12 Francesco Potortì <F.Potorti@cnuce.cnr.it> @@ -4678,7 +4678,7 @@ * etags.c (xnew): Add support for debugging with chkmalloc. (error): Use this instead of printf whenever possible. - (main): Only call xnew after having initialised progname. + (main): Only call xnew after having initialized progname. (substitute): Bad memory corruption error corrected. 1997-04-08 Francesco Potortì <F.Potorti@cnuce.cnr.it> @@ -5596,8 +5596,8 @@ 1995-02-22 Francesco Potortì (pot@cnuce.cnr.it) - * etags.c (C_entries): token_saved removed. Initialise tok.valid and - savetok.valid. Mark token as valid when it is initialised. + * etags.c (C_entries): token_saved removed. Initialize tok.valid and + savetok.valid. Mark token as valid when it is initialized. (make_tag): Make token only if token is valid and reset validity. (CNL_SAVE_DEFINEDEF): Test for savetok.valid instead of token_saved. (TOKEN): Add a new member: valid. @@ -5609,15 +5609,15 @@ 1995-02-14 Francesco Potortì (pot@cnuce.cnr.it) - * etags.c (C_entries): Initialise the new members of TOKEN. + * etags.c (C_entries): Initialize the new members of TOKEN. (C_entries): Do not allocate a new space for each token found by consider_token. Let make_tag do that instead. (make_tag): Since now TOKEN has memory of where it is taken from, this new macro substitutes both make_tag_from_new_lb and make_tag_from_oth_lb. All callers changed. (TOKEN): Add linepos and buffer members. - (main): Initialise token_str. - (lang_extensions): Recognise .c++ and .h++ as C++ file suffixes. + (main): Initialize token_str. + (lang_extensions): Recognize .c++ and .h++ as C++ file suffixes. (token_str): New global variable used by C_entries. 1995-02-07 Richard Stallman <rms@pogo.gnu.ai.mit.edu> @@ -5626,7 +5626,7 @@ 1995-02-01 Francesco Potortì (pot@cnuce.cnr.it) - * etags.c (pfnote): Initialise been_warned in the node. + * etags.c (pfnote): Initialize been_warned in the node. (C_entries): Remove a speed hack for the sake of clarity. 1995-01-18 Francesco Potortì (pot@cnuce.cnr.it) @@ -5911,8 +5911,8 @@ 1994-09-29 Francesco Potortì (pot@cnuce.cnr.it) - * etags.c (C_entries): Recognise typedef of ANSI style functions. - (C_entries): Recognise #define inside a struct. + * etags.c (C_entries): Recognize typedef of ANSI style functions. + (C_entries): Recognize #define inside a struct. (C_entries): ANSI tells that preprocessor commands do not have to start on the first column. (print_help): Documentation corrected for -d and -D. @@ -6026,7 +6026,7 @@ 1994-07-08 Dave Love (d.love@dl.ac.uk) - * etags.c (takeprec): Recognise `character*(*) function'. + * etags.c (takeprec): Recognize `character*(*) function'. 1994-07-08 Francesco Potortì (pot@cnuce.cnr.it) @@ -6219,7 +6219,7 @@ TeX_functions, Prolog_functions. (inf): No more a global variable. (C_entries): Take 2nd parameter `inf' instead of using the global one. - (find_entries): Add the cp1 var for optimisation. + (find_entries): Add the cp1 var for optimization. (find_entries): Add more suffixes for assembler files. (Asm_funcs): Now finds labels even without an ending colon. @@ -6247,7 +6247,7 @@ functions added to compute filenames in tags files. (process_file): Filenames in tags file are relative to the directory where the tags file is (useful with the -o option). - (main): Initialise the outfiledir var. + (main): Initialize the outfiledir var. (TYPEDST): Add the `tignore' value. (C_entries): Corrected various small bugs. @@ -6553,7 +6553,7 @@ 1993-09-20 Francesco Potortì (pot@fly) - * etags.c (C_entries): is_func is initialised here instead of in + * etags.c (C_entries): is_func is initialized here instead of in consider_token for the sake of the yacc rules section. (C_entries): Now class, struct, enum, union and typedef produce named tags. @@ -6607,7 +6607,7 @@ 1993-08-04 Francesco Potortì (pot@spiff.gnu.ai.mit.edu) - * etags.c (L_isdef, L_isquote, L_getit): Small optimisations. + * etags.c (L_isdef, L_isquote, L_getit): Small optimizations. (L_funcs): The (foo::defmumble stuff now should work. (consider_token): Function returned random value--corrected. (C_entries): Corrected == versus = typo. @@ -6629,7 +6629,7 @@ (C_entries, consider_token): Make use of fignore. (consider_token): Reset funcdef when next_token_is_func: when in ctags mode makes DEFVAR and others work better. - (L_isquote): Function that recognises the "(quote" string. + (L_isquote): Function that recognizes the "(quote" string. (L_getit): Ignore quoting via "'" or "(quote". Useful for defalias. 1993-07-29 Paul Eggert (eggert@twinsun.com) @@ -6976,7 +6976,7 @@ (TOKEN): Member linestart removed. (linepos, prev_linepos, lb1): Deleted. (main): Call initbuffer on lbs array instead of lb1. - (init): Remove the initialisation of the logical _gd array. + (init): Remove the initialization of the logical _gd array. (find_entries): A .sa suffix means assembler file. (C_create_stab): "auto", "void", "extern", "static" are st_C_typespec. All C state machines rewritten. diff --git a/lib-src/etags.c b/lib-src/etags.c index df505b0ef56..30d90e9d911 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -1862,10 +1862,10 @@ find_entries (FILE *inf) assert (parser != NULL); - /* Generic initialisations before reading from file. */ + /* Generic initializations before reading from file. */ linebuffer_setlen (&filebuf, 0); /* reset the file buffer */ - /* Generic initialisations before parsing file with readline. */ + /* Generic initializations before parsing file with readline. */ lineno = 0; /* reset global line number */ charno = 0; /* reset global char number */ linecharno = 0; /* reset global char number of line start */ @@ -1895,7 +1895,7 @@ find_entries (FILE *inf) * 4. the character, if any, immediately after NAME in LINESTART must * also be a character in NONAM. * - * The implementation uses the notinname() macro, which recognises the + * The implementation uses the notinname() macro, which recognizes the * characters stored in the string `nonam'. * etags.el needs to use the same characters that are in NONAM. */ @@ -3057,7 +3057,7 @@ make_C_tag (int isfun) make_tag (token_name.buffer, token_name.len, isfun, token.line, token.offset+token.length+1, token.lineno, token.linepos); else if (DEBUG) - { /* this branch is optimised away if !DEBUG */ + { /* this branch is optimized away if !DEBUG */ make_tag (concat ("INVALID TOKEN:-->", token_name.buffer, ""), token_name.len + 17, isfun, token.line, token.offset+token.length+1, token.lineno, token.linepos); @@ -3304,7 +3304,7 @@ C_entries (int c_ext, FILE *inf) if (c == ':' && *lp == ':' && begtoken (lp[1])) /* This handles :: in the middle, but not at the beginning of an identifier. - Also, space-separated :: is not recognised. */ + Also, space-separated :: is not recognized. */ { if (c_ext & C_AUTO) /* automatic detection of C++ */ c_ext = (c_ext | C_PLPL) & ~C_AUTO; @@ -5900,7 +5900,7 @@ regex_tag_multiline (void) if (!rp->multi_line) continue; /* skip normal regexps */ - /* Generic initialisations before parsing file from memory. */ + /* Generic initializations before parsing file from memory. */ lineno = 1; /* reset global line number */ charno = 0; /* reset global char number */ linecharno = 0; /* reset global char number of line start */ diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 68c9173efca..11a4acd3b16 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3033,7 +3033,7 @@ more people. * cus-edit.el (custom-file): When running under emacs -q, always - refuse to save the customisations, even if the .emacs file doesn't + refuse to save the customizations, even if the .emacs file doesn't exist. * info.el: Remove the `Info-beginning-of-buffer' function diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 1677d8659bf..e40f419b32a 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -1036,13 +1036,13 @@ 2003-06-29 Nick Roberts <nick@nick.uklinux.net> - * gdb-ui.el (gdb-display-number-end): Don't re-initialise local + * gdb-ui.el (gdb-display-number-end): Don't re-initialize local variables to preserve array slices. (gdb-array-slice): Rename gdb-mouse-array-slice. (gdb-array-slice): Interactive function bound to "\r" for text terminals. (gdb-view-source): Rename gdb-view-source-function. - Set uninitialised variables (defvars) to nil. + Set uninitialized variables (defvars) to nil. 2003-06-29 Kai Großjohann <kai.grossjohann@gmx.net> @@ -2149,7 +2149,7 @@ 2003-05-25 Kevin Ryde <user42@zip.com.au> - * info-look.el (autoconf-mode setups): Recognise AH_ and AU_ entries + * info-look.el (autoconf-mode setups): Recognize AH_ and AU_ entries in "(autoconf)Autoconf Macro Index". Add "(autoconf)M4 Macro Index" and "(autoconf)Autotest Macro Index". Remove duplicate copy of "(automake)Macro and Variable Index". Keep automake after all @@ -14917,7 +14917,7 @@ 2002-05-14 Francesco Potortì <pot@gnu.org> - * shell.el (shell-mode): Make second part of initialisation + * shell.el (shell-mode): Make second part of initialization depend on whether comint-input-ring is empty, rather than depend on it being nil. @@ -22669,7 +22669,7 @@ Suggested by Kalle Olavi Niemitalo <kon@iki.fi>: - * vc-hooks.el (vc-error-occured): Backquotified. + * vc-hooks.el (vc-error-occurred): Backquotified. (vc-file-prop-obarray): Use prime length for better efficiency. * vc.el (vc-clear-context): Fill obarray with 0, not nil. diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index e916db64f05..7df356b52d8 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -2823,7 +2823,7 @@ 2007-01-01 Alan Mackenzie <acm@muc.de> * progmodes/cc-engine.el (c-guess-basic-syntax, case 5N): - Check the format of c-state-cache is valid for an optimisation before + Check the format of c-state-cache is valid for an optimization before using it. * progmodes/cc-engine.el (c-guess-basic-syntax): New case 5Q "we @@ -2840,11 +2840,11 @@ * progmodes/cc-cmds.el (c-context-line-break): Don't indent the new line after an escaped EOL in a string. - * progmodes/cc-engine.el (c-forward-label): Recognise "foo:" as a + * progmodes/cc-engine.el (c-forward-label): Recognize "foo:" as a label when it directly follows "else", "do", .... * progmodes/cc-engine.el (c-backward-<>-arglist): Tolerate empty - angle brackets (as seen in "explicit specialisations" of C++ + angle brackets (as seen in "explicit specializations" of C++ templates). * progmodes/cc-vars.el (c-indentation-style): Mention c-file-style @@ -2871,7 +2871,7 @@ * progmodes/cc-cmds.el (c-electric-slash): Extend the handling of clean-up comment-close-slash also to work when there's a comment terminator on the line. - (c-beginning-of-defun, c-end-of-defun): Refactor and optimise + (c-beginning-of-defun, c-end-of-defun): Refactor and optimize these for large arg - only take account of top level {..}, except for initial and final adjustments. M-- C-M-[ae] now go to the right defuns when the starting point is between defuns. They use @@ -3257,7 +3257,7 @@ 2006-12-17 Alan Mackenzie <acm@muc.de> - * emacs-lisp/lisp.el (beginning-of-defun-raw): Optimise (for + * emacs-lisp/lisp.el (beginning-of-defun-raw): Optimize (for speed) the case when open-paren-in-column-0-is-defun-start is nil. Based on code by Martin Rudalics. @@ -4124,7 +4124,7 @@ 2006-11-15 Simon Marshall <simon@gnu.org> * progmodes/cc-fonts.el (c-font-lock-declarators): Use c-at-toplevel-p - to recognise "T t()" as a function declaration, rather than a + to recognize "T t()" as a function declaration, rather than a variable instantiation, iff at the top-level or inside a class declaration. Suggested by Feng Li <fengli@gmail.com>. @@ -8722,7 +8722,7 @@ * progmodes/gdb-ui.el (gdb-same-frame): New option. (gud-old-arrow, gdb-frame-begin, gdb-printing): New variables. - (gdb-init-1): Initialise them. + (gdb-init-1): Initialize them. (gdb-starting): Reset gdb-printing. (gdb-starting): Save value of gud-overlay-arrow-position. (gdb-frame-begin): Set gdb-frame-begin, gdb-printing. @@ -10937,7 +10937,7 @@ 2006-04-10 Nick Roberts <nickrob@snap.net.nz> - * progmodes/gdb-ui.el (gdb-init-1): Re-initialise gdb-main-file to nil. + * progmodes/gdb-ui.el (gdb-init-1): Re-initialize gdb-main-file to nil. (gdb-get-version): Make it work for pre "interpreter mi" (GDB 5.3?). (gdb-setup-windows): Put something in source window if we can't find the source file. @@ -16153,7 +16153,7 @@ much cruft in cc-awk.el, cc-cmds.el and cc-engine.el to clear out. * progmodes/cc-cmds.el: (c-ascertain-adjacent-literal): In the backwards direction, now - recognises AWK regexp delimiters as string delimiters. + recognizes AWK regexp delimiters as string delimiters. (c-after-statement-terminator-p): Adapt for virtual semicolons; check more rigorously for "end of macro". (c-back-over-illiterals, c-forward-over-illiterals): Adapt for @@ -16280,7 +16280,7 @@ * progmodes/cc-cmds.el, cc-styles.el, cc-vars.el: New variables c-string-par-start/separate c-sentence-end-with-esc-eol, - initialised in c-setup-paragraph-variables, used in string + initialized in c-setup-paragraph-variables, used in string scanning subroutines of c-beginning-of-statement. * progmodes/cc-cmds.el (c-electric-brace): Don't delete a comment @@ -22315,7 +22315,7 @@ * ibuf-ext.el (ibuffer-auto-update-changed): Use `frame-or-buffer-changed-p' to check whether we need to update. (ibuffer-auto-mode): Don't advise `get-buffer-create' and - `kill-buffer'. Initialise `ibuffer-auto-buffers-changed' + `kill-buffer'. Initialize `ibuffer-auto-buffers-changed' as a `frame-or-buffer-changed-p' state vector instead. 2005-08-27 Romain Francoise <romain@orebokech.com> diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 319cdb14b9b..0642a4d14ab 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -36,7 +36,7 @@ 2008-02-01 Vinicius Jose Latorre <viniciusjl@ig.com.br> * ps-print.el: Some face attributes (like :strike-through) were not - being recognised. Reported by Leo <sdl.web@gmail.com>. + being recognized. Reported by Leo <sdl.web@gmail.com>. (ps-print-version): New version 7.3.2. (ps-screen-to-bit-face): Fix code. Call ps-face-strikeout-p, ps-face-overline-p and ps-face-box-p functions. @@ -4137,7 +4137,7 @@ 2008-01-14 Alan Mackenzie <acm@muc.de> * progmodes/cc-engine.el (c-guess-basic-syntax): Prevent a macro - call inside a struct being recognised as a K&R argument. + call inside a struct being recognized as a K&R argument. 2008-01-14 Stefan Monnier <monnier@iro.umontreal.ca> @@ -12544,7 +12544,7 @@ a weird set-buffer&prog1 combination. * emacs-lisp/byte-opt.el (byte-optimize-if): Move `progn' out of the - test so as to optimise cases where the `progn's result is constant. + test so as to optimize cases where the `progn's result is constant. 2007-08-23 Thien-Thi Nguyen <ttn@gnuvola.org> @@ -13845,7 +13845,7 @@ 2007-07-24 Alan Mackenzie <acm@muc.de> * emacs-lisp/bytecomp.el (byte-compile-from-buffer): - Initialise byte-compile-unresolved-functions before rather than + Initialize byte-compile-unresolved-functions before rather than after a compilation. (byte-compile-unresolved-functions): Amplify doc string. @@ -15917,7 +15917,7 @@ * help-mode.el (help-xref-forward-stack) (help-xref-stack-forward-item, help-forward-label): New variables. (help-forward): New button type. - (help-setup-xref): Initialise help-xref-forward-stack. + (help-setup-xref): Initialize help-xref-forward-stack. (help-make-xrefs): Add forward button, if appropriate. (help-xref-go-back): Push item on forward stack. (help-xref-go-forward, help-go-forward): New functions. diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index 1cde53ba0d3..ce2253bcfe6 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -14189,7 +14189,7 @@ 2008-04-19 Nick Roberts <nickrob@snap.net.nz> * progmodes/gdb-ui.el (gdb-thread-indicator): New variable. - (gdb-init-1): Initialise it. + (gdb-init-1): Initialize it. (gdb-annotation-rules): New entry for "new-thread". (gdb-thread-identification): New function to customize mode-line-buffer-identification. @@ -15994,11 +15994,11 @@ 2008-04-02 Alan Mackenzie <acm@muc.de> * progmodes/cc-cmds.el (c-defun-name, c-cpp-define-name): - New optimised functions to get the name of the current defun/macro. + New optimized functions to get the name of the current defun/macro. * add-log.el (add-log-current-defun): Move the functionality which gets the current function name for C like modes to cc-cmds.el, - thus optimising for speed. + thus optimizing for speed. 2008-04-02 Chong Yidong <cyd@stupidchicken.com> @@ -19392,7 +19392,7 @@ * progmodes/cc-mode.el (c-basic-common-init): C and ObjC now use syntax-table text properties. (c-common-init): Call language specific before/after-change - functions at mode initialisation. + functions at mode initialization. (c-new-BEG, c-new-END, c-old-BOM, c-old-EOM): New variables. (c-extend-region-for-CPP, c-neutralize-CPP-line) (c-neutralize-syntax-in-CPP): New functions. diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index 4a1769b117e..dfd9b94b53e 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -2790,7 +2790,7 @@ * net/tramp-gw.el: * net/tramp-imap.el: * net/tramp-sh.el: - * net/tramp-smb.el: Add tramp-autoload cookie for initialisation + * net/tramp-smb.el: Add tramp-autoload cookie for initialization code of `tramp-default-method-alist' and `tramp-default-user-alist'. 2010-12-29 Karl Fogel <kfogel@red-bean.com> @@ -7632,7 +7632,7 @@ (post-self-insert-hook): Use it. * emacs-lisp/pcase.el (pcase-split-memq): - Fix overenthusiastic optimisation. + Fix overenthusiastic optimization. (pcase-u1): Handle the case of a lambda pred. 2010-08-31 Kenichi Handa <handa@m17n.org> @@ -9381,7 +9381,7 @@ Fix an indentation bug: - * progmodes/cc-mode.el (c-common-init): Initialise c-new-BEG/END. + * progmodes/cc-mode.el (c-common-init): Initialize c-new-BEG/END. (c-neutralize-syntax-in-and-mark-CPP): c-new-BEG/END: Take account of existing values. @@ -14596,7 +14596,7 @@ 2009-12-05 Kevin Ryde <user42@zip.com.au> * textmodes/sgml-mode.el (sgml-lexical-context): - Recognise comment-start-skip to comment-end-skip as comment (Bug#4781). + Recognize comment-start-skip to comment-end-skip as comment (Bug#4781). 2009-12-05 Juri Linkov <juri@jurta.org> diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index 89856d37721..5b0f2ac4270 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 @@ -2190,7 +2190,7 @@ 1986-12-15 Richard Mlynarik (mly@prep) * fortran.el: - Initialise fortran-mode-abbrev-table correctly. + Initialize fortran-mode-abbrev-table correctly. * fortran.el: fortran-comment-indent-char should be a character (a fixnum), not diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4 index f9407ce20d8..b2cdc634f84 100644 --- a/lisp/ChangeLog.4 +++ b/lisp/ChangeLog.4 @@ -2462,7 +2462,7 @@ 1994-03-03 Simon Marshall (Simon.Marshall@mail.esrin.esa.it) * cmuscheme.el (inferior-scheme-mode): Removed unnecessary - initialisation of comint-input-sentinel. + initialization of comint-input-sentinel. * shell.el (shell-dynamic-complete-functions): New variable. (shell-mode): Use it to set comint-dynamic-complete-functions. @@ -4958,7 +4958,7 @@ 1993-11-08 Simon Marshall (Simon.Marshall@mail.esrin.esa.it) * comint.el (comint-preinput-scroll-to-bottom): Added - comint-magic-space to list of commands recognised as inserting. + comint-magic-space to list of commands recognized as inserting. * comint.el (comint-output-filter): Corrected check for killed buffer. @@ -5202,7 +5202,7 @@ * comint.el (comint-last-output-start): New variable to record where most recent process output started from. - (comint-mode): Initialise it. + (comint-mode): Initialize it. (comint-output-filter): Set it. * comint.el (comint-previous-matching-input-string): Moved to @@ -5220,7 +5220,7 @@ they move within the buffer rather than do input. * comint.el (comint-send-input, comint-after-pmark-p) - (comint-kill-input, comint-proc-query): Removed serialisation of + (comint-kill-input, comint-proc-query): Removed serialization of obtaining the process mark's marker-position. * comint.el, shell.el: Commented out comint/shell-load-hooks. @@ -8952,4 +8952,3 @@ See ChangeLog.3 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5 index 2d61f464a29..b749be79fc1 100644 --- a/lisp/ChangeLog.5 +++ b/lisp/ChangeLog.5 @@ -6165,7 +6165,7 @@ 1994-10-05 Simon Marshall <Simon.Marshall@mail.esrin.esa.it> - * comint.el (comint-check-proc): Recognise `open'. + * comint.el (comint-check-proc): Recognize `open'. (comint-exec): Use open-network-stream if command is a cons pair. * font-lock.el (compilation-mode-font-lock-keywords, @@ -6954,7 +6954,7 @@ 1994-09-19 Francesco Potortì <pot@cnuce.cnr.it> - * rlogin.el (rlogin): Recognise the `-l user' option to rlogin and + * rlogin.el (rlogin): Recognize the `-l user' option to rlogin and let comint and ange-ftp know about the correct home directory. 1994-09-19 Richard Stallman <rms@mole.gnu.ai.mit.edu> @@ -9280,4 +9280,3 @@ See ChangeLog.4 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index 7ba9261ccf0..42c9df84876 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 @@ -1491,9 +1491,9 @@ 1996-04-16 Francesco Potortì <F.Potorti@cnuce.cnr.it> - * vc.el (vc-comment-ring): Initialise using make-ring. - (vc-clear-context): Initialise vc-comment-ring using make-ring. - (vc-finish-logentry): Don't initialise vc-comment-ring here. + * vc.el (vc-comment-ring): Initialize using make-ring. + (vc-clear-context): Initialize vc-comment-ring using make-ring. + (vc-finish-logentry): Don't initialize vc-comment-ring here. 1996-04-15 Eric Ding <ericding@mit.edu> @@ -3055,7 +3055,7 @@ (font-lock-mode): Use them. Doc fix. Don't make font-lock-fontified buffer local here. (font-lock-set-defaults): Do it here. - (font-lock-compile-keyword): New function. Recognise `eval' keywords. + (font-lock-compile-keyword): New function. Recognize `eval' keywords. (font-lock-compile-keywords): Use it. (global-font-lock-mode): New command for Global Font Lock mode. (font-lock-global-modes): New variable. @@ -8038,4 +8038,3 @@ See ChangeLog.5 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index 6d3d41a5a5c..dea5137d246 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -6259,7 +6259,7 @@ * sql.el: Added keywords from `finder-by-keyword'. (sql-mode): Made sql-buffer a local variable, changed the documentation: removed instructions to add *.sql files to - auto-mode-alist, added documentation for having mutliple SQL + auto-mode-alist, added documentation for having multiple SQL buffers sending their stuff to different SQLi buffers, each running a different process. (sql-postgres): Quoted *SQL* in doc string. @@ -6270,7 +6270,7 @@ (sql-sybase): Quoted *SQL* in doc string, added comma. (sql-oracle): Likewise. (sql-interactive-mode): Added extensive documentation for having - mutliple SQL buffers sending their stuff to different SQLi + multiple SQL buffers sending their stuff to different SQLi buffers, each running a different process. (sql-buffer): Changed doc from *SQL* to SQLi. (sql-get-login): Doc fix. diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 4f867c24561..f08e6fb8863 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -40,7 +40,7 @@ 2001-10-17 Francesco Potortì <pot@gnu.org> * comint.el (comint-password-prompt-regexp): Make it less - restrictive, letting comint recognise OpenSSH2 passphrase prompts. + restrictive, letting comint recognize OpenSSH2 passphrase prompts. 2001-10-17 John Wiegley <johnw@gnu.org> diff --git a/lisp/allout.el b/lisp/allout.el index 8cbdbee7303..a08aa05d581 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -825,7 +825,7 @@ formatted copy." (defcustom allout-encrypt-unencrypted-on-saves t "If non-nil, topics pending encryption are encrypted during buffer saves. -This provents file-system exposure of un-encrypted contents of +This prevents file-system exposure of un-encrypted contents of items marked for encryption. When non-nil, if the topic currently being edited is decrypted, @@ -2283,7 +2283,7 @@ If topic has no offspring, then the next sibling with offspring will determine whether or not this one is determined to be aberrant. If true, then the allout-recent-* settings are calibrated on the -offspring that qaulifies it as aberrant, ie with depth that +offspring that qualifies it as aberrant, ie with depth that exceeds the topic by more than one." ;; This is most clearly understood when considering standard-prefix-leader diff --git a/lisp/autorevert.el b/lisp/autorevert.el index 817aaff55ca..f70025e9d3f 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -77,7 +77,7 @@ ;; M-x global-auto-revert-mode RET ;; ;; To activate Global Auto-Revert Mode every time Emacs is started -;; customise the option `global-auto-revert-mode' or the following +;; customize the option `global-auto-revert-mode' or the following ;; line could be added to your ~/.emacs: ;; (global-auto-revert-mode 1) ;; diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el index 20b4a9db5e2..44354f0822f 100644 --- a/lisp/calc/calc-bin.el +++ b/lisp/calc/calc-bin.el @@ -291,7 +291,7 @@ the size of a Calc bignum digit.") (if (eq (car-safe b) 'mod) (if (equal mod (nth 2 b)) (setq b (nth 1 b)) - (math-reject-arg b "*Inconsistent modulos")))) + (math-reject-arg b "*Inconsistent modulus")))) (setq mod (nth 2 b) b (nth 1 b))) (if (Math-messy-integerp mod) @@ -303,9 +303,9 @@ the size of a Calc bignum digit.") (if w (if (/= w bits) (calc-record-why - "*Warning: Modulo inconsistent with word size")) + "*Warning: Modulus inconsistent with word size")) (setq w bits)) - (calc-record-why "*Warning: Modulo is not a power of 2")) + (calc-record-why "*Warning: Modulus is not a power of 2")) (math-make-mod (if b (funcall f a b w) (funcall f a w)) diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el index e16c26eaa19..97d955eb07d 100644 --- a/lisp/calc/calc-poly.el +++ b/lisp/calc/calc-poly.el @@ -419,7 +419,7 @@ (list 'frac 1 denom)) 1)) -;;; Compute the GCD of two monovariate polynomial lists. +;;; Compute the GCD of two univariate polynomial lists. ;;; Knuth section 4.6.1, algorithm C. (defun math-poly-gcd-coefs (u v) (let ((d (math-poly-gcd (math-poly-gcd-list u) diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 1b980b3b1fa..d161602bec0 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -147,7 +147,7 @@ See the documentation for the function `diary-list-sexp-entries'." Nil means there are no comments. The diary does not display parts of entries that are inside comments. You can use comments for whatever you like, e.g. for meta-data that packages such as -`appt.el' can use. Comments may not span mutliple lines, and there +`appt.el' can use. Comments may not span multiple lines, and there can be only one comment on any line. See also `diary-comment-end'." :version "24.1" diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index b0c7f125982..de232c25e3f 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -61,14 +61,14 @@ ;; ;; The TODO list file has a special format and some auxiliary ;; information, which will be added by the todo-show function if -;; it attempts to visit an un-initialised file. Hence it is +;; it attempts to visit an un-initialized file. Hence it is ;; recommended to use the todo-show function for the first time, -;; in order to initialise the file, but it is not necessary +;; in order to initialize the file, but it is not necessary ;; afterwards. ;; ;; As these commands are quite long to type, I would recommend ;; the addition of two bindings to your to your global keymap. I -;; personally have the following in my initialisation file: +;; personally have the following in my initialization file: ;; ;; (global-set-key "\C-ct" 'todo-show) ; switch to TODO buffer ;; (global-set-key "\C-ci" 'todo-insert-item) ; insert new item diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el index 2151e9ef53b..98f744dca6e 100644 --- a/lisp/cedet/semantic/bovine/el.el +++ b/lisp/cedet/semantic/bovine/el.el @@ -863,7 +863,7 @@ fields and such to, but that is for some other day." In Emacs Lisp, a prototype for something may start (autoload ...). This is certainly not expected if this is used to display a summary. Make up something else. When we go to write something that needs -a real Emacs Lisp protype, we can fix it then." +a real Emacs Lisp prototype, we can fix it then." (let ((class (semantic-tag-class tag)) (name (semantic-format-tag-name tag parent color)) ) diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index 41a569564d0..2b3841bd594 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -1025,7 +1025,7 @@ Output must be in semanticdb Find result format." ((obj semantic-collector-abstract) prefix) "For OBJ, do whatepsace completion based on PREFIX. This implies that if there are two completions, one matching -the test \"preifx\\>\", and one not, the one matching the full +the test \"prefix\\>\", and one not, the one matching the full word version of PREFIX will be chosen, and that text returned. This function requires that `semantic-collector-calculate-completions' has been run first." diff --git a/lisp/cedet/semantic/db-javascript.el b/lisp/cedet/semantic/db-javascript.el index 213216cee1a..716bbc9d00a 100644 --- a/lisp/cedet/semantic/db-javascript.el +++ b/lisp/cedet/semantic/db-javascript.el @@ -151,7 +151,7 @@ local variable." ;;; Usage ;; -;; Unlike other tables, an omniscent database does not need to +;; Unlike other tables, an omniscient database does not need to ;; be associated with a path. Use this routine to always add ourselves ;; to a search list. (define-mode-local-override semanticdb-find-translate-path javascript-mode diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el index c9013ed8c90..3d2128db29a 100644 --- a/lisp/cedet/semantic/db.el +++ b/lisp/cedet/semantic/db.el @@ -636,7 +636,7 @@ The file associated with OBJ does not need to be in a buffer." (when (featurep 'semantic/lex-spp) (oset table lexical-table (semantic-lex-spp-save-table))) - ;; Incremental parser doesn't mokey around with this. + ;; Incremental parser doesn't monkey around with this. (oset table unmatched-syntax semantic-unmatched-syntax-cache) ;; Synchronize the index diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el index 4ac2733a34f..a007f21b69f 100644 --- a/lisp/cedet/semantic/edit.el +++ b/lisp/cedet/semantic/edit.el @@ -392,7 +392,7 @@ See `semantic-edits-change-leaf-tag' for details on parents." ;; There are no tags left, and all tags originally ;; found are encompassed by the change. Setup our list ;; from the cache - (setq list-to-search semantic--buffer-cache);; We have a tag ouside the list. Check for + (setq list-to-search semantic--buffer-cache);; We have a tag outside the list. Check for ;; We know we have a parent because it would ;; completely cover the change. A tag can only ;; do that if it is a parent after we get here. diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index 033c34e1b83..7566c08f13a 100644 --- a/lisp/cedet/semantic/imenu.el +++ b/lisp/cedet/semantic/imenu.el @@ -368,7 +368,7 @@ Optional argument PARENT is a tag parent of STREAM." semantic-imenu-expandable-tag-classes) children ) - ;; to keep an homogeneous menu organisation, type menu items + ;; to keep an homogeneous menu organization, type menu items ;; always have a sub-menu with at least the *definition* ;; item (even if the tag has no type components) (progn diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index 4da3be98f37..fca367ecb8c 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el @@ -1362,11 +1362,11 @@ Return either a paren token or a semantic list token depending on )) (define-lex-simple-regex-analyzer semantic-lex-open-paren - "Detect and create an open parenthisis token." + "Detect and create an open parenthesis token." "\\s(" 'open-paren 0 (setq semantic-lex-current-depth (1+ semantic-lex-current-depth))) (define-lex-simple-regex-analyzer semantic-lex-close-paren - "Detect and create a close paren token." + "Detect and create a close parenthesis token." "\\s)" 'close-paren 0 (setq semantic-lex-current-depth (1- semantic-lex-current-depth))) (define-lex-regex-analyzer semantic-lex-string diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el index cf3f5b603c8..82b23d8d1cd 100644 --- a/lisp/cedet/semantic/tag.el +++ b/lisp/cedet/semantic/tag.el @@ -1162,7 +1162,7 @@ This function is for internal use only." (semantic-tag-components-with-overlays tag))))) (defun semantic--tag-unlink-cache-from-buffer () - "Convert all tags in the current cache to use overlay proxys. + "Convert all tags in the current cache to use overlay proxies. This function is for internal use only." (require 'semantic) (semantic--tag-unlink-list-from-buffer diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el index 78de16c4f92..78d5569c2a7 100644 --- a/lisp/cedet/semantic/texi.el +++ b/lisp/cedet/semantic/texi.el @@ -262,7 +262,7 @@ can handle the @menu environment.") (let ((parenthetical (semantic-up-context-default)) ) (when (not parenthetical) - ;; We are in parenthises. Are they the types of parens + ;; We are in parentheses. Are they the types of parens ;; belonging to a texinfo construct? (forward-word -1) (when (looking-at "@\\w+{") diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el index f392379347a..11d84e96f41 100644 --- a/lisp/cedet/srecode/ctxt.el +++ b/lisp/cedet/srecode/ctxt.el @@ -64,7 +64,7 @@ Some useful context values used by the provided srecode templates are: \"comment\" - In a comment in a block of code -- these items show up at the end of the context list. -- \"public\", \"protected\", \"private\" - - In or near a section of public/pritected/private entries. + In or near a section of public/protected/private entries. \"code\" - In a block of code. \"string\" - In a string in a block of code \"comment\" - In a comment in a block of code diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el index d9765ebd449..b947c63f4dd 100644 --- a/lisp/cedet/srecode/find.el +++ b/lisp/cedet/srecode/find.el @@ -238,7 +238,7 @@ Optional argument HASH is the hash table to fill in." (tabs (when mt (oref mt :tables))) ) (while tabs - ;; Exclude templates for a perticular application. + ;; Exclude templates for a particular application. (when (and (not (oref (car tabs) :application)) (srecode-template-table-in-project-p (car tabs))) (maphash (lambda (key temp) diff --git a/lisp/comint.el b/lisp/comint.el index f25293ff3ac..3b874c48f27 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -2568,7 +2568,7 @@ This command is like `M-.' in bash." ;; First usage; initialize to a marker (setq comint-insert-previous-argument-last-start-pos (make-marker))))) - ;; Make sure we're not in the prompt, and add a beginning space if necess. + ;; Make sure we're not in the prompt, and add a beginning space if necessary. (if (<= (point) (comint-line-beginning-position)) (comint-bol) (just-one-space)) diff --git a/lisp/dframe.el b/lisp/dframe.el index 93d9e7948cf..b7c29d8f992 100644 --- a/lisp/dframe.el +++ b/lisp/dframe.el @@ -96,7 +96,7 @@ ;; dframe-track-mouse, dframe-help-echo-function -- ;; These variables need to be set to functions that display info ;; based on the mouse's position. -;; Text propert 'help-echo, set to `dframe-help-echo', which will +;; Text property 'help-echo, set to `dframe-help-echo', which will ;; call `dframe-help-echo-function'. ;; Have a `-click' function, it can call `dframe-quick-mouse' for ;; positioning. If the variable `dframe-power-click' is non-nil, @@ -136,7 +136,7 @@ This is nil for terminals, since updating a frame in a terminal is not useful to the user.") (defcustom dframe-update-speed - (if (featurep 'xemacs) 2 ; 1 is too obrusive in XEmacs + (if (featurep 'xemacs) 2 ; 1 is too obtrusive in XEmacs 1) "Idle time in seconds needed before dframe will update itself. Updates occur to allow dframe to display directory information diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 096e91ea4fb..2e05e93d569 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -2195,7 +2195,7 @@ list that represents a doc string reference. (byte-compile-keep-pending form))))) ;; Functions and variables with doc strings must be output separately, -;; so make-docfile can recognise them. Most other things can be output +;; so make-docfile can recognize them. Most other things can be output ;; as byte-code. (put 'autoload 'byte-hunk-handler 'byte-compile-file-form-autoload) diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index c9e32023187..9b708d4bbd2 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -2118,7 +2118,7 @@ before using the Ispell engine on it." ;; Find out how we spell-check this word. (if (or ;; All caps w/ option th, or s tacked on the end - ;; for pluralization or numberthness. + ;; for pluralization or number. (string-match "^[A-Z][A-Z]+\\(s\\|th\\)?$" word) (looking-at "}") ; a keymap expression ) diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el index df57148962f..278dff0f085 100644 --- a/lisp/emacs-lisp/eieio-base.el +++ b/lisp/emacs-lisp/eieio-base.el @@ -178,7 +178,7 @@ only one object ever exists." ;; calculate path names relative to a given instance. This will ;; make the saved object location independent by converting all file ;; references to be relative to the directory the object is saved to. -;; You must call `eieio-peristent-path-relative' on each file name +;; You must call `eieio-persistent-path-relative' on each file name ;; saved in your object. (defclass eieio-persistent () ((file :initarg :file diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el index 99d204692fa..e58656d7941 100644 --- a/lisp/emulation/edt-mapper.el +++ b/lisp/emulation/edt-mapper.el @@ -151,7 +151,7 @@ ;;; Logic in simple.el maps some of these unassigned function keys to ;;; ordinary typing keys. Where this is the case, a call to ;;; read-key-sequence, below, does not return the name of the function -;;; key pressd by the user but, instead, it returns the name of the +;;; key pressed by the user but, instead, it returns the name of the ;;; key to which it has been mapped. It needs to know the name of the ;;; key pressed by the user. As a workaround, we assign a function to ;;; each of the unassigned function keys of interest, here. These diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index 93bf8251ce1..3e21e77a77b 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el @@ -259,7 +259,7 @@ (defvar ex-addresses nil) ;; This flag is supposed to be set only by `#', `print', and `list', -;; none of which is implemented. So, it and the pices of the code it +;; none of which is implemented. So, it and the pieces of the code it ;; controls are dead weight. We keep it just in case this might be ;; needed in the future. (defvar ex-flag nil) diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el index 778910017cd..a2e289df5e8 100644 --- a/lisp/emulation/viper-mous.el +++ b/lisp/emulation/viper-mous.el @@ -95,7 +95,7 @@ considered related." ;; remembers prefix argument to pass along to commands invoked by second ;; click. -;; This is needed because in Emacs (not XEmacs), assigning to preix-arg +;; This is needed because in Emacs (not XEmacs), assigning to prefix-arg ;; causes Emacs to count the second click as if it was a single click (defvar viper-global-prefix-argument nil) diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01 index 1e90b33a23b..001ab42926f 100644 --- a/lisp/erc/ChangeLog.01 +++ b/lisp/erc/ChangeLog.01 @@ -912,7 +912,7 @@ fixed one occurrence of a setq with only one argument (XEmacs didn't like that) * erc.el: - Added erc-next-line-add-newlines customisation possibility. + Added erc-next-line-add-newlines customization possibility. * erc.el: added erc-fill-prefix for defining your own way of filling and fixed filling somehow @@ -940,8 +940,7 @@ * erc.el: typo - * erc.el: ommit - :wq + * erc.el: omit 2001-07-06 Alex Schroeder <alex@gnu.org> diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02 index d1b05a23140..279a336f15f 100644 --- a/lisp/erc/ChangeLog.02 +++ b/lisp/erc/ChangeLog.02 @@ -343,7 +343,7 @@ 2002-12-14 Damien Elmes <erc@repose.cx> * erc.el: - last-peers: initialise to a cons. thanks to Francis Litterio + last-peers: initialize to a cons. thanks to Francis Litterio <franl@world.std.com> for the patch * erc.el: @@ -2616,4 +2616,3 @@ See ChangeLog.01 for earlier changes. ;; Local Variables: ;; coding: utf-8 ;; End: - diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03 index 956ef5f4c66..322f7c93f7d 100644 --- a/lisp/erc/ChangeLog.03 +++ b/lisp/erc/ChangeLog.03 @@ -1425,7 +1425,7 @@ reference argument directly - no string matching * erc.el(erc-extract-command-from-line): - hmm, thinko in the canonicalisation. should + hmm, thinko in the canonicalization. should be fixed 2003-01-16 Francis Litterio <franl@users.sourceforge.net> diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el index 24990e1e068..c6b0984fe67 100644 --- a/lisp/erc/erc-log.el +++ b/lisp/erc/erc-log.el @@ -50,7 +50,7 @@ ;; erc-log-write-after-send t ;; erc-log-write-after-insert t) ;; -;; If you only want to save logs for some buffers, customise the +;; If you only want to save logs for some buffers, customize the ;; variable `erc-enable-logging'. ;; How it works: @@ -450,4 +450,3 @@ You can save every individual message by putting this function on ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: - diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index bde51da6e3d..7e567bd1648 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el @@ -36,7 +36,7 @@ (require 'erc) (eval-when-compile (require 'cl)) -;; Customisation: +;; Customization: (defgroup erc-match nil "Keyword and Friend/Foe/... recognition. @@ -633,4 +633,3 @@ This function is meant to be called from `erc-text-matched-hook'." ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: - diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el index b663aeed423..e2e5fa1c4f2 100644 --- a/lisp/erc/erc-track.el +++ b/lisp/erc/erc-track.el @@ -1040,7 +1040,7 @@ relative to `erc-track-switch-direction'" ((oldest leastactive) (- (length erc-modified-channels-alist) arg)) (t (1- arg)))) - ;; normalise out of range user input + ;; normalize out of range user input (cond ((>= offset (length erc-modified-channels-alist)) (setq offset (1- (length erc-modified-channels-alist)))) ((< offset 0) @@ -1075,4 +1075,3 @@ switch back to the last non-ERC buffer visited. Next is defined by ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: - diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 8e0973c7b8b..a218dd12555 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -5797,7 +5797,7 @@ If it doesn't exist, create it." "Give information about the nickname at `point'. If called interactively, give a human readable message in the -minibuffer. If called programatically, return the corresponding +minibuffer. If called programmatically, return the corresponding entry of `channel-members'." (interactive) (require 'thingatpt) diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el index 2308e08ed62..e45b36e3511 100644 --- a/lisp/eshell/em-pred.el +++ b/lisp/eshell/em-pred.el @@ -173,7 +173,7 @@ OWNERSHIP: FILE ATTRIBUTES: l[+-]N +/-/= N links - a[Mwhms][+-](N|'FILE') access time +/-/= N mnths/weeks/hours/mins/secs + a[Mwhms][+-](N|'FILE') access time +/-/= N months/weeks/hours/mins/secs (days if unspecified) if FILE specified, use as comparison basis; so a+'file.c' shows files accessed before file.c was diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el index 7d5fbbeabeb..bd575a0f809 100644 --- a/lisp/eshell/em-term.el +++ b/lisp/eshell/em-term.el @@ -24,7 +24,7 @@ ;; At the moment, eshell is stream-based in its interactive input and ;; output. This means that full-screen commands, such as "vi" or ;; "lynx", will not display correctly. These are therefore thought of -;; as "visual" programs. In order to run these progrem under Emacs, +;; as "visual" programs. In order to run these programs under Emacs, ;; Eshell uses the term.el package, and invokes them in a separate ;; buffer, giving the illusion that Eshell itself is allowing these ;; visual processes to execute. diff --git a/lisp/files.el b/lisp/files.el index 6cf94a89c92..0f167ce3ffa 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -5790,7 +5790,7 @@ returns nil." ;; vc dired listings provide the state or blanks between file ;; permissions and date. The state is always surrounded by - ;; parantheses: + ;; parentheses: ;; -rw-r--r-- (modified) 2005-10-22 21:25 files.el ;; This is not supported yet. (purecopy (concat "\\([0-9][BkKMGTPEZY]? " iso diff --git a/lisp/foldout.el b/lisp/foldout.el index b0eaf753d60..4f93b4205b2 100644 --- a/lisp/foldout.el +++ b/lisp/foldout.el @@ -111,9 +111,9 @@ ;; setup a lot easier. ;; ;; folding.el by Jamie Lokier <u90jl@ecs.ox.ac.uk> supports folding by -;; recognising special marker text in you file. +;; recognizing special marker text in you file. ;; -;; c-outline.el (by me) provides outline-mode support to recognise `C' +;; c-outline.el (by me) provides outline-mode support to recognize `C' ;; statements as outline headings, so with foldout you can have a folding `C' ;; code editor without having to put in start- and end-of-fold markers. This ;; is a real winner! diff --git a/lisp/font-core.el b/lisp/font-core.el index 0db17efd7b7..a5de29520f7 100644 --- a/lisp/font-core.el +++ b/lisp/font-core.el @@ -210,7 +210,7 @@ this function onto `change-major-mode-hook'." ;; A few people have hassled in the past for a way to make it easier to turn on ;; Font Lock mode, without the user needing to know for which modes s/he has to ;; turn it on, perhaps the same way hilit19.el/hl319.el does. I've always -;; balked at that way, as I see it as just re-moulding the same problem in +;; balked at that way, as I see it as just re-molding the same problem in ;; another form. That is; some person would still have to keep track of which ;; modes (which may not even be distributed with Emacs) support Font Lock mode. ;; The list would always be out of date. And that person might have to be me. diff --git a/lisp/forms.el b/lisp/forms.el index ef6d9b023b4..215f3ce88f7 100644 --- a/lisp/forms.el +++ b/lisp/forms.el @@ -1295,7 +1295,7 @@ Commands: Equivalent keys in read-only mode: ) (defun forms--mode-menu-ro (map) -;;; Menu initialisation +;;; Menu initialization ; (define-key map [menu-bar] (make-sparse-keymap)) (define-key map [menu-bar forms] (cons "Forms" (make-sparse-keymap "Forms"))) @@ -1341,7 +1341,7 @@ Commands: Equivalent keys in read-only mode: (put 'forms-delete-record 'menu-enable '(not forms-read-only)) ) (defun forms--mode-menu-edit (map) -;;; Menu initialisation +;;; Menu initialization ; (define-key map [menu-bar] (make-sparse-keymap)) (define-key map [menu-bar forms] (cons "Forms" (make-sparse-keymap "Forms"))) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 5e25d01da71..a9db3c23fef 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -332,7 +332,7 @@ decoding nnimap groups. * gnus.el (gnus-variable-list): Don't save `gnus-format-specs' in the - newsrc file. It doesn't seem like an important optimisation any more. + newsrc file. It doesn't seem like an important optimization any more. 2011-09-10 Dave Abrahams <dave@boostpro.com> (tiny change) @@ -985,7 +985,7 @@ * nnimap.el (nnimap-process-expiry-targets): Say what target we're expiring articles to. - * mm-util.el (mm-charset-to-coding-system): Recognise all ANSI.x3.4 + * mm-util.el (mm-charset-to-coding-system): Recognize all ANSI.x3.4 variations as ASCII (bug#5458). 2011-06-30 Katsumi Yamaoka <yamaoka@jpl.org> @@ -4504,7 +4504,7 @@ 2010-10-30 Lars Magne Ingebrigtsen <larsi@gnus.org> - * shr.el (shr-tag-span): Drop colorisation of regions since we don't + * shr.el (shr-tag-span): Drop colorization of regions since we don't control the background color. (shr-tag-img): Ignore very small web bug type images. (shr-put-image): Add help-echo alt texts to the images. @@ -11860,7 +11860,7 @@ * message.el (message-font-lock-keywords): Use message-header-xheader face for "X-Foo", its apparent intended purpose. Move "X-" pattern - ahead of the anything pattern, to get it recognised. + ahead of the anything pattern, to get it recognized. 2007-05-12 Michaël Cadilhac <michael@cadilhac.name> @@ -14905,7 +14905,7 @@ (nnweb-request-list): Don't list bogus groups. There can only be one. (nnweb-request-create-group): Don't use ARGS. (nnweb-possibly-change-server, nnweb-request-group): Remove some - initialisations. Let nnoo do the work. + initializations. Let nnoo do the work. 2006-01-31 Katsumi Yamaoka <yamaoka@jpl.org> diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index e52f898b184..dcdf1c2934b 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -10428,7 +10428,7 @@ * mml-sec.el (mml-secure-message-encrypt-smime): New. * mml-sec.el (mml-secure-message-encrypt-pgp): New. * mml-sec.el (mml-secure-message-encrypt-pgpmime): New. - * mml.el (mml-parse-1): Added code to recognise the secure tag and + * mml.el (mml-parse-1): Added code to recognize the secure tag and convert it to either a part or multipart depending on if there are other parts in the message. * mml.el (mml-mode-map): Changed default sign/encrypt keybindings diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index e9d31312a11..bf7f31e6392 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -3232,7 +3232,7 @@ FORCE is equivalent to setting the expiration predicates to true." ;; Convert the keep lists to elements that look like (article# ;; nil keep_flag nil) then append it to the expanded dlist - ;; These statements are sorted by ascending precidence of the + ;; These statements are sorted by ascending precedence of the ;; keep_flag. (setq dlist (nconc dlist (mapcar (lambda (e) diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index a798e22902f..043356ca841 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el @@ -55,7 +55,7 @@ ;; * nnoo. NNDiary is very similar to nnml. This makes the idea of using nnoo ;; (to derive nndiary from nnml) natural. However, my experience with nnoo -;; is that for reasonably complex back ends like this one, noo is a burden +;; is that for reasonably complex back ends like this one, nnoo is a burden ;; rather than an help. It's tricky to use, not everything can be inherited, ;; what can be inherited and when is not very clear, and you've got to be ;; very careful because a little mistake can fuck up your other back ends, @@ -1320,7 +1320,7 @@ all. This may very well take some time.") (or minute (setq minute 59)) (or hour (setq hour 23)) ;; I'll just compute all possible values and test them by decreasing - ;; order until one succeeds. This is probably quide rude, but I got + ;; order until one succeeds. This is probably quite rude, but I got ;; bored in finding a good algorithm for doing that ;-) ;; ### FIXME: remove identical entries. (let ((dom-list (nth 2 sched)) diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index cda17ba57c6..b4e6e31fae4 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -1035,7 +1035,7 @@ textual parts.") ((eq action 'set) "")) (mapconcat #'identity flags " "))))))) ;; Wait for the last command to complete to avoid later - ;; syncronisation problems with the stream. + ;; synchronization problems with the stream. (when sequence (nnimap-wait-for-response sequence)))))) diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el index 0a8fa43f3bc..4ad9d11f906 100644 --- a/lisp/gnus/nnmairix.el +++ b/lisp/gnus/nnmairix.el @@ -333,7 +333,7 @@ can happen are wrong marks in nnmairix groups." "Use only the registry for determining original group(s). If set to t, nnmairix will only use the registry for determining the original group(s) of an article (which is also necessary for -propapagting marks). If set to nil, it will also try to determine +propagating marks). If set to nil, it will also try to determine the group from an additional mairix search which might be slow when propagating lots of marks." :version "23.1" diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 0cc9385085c..056115f57b7 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -1,4 +1,4 @@ -;;; htmlfontify.el --- htmlise a buffer/source tree with optional hyperlinks +;;; htmlfontify.el --- htmlize a buffer/source tree with optional hyperlinks ;; Copyright (C) 2002-2003, 2009-2011 Free Software Foundation, Inc. @@ -10,7 +10,7 @@ ;; Author: Vivek Dasmohapatra <vivek@etla.org> ;; Maintainer: Vivek Dasmohapatra <vivek@etla.org> ;; Created: 2002-01-05 -;; Description: htmlise a buffer/source tree with optional hyperlinks +;; Description: htmlize a buffer/source tree with optional hyperlinks ;; URL: http://rtfm.etla.org/emacs/htmlfontify/ ;; Compatibility: Emacs23, Emacs22 ;; Incompatibility: Emacs19, Emacs20, Emacs21 @@ -1576,7 +1576,7 @@ FILE, if set, is the file name." (delete-overlay rovl)) (copy-to-buffer html-buffer (point-min) (point-max)) (set-buffer html-buffer) - ;; rip out props that could interfere with our htmlisation of the buffer: + ;; rip out props that could interfere with our htmlization of the buffer: (remove-text-properties (point-min) (point-max) hfy-ignored-properties) ;; Apply overlay invisible spec (setq orig-ovls @@ -2026,13 +2026,13 @@ FILE is the specific file we are rendering." (hash-entry nil) (tag-string nil) (tag-line nil) (tag-point nil) (new-entry nil) (etags-file nil)) - ;; (re)initialise the tag reverse map: + ;; (re)initialize the tag reverse map: (if trmap-cache (setq trmap-hash (cadr trmap-cache)) (setq trmap-hash (make-hash-table :test 'equal)) (setq hfy-tags-rmap (list (list srcdir trmap-hash) hfy-tags-rmap))) (clrhash trmap-hash) - ;; (re)initialise the tag cache: + ;; (re)initialize the tag cache: (if cache-entry (setq cache-hash (cadr cache-entry)) (setq cache-hash (make-hash-table :test 'equal)) (setq hfy-tags-cache (list (list srcdir cache-hash) hfy-tags-cache))) diff --git a/lisp/international/characters.el b/lisp/international/characters.el index 7bf504bfb55..55aee4d53db 100644 --- a/lisp/international/characters.el +++ b/lisp/international/characters.el @@ -512,7 +512,7 @@ with L, LRE, or LRO Unicode bidi character type.") ;; relating Unicode categories to Emacs syntax codes. ;; NBSP isn't semantically interchangeable with other whitespace chars, - ;; so it's more like punctation. + ;; so it's more like punctuation. (set-case-syntax ? "." tbl) (set-case-syntax ?¡ "." tbl) (set-case-syntax ?¦ "_" tbl) diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el index 0da6cc614fd..cc8d1e25c66 100644 --- a/lisp/international/ogonek.el +++ b/lisp/international/ogonek.el @@ -284,11 +284,11 @@ The functions come in the following groups. :type 'character :group 'ogonek) (defcustom ogonek-prefix-from-encoding "iso8859-2" - "Encoding in the source file subject to prefixifation." + "Encoding in the source file subject to prefixation." :type ogonek-encoding-choices :group 'ogonek) (defcustom ogonek-prefix-to-encoding "iso8859-2" - "Encoding in the target file subject to deprefixifation." + "Encoding in the target file subject to deprefixation." :type ogonek-encoding-choices :group 'ogonek) diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index a96fbf9253f..21201c6cff5 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el @@ -122,7 +122,7 @@ ;; t IN | INBOX ;; t In | [No match] -;;; Customisation +;;; Customization ;; See the User Variables section below for easy ways to change the ;; functionality of the program. These are accessible using the diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el index 9269a24c4cb..fcc334ea30b 100644 --- a/lisp/mail/metamail.el +++ b/lisp/mail/metamail.el @@ -165,7 +165,7 @@ redisplayed as output is inserted." (list (format "EMACS_VIEW_MODE=%d" (if (numberp viewmode) viewmode 1))))) (save-excursion - ;; Gee! Metamail does not ouput to stdout if input comes from + ;; Gee! Metamail does not output to stdout if input comes from ;; stdin. (let ((selective-display nil)) ;Disable ^M to nl translation. (write-region beg end metafile nil 'nomessage)) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 9aa0ba4e262..9c020ffadab 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -445,7 +445,7 @@ (define-key menu [props] `(menu-item ,(purecopy "Text Properties") facemenu-menu)) - ;; ns-win.el said: Add spell for platorm consistency. + ;; ns-win.el said: Add spell for platform consistency. (if (featurep 'ns) (define-key menu [spell] `(menu-item ,(purecopy "Spell") ispell-menu-map))) diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 0327b64a33f..a97185e1496 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -1399,7 +1399,7 @@ See also \\[mh-mh-to-mime]." ("mailto") ; RFC1738 Electronic mail address ("news") ; RFC1738 Usenet news ("nntp") ; RFC1738 Usenet news using NNTP access - ("propspero") ; RFC1738 Prospero Directory Service + ("prospero") ; RFC1738 Prospero Directory Service ("telnet") ; RFC1738 Telnet ("tftp") ; RFC2046 Trivial File Transfer Protocol ("url") ; RFC2017 URL scheme MIME access-type Protocol diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el index bcf1749e13f..7f04cac96fe 100644 --- a/lisp/mouse-sel.el +++ b/lisp/mouse-sel.el @@ -60,7 +60,7 @@ ;; ;; Thanks to KevinB@bartley.demon.co.uk for his useful input. ;; -;;--- Customisation ------------------------------------------------------- +;;--- Customization ------------------------------------------------------- ;; ;; * You may want to use none or more of following: ;; diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 458d419012b..f6a5b53ae7f 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -46,7 +46,7 @@ ;; Extended filename syntax: ;; ;; The default extended filename syntax is '/user@host:name', where the -;; 'user@' part may be omitted. This syntax can be customised to a certain +;; 'user@' part may be omitted. This syntax can be customized to a certain ;; extent by changing ange-ftp-name-format. There are limitations. ;; The `host' part has an optional suffix `#port' which may be used to ;; specify a non-default port number for the connexion. @@ -1665,7 +1665,7 @@ good, skip, fatal, or unknown." (ange-ftp-process-handle-line line proc) ;; If we've seen a potential error message and it ;; hasn't been cancelled by a good message before - ;; seeing a propt, then the error was real. + ;; seeing a prompt, then the error was real. (delete-process proc) (setq ange-ftp-process-busy nil ange-ftp-process-result-line ange-ftp-pending-error-line)))) diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index b55884ff180..3ab1a345470 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -138,7 +138,7 @@ ;; M-x browse-url-of-dired-file RET ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Customisation (~/.emacs) +;; Customization (~/.emacs) ;; To see what variables are available for customization, type ;; `M-x set-variable browse-url TAB'. Better, use @@ -190,7 +190,7 @@ ;; ;; (add-hook 'browse-url-of-file-hook 'browse-url-netscape-reload) -;; You may also want to customise browse-url-netscape-arguments, e.g. +;; You may also want to customize browse-url-netscape-arguments, e.g. ;; (setq browse-url-netscape-arguments '("-install")) ;; ;; or similarly for the other browsers. diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index 7cfdd2cb89d..8ff74a94eb0 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el @@ -1793,7 +1793,7 @@ Update teeview afterwards unless NO-UPDATE is non-nil." result)) (defun newsticker--group-remove-obsolete-feeds (group) - "Recursively remove obselete feeds from GROUP." + "Recursively remove obsolete feeds from GROUP." (let ((result nil) (urls (append newsticker-url-list newsticker-url-list-defaults))) (mapc (lambda (g) diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el index 7a1e5fc6a80..a31ec496c16 100644 --- a/lisp/net/quickurl.el +++ b/lisp/net/quickurl.el @@ -201,7 +201,7 @@ in your ~/.emacs (after loading/requiring quickurl).") (listp (cdr url))) (defun quickurl-make-url (keyword url &optional comment) - "Create a URL from KEYWORD, URL and (optionaly) COMMENT." + "Create a URL from KEYWORD, URL and (optionally) COMMENT." (if (and comment (not (zerop (length comment)))) (list keyword url comment) (cons keyword url))) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 50a3c1fca5e..51fc6e295f0 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -5033,11 +5033,11 @@ function cell is returned to be applied on a buffer." ;; until the last but one hop via `start-file-process'. Apply it ;; also for ftp and smb. ;; * WIBNI if we had a command "trampclient"? If I was editing in -;; some shell with root priviledges, it would be nice if I could +;; some shell with root privileges, it would be nice if I could ;; just call ;; trampclient filename.c ;; as an editor, and the _current_ shell would connect to an Emacs -;; server and would be used in an existing non-priviledged Emacs +;; server and would be used in an existing non-privileged Emacs ;; session for doing the editing in question. ;; That way, I need not tell Emacs my password again and be afraid ;; that it makes it into core dumps or other ugly stuff (I had Emacs diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 150ef18be52..73b9339e25a 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -480,7 +480,7 @@ PRESERVE-UID-GID and PRESERVE-SELINUX-CONTEXT are completely ignored." ;; Dissect NAME. (with-parsed-tramp-file-name name nil ;; Tilde expansion if necessary. We use the user name as share, - ;; which is offen the case in domains. + ;; which is often the case in domains. (when (string-match "\\`/?~\\([^/]*\\)" localname) (setq localname (replace-match diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el index efb2cdd6166..ea4a887898e 100644 --- a/lisp/net/xesam.el +++ b/lisp/net/xesam.el @@ -88,7 +88,7 @@ ;; ;; (setq xesam-query-type 'fulltext-query) ;; -;; Another option to be customised is the number of hits to be +;; Another option to be customized is the number of hits to be ;; presented at once. ;; ;; (setq xesam-hits-per-page 50) diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index f7aa7bf4701..50761ede7cb 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -1619,7 +1619,7 @@ Where CATEGORY-REGEXP is a regexp matching the categories where the icon should be displayed. FILE-OR-DATA either a file path or a string containing image data. -The other fields can be omited safely if not needed: +The other fields can be omitted safely if not needed: TYPE indicates the image type. DATA-P is a boolean indicating whether the FILE-OR-DATA string is image data. diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el index 05cca0e311e..24aea5d7eae 100644 --- a/lisp/org/org-capture.el +++ b/lisp/org/org-capture.el @@ -372,7 +372,7 @@ to avoid conflicts with other active capture processes." (plist-get (if local org-capture-current-plist org-capture-plist) prop)) (defun org-capture-member (prop &optional local) - "Is PROP a preperty in `org-capture-plist'. + "Is PROP a property in `org-capture-plist'. When LOCAL is set, use the local variable `org-capture-current-plist', this is necessary after initialization of the capture process, to avoid conflicts with other active capture processes." diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el index 352d414a4b6..d567b929056 100644 --- a/lisp/org/org-ctags.el +++ b/lisp/org/org-ctags.el @@ -36,7 +36,7 @@ ;; links to these 'tagged' destinations, allowing seamless navigation between ;; multiple org-mode files. Topics can be created in any org mode file and ;; will always be found by plain links from other files. Other file types -;; recognised by ctags (source code files, latex files, etc) will also be +;; recognized by ctags (source code files, latex files, etc) will also be ;; available as destinations for plain links, and similarly, org-mode links ;; will be available as tags from source files. Finally, the function ;; `org-ctags-find-tag-interactive' lets you choose any known tag, using diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index 5eeaf6199f4..72723845426 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -51,7 +51,7 @@ (defvar orgtbl-after-send-table-hook nil "Hook for functions attaching to `C-c C-c', if the table is sent. This can be used to add additional functionality after the table is sent -to the receiver position, othewise, if table is not sent, the functions +to the receiver position, otherwise, if table is not sent, the functions are not run.") (defcustom orgtbl-optimized (eq org-enable-table-editor 'optimized) diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el index b05b05f7bdf..e111e743608 100644 --- a/lisp/play/5x5.el +++ b/lisp/play/5x5.el @@ -579,7 +579,7 @@ Solutions are sorted from least to greatest Hamming weight." (let* (calc-command-flags (grid-size-squared (* 5x5-grid-size 5x5-grid-size)) - ;; targetv is the vector the origine of which is org="current + ;; targetv is the vector the origin of which is org="current ;; grid" and the end of which is dest="all ones". (targetv (5x5-log diff --git a/lisp/printing.el b/lisp/printing.el index c5951a4983f..d6c67cc68a6 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -3692,7 +3692,7 @@ VI. Customization: "\n\n The printing interface buffer has the same functionality as the printing menu. The major difference is that the states (like sending PostScript generated to a -file, n-up printing, etc.) are set and saved between priting buffer +file, n-up printing, etc.) are set and saved between printing buffer activation. Also, the landscape, duplex and tumble values are the same for PostScript file and directory/buffer/region/mode processing; using menu, there are different value sets for PostScript file and directory/buffer/region/mode diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index cdbe5b39bf1..8213a83461b 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -231,7 +231,7 @@ ;; to foul things up. (defconst c-awk-non-arith-op-bra-re "[[\(&=:!><,?;'~|]") -;; Matches an openeing BRAcket ,round or square, or any operator character +;; Matches an opening BRAcket, round or square, or any operator character ;; apart from +,-,/,*,%. For the purpose at hand (detecting a / which is a ;; regexp bracket) these arith ops are unnecessary and a pain, because of "++" ;; and "--". diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 68f31c55e71..1eaf8910d14 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -2178,7 +2178,7 @@ function does not require the declaration to contain a brace block." (end (1- (cdr range))) (here-filler ; matches WS and escaped newlines at point. "\\=\\([ \t\n\r\f]\\|\\\\[\n\r]\\)*") - ;; Enhance paragraph-start and paragraph-separate also to recognise + ;; Enhance paragraph-start and paragraph-separate also to recognize ;; blank lines terminated by escaped EOLs. IT MAY WELL BE that ;; these values should be customizable user options, or something. (paragraph-start c-string-par-start) @@ -2234,7 +2234,7 @@ function does not require the declaration to contain a brace block." (save-match-data (let* ((here (point)) last - ;; Enhance paragraph-start and paragraph-separate to recognise + ;; Enhance paragraph-start and paragraph-separate to recognize ;; blank lines terminated by escaped EOLs. (paragraph-start c-string-par-start) (paragraph-separate c-string-par-separate) diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index fb9fd406ef8..c91fe13543a 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -774,7 +774,7 @@ be after it." ;; In addition to `c-at-vsemi-p-fn', a mode may need to supply a function for ;; `c-vsemi-status-unknown-p-fn'. The macro `c-vsemi-status-unknown-p' is a ;; rather recondite kludge. It exists because the function -;; `c-beginning-of-statement-1' sometimes tests for VSs as an optimisation, +;; `c-beginning-of-statement-1' sometimes tests for VSs as an optimization, ;; but `c-at-vsemi-p' might well need to call `c-beginning-of-statement-1' in ;; its calculations, thus potentially leading to infinite recursion. ;; @@ -1249,7 +1249,7 @@ been put there by c-put-char-property. POINT remains unchanged." ;; which introduces a CPP construct and every EOL (or EOB, or character ;; preceding //, etc.) which terminates it. We can instantly "comment ;; out" all CPP constructs by giving `c-cpp-delimiter' a syntax-table -;; propery '(14) (generic comment delimiter). +;; property '(14) (generic comment delimiter). (defmacro c-set-cpp-delimiters (beg end) ;; This macro does a hidden buffer change. `(progn diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index fb146b3976a..5ec0ab04f7f 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -2548,7 +2548,7 @@ comment at the start of cc-engine.el for more info." c-state-cache))) ;; N.B. This defsubst codes one method for the simple, normal case, ;; and a more sophisticated, slower way for the general case. Don't - ;; eliminate this defsubst - it's a speed optimisation. + ;; eliminate this defsubst - it's a speed optimization. (c-append-lower-brace-pair-to-state-cache (1- bra+1))))) (defun c-append-to-state-cache (from) @@ -2788,7 +2788,7 @@ comment at the start of cc-engine.el for more info." ;; ;; This function must only be called only when (> `c-state-cache-good-pos' ;; HERE). Usually the gap between CACHE-POS and HERE is large. It is thus - ;; optimised to eliminate (or minimize) scanning between these two + ;; optimized to eliminate (or minimize) scanning between these two ;; positions. ;; ;; Return a three element list (GOOD-POS SCAN-BACK-POS FWD-FLAG), where: @@ -4233,9 +4233,9 @@ comment at the start of cc-engine.el for more info." ;; fails to take account of the change of the s-t property on the opening / to ;; "string", and reports that the { is within a string started by the second /. ;; -;; The workaround for this is for the AWK Mode initialisation to switch the +;; The workaround for this is for the AWK Mode initialization to switch the ;; defalias for c-in-literal to c-slow-in-literal. This will slow down other -;; cc-modes in XEmacs whenever an awk-buffer has been initialised. +;; cc-modes in XEmacs whenever an awk-buffer has been initialized. ;; ;; (Alan Mackenzie, 2003/4/30). @@ -4904,7 +4904,7 @@ comment at the start of cc-engine.el for more info." (setq cfd-prop-match nil)) (when (/= cfd-macro-end 0) - ;; Restore limits if we did macro narrowment above. + ;; Restore limits if we did macro narrowing above. (narrow-to-region (point-min) cfd-buffer-end))) (goto-char cfd-continue-pos) @@ -7100,7 +7100,7 @@ comment at the start of cc-engine.el for more info." ;; colon). Currently (2006-03), this applies only to Objective C's ;; keywords "@private", "@protected", and "@public". Returns t. ;; - ;; One of the things which will NOT be recognised as a label is a bit-field + ;; One of the things which will NOT be recognized as a label is a bit-field ;; element of a struct, something like "int foo:5". ;; ;; The end of the label is taken to be just after the colon, or the end of @@ -9582,7 +9582,7 @@ comment at the start of cc-engine.el for more info." (c-add-syntax 'inher-cont (c-point 'boi))) ;; CASE 5D.5: Continuation of the "expression part" of a - ;; top level construct. Or, perhaps, an unrecognised construct. + ;; top level construct. Or, perhaps, an unrecognized construct. (t (while (and (setq placeholder (point)) (eq (car (c-beginning-of-decl-1 containing-sexp)) @@ -9593,7 +9593,7 @@ comment at the start of cc-engine.el for more info." (< (point) placeholder))) (c-add-stmt-syntax (cond - ((eq (point) placeholder) 'statement) ; unrecognised construct + ((eq (point) placeholder) 'statement) ; unrecognized construct ;; A preceding comma at the top level means that a ;; new variable declaration starts here. Use ;; topmost-intro-cont for it, for consistency with diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index fa94af071f7..a31de35f3ba 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1040,7 +1040,7 @@ casts and declarations are fontified. Used on level 2 and higher." ;; Inside the following "condition form", we move forward over the ;; declarator's identifier up as far as any opening bracket (for array ;; size) or paren (for parameters of function-type) or brace (for - ;; array/struct initialisation) or "=" or terminating delimiter + ;; array/struct initialization) or "=" or terminating delimiter ;; (e.g. "," or ";" or "}"). (and pos diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index e1fb69c30c8..76dfb3c7a28 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -772,7 +772,7 @@ literal are multiline." "Regexp matching the prefix of a cpp directive in the languages that normally use that macro preprocessor. Tested at bol or at boi. Assumed to not contain any submatches or \\| operators." - ;; TODO (ACM, 2005-04-01). Amend the following to recognise escaped NLs; + ;; TODO (ACM, 2005-04-01). Amend the following to recognize escaped NLs; ;; amend all uses of c-opt-cpp-prefix which count regexp-depth. t "\\s *#\\s *" (java awk) nil) @@ -1520,7 +1520,7 @@ properly." ;; end-of-defun-function will be set so that commands like ;; `mark-defun' and `narrow-to-defun' work right. The key sequences ;; C-M-a and C-M-e are, however, bound directly to the CC Mode -;; functions, allowing optimisation for large n. +;; functions, allowing optimization for large n. (c-lang-defconst beginning-of-defun-function "Function to which beginning-of-defun-function will be set." t 'c-beginning-of-defun @@ -2530,7 +2530,7 @@ Note that Java specific rules are currently applied to tell this from "\\.?[0-9]" "\\|" - ;; The nonambiguous operators from `prefix-ops'. + ;; The unambiguous operators from `prefix-ops'. (c-make-keywords-re nil (set-difference nonkeyword-prefix-ops in-or-postfix-ops :test 'string-equal)) @@ -2681,7 +2681,7 @@ possible for good performance." pos (match-end 0))) res)))) - ;; Allow cpp operatios (where applicable). + ;; Allow cpp operations (where applicable). t (if (c-lang-const c-opt-cpp-prefix) (set-difference (c-lang-const c-block-prefix-disallowed-chars) '(?#)) diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el index 4e9350de425..942303b1096 100644 --- a/lisp/progmodes/cc-menus.el +++ b/lisp/progmodes/cc-menus.el @@ -66,7 +66,7 @@ A sample value might look like: `\\(_P\\|_PROTO\\)'.") (defvar cc-imenu-c++-generic-expression `( ;; Try to match ::operator definitions first. Otherwise `X::operator new ()' - ;; will be incorrectly recognised as function `new ()' because the regexps + ;; will be incorrectly recognized as function `new ()' because the regexps ;; work by backtracking from the end of the definition. (nil ,(concat diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 141cd6f972c..cc5a5236255 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -293,7 +293,7 @@ control). See \"cc-mode.el\" for more info." ;; replaces `fill-paragraph' and does the adaption before calling ;; `fill-paragraph-function', and we have to mask comments etc ;; before that. Also, `c-fill-paragraph' chains on to - ;; `fill-paragraph' and the value on `fill-parapgraph-function' to + ;; `fill-paragraph' and the value on `fill-paragraph-function' to ;; do the actual filling work. (substitute-key-definition 'fill-paragraph 'c-fill-paragraph c-mode-base-map global-map) @@ -505,7 +505,7 @@ that requires a literal mode spec at compile time." ;; doesn't work with filladapt but it's better than nothing. (set (make-local-variable 'fill-paragraph-function) 'c-fill-paragraph) - ;; Initialise the cache of brace pairs, and opening braces/brackets/parens. + ;; Initialize the cache of brace pairs, and opening braces/brackets/parens. (c-state-cache-init) (when (or c-recognize-<>-arglists diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index 13cba0fe701..2d0b18f3dae 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -1191,7 +1191,7 @@ error message." ;; Note: there is a small inefficiency in find-buffer-visiting : ;; truename is computed even if not needed. Not too sure about this ;; but I suspect truename computation accesses the disk. - ;; It is maybe a good idea to optimise this find-buffer-visiting. + ;; It is maybe a good idea to optimize this find-buffer-visiting. ;; An alternative would be to use only get-file-buffer ;; but this looks less "sure" to find the buffer for the file. (while (and (not the-buffer) buffer-search-extensions) diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 7d31fb63e91..a3ca87ec94a 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -823,7 +823,7 @@ detailed description of this mode. (run-hooks 'gdb-mode-hook)) (defun gdb-init-1 () - ;; (re-)initialise + ;; (re-)initialize (setq gdb-selected-frame nil gdb-frame-number nil gdb-thread-number nil diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 3f16b3655b8..527bc51eef8 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -1168,7 +1168,7 @@ containing the executable being debugged." ;; appears to indicate a breakpoint. Then we prod the dbx sub-process ;; to output the information we want with a combination of the ;; `printf' and `file' commands as a pseudo marker which we can -;; recognise next time through the marker-filter. This would be like +;; recognize next time through the marker-filter. This would be like ;; the gdb marker but you can't get the file name without a newline... ;; Note that gud-remove won't work since Irix dbx expects a breakpoint ;; number rather than a line number etc. Maybe this could be made to @@ -1689,7 +1689,7 @@ and source-file directory for your debugger." ;; Run jdb (like this): jdb ;; ;; type any jdb switches followed by the name of the class you'd like to debug. -;; Supply a fully qualfied classname (these do not have the ".class" extension) +;; Supply a fully qualified classname (these don't have the ".class" extension) ;; for the name of the class to debug (e.g. "COM.the-kind.ddavies.CoolClass"). ;; See the known problems section below for restrictions when specifying jdb ;; command line switches (search forward for '-classpath'). diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 8155198e3d7..0266fc17f9c 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -986,7 +986,7 @@ describes the correct routine - even if the keyword description cannot be found. TYPE is ignored. This function expects a more or less standard routine header. In -particlar it looks for the `NAME:' tag, either with a colon, or alone +particular it looks for the `NAME:' tag, either with a colon, or alone on a line. Then `NAME:' must be followed by the routine name on the same or the next line. When KEYWORD is non-nil, looks first for a `KEYWORDS' section. It is amazing how inconsistent this is through diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el index 636766b36e7..1328e303d45 100644 --- a/lisp/progmodes/inf-lisp.el +++ b/lisp/progmodes/inf-lisp.el @@ -598,7 +598,7 @@ See variable `lisp-describe-sym-command'." (error "No Lisp subprocess; see variable `inferior-lisp-buffer'")))) -;;; Do the user's customisation... +;;; Do the user's customization... ;;;=============================== (defvar inferior-lisp-load-hook nil "This hook is run when the library `inf-lisp' is loaded.") diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index ef0905bb2a8..8b4798e1c14 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -169,7 +169,7 @@ ;; package requirements. ;; Version 1.13: ;; o Removed the use of `map-char-table' in `prolog-build-case-strings' -;; which appears to cause prblems in (at least) Emacs 23.0.0.1. +;; which appears to cause problems in (at least) Emacs 23.0.0.1. ;; o Added if-then-else indentation + corresponding electric ;; characters. New customization: `prolog-electric-if-then-else-flag' ;; o Align support (requires `align'). New customization: @@ -391,7 +391,7 @@ Otherwise indent to `prolog-indent-width'." (defcustom prolog-left-indent-regexp "\\(;\\|\\*?->\\)" "*Regexp for character sequences after which next line is indented. -Next line after such a regexp is indented to the opening paranthesis level." +Next line after such a regexp is indented to the opening parenthesis level." :group 'prolog-indentation :type 'regexp) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index a0a368777e7..6bc4db60596 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1122,7 +1122,7 @@ don't move and return nil. Otherwise return t." ;;;; Imenu. -;; For possibily speeding this up, here's the top of the ELP profile +;; For possibly speeding this up, here's the top of the ELP profile ;; for rescanning pydoc.py (2.2k lines, 90kb): ;; Function Name Call Count Elapsed Time Average Time ;; ==================================== ========== ============= ============ diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index cd2d45b7856..3a94601768d 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -16857,7 +16857,7 @@ User Options `vhdl-configuration-file-name': (new) Specify how the configuration file name is obtained. `vhdl-compose-configuration-name': (new) - Specify how the configuration name is optained. + Specify how the configuration name is obtained. `vhdl-compose-configuration-create-file': (new) Specify whether a new file should be created for a configuration. `vhdl-compose-configuration-hierarchical': (new) diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el index c0e4d68107b..65cdb600d74 100644 --- a/lisp/ps-mule.el +++ b/lisp/ps-mule.el @@ -1010,7 +1010,7 @@ the sequence." ps-mule-external-libraries)) (defun ps-mule-encode-header-string (string fonttag) - "Generate PostScript code for ploting STRING by font FONTTAG. + "Generate PostScript code for plotting STRING by font FONTTAG. FONTTAG should be a string \"/h0\", \"/h1\", \"/L0\", or \"/H0\". Any other value is treated as \"/H0\"." (with-temp-buffer diff --git a/lisp/repeat.el b/lisp/repeat.el index 8bab8691b4f..8ddc8d41429 100644 --- a/lisp/repeat.el +++ b/lisp/repeat.el @@ -26,7 +26,7 @@ ;; Sometimes the fastest way to get something done is just to lean on a key; ;; moving forward through a series of words by leaning on M-f is an example. -;; But 'forward-page is orthodoxily bound to C-x ], so moving forward through +;; But 'forward-page is orthodoxly bound to C-x ], so moving forward through ;; several pages requires ;; Loop until desired page is reached: ;; Hold down control key with left pinkie. diff --git a/lisp/replace.el b/lisp/replace.el index bf6425f4099..4ea3f747caa 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1225,7 +1225,7 @@ See also `multi-occur'." (with-current-buffer occur-buf (if (stringp nlines) - (fundamental-mode) ;; This is for collect opeartion. + (fundamental-mode) ;; This is for collect operation. (occur-mode)) (let ((inhibit-read-only t) ;; Don't generate undo entries for creation of the initial contents. diff --git a/lisp/ses.el b/lisp/ses.el index c71c603726c..cdc58e12d00 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -1315,7 +1315,7 @@ Newlines in the data are escaped." (setq formula (cadr formula))) (if (eq (car-safe printer) 'ses-safe-printer) (setq printer (cadr printer))) - ;; This is noticably faster than (format "%S %S %S %S %S") + ;; This is noticeably faster than (format "%S %S %S %S %S") (setq text (concat "(ses-cell " (symbol-name sym) " " @@ -2720,7 +2720,7 @@ When inserting cells, the formulas are usually relocated to keep the same relative references to neighboring cells. This is best if the formulas generally refer to other cells within the yanked text. You can use the C-u prefix to specify insertion without relocation, which is best when the -formulas refer to cells outsite the yanked text. +formulas refer to cells outside the yanked text. When inserting formulas, the text is treated as a string constant if it doesn't make sense as a sexp or would otherwise be considered a symbol. Use 'sym to diff --git a/lisp/shell.el b/lisp/shell.el index 31c5729b83a..47119e6769c 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -89,7 +89,7 @@ ;; comint-strip-ctrl-m Remove trailing ^Ms from output ;; ;; The shell mode hook is shell-mode-hook -;; comint-prompt-regexp is initialised to shell-prompt-pattern, for backwards +;; comint-prompt-regexp is initialized to shell-prompt-pattern, for backwards ;; compatibility. ;; Read the rest of this file for more information. diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 8fd1bc306e8..30642e8f2f7 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -471,7 +471,7 @@ Possible values are: 'trim - trim large directories to only show the last few. nil - no trimming." :group 'speedbar - :type '(radio (const :tag "Span large directories over mutiple lines." + :type '(radio (const :tag "Span large directories over multiple lines." span) (const :tag "Trim large directories to only show the last few." trim) diff --git a/lisp/term.el b/lisp/term.el index e1638aecc76..dc5ae29ffd2 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -2122,7 +2122,7 @@ If this takes us past the end of the current line, don't skip at all." "Is point after the process output marker?" ;; Since output could come into the buffer after we looked at the point ;; but before we looked at the process marker's value, we explicitly - ;; serialise. This is just because I don't know whether or not Emacs + ;; serialize. This is just because I don't know whether or not Emacs ;; services input during execution of lisp commands. (let ((proc-pos (marker-position (process-mark (get-buffer-process (current-buffer)))))) @@ -3890,7 +3890,7 @@ if KIND is 1, erase from home to point; else erase from home to point-max." (goto-char (point-max)) (recenter -1)) -;;; Do the user's customisation... +;;; Do the user's customization... (defvar term-load-hook nil "This hook is run when term is loaded in. diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index 4459ac10098..c9b1c44eb91 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -3595,7 +3595,7 @@ If optional arg CONTENT is non-nil extract content of text fields." (defun bibtex-autofill-entry () "Try to fill fields of current BibTeX entry based on neighboring entries. The current entry must have a key. Determine the neighboring entry -\(previouse or next\) whose key is more similar to the key of the current +\(previous or next\) whose key is more similar to the key of the current entry. For all empty fields of the current entry insert the corresponding field contents of the neighboring entry. Finally try to update the text based on the difference between the keys of the neighboring and the current diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el index 5cc5ba45e13..1127e6a5d20 100644 --- a/lisp/textmodes/conf-mode.el +++ b/lisp/textmodes/conf-mode.el @@ -155,7 +155,7 @@ not align (only setting space according to `conf-assignment-space')." (modify-syntax-entry ?/ ". 124" table) (modify-syntax-entry ?* ". 23b" table) table) - "Syntax table in use in Java prperties buffers.") + "Syntax table in use in Java properties buffers.") (defvar conf-ppd-mode-syntax-table (let ((table (make-syntax-table conf-mode-syntax-table))) diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 08922445521..08a45b6b302 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -5535,7 +5535,7 @@ When COORDINATE is omitted or nil the point in current buffer is assumed in plac table-cell-info-lu-coordinate)) (defun table--offset-coordinate (coordinate offset &optional negative) - "Return the offseted COORDINATE by OFFSET. + "Return the offset COORDINATE by OFFSET. When optional NEGATIVE is non-nil offsetting direction is negative." (cons (if negative (- (car coordinate) (car offset)) (+ (car coordinate) (car offset))) diff --git a/lisp/thumbs.el b/lisp/thumbs.el index 6ac8eddc9d6..dad4731122e 100644 --- a/lisp/thumbs.el +++ b/lisp/thumbs.el @@ -92,7 +92,7 @@ When it reaches that size (in bytes), a warning is sent." :group 'thumbs) ;; Unfortunately Windows XP has a program called CONVERT.EXE in -;; C:/WINDOWS/SYSTEM32/ for partioning NTFS system. So Emacs +;; C:/WINDOWS/SYSTEM32/ for partitioning NTFS systems. So Emacs ;; can find the one in your ImageMagick directory, you need to ;; customize this value to the absolute filename. (defcustom thumbs-conversion-program diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el index 9e29de0cbed..0e3713c9fcc 100644 --- a/lisp/url/url-dav.el +++ b/lisp/url/url-dav.el @@ -417,7 +417,7 @@ XML document." Automatically creates an XML request body if TAG is non-nil. BODY is the XML document fragment to be enclosed by <TAG></TAG>. -DEPTH is how deep the request should propogate. Default is 0, meaning +DEPTH is how deep the request should propagate. Default is 0, meaning it should apply only to URL. A negative number means to use `Infinity' for the depth. Not all WebDAV servers support this depth though. diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el index eeac55ac0f8..a20a49a4c39 100644 --- a/lisp/vc/vc-arch.el +++ b/lisp/vc/vc-arch.el @@ -398,7 +398,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see (with-temp-buffer (insert-file-contents rej) (goto-char (point-min)) - (looking-at "Conflicts occured, diff3 conflict markers left in file\\."))))) + (looking-at "Conflicts occurred, diff3 conflict markers left in file\\."))))) (defun vc-arch-delete-rej-if-obsolete () "For use in `after-save-hook'." diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index 82eb8783a74..d4b631a1d1b 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -1021,7 +1021,7 @@ specific headers." (lambda (info) ;; The state for directory entries might ;; have been changed to 'up-to-date, - ;; reset it, othewise it will be removed when doing 'x' + ;; reset it, otherwise it will be removed when doing 'x' ;; next time. ;; FIXME: There should be a more elegant way to do this. (when (and (vc-dir-fileinfo->directory info) diff --git a/lisp/window.el b/lisp/window.el index 4c77cb00025..477211672cf 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -4950,7 +4950,7 @@ the list of recently selected ones." (defun read-buffer-to-switch (prompt) "Read the name of a buffer to switch to, prompting with PROMPT. -Return the neame of the buffer as a string. +Return the name of the buffer as a string. This function is intended for the `switch-to-buffer' family of commands since these need to omit the name of the current buffer diff --git a/lisp/woman.el b/lisp/woman.el index a16bfa39c86..243196a5302 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -2558,7 +2558,7 @@ REQUEST is the invoking directive without the leading dot." ;; ((looking-at "[te]") (setq c nil)) ; reject t(roff) and e(ven page) ((looking-at "[ntoe]") (setq c (memq (following-char) woman-if-conditions-true))) - ;; Unrecognised letter so reject: + ;; Unrecognized letter so reject: ((looking-at "[A-Za-z]") (setq c nil) (WoMan-warn "%s %s -- unrecognized condition name rejected!" request (match-string 0))) @@ -3697,7 +3697,7 @@ expression in parentheses. Leaves point after the value." (setq woman-request (match-string 1))))) ;; Delete request or macro name: (woman-delete-match 0)) - ;; Unrecognised request: + ;; Unrecognized request: ((prog1 nil ;; (WoMan-warn ".%s request ignored!" woman-request) (WoMan-warn-ignored woman-request "ignored!") diff --git a/nt/runemacs.c b/nt/runemacs.c index 47b8f54bb02..2d2474c3592 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c @@ -111,7 +111,7 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) #endif /* Append original arguments if any; first look for arguments we - recognise (-wait, -high, and -low), and apply them ourselves. */ + recognize (-wait, -high, and -low), and apply them ourselves. */ while (cmdline[0] == '-' || cmdline[0] == '/') { if (strncmp (cmdline+1, "wait", 4) == 0) diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index 181b11b5a2b..1992ef96e0a 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -6387,7 +6387,7 @@ 2005-11-20 Nick Roberts <nickrob@snap.net.nz> * lisp.h: Use typedef when Lisp_Object is EMACS_INT so that - this type is recognised when debugging. + this type is recognized when debugging. 2005-11-19 Andreas Schwab <schwab@suse.de> @@ -13398,7 +13398,7 @@ 2004-07-04 John Paul Wallington <jpw@gnu.org> * fileio.c (read_file_name_completion_ignore_case): New variable. - (syms_of_fileio): Declare and initialise it. + (syms_of_fileio): Declare and initialize it. (Fread_file_name): Bind `completion-ignore-case' to respect it. 2004-07-03 Eli Zaretskii <eliz@gnu.org> diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index f8b38554781..37a75c3c998 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -5896,7 +5896,7 @@ * eval.c (Feval, Ffuncall): Use the new names. * lisp.h (struct Lisp_Subr): Rename `am' to aMANY and add aUNEVALLED. - (DEFUN): Add braces around the union initialisation and use ## to + (DEFUN): Add braces around the union initialization and use ## to specify the right union alternative and avoid a cast. 2010-07-18 Juanma Barranquero <lekktu@gmail.com> @@ -9266,7 +9266,7 @@ Get rid of the direct_output optimizations. * keyboard.c (nonundocount): Remove extern declaration. - (command_loop_1): Remove brittle optimisation for cheap and + (command_loop_1): Remove brittle optimization for cheap and common operations. * xdisp.c (redisplay_internal): Don't bother checking redisplay_performed_directly_p any more. @@ -12481,7 +12481,7 @@ * dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function xd_symbol_to_dbus_type. With Solaris 2.11, it was said to compile - for hours, when optimzation is enabled. + for hours, when optimization is enabled. (xd_signature, xd_append_arg, xd_retrieve_arg, xd_initialize) (xd_read_message): Make them static. @@ -16072,7 +16072,7 @@ 2008-09-07 Andreas Schwab <schwab@suse.de> * callproc.c (Fcall_process): Don't hold references to string data - across garbage collection. Move initialisation of new_argv down + across garbage collection. Move initialization of new_argv down to avoid compiler bug. 2008-09-07 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de> @@ -19248,7 +19248,7 @@ * w32menu.c (Fx_popup_menu): Unwind protect while building menu. (parse_single_submenu): Remove. (digest_single_submenu): Remove. - (syms_of_w32menu): Don't initialise variables that have moved + (syms_of_w32menu): Don't initialize variables that have moved to menu.c. (set_frame_menubar): Sync with version in xmenu.c. (w32_menu_show): Sync with xmenu_show in xmenu.c. @@ -21290,7 +21290,7 @@ (CACHE_BLOCKSIZE): New constants. * w32font.c (Qja, Qko, Qzh): New symbols. - (syms_of_w32font): Initialise them. + (syms_of_w32font): Initialize them. (font_matches_spec): Use them to filter by language. (recompute_cached_metrics): Remove function. (compute_metrics, clear_cached_metrics): New functions. @@ -29651,7 +29651,7 @@ * callproc.c (child_setup, getenv_internal): Use the display-environment-variable and term-environment-variable frame params. - (set_initial_environment): Initialise Vprocess_environment. + (set_initial_environment): Initialize Vprocess_environment. * config.in: Disable multi-keyboard support on a mac. @@ -31298,7 +31298,7 @@ (term_mouse_highlight, term_mouse_movement, term_mouse_position) (term_mouse_click, handle_one_term_event, Fterm_open_connection) (Fterm_close_connection): New functions. - (term_init): Initialise mouse_face_window. + (term_init): Initialize mouse_face_window. 2007-05-19 Chong Yidong <cyd@stupidchicken.com> diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index 05e448c043c..62e3de22b09 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 @@ -1152,7 +1152,7 @@ 1987-07-29 Richard Mlynarik (mly@prep) - * lread.c (init_read): Initialise load_in_progress. + * lread.c (init_read): Initialize load_in_progress. 1987-07-28 Richard M. Stallman (rms@prep) @@ -2251,7 +2251,7 @@ 1987-01-16 Richard Mlynarik (mly@prep) * xfns.c (Fx_set_{background,cursor,mouse}_color): - Initialise save_color. + Initialize save_color. * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c: Delete/replace unused/conditionalised variables @@ -3002,7 +3002,7 @@ 1986-11-18 Richard Mlynarik (mly@prep) * emacs.c (main): - Giving `inhibit_x_windows' an initialisation loses; + Giving `inhibit_x_windows' an initialization loses; do it explicitly. * xfns.c (Fx_rubber_band): @@ -3291,7 +3291,7 @@ 1986-11-03 Richard Mlynarik (mly@prep) * xterm.c (stufflines): - Initialise signal mask. + Initialize signal mask. * xterm.h: Add definition of sigmask @@ -3346,7 +3346,7 @@ New function. * window.c (Fset_window_hscroll): - Don't inhibit redisplay optimisations if hscroll is same. + Don't inhibit redisplay optimizations if hscroll is same. * ymakefile: rm ../etc/DOC to avoid make-docfile overwriting any files which @@ -3358,7 +3358,7 @@ VMS changes from Sasaki * termcap.c (tgetent): - Make sure `indirect' initialised. + Make sure `indirect' initialized. * xfns.c (grey_p and callers): New function to compensate for ugly chauvinistic American @@ -3496,7 +3496,7 @@ core-dump) Dike out global-minor-modes. This wasn't actually being used by - anything (due to a bug) and wasn't even being initialised! + anything (due to a bug) and wasn't even being initialized! minor-mode-alist does what this thought it was doing. 1986-10-11 Richard Mlynarik (mly@prep) diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 9ce7828fac9..fb3ec172055 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -9010,7 +9010,7 @@ * keyboard.c (cmd_error): If an error occurs before somebody has provided a screen to print it on, print it to stderr and exit Emacs. Handle batch-mode errors with the same code. - * lisp.h (Qexternal_debugging_ouput): New extern declaration, for + * lisp.h (Qexternal_debugging_output): New extern declaration, for use in cmd_error. * screen.c (Fscreen_pixel_size, Fset_screen_position): Doc fix. diff --git a/src/ChangeLog.4 b/src/ChangeLog.4 index 208d9c2cdb0..88c9e3dbf71 100644 --- a/src/ChangeLog.4 +++ b/src/ChangeLog.4 @@ -3656,7 +3656,7 @@ * m/delta.h (BROKEN_CLOSEDIR): Added because closedir is interruptible. (HAVE_UNISTD_H): Deleted because configure takes care of it. - (C_SWITCH_MACHINE): Added optimisation options for gnu cc. + (C_SWITCH_MACHINE): Added optimization options for gnu cc. 1993-12-17 Mike Long (mike.long@analog.com) @@ -5007,7 +5007,7 @@ Change display code to handle the `invisible' text property. * dispnew.c (direct_output_for_insert): Fail if character just inserted has text properties. - (direct_ouput_forward_char): Fail if moving near invisible chars. + (direct_output_forward_char): Fail if moving near invisible chars. * indent.c (compute_motion): Compute correctly for invisible text. (vmotion): Take care of invisible newlines. * intervals.c (set_point): Ignore `invisible' property diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index 1f21e9fb99c..ee79917a34d 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 @@ -3463,7 +3463,7 @@ * lisp.h (running_asynch_code): New global flag. * emacs.c (running_asynch_code): New global flag. - (main): Initialise it. + (main): Initialize it. * process.c (read_process_output, exec_sentinel): Set and reset the running_asynch_code global flag and restore match data. diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index 141a570040c..af97d0de7b4 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 @@ -1182,7 +1182,7 @@ support in sys_select. (term_ntproc): New function. - (init_ntproc): New function to initialise socket support and make + (init_ntproc): New function to initialize socket support and make initial std handles non-inheritable. Also ensure stdin, stdout and stderr have valid handles so that pipes and sockets can't inadvertently use fd 0, 1, or 2. @@ -1440,7 +1440,7 @@ Correctly detect when default_directory is absolute. Be strict when looking for MSDOS drive specifier; defer calling getdefdir. Ignore drive specifier if name now has UNC prefix. - Correctly recognise if name is not absolute when trying simple + Correctly recognize if name is not absolute when trying simple method to expand; return original string if possible. Skip dir sep after ~ or ~user. Use getpwnam instead of HOME for ~user on NT. diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index 73d0d45e9c1..ec4c27a4d9e 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 @@ -10963,7 +10963,7 @@ 1996-08-28 Morten Welinder <terra@diku.dk> * minibuf.c (Vhistory_length, Qhistory_length): New variables. - (syms_of_minibuf): Register and initialise these. + (syms_of_minibuf): Register and initialize these. (read_minibuf): Truncate history list if needed. 1996-08-28 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 00e4a1f62c8..bd51e55cdc6 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -13266,7 +13266,7 @@ * charset.c (Fchar_bytes): Doc fix. (char_bytes): Fix returned value to match returned type. - (syms_of_charset): Fix type clash in initialisation of + (syms_of_charset): Fix type clash in initialization of Vauto_fill_chars. 1998-10-29 Geoff Voelker <voelker@cs.washington.edu> @@ -13429,7 +13429,7 @@ `x-list-fonts.c'. (w32_get_font_info, w32_query_font, w32_find_ccl_program): New functions for fontset support - adapted from x_ equivalents. - (syms_of_w32fns): New lisp variables initialised. Function + (syms_of_w32fns): New lisp variables initialized. Function pointers for fontset.c set up. * w32term.c: Include fontset.h. Define codepage macros. diff --git a/src/ccl.c b/src/ccl.c index 6366f1acb88..2b4f04d1247 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -47,7 +47,7 @@ static Lisp_Object Qcode_conversion_map; static Lisp_Object Qcode_conversion_map_id; /* Symbols of ccl program have this property, a value of the property - is an index for Vccl_protram_table. */ + is an index for Vccl_program_table. */ static Lisp_Object Qccl_program_idx; /* Table of registered CCL programs. Each element is a vector of diff --git a/src/character.c b/src/character.c index a21760c8ab2..88b1f11b96b 100644 --- a/src/character.c +++ b/src/character.c @@ -669,7 +669,7 @@ str_as_multibyte (unsigned char *str, EMACS_INT len, EMACS_INT nbytes, } /* Parse unibyte string at STR of LEN bytes, and return the number of - bytes it may ocupy when converted to multibyte string by + bytes it may occupy when converted to multibyte string by `str_to_multibyte'. */ EMACS_INT diff --git a/src/character.h b/src/character.h index 09bcf17ab96..5ae6cb8c49c 100644 --- a/src/character.h +++ b/src/character.h @@ -596,7 +596,7 @@ sanitize_char_width (EMACS_INT width) ? ASCII_CHAR_WIDTH (c) \ : sanitize_char_width (XINT (CHAR_TABLE_REF (Vchar_width_table, c)))) -/* If C is a variation selector, return the index numnber of the +/* If C is a variation selector, return the index of the variation selector (1..256). Otherwise, return 0. */ #define CHAR_VARIATION_SELECTOR_P(c) \ diff --git a/src/dbusbind.c b/src/dbusbind.c index 52e08d8ee2a..7984be3564b 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -184,7 +184,7 @@ static int xd_in_read_queued_messages = 0; #endif /* This was a macro. On Solaris 2.11 it was said to compile for - hours, when optimzation is enabled. So we have transferred it into + hours, when optimization is enabled. So we have transferred it into a function. */ /* Determine the DBusType of a given Lisp symbol. OBJECT must be one of the predefined D-Bus type symbols. */ diff --git a/src/fileio.c b/src/fileio.c index 54fc67e6631..e3586c50056 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -338,7 +338,7 @@ Given a Unix syntax file name, returns a string ending in slash. */) while (p != beg && !IS_DIRECTORY_SEP (p[-1]) #ifdef DOS_NT - /* only recognise drive specifier at the beginning */ + /* only recognize drive specifier at the beginning */ && !(p[-1] == ':' /* handle the "/:d:foo" and "/:foo" cases correctly */ && ((p == beg + 2 && !IS_DIRECTORY_SEP (*beg)) @@ -401,7 +401,7 @@ or the entire name if it contains no slash. */) while (p != beg && !IS_DIRECTORY_SEP (p[-1]) #ifdef DOS_NT - /* only recognise drive specifier at beginning */ + /* only recognize drive specifier at beginning */ && !(p[-1] == ':' /* handle the "/:d:foo" case correctly */ && (p == beg + 2 || (p == beg + 4 && IS_DIRECTORY_SEP (*beg)))) diff --git a/src/fontset.c b/src/fontset.c index 34b2131832f..e20d7957c7f 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1346,7 +1346,7 @@ accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val) In FONTSET, set FONT_DEF in a fashion specified by ADD for characters in RANGE and ranges in SCRIPT_RANGE_LIST before RANGE. - The consumed ranges are poped up from SCRIPT_RANGE_LIST, and the + The consumed ranges are popped up from SCRIPT_RANGE_LIST, and the new SCRIPT_RANGE_LIST is stored in ARG. If ASCII is nil, don't set FONT_DEF for ASCII characters. It is diff --git a/src/ftfont.c b/src/ftfont.c index 7858a31be21..5c540f9bf82 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -272,7 +272,7 @@ ftfont_pattern_entity (FcPattern *p, Lisp_Object extra) } else { - /* As this font is not scalable, parhaps this is a BDF or PCF + /* As this font is not scalable, perhaps this is a BDF or PCF font. */ FT_Face ft_face; @@ -730,7 +730,7 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots if ((n = FONT_SLANT_NUMERIC (spec)) >= 0 && n < 100) - /* Fontconfig doesn't support reverse-italic/obligue. */ + /* Fontconfig doesn't support reverse-italic/oblique. */ return NULL; if (INTEGERP (AREF (spec, FONT_DPI_INDEX))) diff --git a/src/gtkutil.c b/src/gtkutil.c index 59bcdfa4afd..3df46afcd3a 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -127,7 +127,7 @@ xg_set_screen (GtkWidget *w, FRAME_PTR f) Returns non-zero if display could be opened, zero if display could not be opened, and less than zero if the GTK version doesn't support - multipe displays. */ + multiple displays. */ void xg_display_open (char *display_name, Display **dpy) @@ -4262,7 +4262,7 @@ xg_make_tool_item (FRAME_PTR f, #endif gtk_tool_item_set_homogeneous (ti, FALSE); - /* Callback to save modifyer mask (Shift/Control, etc). GTK makes + /* Callback to save modifier mask (Shift/Control, etc). GTK makes no distinction based on modifiers in the activate callback, so we have to do it ourselves. */ g_signal_connect (wb, "button-release-event", diff --git a/src/image.c b/src/image.c index a82b16aa805..8b61c7eefbc 100644 --- a/src/image.c +++ b/src/image.c @@ -7754,7 +7754,7 @@ imagemagick_load_image (struct frame *f, struct image *img, } /* Finally we are done manipulating the image. Figure out the - resulting width/height and transfer ownerwship to Emacs. */ + resulting width/height and transfer ownership to Emacs. */ height = MagickGetImageHeight (image_wand); width = MagickGetImageWidth (image_wand); diff --git a/src/keyboard.c b/src/keyboard.c index a4c85683061..80873fcb57a 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -12100,7 +12100,7 @@ This variable is keyboard-local. */); Function key definitions that apply to all terminal devices should go here. If a mapping is defined in both the current `local-function-key-map' binding and this variable, then the local -definition will take precendence. */); +definition will take precedence. */); Vfunction_key_map = Fmake_sparse_keymap (Qnil); DEFVAR_LISP ("key-translation-map", Vkey_translation_map, diff --git a/src/process.c b/src/process.c index 53382d804f2..bea9e72019b 100644 --- a/src/process.c +++ b/src/process.c @@ -1414,7 +1414,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) val = XCDR (Vdefault_process_coding_system); } XPROCESS (proc)->encode_coding_system = val; - /* Note: At this momemnt, the above coding system may leave + /* Note: At this moment, the above coding system may leave text-conversion or eol-conversion unspecified. They will be decided after we read output from the process and decode it by some coding system, or just before we actually send a text to diff --git a/src/w32.c b/src/w32.c index b2b47dbd179..304445e2238 100644 --- a/src/w32.c +++ b/src/w32.c @@ -3057,7 +3057,7 @@ generate_inode_val (const char * name) unsigned hash; /* Get the truly canonical filename, if it exists. (Note: this - doesn't resolve aliasing due to subst commands, or recognise hard + doesn't resolve aliasing due to subst commands, or recognize hard links. */ if (!w32_get_long_filename ((char *)name, fullname, MAX_PATH)) abort (); @@ -5845,7 +5845,7 @@ term_ntproc (void) void init_ntproc (void) { - /* Initialise the socket interface now if available and requested by + /* Initialize the socket interface now if available and requested by the user by defining PRELOAD_WINSOCK; otherwise loading will be delayed until open-network-stream is called (w32-has-winsock can also be used to dynamically load or reload winsock). diff --git a/src/w32console.c b/src/w32console.c index 49bf56ddee9..30c71f1c276 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -748,7 +748,7 @@ syms_of_ntterm (void) doc: /* Non-nil means make terminal frames use the full screen buffer dimensions. This is desirable when running Emacs over telnet. A value of nil means use the current console window dimensions; this -may be preferrable when working directly at the console with a large +may be preferable when working directly at the console with a large scroll-back buffer. */); w32_use_full_screen_buffer = 0; @@ -757,4 +757,3 @@ scroll-back buffer. */); defsubr (&Sset_cursor_size); defsubr (&Sset_message_beep); } - diff --git a/src/w32fns.c b/src/w32fns.c index 4a6da46141c..5b936195aa5 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -2262,7 +2262,7 @@ w32_msg_pump (deferred_msg * msg_buf) some third party shell extensions can cause it to be used in system dialogs, which causes a crash if it is not initialized. This is a known bug in Windows, which was fixed long ago, but - the patch for XP is not publically available until XP SP3, + the patch for XP is not publicly available until XP SP3, and older versions will never be patched. */ CoInitialize (NULL); w32_createwindow ((struct frame *) msg.wParam); @@ -2880,7 +2880,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) key.dwControlKeyState = modifiers; add = w32_kbd_patch_key (&key); - /* 0 means an unrecognised keycode, negative means + /* 0 means an unrecognized keycode, negative means dead key. Ignore both. */ while (--add >= 0) { diff --git a/src/w32proc.c b/src/w32proc.c index 279816bcc3e..254a32503c4 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -122,12 +122,12 @@ new_child (void) for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--) if (!CHILD_ACTIVE (cp)) - goto Initialise; + goto Initialize; if (child_proc_count == MAX_CHILDREN) return NULL; cp = &child_procs[child_proc_count++]; - Initialise: + Initialize: memset (cp, 0, sizeof (*cp)); cp->fd = -1; cp->pid = -1; @@ -821,7 +821,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) The w32 GNU-based library from Cygnus doubles quotes to escape them, while MSVC uses backslash for escaping. (Actually the MSVC - startup code does attempt to recognise doubled quotes and accept + startup code does attempt to recognize doubled quotes and accept them, but gets it wrong and ends up requiring three quotes to get a single embedded quote!) So by default we decide whether to use quote or backslash as the escape character based on whether the diff --git a/src/w32term.c b/src/w32term.c index 18f5b85367c..a2ccdd21f7d 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -5576,7 +5576,7 @@ x_raise_frame (struct frame *f) input focus anyway (so the window with focus will never be completely obscured) - if not, then just moving the mouse over it is sufficient to give it focus. On Windows, the user must actually - click on the frame (preferrably the title bar so as not to move + click on the frame (preferably the title bar so as not to move point), which is more awkward. Also, no other Windows program raises a window to the top but leaves another window (possibly now completely obscured) with input focus. @@ -6164,7 +6164,7 @@ w32_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) dpyinfo->has_palette = GetDeviceCaps (hdc, RASTERCAPS) & RC_PALETTE; ReleaseDC (NULL, hdc); - /* initialise palette with white and black */ + /* initialize palette with white and black */ { XColor color; w32_defined_color (0, "white", &color, 1); diff --git a/src/w32xfns.c b/src/w32xfns.c index fbbf11bd65c..fc2d5904d67 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c @@ -188,7 +188,7 @@ get_next_msg (W32Msg * lpmsg, BOOL bWait) } nQueue--; - /* Consolidate WM_PAINT messages to optimise redrawing. */ + /* Consolidate WM_PAINT messages to optimize redrawing. */ if (lpmsg->msg.message == WM_PAINT && nQueue) { int_msg * lpCur = lpHead; @@ -441,4 +441,3 @@ void x_sync (void *f) { } - diff --git a/src/window.h b/src/window.h index de0f7307a51..df29ca1368f 100644 --- a/src/window.h +++ b/src/window.h @@ -268,7 +268,7 @@ struct window /* List of buffers re-shown in this window. */ Lisp_Object next_buffers; - /* An alist with parameteres. */ + /* An alist with parameters. */ Lisp_Object window_parameters; /* No Lisp data may follow below this point without changing diff --git a/src/xdisp.c b/src/xdisp.c index bc7a7a053db..8a8c1d08994 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1445,7 +1445,7 @@ pos_visible_p (struct window *w, EMACS_INT charpos, int *x, int *y, position is CHARPOS. For the contingency that we didn't, and stopped at the first newline from the display string, move back over the glyphs - prfoduced from the string, until we find the + produced from the string, until we find the rightmost glyph not from the string. */ if (IT_CHARPOS (it3) != charpos && EQ (it3.object, string)) { @@ -14109,7 +14109,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row, || (STRINGP (g1->object) && (!NILP (Fget_char_property (make_number (g1->charpos), Qcursor, g1->object)) - /* pevious candidate is from the same display + /* previous candidate is from the same display string as this one, and the display string came from a text property */ || (EQ (g1->object, glyph->object) @@ -17020,7 +17020,7 @@ try_window_id (struct window *w) last_unchanged_at_beg_row = find_last_unchanged_at_beg_row (w); if (last_unchanged_at_beg_row) { - /* Avoid starting to display in the moddle of a character, a TAB + /* Avoid starting to display in the middle of a character, a TAB for instance. This is easier than to set up the iterator exactly, and it's not a frequent case, so the additional effort wouldn't really pay off. */ diff --git a/src/xfns.c b/src/xfns.c index 6de412c4e68..88e8ac595c5 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -2962,7 +2962,7 @@ x_default_font_parameter (struct frame *f, Lisp_Object parms) if (NILP (font_param)) { - /* System font should take precedendce over X resources. We suggest this + /* System font should take precedence over X resources. We suggest this regardless of font-use-system-font because .emacs may not have been read yet. */ const char *system_font = xsettings_get_system_font (); diff --git a/test/cedet/semantic-utest.el b/test/cedet/semantic-utest.el index db737b60c6f..b50f75df996 100644 --- a/test/cedet/semantic-utest.el +++ b/test/cedet/semantic-utest.el @@ -170,7 +170,7 @@ def fun2(a,b,c): #1 ) -; "pyhon test case. notice that python is indentation sensitive +; "python test case. notice that python is indentation sensitive (defvar semantic-utest-Python-name-contents |