Merge from trunk.

419 files changed, 2511 insertions, 2011 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65ab83e0204..11a4acd3b16 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,311 @@
+2011-11-20  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmail.el (rmail-enable-mime-composing): Make it a defcustom.
+        (rmail-insert-mime-forwarded-message-function, rmail-mime-feature):
+        Doc fixes.
+        (rmail-decode-mime-charset): Mark as obsolete.
+
+        * mail/rmailsum.el (rmail-message-regexp-p-1):
+        * mail/rmail.el (rmail-search-message, rmail-forward, rmail-resend):
+        Before using mime functions, check they are set.  (Bug#10077)
+
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-finder-find-node): Use `package--builtins' instead
+        of `package-alist'.  Use node names formed by the pattern "Keyword "
+        and the keyword name.
+
+2011-11-19  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * progmodes/sh-script.el (sh-assignment-regexp): Add entry for
+        bash.
+
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-hide-note-references): Add `:set' tag to `defcustom'
+        that calls `revert-buffer' on all Info buffers.  (Bug#9915)
+        (Info-revert-find-node): Remove let-bindings `old-buffer-name',
+        `old-history', `old-history-forward'.  Add let-binding
+        `window-selected'.  Remove calls to `kill-buffer',
+        `switch-to-buffer' and `Info-mode'.  Set `Info-current-file' to nil
+        before calling `Info-find-node', so `Info-find-node-2' will reread
+        the Info file.  Restore window positions only when `window-selected'
+        is non-nil.
+
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-lazy-highlight-new-loop):
+        Remove condition `(not isearch-error)'.  (Bug#9918)
+
+        * misearch.el (multi-isearch-search-fun): Add condition
+        `(not bound)' to ignore lazy-highlighting search.
+        Add the search-failed message "end of multi" when the end of
+        multi-sequence is reached.  Uncapitalize the search-failed
+        message "Repeat for next buffer".
+
+        * info.el (Info-search): Add the search-failed message
+        "end of the manual" when the end of the manual is reached
+        in Isearch mode.
+
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-find-node-2, Info-select-node, Info-history-find-node):
+        Use non-destructive `remove' instead of `delete' because
+        `Info-history-list' stored to `Info-isearch-initial-history-list' in
+        `Info-isearch-start' might need to be restored in `Info-isearch-end'.
+
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-edit-string): Let-bind `history-add-new-input'
+        to nil instead of binding `search-ring' and `regexp-search-ring'.
+        (Bug#9185)
+
+2011-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (line-move): Force movement by logical lines for any
+        hscrolled window, not only when auto-hscroll-mode is on.
+        (line-move-visual): Update doc string to that effect.  (Bug#10076)
+
+2011-11-19  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * language/european.el (macintosh): Define as alias for mac-roman.
+
+2011-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/rmailmm.el (rmail-mime-display-header)
+        (rmail-mime-display-tagline, rmail-mime-display-body): New defsubsts.
+        (rmail-mime-entity-segment, rmail-mime-toggle-raw)
+        (rmail-mime-toggle-hidden, rmail-mime-insert-text)
+        (rmail-mime-insert-bulk, rmail-mime-insert-multipart)
+        (rmail-mime-insert, rmail-mime-insert-tagline): Use them instead
+        of a raw aref.
+        (rmail-mime-entity-segment): To get past the tagline, move forward
+        2 more lines, to account for the 2 empty lines that precede and
+        follow the line with the buttons.
+        (rmail-mime-update-tagline): Move one more line, to get past the
+        empty line that follows the buttons in the tagline.  (Bug#9520)
+
+2011-11-19  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-max-delta-1, window-min-delta-1)
+        (window-min-size-1, window-state-get-1, window-state-put-1)
+        (window-state-put-2): Use "window--" prefix.
+
+2011-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/smie.el: Improve warnings and conflict detection.
+        (smie-warning-count): New var.
+        (smie-set-prec2tab): Use it.
+        (smie-bnf->prec2): Improve warnings.  Add docstring.
+        (smie-bnf--closer-alist): Rename from smie-bnf-closer-alist.
+        (smie-bnf--set-class): New function.
+        (smie-bnf--classify): Rename from smie-bnf-classify.  Rewrite to fix
+        corner case.
+
+        * progmodes/compile.el: Obey compilation-first-column in dest buffer.
+        (compilation-error-properties, compilation-move-to-column):
+        Handle compilation-first-column while in the target buffer.
+
+        * progmodes/cc-engine.el (c-remove-stale-state-cache-backwards):
+        Don't hardcode point-min==1.
+
+        * eshell/esh-cmd.el (eshell-do-eval): Handle `setq' (bug#9907).
+        (eshell-rewrite-for-command): Remove workaround.
+        (eshell-do-pipelines, eshell-do-pipelines-synchronously)
+        (eshell-do-eval, eshell-exec-lisp): Avoid gratuitous setq.
+        * eshell/esh-util.el (eshell-condition-case, eshell-for): Use declare.
+
+        * files-x.el (modify-file-local-variable): Obey commenting conventions.
+
+2011-11-17  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/autoload.el (autoload-generate-file-autoloads):
+        Ignore buffer-local generated-autoload-file if it is the same
+        as the global value.  (Bug#10049)
+
+2011-11-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * textmodes/reftex-toc.el (reftex-toc-return-marker, reftex-toc-help)
+        (reftex-toc, reftex-toc, reftex-toc-dframe-p, reftex-toc-next-heading)
+        (reftex-toc-previous-heading, reftex-toc-max-level)
+        (reftex-toc-goto-line-and-hide, reftex-toc-show-calling-point)
+        (reftex-toc-quit, reftex-toc-revert, reftex-toc-jump)
+        (reftex-toc-do-promote, reftex-toc-promote-prepare)
+        (reftex-toc-promote-action, reftex-toc-extract-section-number)
+        (reftex-toc-load-all-files-for-promotion, reftex-toc-rename-label)
+        (reftex-toc-rename-label, reftex-toc-visit-location)
+        (reftex-toc-visit-location, reftex-toggle-auto-toc-recenter)
+        (reftex-toggle-auto-toc-recenter, reftex-toggle-auto-toc-recenter)
+        (reftex-make-separate-toc-frame): Fix typos, and use TOC consistently,
+        leaving "*toc*" only for references to the buffer.
+
+2011-11-17  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-resize, delete-window, split-window):
+        Replace window-splits by window-combination-resize.
+        * cus-start.el (window-splits): Replace by
+        window-combination-resize.
+
+2011-11-17  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/sh-script.el (sh-font-lock-keywords-var):
+        Make bash entry derive from sh entry, not shell entry.
+
+2011-11-16  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-handle-file-truename): Cache only the local
+        file name.
+
+        * net/tramp-cache.el (tramp-flush-file-property): Flush also
+        properties of linked files.  (Bug#9879)
+
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * menu-bar.el (menu-bar-file-menu):
+        * printing.el (pr-ps-utility):
+        * calendar/icalendar.el (icalendar, icalendar--convert-tz-offset)
+        (icalendar--convert-to-ical, icalendar--convert-ordinary-to-ical)
+        (icalendar--convert-weekly-to-ical, icalendar--convert-yearly-to-ical)
+        (icalendar--convert-sexp-to-ical, icalendar--convert-block-to-ical)
+        (icalendar--convert-float-to-ical, icalendar--convert-date-to-ical)
+        (icalendar--convert-cyclic-to-ical)
+        (icalendar--convert-anniversary-to-ical, icalendar-import-buffer)
+        (icalendar--convert-ical-to-diary)
+        (icalendar--convert-recurring-to-diary)
+        (icalendar--convert-non-recurring-all-day-to-diary)
+        (icalendar-import-format-sample):
+        * progmodes/idlw-shell.el (idlwave-shell-mode):
+        * progmodes/vhdl-mode.el (vhdl-mode, vhdl-print-two-column)
+        (vhdl-print-customize-faces, vhdl-mode, vhdl-ps-print-settings)
+        (vhdl-ps-print-init): Fix typos.
+
+2011-11-16  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el, allout-widgets.el (file metadata): Attribute copyright to
+        FSF and collapse date sequence, obscure author/maintainer email address
+        better, remove extra version line, track relocation of author's webpage.
+
+        * progmodes/python.el (python-pdbtrack-input-prompt)
+        (python-pdbtrack-track-stack-file): Adjust to recognize ipdb as well as
+        regular python pdb prompts.  Adjustments shamelessly taken exactly as
+        suggested in EmacsWiki page (tiny change):
+        http://www.emacswiki.org/PythonProgrammingInEmacs#toc14
+
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * expand.el (expand-pos, expand-index, expand-point):
+        Remove redundant info from docstring.
+        (expand-add-abbrevs): Doc fix.
+        (expand-c-sample-expand-list, expand-sample-lisp-mode-expand-list)
+        (expand-sample-perl-mode-expand-list): Fix typos.
+
+        * net/dbus.el (dbus-event-member-name):
+        * play/5x5.el (5x5-solve-rotate-left, 5x5-solver-output):
+        * term/pc-win.el (msdos-create-frame-with-faces):
+        * textmodes/texinfmt.el (texinfo-format-image): Fix typos.
+
+2011-11-16  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (split-window, window-state-get-1)
+        (window-state-put-1, window-state-put-2): Rename occurrences of
+        window-nest to window-combination-limit.
+        * cus-start.el (window-nest): Rename to
+        window-combination-limit.
+
+2011-11-16  Chong Yidong  <cyd@gnu.org>
+
+        * progmodes/autoconf.el (autoconf-mode): Fix comment-start-skip
+        regexp (Bug#10033).
+
+2011-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * tmm.el (tmm-prompt): Use minibuffer-with-setup-hook (bug#10053).
+        `completing-read' will remove *Completions* and will preserve
+        current-buffer for us.
+        (tmm-add-prompt): Users of *Completions* will always (re)set its
+        major mode.
+        (tmm-old-comp-map): Remove.
+
+2011-11-16  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmailedit.el: Require rmailmm when compiling.
+        (rmail-old-mime-state): New declaration.
+        (rmail-edit-current-message): If editing a mime message,
+        edit the "raw" message from the mbox buffer.
+        (rmail-cease-edit): Handle mime messages.  (Bug#9840)
+
+2011-11-15  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmailmm.el (rmail-mime-toggle-raw): Remove entity arg,
+        which wasn't being used.  Add optional arg to force given state.
+        (rmail-mime): Add optional arg to force given state.
+
+2011-11-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * allout.el (allout-encryption-plaintext-sanitization-regexps):
+        * frame.el (display-mm-dimensions-alist):
+        * outline.el (outline-mode-menu-bar-map, outline-move-subtree-up)
+        (outline-move-subtree-down):
+        * net/newst-treeview.el (newsticker--treeview-do-get-node-of-feed)
+        (newsticker--treeview-do-get-node):
+        * net/quickurl.el (quickurl-list-buffer-name):
+        * progmodes/dcl-mode.el (dcl-mode):
+        * progmodes/gdb-mi.el (gdb-mapcar*):
+        * progmodes/sql.el (sql-mode-oracle-font-lock-keywords): Fix typos.
+
+2011-11-15  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmail.el (rmail-file-coding-system): It's only ever used
+        in a boolean sense, so just make it a boolean, and fix the doc.
+        (rmail-show-mime-function, rmail-mime-feature)
+        (rmail-require-mime-maybe): Doc fixes.
+        (rmail-show-message-1): Check rmail-show-mime-function is non-nil.
+
+        * mail/rmailmm.el (rmail-show-mime): Doc fix.
+
+2011-11-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * epg.el (epg-start-decrypt, epg-start-verify, epg-start-sign)
+        (epg-start-encrypt, epg-start-export-keys, epg-start-import-keys)
+        (epg-start-receive-keys, epg-start-delete-keys, epg-start-sign-keys)
+        (epg-start-generate-key, epg-context-set-progress-callback): Fix typos.
+
+2011-11-15  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmailmm.el (rmail-mime-entity, rmail-mime-entity-segment)
+        (rmail-mime-shown-mode, rmail-mime-hidden-mode, rmail-mime-raw-mode)
+        (rmail-mime-toggle-hidden, rmail-mime-insert-tagline)
+        (rmail-mime-insert-header, rmail-mime-handle, rmail-mime-parse)
+        (rmail-mime, rmail-show-mime): Doc fixes.
+
+        * term/ns-win.el (mode-line-frame-identification):
+        Leave it alone.  (Bug#10051)
+
+        * simple.el (mark-whole-buffer): Doc fix.  (Bug#10023)
+
+        * mail/rmailout.el (rmail-output-to-rmail-buffer):
+        Handle empty buffers.  (Bug#9978)
+
+2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * international/mule.el (define-charset):
+        * mail/rmailmm.el (rmail-mime-find-header-encoding):
+        * progmodes/prolog.el (prolog-mode-hook, prolog-inferior-mode-hook):
+        * progmodes/verilog-mode.el (verilog-backward-token):
+        * textmodes/ispell.el (lookup-words):
+        * textmodes/sgml-mode.el (sgml-guess-indent): Fix typos.
+
 2011-11-14  Glenn Morris  <rgm@gnu.org>
 
         * progmodes/executable.el
         (executable-make-buffer-file-executable-if-script-p):
         Handle file-modes returning nil.
 
+        * mail/rmailsum.el (rmail-summary): Remove movement to beginning of
+        message - not necessary, and causes problems.  (Bug#9831)
+
+        * mail/rmailsum.el (rmail-new-summary): Preserve message number.
+
         * mail/rmail.el (rmail-no-mail-p): Remove mode-line N/M indicator.
 
         * mail/rmailsum.el (rmail-summary, rmail-new-summary)
@@ -368,11 +670,10 @@
         * progmodes/cc-defs.el: Update "virtual semicolon" comments.
 
         * progmodes/cc-engine.el (c-crosses-statement-barrier-p):
-        Recode to scan one line at at time rather than having \n and \r
-        explicitly in c-stmt-delim-chars
-        (for some modes, e.g. AWK).
+        Recode to scan one line at a time rather than having \n and \r
+        explicitly in c-stmt-delim-chars (for some modes, e.g. AWK).
         (c-forward-label): Amend for virtual semicolons.
-        (c-at-macro-vsemi-p, c-macro-vsemi-status-unknown-p): New functions
+        (c-at-macro-vsemi-p, c-macro-vsemi-status-unknown-p): New functions.
 
         * progmodes/cc-fonts.el (c-font-lock-declarations): Take account
         of the new C macros.
@@ -389,7 +690,7 @@
 
         * progmodes/cc-vars.el (c-macro-with-semi-re):
         (c-macro-names-with-semicolon): New variables.
-        (c-make-macro-with-semi-re): New function
+        (c-make-macro-with-semi-re): New function.
 
 2011-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -444,7 +745,7 @@
 2011-10-26  Michael Albinus  <michael.albinus@gmx.de>
 
         * ido.el (ido-file-name-all-completions-1): Do not require
-        tramp.el explicitely.  (Bug#7583)
+        tramp.el explicitly.  (Bug#7583)
 
 2011-10-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -2462,13 +2763,13 @@
 
 2011-08-20  Alan Mackenzie  <acm@muc.de>
 
-        * Fontify CPP expressions correctly when starting in the middle of
+        Fontify CPP expressions correctly when starting in the middle of
         such a construct.  Mainly for when jit-lock etc. starts a chunk
         here.
 
-        * progmodes/cc-fonts.el (c-font-lock-context): new buffer local
+        * progmodes/cc-fonts.el (c-font-lock-context): New buffer local
         variable.
-        (c-make-font-lock-search-form): new function, extracted from
+        (c-make-font-lock-search-form): New function, extracted from
         c-make-font-lock-search-function.
         (c-make-font-lock-search-function): Use the above function.
         (c-make-font-lock-context-search-function): New function.
@@ -2732,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
@@ -2799,7 +3100,7 @@
 
         * progmodes/cc-fonts.el (c-font-lock-declarations): Jump over the
         QT keyword "more" to prevent "more slots: ...." being spuriously
-        parsed as a bitfield declaraion.
+        parsed as a bitfield declaration.
 
         * progmodes/cc-engine.el (c-beginning-of-statement-1):
         Refactor and enhance to handle bitfield declarations.
@@ -3498,7 +3799,7 @@
         Also clean up the code slightly.
 
         * progmodes/grep.el (rgrep): Don't bind `process-connection-type',
-        because that makes the colours go away.
+        because that makes the colors go away.
 
         * mail/sendmail.el (send-mail-function): Change the default to
         `sendmail-query-once'.
@@ -3871,7 +4172,7 @@
         for list)" (bug#6475).
 
         * files.el (file-expand-wildcards): Ignore non-readable
-        sub-directories while trying to find matches instead of signalling
+        sub-directories while trying to find matches instead of signaling
         an error (bug#6297).
 
         * man.el (Man-reference-regexp): Allow matching possible
@@ -5544,7 +5845,7 @@
 
         * image-mode.el (image-toggle-display-image): Ensure that the
         image spec passed to the animate timer is the same object as in
-        the the buffer's display property (Bug#6981).
+        the buffer's display property (Bug#6981).
         (image-transform-properties): Doc fix.
 
         * image.el (image-animate-max-time): Default to nil.
@@ -5626,7 +5927,7 @@
 2011-05-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * minibuffer.el (completion--capf-wrapper): Check applicability before
-        retuning non-nil for non-exclusive completion data.
+        returning non-nil for non-exclusive completion data.
         * progmodes/etags.el (tags-completion-at-point-function):
         * info-look.el (info-lookup-completions-at-point): Mark as
         non-exclusive.
diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1
index f1c931589d1..aac6e998a88 100644
--- a/lisp/ChangeLog.1
+++ b/lisp/ChangeLog.1
@@ -1947,7 +1947,7 @@
         elements of command-history are expressions.
 
         * simple.el (error):
-        Just keep signalling if user tries to continue.
+        Just keep signaling if user tries to continue.
 
 1985-09-07  Richard M. Stallman  (rms@mit-prep)
 
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 1c2f2b5b015..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
@@ -2339,7 +2339,7 @@
         skips encoded regions.  Allow user to skip saving Fcc messages with
         large attachments.  Fixed region skipping bug with multi-line
         comments - e.g.  tex $ regions spanning multiple lines.
-        Added support for postscript and uuencoded regions.
+        Added support for PostScript and uuencoded regions.
         Redundant dictionary file names purged.
         Dictionary definition field name changed from "Character Set"
         to "Coding System".  Fixed bug in reloading dictionaries.
@@ -2374,7 +2374,7 @@
         (ispell-valid-dictionary-list): New function returning all valid
         dictionaries on machine.
         (ispell-checking-message): Documentation string improved.
-        (ispell-skip-region-alist): Add uuencoded and postscript region
+        (ispell-skip-region-alist): Add uuencoded and PostScript region
         skipping.  Improve http/e-mail/file regexp to not match `/.\w'.
         (ispell-html-skip-alists): New variable for html region support.
         (ispell-send-string): Remove redundant xemacs check.
@@ -2402,7 +2402,7 @@
         html skipping pushed to alists.
         (ispell-get-line): Add support for multi-line comment regions.
         (ispell): Check that variables to continue spelling are bound.
-        (ispell-message-text-end): Postscript and uuencoded regions now
+        (ispell-message-text-end): PostScript and uuencoded regions now
         supported as MIME regions, rather than as end-of-message region.
         (ispell-mime-multipartp): New function supporting MIME.
         (ispell-mime-skip-part): New function supporting MIME.
@@ -3318,7 +3318,7 @@
         ada-prj.el are now defined in this package, which makes it easier to
         edit menus.
         (ada-narrow-to-defun): Add support for `narrow-to-region'.
-        No longer explicitely load ada-xref.el and ada-prj.el.  Use autoload
+        No longer explicitly load ada-xref.el and ada-prj.el.  Use autoload
         statements instead.
 
         * progmodes/ada-xref.el (ada-gnatls-args): New variable.
@@ -3516,7 +3516,7 @@
 2003-04-23  Stefan Monnier  <monnier@cs.yale.edu>
 
         * newcomment.el (comment-normalize-vars): Prompt the user for
-        the comment-start to use rather than signalling an error.  Fix regexp.
+        the comment-start to use rather than signaling an error.  Fix regexp.
         (uncomment-region): Don't leave half-removed comment markers.
 
 2003-04-23  Richard M. Stallman  <rms@gnu.org>
@@ -4332,7 +4332,7 @@
 
 2003-04-01  Stefan Monnier  <monnier@cs.yale.edu>
 
-        * progmodes/asm-mode.el (asm-mode-syntax-table): Setup entries
+        * progmodes/asm-mode.el (asm-mode-syntax-table): Setup entries
         that do not depend on asm-comment-char.
         (asm-mode-map): Declare and init at the same time.
         (asm-code-level-empty-comment-pattern)
@@ -9383,7 +9383,7 @@
 
 2002-10-06  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
-        * progmodes/fortran.el (fortran-beginning-do): Ignore labelled DO
+        * progmodes/fortran.el (fortran-beginning-do): Ignore labeled DO
         loops.
 
 2002-10-05  Stefan Monnier  <monnier@cs.yale.edu>
@@ -9632,7 +9632,7 @@
         named ucs-translation-table-for-decode vacant.  If FOR-ENCODE is
         non-nil, make a proper char-table populates the translation table
         name utf-translation-table-for-encode.  Call register-char-codings
-        for all mule-utf-* to to reset their status to the original.
+        for all mule-utf-* to reset their status to the original.
         (unify-8859-on-encoding-mode): Call ucs-unify-8859 and
         ucs-fragment-8859 with fixed arguments.  Set the version to 21.3.
         (unify-8859-on-decoding-mode): Likewise.  Remove dependency.
@@ -10545,7 +10545,7 @@
 
 2002-09-22  Kai Großjohann  <grossjoh@ls6.informatik.uni-dortmund.de>
 
-        * dired.el (dired-insert-directory): Always add "--dired" to to
+        * dired.el (dired-insert-directory): Always add "--dired" to
         SWITCHES for remote files.
         * files.el (insert-directory): Comment saying that "--dired"
         might be in the SWITCHES.
@@ -11617,7 +11617,7 @@
         * emacs-lisp/bytecomp.el (byte-compile-warning-prefix):
         Decide here whether to print which form we're compiling.
         If we do that, still print file and line.  Make file name
-        relative to default-directory.  Print fewer newlines.
+        relative to default-directory.  Print fewer newlines.
         (byte-compile-log-file): Print something even if no file.
         Print messages for entering and leaving directories,
         and set default-directory.
@@ -11680,7 +11680,7 @@
 2002-08-27  Francesco Potortì  <pot@gnu.org>
 
         * net/ange-ftp.el (ange-ftp-skip-msgs): Skip the 530 response
-        given by vsFTPd when accessed with a kerberised FTP client.
+        given by vsFTPd when accessed with a kerberized FTP client.
 
 2002-08-27  Richard M. Stallman  <rms@gnu.org>
 
@@ -12899,7 +12899,7 @@
         * timer.el (timer-inc-time): Doc fix.
 
         * replace.el (keep-lines, flush-lines): Interactively report
-        read-only error before reading regexp argument.
+        read-only error before reading regexp argument.
 
         * dabbrev.el (dabbrev--search): Use inhibit-point-motion-hooks.
 
@@ -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.
 
@@ -21105,12 +21105,12 @@
         so that the next undo after an error will not begin redoing.
 
         * simple.el (shell-command): Doc fix.
-        (shell-command-on-region): If there is output an an error,
+        (shell-command-on-region): If there is output and an error,
         add "...Shell command failed" to the output.
 
 2001-12-13  David Ponce  <david@dponce.com>
 
-        * ruler-mode.el (ruler-mode-left-fringe-cols): Variable removed.
+        * ruler-mode.el (ruler-mode-left-fringe-cols): Variable removed.
         (ruler-mode-left-fringe-cols): Function replaced by more efficient
         implementation `ruler-mode-extra-left-cols'.
         (ruler-mode-ruler): Use above new function.  Take into account
@@ -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.
@@ -23550,4 +23550,3 @@ See ChangeLog.9 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.11 b/lisp/ChangeLog.11
index 76bac50c4b8..08bd70926b4 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -5283,7 +5283,7 @@
         (disabled-command-function): Function renamed from
         `disabled-command-hook'.  Adapt code to name change of the variable.
 
-2004-08-07  Satyaki Das  <satyaki@theforce.stanford.edu>  (tiny change)
+2004-08-07  Satyaki Das  <satyaki@theforce.stanford.edu>
 
         * simple.el (completion-root-regexp): New defvar.
         (completion-setup-function): Use it instead of a literal string.
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 1e7ed845b49..7df356b52d8 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -764,7 +764,7 @@
         Fix calls to get-buffer-window to find windows in other frames.
         Reported by David Hansen <david.hansen@gmx.net>.
 
-2007-03-27   Kevin Ryde  <user42@zip.com.au>
+2007-03-27  Kevin Ryde  <user42@zip.com.au>
 
         * info.el (Info-display-images-node): On a text-only terminal,
         show the "text" or "alt" parts of the image blobs.
@@ -938,7 +938,7 @@
 2007-03-20  David Kastrup  <dak@gnu.org>
 
         * files.el (magic-mode-alist): Require literal "%!PS" string for
-        magic postscript file detection.
+        magic PostScript file detection.
 
 2007-03-20  Richard Stallman  <rms@gnu.org>
 
@@ -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>.
 
@@ -7561,7 +7561,7 @@
         * pcvs-util.el (cvs-get-buffer-create): Obey `noreuse' even if `name'
         doesn't look like a file name.
 
-        * complete.el (PC-expand-many-files): Avoid signalling an error when
+        * complete.el (PC-expand-many-files): Avoid signaling an error when
         the current directory doesn't exist.  Reported by Michaël Cadilhac.
 
 2006-08-02  Andreas Schwab  <schwab@suse.de>
@@ -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.
@@ -8855,7 +8855,7 @@
         (org-get-indentation): New optional argument LINE.
         (org-fix-indentation, org-remove-tabs): New functions.
         (org-export-as-ascii, org-ascii-level-start): Determine and apply
-        correct indentation for headlines that are converted it items.
+        correct indentation for headlines that are converted to items.
         (org-skip-comments): Remove table lines that contain narrowing
         cookies but no other non-empty fields.
         (org-set-tags): Allow groups of mutually exclusive tags.
@@ -9419,7 +9419,7 @@
         (org-insert-labeled-timestamps-at-point): New option.
         (org-cycle, org-occur, org-scan-tags): Use `org-overview' instead
         of `hide-sublevels 1', in case the first headline is not level 1.
-        (org-overview, org-content): New fuction.
+        (org-overview, org-content): New function.
         (org-cycle-global-status, org-cycle-subtree-status): Make these
         variables buffer-local.
         (org-global-cycle): New command.
@@ -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
@@ -16735,7 +16735,7 @@
         * progmodes/cc-cmds.el (c-beginning-of-statement (and
         subfunctions)): Adapt c-\(back\|forward\)-over-illiterals such
         that movement over macros and code are rigorously separated from
-        eachother.  Correct a few incidental bugs.
+        each other.  Correct a few incidental bugs.
 
         * progmodes/cc-cmds.el: Restructure c-beginning-of-statement:
         Improve its doc-string.  Improve the handling of certain specific cases.
@@ -16884,7 +16884,7 @@
         * progmodes/cc-fonts.el (c-font-lock-complex-decl-prepare)
         (c-font-lock-declarators, c-font-lock-declarations)
         (c-complex-decl-matchers, c-basic-matchers-after): Use a text
-        property to mark the items in in declarator lists to handle
+        property to mark the items in declarator lists to handle
         refontification inside multiline declarations better.
 
         * progmodes/cc-fonts.el (c-font-lock-declarations): Recognize a
@@ -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>
@@ -33362,4 +33362,3 @@ See ChangeLog.11 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.13 b/lisp/ChangeLog.13
index 993c51163cb..0642a4d14ab 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -16,7 +16,7 @@
         * international/fontset.el (script-representative-chars): Add cham
         and tai-viet.
         (setup-default-fontset): Add iso10646-1 font for latin and ipa.
-        Add fontconfig spec for cjk-misc.  Explicitly specify font font
+        Add fontconfig spec for cjk-misc.  Explicitly specify font
         for U+E000..U+F8FF.
 
         * international/characters.el (script-list): Add cham.
@@ -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.
@@ -1673,7 +1673,7 @@
         x-resolve-font-name.
         (x-complement-fontset-spec): Never prepend an ASCII font.
         (create-fontset-from-fontset-spec): If a fontset of the same name
-        already exists, override it instead of signalling an error.  Don't
+        already exists, override it instead of signaling an error.  Don't
         turn `ascii' into `latin'.  Don't update fontset-alias-alist here.
 
         * international/mule-conf.el (unicode-bmp): Delete duplicated
@@ -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>
 
@@ -10127,7 +10127,7 @@
 2007-10-08  Richard Stallman  <rms@gnu.org>
 
         * wid-edit.el (widget-specify-button): Don't merge mouse-face with
-        neighbouring buttons.
+        neighboring buttons.
 
 2007-10-08  Andreas Schwab  <schwab@suse.de>
 
@@ -10151,7 +10151,7 @@
 2007-10-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * wid-edit.el (widget-image-insert): Don't merge mouse-face with
-        neighbouring buttons.
+        neighboring buttons.
 
         * progmodes/compile.el (compilation-error-regexp-alist-alist):
         Recognize gcc's use of "note" for informational messages.
@@ -11855,7 +11855,7 @@
         (org-agenda-files): Ignore non-existing files.
         (org-agenda-skip-unavailable-files): New variable.
         (org-ellipsis): All a face as value.
-        (org-mode): Interprete the face value of `org-ellipsis'.
+        (org-mode): Interpret the face value of `org-ellipsis'.
         (org-archive-save-context-info): New option.
         (org-archive-subtree): Store context info in archived entry.
         (org-fast-tag-selection-can-set-todo-state): New variable.
@@ -11890,7 +11890,7 @@
         (org-set-regexps-and-options): Use `org-remove-keyword-keys'.
         (org-remove-keyword-keys): New function.
 
-2007-08-30  Jari Aalto  <jari.aalto@cante.net>  (tiny change)
+2007-08-30  Jari Aalto  <jari.aalto@cante.net>
 
         * progmodes/grep.el (grep-find-ignored-directories):
         Add monotone _MTN bookkeeping directory in workspaces.
@@ -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.
@@ -16414,7 +16414,7 @@
 2007-05-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * files.el (magic-mode-alist, magic-fallback-mode-alist):
-        Move the *ml, Postscript, and XmCD entries to the fallback part.
+        Move the *ml, PostScript, and XmCD entries to the fallback part.
 
         * files.el (magic-fallback-mode-alist):
         Rename from file-start-mode-alist.
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index c30f0e749ce..ce2253bcfe6 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -2885,11 +2885,11 @@
 2009-01-25  Craig Markwardt  <cbmarkwardt@gmail.com>
 
         * calendar/icalendar.el (icalendar-uid-format): New defcustom
-        variable to allow the user to choose icalendar UID format.
+        variable to allow the user to choose iCalendar UID format.
         (icalendar--diarytime-to-isotime): Bug fix, now times in the range
         12:00am-12:59am are correctly converted to 0000-0059, instead of 12pm.
         (icalendar-export-region, icalendar--create-uid): Use custom
-        function to compute icalendar UID for each entry.
+        function to compute iCalendar UID for each entry.
         (icalendar--parse-summary-and-rest): Bug fix for parsing of lines
         with description, location, etc. fields (need to keep active count
         of fields encountered).  Another bug fix to the regex that matches
@@ -6724,7 +6724,7 @@
         (rx-check-any): Return result as a list.  Don't convert chars to
         strings.  Don't prepend "\\" to "^".  Don't search for close bracket.
         Check char category string.  Call rx-form instead of rx-to-string.
-        (rx-any): Rebuid to complete the function.
+        (rx-any): Rebuild to complete the function.
         (rx-check-not): Fix char category regexp pattern string.
         Call rx-form instead of rx-to-string.
         (rx-not): Call rx-form instead of rx-to-string.  Convert "[^]" to
@@ -7913,7 +7913,7 @@
         ignored while matching, replace the entire filename with completion.
 
         * textmodes/flyspell.el (flyspell-check-pre-word-p): Make sure
-        flyspell-pre-point is valid to avoid signalling an error in
+        flyspell-pre-point is valid to avoid signaling an error in
         post-command-hook.
 
 2008-08-26  Johan Bockgård  <bojohan@gnu.org>
@@ -13629,7 +13629,7 @@
         (completion-emacs22-try-completion): Place cursor after the /, as was
         done in Emacs-22's minibuffer-complete-word.
         Fix bug reported by David Hansen <david.hansen@gmx.net>.
-        (completion-emacs22-try-completion): Merge all mergeable text rather
+        (completion-emacs22-try-completion): Merge all mergable text rather
         than just /.
         (completion-pcm--delim-wild-regex): New var.
         (completion-pcm-word-delimiters): New custom.
@@ -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>
 
@@ -17799,7 +17799,7 @@
         (org-local-logging): New function.
         (org-columns-open-link): Fix bug with opening link in column view.
         (org-local-logging): New function.
-        (org-todo): Make sure that LOGGING properties are honoured.
+        (org-todo): Make sure that LOGGING properties are honored.
         (org-todo-keywords): Improve docstring.
         (org-startup-options): Cleanup startup options.
         (org-set-regexps-and-options): Process the "!" markers.
@@ -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.
@@ -20567,4 +20567,3 @@ See ChangeLog.13 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.15 b/lisp/ChangeLog.15
index ed70075754c..dfd9b94b53e 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -2790,13 +2790,13 @@
         * 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>
 
         * saveplace.el (save-place-alist-to-file): Save list sorted and
-        pretty-printed, so that it is mergeable by line-based text merging,
+        pretty-printed, so that it is mergable by line-based text merging,
         as suggested by Iain Dalton <iain.dalton {_AT_} gmail.com>.
 
 2010-12-28  Ken Manheimer  <ken.manheimer@gmail.com>
@@ -3058,7 +3058,7 @@
         * net/tramp-sh.el (tramp-sh-handle-start-file-process):
         Protect buffer-modified value.  (Bug#7557)
 
-2010-12-13   Jan Moringen  <jmoringe@techfak.uni-bielefeld.de>
+2010-12-13  Jan Moringen  <jmoringe@techfak.uni-bielefeld.de>
 
         * log-edit.el (log-edit-changelog-entries):
         Regexp quote filename.  (Bug#7505)
@@ -5376,7 +5376,7 @@
 
 2010-10-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * newcomment.el (comment-dwim): Fix the intentation in the doc string.
+        * newcomment.el (comment-dwim): Fix the indentation in the doc string.
 
 2010-10-21  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -5815,7 +5815,7 @@
         querying the password for.
 
         * ibuffer.el (ibuffer-visit-buffer): To mimick list-buffers
-        behaviour, don't bury the ibuffer buffer when visiting other buffers.
+        behavior, don't bury the ibuffer buffer when visiting other buffers.
 
 2010-10-08  Chong Yidong  <cyd@stupidchicken.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.
 
@@ -11215,7 +11215,7 @@
         * bindings.el (complete-symbol): Move into minibuffer.el.
 
         * minibuffer.el (complete-tag): Move from etags.el.  If tags
-        completion cannot be performed, return nil instead of signalling
+        completion cannot be performed, return nil instead of signaling
         an error.
         (completion-at-point): Make it an alias for complete-symbol.
         (complete-symbol): Move from bindings.el, and replace with the
@@ -12221,7 +12221,7 @@
 
 2010-03-27  Nick Roberts  <nickrob@snap.net.nz>
 
-        Restore GDB/MI fuctionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz.
+        Restore GDB/MI functionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz.
         * progmodes/gdb-mi.el: Restore.
         * progmodes/gdb-ui.el: Remove.
         * progmodes/gud.el: Re-accommodate for gdb-mi.el.
@@ -12985,7 +12985,7 @@
         file has no read permissions for the owner, there might be
         problems otherwise.  Reported by Ole Laursen <olau@iola.dk>.
 
-22010-02-18  Glenn Morris  <rgm@gnu.org>
+2010-02-18  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/authors.el (authors-renamed-files-alist):
         Add entries for INSTALL.CVS.
@@ -13311,7 +13311,7 @@
 
 2010-01-29  Chong Yidong  <cyd@stupidchicken.com>
 
-        * dirtrack.el (dirtrack): Warn instead of signalling error if the
+        * dirtrack.el (dirtrack): Warn instead of signaling error if the
         regexp is incorrect (Bug#5476).
 
 2010-01-29  Michael Albinus  <michael.albinus@gmx.de>
@@ -13597,7 +13597,7 @@
         * textmodes/artist.el (artist-compute-popup-menu-table):
         Remove duplicated words in doc-strings.
 
-2010-01-15   David Abrahams  <dave@boostpro.com>  (tiny change)
+2010-01-15  David Abrahams  <dave@boostpro.com>  (tiny change)
 
         * net/mairix.el (mairix-widget-send-query): Send -1 instead of nil
         to mairix-search to suppress threading (Bug#5342).
@@ -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 36046562653..5b0f2ac4270 100644
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -1960,7 +1960,7 @@
         window for it.
 
         * terminal.el (te-filter):
-        Save/restore point from te-saved-point to minimise the lossage
+        Save/restore point from te-saved-point to minimize the lossage
         vandals can inflict.
 
 1987-01-09  Richard M. Stallman  (rms@prep)
@@ -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
@@ -4008,4 +4008,3 @@ See ChangeLog.1 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.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 1edf6d692a0..b749be79fc1 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -196,7 +196,7 @@
         (ispell-required-version): Documentation changes.
         (ispell-skip-sgml): Documentation changes.
         (ispell-command-loop): `mode-line-format' now shows misspelled word.
-        (ispell-message-text-end): Can now process postscript version 1.
+        (ispell-message-text-end): Can now process PostScript version 1.
         (ispell-message-start-skip): New variable for block skips, set up for
         pgp and forward blocks.
         (ispell-message-end-skip): New variable for block skips, set up for
@@ -879,7 +879,7 @@
         * ada-mode.el (initial comments): Copyright 1995; don't speak
         about setup; correct history for a file that actually IS in
         Emacs 19.29; update list of known bugs.
-        (all functions): Inititialize all local variables explicitely to 'nil'.
+        (all functions): Initialize all local variables explicitly to 'nil'.
         (ada-font-lock-keywords): Initialized according to new user option
         `font-lock-maximum-decoration'.
 
@@ -5507,7 +5507,7 @@
 
 1994-10-26  Michael Ernst  <mernst@research.microsoft.com>
 
-        * ispell.el (ispell-message-text-end): Match Postscript 3 like 2.
+        * ispell.el (ispell-message-text-end): Match PostScript 3 like 2.
 
 1994-10-26  Ed Reingold  <reingold@albert.gnu.ai.mit.edu>
 
@@ -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.7 b/lisp/ChangeLog.7
index 7ef7fe9dffc..cb606cd0847 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -1948,7 +1948,7 @@
         Add support for loading the files that contain :version when doing
         `customize-changed-options' so it can know which variables have
         changed even in files that were not loaded at the time it was called.
-        * cus-edit.el (customize-changed-options): Remeber all the
+        * cus-edit.el (customize-changed-options): Remember all the
         versions and load the corresponding files before we show the
         customization buffer.  Change the sorting to show the groups first
         in the customization buffer.
@@ -4923,10 +4923,10 @@
         (fortran-blink-matching-if, fortran-blink-matching-do)
         (fortran-indent-new-line): Bind case-fold-search.
         (fortran-end-do, fortran-beginning-do, fortran-end-if)
-        (fortran-beginning-if): Bind case-fold-search.  Allow labelled blocks.
+        (fortran-beginning-if): Bind case-fold-search.  Allow labeled blocks.
         Use fortran-end-prog-re.
         (fortran-if-start-re): New variable.
-        (fortran-calculate-indent): Allow labelled blocks.  Simplify the conds.
+        (fortran-calculate-indent): Allow labeled blocks.  Simplify the conds.
         Make select case indentation work.
         (fortran-is-in-string-p): Ignore Emacs 18 bug kluge.
         (fortran-fill): Allow double quotes in check for string.
@@ -6526,7 +6526,7 @@
 
         * bibtex.el (bibtex-autokey-get-titles): Non capitalized title words
         are used for key generation as well.
-        (bibtex-member-of-regexp): Case is honoured for matches now.
+        (bibtex-member-of-regexp): Case is honored for matches now.
         (bibtex-autokey-titleword-ignore): Added entries provide compatibility
         to former behavior.
 
@@ -6815,9 +6815,9 @@
         `reftex-no-include-regexps'.
         (reftex-no-include-regexps): New option.
         (reftex-do-parse): Initialize appendix flag.
-        (reftex-parse-from-file): Interprete appendix.
+        (reftex-parse-from-file): Interpret appendix.
         (reftex-section-info): Use changed version of reftex-section-number.
-        (reftex-where-am-I): Interprete appendix match.
+        (reftex-where-am-I): Interpret appendix match.
         (reftex-init-section-numbers): New arg: appendix.
         (reftex-section-number): Treat appendix enumeration.
         (reftex-toc-external): Improved message.
@@ -11240,7 +11240,7 @@
         (reftex-cite-comment-format): New variable.
         (reftex-cite-punctuation): New variable.
         (reftex-make-master-buffer): Changed name of master buffer,
-        removed interactive.  Runs a hook on the buffer.  Interprete
+        removed interactive.  Runs a hook on the buffer.  Interpret
         TEXINPUTS environment variable.  Allow naked argument for \input.
         Master buffer is now in fundamental mode.
         (reftex-access-scan-info): Name of master buffer changed.
@@ -11264,9 +11264,9 @@
         (reftex-allow-for-ctrl-m): New function.
         (reftex-label-info-update): Allow more general label commands.
         (reftex-label-info): New parameter derive.
-        (reftex-short-context): Interprete integer parse as nth arg of macro.
+        (reftex-short-context): Interpret integer parse as nth arg of macro.
         (reftex-nth-parens-substring): New function.
-        (reftex-select-item): Interprete the new 'cnt text property.
+        (reftex-select-item): Interpret the new 'cnt text property.
         (reftex-pop-to-label): Allow more general label commands.
         (reftex-nicify-text): Allow more general label commands.
         (reftex-toc): Remember previous window configuration.  Use text
@@ -21766,9 +21766,9 @@
 
         * f90.el (f90-no-block-limit): Fixed bug for indentation of
         elsewhere and elseif.
-        (f90-looking-at-where-or-forall): Now allows for labelled forall
+        (f90-looking-at-where-or-forall): Now allows for labeled forall
         and where statements.
-        (f90-font-lock-keywords-2): New highlighting for labelled where
+        (f90-font-lock-keywords-2): New highlighting for labeled where
         and forall.  Fixed small bug with else highlighting.
         (f90-fill-region): Moved indentation to f90-break-line.
         (f90-break-line): Will now always indent the second line.
@@ -22110,7 +22110,7 @@
 1996-09-27  Jacques Duthen  <duthen@cegelec-red.fr>
 
         * ps-print.el
-        (ps-print-prologue-1): Fix bug in postscript comment lines.
+        (ps-print-prologue-1): Fix bug in PostScript comment lines.
         (ps-nb-pages): Call ps-setup _before_ switching to the other
         buffer, because of buffer variables.
 
@@ -22123,7 +22123,7 @@
         (ps-page-height-i, ps-page-width-i): Variables deleted.
         (ps-print-prologue): Variable deleted.
         (ps-print-prologue-1, ps-print-prologue-2): New variables.
-        Major rewrite of the postscript code to handle landscape mode,
+        Major rewrite of the PostScript code to handle landscape mode,
         multiple columns and new font management.
         (ps-landscape-mode, ps-number-of-columns, ps-inter-column): New
         variables.
@@ -22136,7 +22136,7 @@
         (ps-header-font, ps-landscape-page-height): New internal variables.
         (ps-top-margin): Change its semantics.  It is now really the top
         margin, not anymore twice the top margin.
-        (/ReportAllFontInfo): New postscript function to get all the font
+        (/ReportAllFontInfo): New PostScript function to get all the font
         families of the printer.
         (ps-setup): New function.
         (ps-line-lengths, ps-nb-pages-buffer, ps-nb-pages-region): New
@@ -23123,4 +23123,3 @@ See ChangeLog.6 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 ada6d98ce3d..dea5137d246 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -434,7 +434,7 @@
         for Emacs 20.4 and the earlier versions.
         (ps-mule-init-external-library): Just require a feature for
         external libraries.
-        (ps-mule-prologue): Postscript code modified for new composition.
+        (ps-mule-prologue): PostScript code modified for new composition.
         (ps-mule-find-wrappoint): New arg COMPOSITION.
         (ps-mule-plot-string): Delete code for composite characters.
         (ps-mule-plot-composition): New function.
@@ -447,7 +447,7 @@
         (ps-mule-plot-rule-cmpchar, ps-mule-plot-cmpchar,
         ps-mule-prepare-cmpchar-font): Deleted.
         (ps-mule-string-encoding): New arg NO-SETFONT.
-        (ps-mule-bitmap-prologue): In Postscript code of BuildGlyphCommon,
+        (ps-mule-bitmap-prologue): In PostScript code of BuildGlyphCommon,
         check Composing, not Cmpchar.
         (ps-mule-initialize): Set ps-mule-composition-prologue-generated
         to nil.
@@ -3475,8 +3475,8 @@
         (reftex-process-string): Preserve default directory.
         (reftex-label-alist-builtin): Changed prefixes of endnote and footnote.
         Also the magic words.
-        (reftex-reference): Interprete new option `reftex-fref-is-default'.
-        (reftex-replace-prefix-escapes): Interprete new `%S' format.
+        (reftex-reference): Interpret new option `reftex-fref-is-default'.
+        (reftex-replace-prefix-escapes): Interpret new `%S' format.
         (reftex-toc-mouse-view-line): Command removed (had no binding).
         (reftex-everything-regexp): New function.
         (reftex-nearest-match): Made better.
@@ -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.
@@ -8317,7 +8317,7 @@
 1998-11-11  Sam Steingold  <sds@goems.com>
 
         * inf-lisp.el (switch-to-lisp): If no inferior lisp present, call
-        `run-lisp' instead of signalling an error.
+        `run-lisp' instead of signaling an error.
 
 1998-11-11  Karl Heuer  <kwzh@gnu.org>
 
@@ -9750,11 +9750,11 @@
         * international/mule.el (charset-description): Doc fix.
 
         * language/chinese.el, language/cyrillic.el, language/czech.el,
-        language/devanagari.el, language/ethiopic.el,
-        language/european.el, language/hebrew.el, language/indian.el,
-        language/japanese.el, language/korean.el, language/lao.el,
-        language/slovak.el, language/thai.el, language/tibetan.el,
-        language/vietnamese.el:
+        * language/devanagari.el, language/ethiopic.el,
+        * language/european.el, language/hebrew.el, language/indian.el,
+        * language/japanese.el, language/korean.el, language/lao.el,
+        * language/slovak.el, language/thai.el, language/tibetan.el,
+        * language/vietnamese.el:
         Add coding: local variable, to avoid bootstrapping problem
         if you need to recompile all the Lisp files using interpreted code.
 
@@ -10009,4 +10009,3 @@ See ChangeLog.7 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.9 b/lisp/ChangeLog.9
index edfe26fbc03..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>
 
@@ -135,7 +135,7 @@
 
         * net/ange-ftp.el (ange-ftp-raw-send-cmd, ange-ftp-wait-not-busy):
         Use with-current-buffer.
-        (ange-ftp-cd): New arg `noerror' to prevent signalling an error.
+        (ange-ftp-cd): New arg `noerror' to prevent signaling an error.
         (ange-ftp-send-cmd): If a `cd' is used (because of a space in the
         filename), catch any error that occurs in `ange-ftp-cd'.
         If an error happened, don't bother sending `cmd' at all.
@@ -1754,7 +1754,7 @@
         number, column number and buffer-percent part of the mode-line.
 
         * image.el (image-type-regexps): Allow whitespace at the start
-        of the image data for XPM, XBM and Postscript, which are
+        of the image data for XPM, XBM and PostScript, which are
         text files.
         (image-jpeg-p): Correct calculation of next field offset.
 
@@ -2030,7 +2030,7 @@
         Do not bind locally the uniquify-possibly-resolvable flag.  Use the
         cached proposed name is possible.
         (uniquify-get-proposed-name): Arguments changed, callers changed.
-        (uniquify-rationalize-conflicting-sublist): Explicitely reset the
+        (uniquify-rationalize-conflicting-sublist): Explicitly reset the
         uniquify-possibly-resolvable flag, which is no more bound locally.
         (uniquify-rename-buffer): Do not set the old unrationalised-buffer
         flag, which does not exist any more.
@@ -5955,7 +5955,7 @@
 2001-01-29  Gerd Moellmann  <gerd@gnu.org>
 
         * menu-bar.el (menu-bar-files-menu): Add menu items for
-        Postscript printing in black and white.
+        PostScript printing in black and white.
 
         * mail/rmail.el (rmail-ignored-headers): Add X-Sign, X-BeenThere,
         X-Mailman-Version, Precedence, List-Help, List-Post,
@@ -10569,7 +10569,7 @@
 2000-10-10  Dave Love  <fx@gnu.org>
 
         * toolbar/tool-bar.el (tool-bar-add-item)
-        (tool-bar-add-item-from-menu): Don't favour XPM icons on mono display.
+        (tool-bar-add-item-from-menu): Don't favor XPM icons on mono display.
 
         * toolbar/attach.pbm, toolbar/cancel.pbm, toolbar/close.pbm:
         * toolbar/copy.pbm, toolbar/cut.pbm, toolbar/exit.pbm:
@@ -12638,7 +12638,7 @@
         (vc-rcs-diff): Only pass `2' to vc-do-command if necessary and
         just do a recursive call if we need to retry.
         (vc-rcs-checkout): Handle the case where rcs is missing by making
-        the buffer read-write if requested and re-signalling the error.
+        the buffer read-write if requested and re-signaling the error.
 
         * vc-cvs.el (vc-cvs-diff): Remove unused and unsupported argument CMP.
 
@@ -14191,7 +14191,7 @@
 
         * international/ja-dic-cnv.el: Renamed from skkdic-cnv.el.
         Provide ja-dic-cnv instead of skkdic-cnv.
-        (ja-dic-filename): Renamed from skkdic-filename.  Referers changed.
+        (ja-dic-filename): Renamed from skkdic-filename.  Referrers changed.
         (iso-2022-7bit-short): Add safe-charsets property.
         (skkdic-convert-postfix): Search Japanese chou-on character in
         addition to Hiragana character.
@@ -17396,7 +17396,7 @@
 
 2000-05-25  Kenichi Handa  <handa@etl.go.jp>
 
-        * international/mule-conf.el: Specify CHARSET-ID explicitely for
+        * international/mule-conf.el: Specify CHARSET-ID explicitly for
         private charsets.
         (mule-unicode-0100-24ff, japanese-jisx0213-1,
         japanese-jisx0213-2): New charsets.
@@ -20709,4 +20709,3 @@ See ChangeLog.8 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/allout-widgets.el b/lisp/allout-widgets.el
index 162da1f4815..dfd9adad2a7 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -1,14 +1,13 @@
 ;; allout-widgets.el --- Visually highlight allout outline structure.
 
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ken Manheimer
+;; Copyright (C) 2005-2011 Free Software Foundation, Inc.
 
-;; Author: Ken Manheimer <ken dot manheimer at gmail dot com>
-;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com>
+;; Author: Ken Manheimer <ken dot manheimer at gmail...>
+;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
 ;; Version: 1.0
 ;; Created: Dec 2005
-;; Version: 1.0
 ;; Keywords: outlines
-;; Website: http://myriadicity.net/Sundry/EmacsAllout
+;; Website: http://myriadicity.net/software-and-systems/craft/emacs-allout
 
 ;;; Commentary:
 
@@ -50,7 +49,7 @@
 ;; systematically couple overlays, graphics, and other features with
 ;; allout-governed text.
 
-;;;_: Code (structured with comments that delinieate an allout outline)
+;;;_: Code (structured with comments that delineate an allout outline)
 
 ;;;_ : General Environment
 (require 'allout)
@@ -811,7 +810,7 @@ Optional RECURSING is for internal use, to limit recursion."
                       (forward-char -1)))))))
 
     (error
-     ;; zero work list so we don't get stuck futily retrying.
+     ;; zero work list so we don't get stuck futilely retrying.
      ;; error recording done by allout-widgets-hook-error-handler.
      (setq allout-widgets-changes-record nil))))
 ;;;_   , major change handlers:
@@ -1245,7 +1244,7 @@ Optional FROM-DEPTH is for internal use."
 (defun allout-range-overlaps (from to ranges)
   "Return a pair indicating overlap of FROM and TO subtree range in RANGES.
 
-First element of result indicates whether candadate range FROM, TO
+First element of result indicates whether candidate range FROM, TO
 overlapped any of the existing ranges.
 
 Second element of result is a new version of RANGES incorporating the
@@ -1465,7 +1464,7 @@ recursive operation."
 
   :from           nil                   ; item beginning - marker
   :to             nil                   ; item end - marker
-  :span-overlay   nil   ; overlay by which actual postion is determined
+  :span-overlay   nil   ; overlay by which actual position is determined
 
   ;; also serves as guide-end:
   :icon-start     nil
@@ -1624,7 +1623,7 @@ We return the item-widget corresponding to the item at point."
 
       (set-buffer-modified-p was-modified)
       (goto-char steady-point)
-      ;; must null the marker or the buffer gets clogged with impedence:
+      ;; must null the marker or the buffer gets clogged with impedance:
       (set-marker steady-point nil)
 
       item-widget)))
@@ -1632,7 +1631,7 @@ We return the item-widget corresponding to the item at point."
 (defun allout-redecorate-item (item-widget)
   "Resituate ITEM-WIDGET decorations, disregarding context.
 
-Use this to redecorate only the item, when you know that it's
+Use this to redecorate only the item, when you know that its
 situation with respect to siblings, parent, and offspring is
 unchanged from its last decoration.  Use
 `allout-decorate-item-and-context' instead to reassess and adjust
diff --git a/lisp/allout.el b/lisp/allout.el
index 18cc3c80dc6..a08aa05d581 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -2,12 +2,12 @@
 
 ;; Copyright (C) 1992-1994, 2001-2011  Free Software Foundation, Inc.
 
-;; Author: Ken Manheimer <ken dot manheimer at gmail dot com>
-;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com>
+;; Author: Ken Manheimer <ken dot manheimer at gmail...>
+;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
 ;; Created: Dec 1991 -- first release to usenet
 ;; Version: 2.3
 ;; Keywords: outlines, wp, languages, PGP, GnuPG
-;; Website: http://myriadicity.net/Sundry/EmacsAllout
+;; Website: http://myriadicity.net/software-and-systems/craft/emacs-allout
 
 ;; This file is part of GNU Emacs.
 
@@ -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,
@@ -1537,14 +1537,14 @@ Entries must be symbols that are bound to the desired values.
 Each value can be a regexp or a list with a regexp followed by a
 substitution string.  If it's just a regexp, all its matches are removed
 before the text is encrypted.  If it's a regexp and a substitution, the
-substition is used against the regexp matches, a la `replace-match'.")
+substitution is used against the regexp matches, a la `replace-match'.")
 (make-variable-buffer-local 'allout-encryption-text-removal-regexps)
 ;;;_   = allout-encryption-ciphertext-rejection-regexps
 (defvar allout-encryption-ciphertext-rejection-regexps nil
   "Variable for regexps matching plaintext to remove before encryption.
 
 This is used to detect strings in encryption results that would
-register as allout mode structural elements, for exmple, as a
+register as allout mode structural elements, for example, as a
 topic prefix.
 
 Entries must be symbols that are bound to the desired regexp values.
@@ -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
@@ -2525,7 +2525,7 @@ Outermost is first."
 (defun allout-mark-active-p ()
   "True if the mark is currently or always active."
   ;; `(cond (boundp...))' (or `(if ...)') invokes special byte-compiler
-  ;; provisions, at least in fsf emacs to prevent warnings about lack of,
+  ;; provisions, at least in GNU Emacs to prevent warnings about lack of,
   ;; eg, region-active-p.
   (cond ((boundp 'mark-active)
          mark-active)
@@ -3543,7 +3543,7 @@ PRIOR-BULLET.)
 Fifth arg, NUMBER-CONTROL, matters only if `allout-numbered-bullet'
 is non-nil *and* no specific INSTEAD was specified.  Then
 NUMBER-CONTROL non-nil forces prefix to either numbered or
-denumbered format, depending on the value of the sixth arg, INDEX.
+unnumbered format, depending on the value of the sixth arg, INDEX.
 
 \(Note that NUMBER-CONTROL does *not* apply to level 1 topics.  Sorry...)
 
@@ -3557,7 +3557,7 @@ number is used as the index for the numbered prefix (allowing, eg,
 sequential renumbering to not require this function counting back the
 index for each successive sibling)."
 ;;;_    . Code:
-  ;; The options are ordered in likely frequence of use, most common
+  ;; The options are ordered in likely frequency of use, most common
   ;; highest, least lowest.  Ie, more likely to be doing prefix
   ;; adjustments than soliciting, and yet more than numbering.
   ;; Current prefix is least dominant, but most likely to be commonly
@@ -3807,7 +3807,7 @@ Nuances:
             ;;(if doing-beginning (goto-char doing-beginning))
             (if (not (bobp))
                 ;; We insert a newline char rather than using open-line to
-                ;; avoid rear-stickiness inheritence of read-only property.
+                ;; avoid rear-stickiness inheritance of read-only property.
                 (progn (if (and (not (> depth ref-depth))
                                 (not before))
                            (open-line 1)
@@ -3822,7 +3822,7 @@ Nuances:
                        (if (and (not (eobp))
                                 (or (not (bolp))
                                     (and (not (bobp))
-                                         ;; bolp doesnt detect concealed
+                                         ;; bolp doesn't detect concealed
                                          ;; trailing newlines, compensate:
                                          (save-excursion
                                            (forward-char -1)
@@ -5473,7 +5473,7 @@ header and body.  The elements of that list are:
                                      "invalid format" format))))
                  (list depth prefix strings))
                     result))
-        ;; Reasses format, if any:
+        ;; Reassess format, if any:
         (if (and format (listp format))
             (cond ((= new-depth depth)
                    (setq format (cons (1+ (car format))
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index ff7edf40dcb..4d6f02a40b7 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -68,7 +68,7 @@
 ;;
 ;; Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> for pointing me to ECMA-48.
 ;;
-;; Stefan Monnier <foo@acm.com> explaing obscure font-lock stuff and
+;; Stefan Monnier <foo@acm.com> for explaining obscure font-lock stuff and for
 ;; code suggestions.
 
 
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 1dfe5cde9ed..9a372f27991 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -1052,7 +1052,7 @@ If non-nil TEXT is a string that will be printed as a heading."
                        ;; omitting any that contain a buffer or a frame.
                        ;; FIXME: Why omit keys that contain buffers and
                        ;; frames?  This looks like a bad workaround rather
-                       ;; than a proper fix.  Does anybod know what problem
+                       ;; than a proper fix.  Does anybody know what problem
                        ;; this is trying to address?  --Stef
                        (dolist (key keys)
                          (let ((i 0)
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index e3d1955ded5..48b4c5be164 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -4,7 +4,7 @@
 
 ;; Author: Morten Welinder <terra@gnu.org>
 ;; Keywords: files archives msdog editing major-mode
-;; Favourite-brand-of-beer: None, I hate beer.
+;; Favorite-brand-of-beer: None, I hate beer.
 
 ;; This file is part of GNU Emacs.
 
@@ -75,7 +75,7 @@
 ;;
 ;; LZH         A series of (header,file).  Headers are checksummed.  No
 ;;             interaction among members.
-;;             Headers come in three flavours called level 0, 1 and 2 headers.
+;;             Headers come in three flavors called level 0, 1 and 2 headers.
 ;;             Level 2 header is free of DOS specific restrictions and most
 ;;             prevalently used.  Also level 1 and 2 headers consist of base
 ;;             and extension headers.  For more details see
@@ -1036,7 +1036,7 @@ using `make-temp-file', and the generated name is returned."
           (setq archive-file-name-coding-system file-name-coding)
           (if (and
                (null
-                (let (;; We may have to encode file name arguement for
+                (let (;; We may have to encode the file name argument for
                       ;; external programs.
                       (coding-system-for-write
                        (and enable-multibyte-characters
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/bs.el b/lisp/bs.el
index 0c32c8b4f19..2a31b05a31f 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -25,7 +25,7 @@
 ;; Version: 1.17
 ;; X-URL: http://www.geekware.de/software/emacs
 ;;
-;; The bs-package contains a main function bs-show for poping up a
+;; The bs-package contains a main function bs-show for popping up a
 ;; buffer in a way similar to `list-buffers' and `electric-buffer-list':
 ;; The new buffer offers a Buffer Selection Menu for manipulating
 ;; the buffer list and buffers.
diff --git a/lisp/button.el b/lisp/button.el
index 6ef79532ae7..262a19c1806 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -42,7 +42,7 @@
 ;; button face may not be visible.  Using overlays avoids this.
 ;;
 ;; Using `define-button-type' to define default properties for buttons
-;; is not necessary, but it is is encouraged, since doing so makes the
+;; is not necessary, but it is encouraged, since doing so makes the
 ;; resulting code clearer and more efficient.
 ;;
 
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-embed.el b/lisp/calc/calc-embed.el
index f011d187a42..f1f79252857 100644
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -125,7 +125,7 @@
   "The mode settings for Calc buffer when put in embedded mode.")
 
 (defun calc-embedded-save-original-modes ()
-  "Save the current Calc modes when entereding embedded mode."
+  "Save the current Calc modes when entering embedded mode."
   (let ((calcbuf (save-excursion
                    (calc-create-buffer)
                    (current-buffer)))
@@ -144,7 +144,7 @@
               (let ((var (cdr (car v))))
                 (unless (memq var '(the-language the-display-just))
                   (setq modes
-                        (cons (cons var (symbol-value var)) 
+                        (cons (cons var (symbol-value var))
                               modes))))
               (setq v (cdr v))))
           (setq calc-embedded-original-modes (cons lang modes)))
@@ -182,7 +182,7 @@
             (calc-set-mode-line))))
     (setq calc-embedded-original-modes nil)))
 
-;; The variables calc-embed-outer-top, calc-embed-outer-bot, 
+;; The variables calc-embed-outer-top, calc-embed-outer-bot,
 ;; calc-embed-top and calc-embed-bot are
 ;; local to calc-do-embedded, calc-embedded-mark-formula,
 ;; calc-embedded-duplicate, calc-embedded-new-formula and
@@ -195,7 +195,7 @@
 
 ;; The variable calc-embed-arg is local to calc-do-embedded,
 ;; calc-embedded-update-formula, calc-embedded-edit and
-;; calc-do-embedded-activate, but is used by 
+;; calc-do-embedded-activate, but is used by
 ;; calc-embedded-make-info, which is called by the above
 ;; functions.
 (defvar calc-embed-arg)
@@ -208,14 +208,14 @@
 
 ;; The following is to take care of any minor modes which override
 ;; a Calc command.
-(defvar calc-override-minor-modes-map 
+(defvar calc-override-minor-modes-map
   (make-sparse-keymap)
   "A list of keybindings that might be overwritten by minor modes.")
 
 ;; Add any keys that might be overwritten here.
 (define-key calc-override-minor-modes-map "`" 'calc-edit)
 
-(defvar calc-override-minor-modes 
+(defvar calc-override-minor-modes
   (cons t calc-override-minor-modes-map))
 
 (defun calc-do-embedded (calc-embed-arg end obeg oend)
@@ -279,7 +279,7 @@
       (calc-embedded-save-original-modes)
       (or calc-embedded-globals
           (calc-find-globals))
-      (setq info 
+      (setq info
             (calc-embedded-make-info (point) nil t calc-embed-arg end obeg oend))
       (if (eq (car-safe (aref info 8)) 'error)
           (progn
@@ -564,7 +564,7 @@ The command \\[yank] can retrieve it from there."
     (goto-char calc-embed-outer-bot)
     (insert "\n")
     (setq new-top (point))
-    (insert-buffer-substring (current-buffer) 
+    (insert-buffer-substring (current-buffer)
                              calc-embed-outer-top calc-embed-outer-bot)
     (goto-char (+ new-top (- calc-embed-top calc-embed-outer-top)))
     (let ((calc-embedded-quiet (if already t 'x)))
@@ -659,7 +659,7 @@ The command \\[yank] can retrieve it from there."
             (equal (symbol-value (car (car v))) value))
           (progn
             (setq changed t)
-            (if temp (setq calc-embed-prev-modes 
+            (if temp (setq calc-embed-prev-modes
                            (cons (cons (car (car v))
                                        (symbol-value (car (car v))))
                                  calc-embed-prev-modes)))
@@ -809,12 +809,12 @@ The command \\[yank] can retrieve it from there."
     (list modes emodes pmodes)))
 
 ;; The variable calc-embed-vars-used is local to calc-embedded-make-info,
-;; calc-embedded-evaluate-expr and calc-embedded-update, but is 
+;; calc-embedded-evaluate-expr and calc-embedded-update, but is
 ;; used by calc-embedded-find-vars, which is called by the above functions.
 (defvar calc-embed-vars-used)
 
 (defun calc-embedded-make-info (point cbuf fresh &optional
-                                      calc-embed-top calc-embed-bot 
+                                      calc-embed-top calc-embed-bot
                                       calc-embed-outer-top calc-embed-outer-bot)
   (let* ((bufentry (assq (current-buffer) calc-embedded-active))
          (found bufentry)
@@ -831,7 +831,7 @@ The command \\[yank] can retrieve it from there."
                (newform (assoc major-mode calc-embedded-open-close-formula-alist))
                (newword (assoc major-mode calc-embedded-word-regexp-alist))
                (newplain (assoc major-mode calc-embedded-open-close-plain-alist))
-               (newnewform 
+               (newnewform
                 (assoc major-mode calc-embedded-open-close-new-formula-alist))
                (newmode (assoc major-mode calc-embedded-open-close-mode-alist)))
            (when newann
@@ -874,9 +874,9 @@ The command \\[yank] can retrieve it from there."
       (aset info 1 (or cbuf (save-excursion
                               (calc-create-buffer)
                               (current-buffer)))))
-    (if (and 
+    (if (and
          (or (integerp calc-embed-top) (equal calc-embed-top '(4)))
-         (not calc-embed-bot))  
+         (not calc-embed-bot))
                                         ; started with a user-supplied argument
         (progn
           (if (equal calc-embed-top '(4))
@@ -1157,7 +1157,7 @@ The command \\[yank] can retrieve it from there."
                (if need-display
                    (calc-embedded-set-justify (cdr (car calc-embed-prev-modes)))))
               (t
-               (set (car (car calc-embed-prev-modes)) 
+               (set (car (car calc-embed-prev-modes))
                     (cdr (car calc-embed-prev-modes)))))
         (setq calc-embed-prev-modes (cdr calc-embed-prev-modes))))))
 
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 8b816665d97..5429509af86 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -432,7 +432,7 @@
   (define-key calc-mode-map "ls" 'calc-spn)
   (define-key calc-mode-map "lm" 'calc-midi)
   (define-key calc-mode-map "lf" 'calc-freq)
-  
+
   (define-key calc-mode-map "l?" 'calc-l-prefix-help)
 
   (define-key calc-mode-map "m" nil)
@@ -2867,7 +2867,7 @@ If X is not an error form, return 1."
            (memq (nth 2 expr) '(var-inf var-uinf var-nan)))))
 
 ;; The variable math-integral-cache is originally declared in calcalg2.el,
-;; but is set by math-defintegral and math-definitegral2.
+;; but is set by math-defintegral and math-defintegral-2.
 (defvar math-integral-cache)
 
 (defmacro math-defintegral (funcs &rest code)
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 427cf6ba233..66e9c002a47 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -683,7 +683,7 @@ C-w  Describe how there is no warranty for Calc."
   (calc-do-prefix-help
    '("Pack, Unpack, Identity, Diagonal, indeX, Build"
      "Row, Column, Subvector; Length; Find; Mask, Expand"
-     "Tranpose, Arrange, reVerse; Head, Kons; rNorm"
+     "Transpose, Arrange, reVerse; Head, Kons; rNorm"
      "SHIFT + Det, & (inverse), LUD, Trace, conJtrn, Cross"
      "SHIFT + Sort, Grade, Histogram; cNorm"
      "SHIFT + Apply, Map, Reduce, accUm, Inner-, Outer-prod"
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index db86c08422e..6d034927ae0 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -260,13 +260,13 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C).
                                                       (length msg)) 32)
                                       "  [?=MORE]")
                             ""))))))))
-  
+
 
 
 
 ;;;; Stack and buffer management.
 
-;; The variable calc-last-why-command is set in calc-do-handly-whys
+;; The variable calc-last-why-command is set in calc-do-handle-whys
 ;; and used in calc-why (in calc-stuff.el).
 (defvar calc-last-why-command)
 
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/calc/calc-units.el b/lisp/calc/calc-units.el
index 43cb5828e85..86e8cbbc73a 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -1598,7 +1598,7 @@ In symbolic mode, return the list (^ a b)."
                    (or (math-lessp acoeff bcoeff)
                        (math-equal acoeff bcoeff)))
               (calc-record-why "*Improper coefficients" nil)
-            (math-mul 
+            (math-mul
              (if (equal aunit '(var dB var-dB))
                  (let ((coef (if power 10 20)))
                    (math-mul coef
@@ -1681,7 +1681,7 @@ In symbolic mode, return the list (^ a b)."
           (math-simplify
            (math-mul
             (math-add
-             coef 
+             coef
              (math-mul (if power 10 20)
                        (math-conditional-apply 'calcFunc-log10 number)))
             units)))
@@ -1689,7 +1689,7 @@ In symbolic mode, return the list (^ a b)."
           (math-simplify
            (math-mul
             (math-add
-             coef 
+             coef
              (math-div (math-conditional-apply 'calcFunc-ln number) (if power 2 1)))
             units))))
       (calc-record-why "*Improper units" nil))))
@@ -1707,7 +1707,7 @@ In symbolic mode, return the list (^ a b)."
             (math-simplify
              (math-mul
               (math-sub
-               coef 
+               coef
                (math-mul (if power 10 20)
                          (math-conditional-apply 'calcFunc-log10 b)))
               units)))
@@ -1715,7 +1715,7 @@ In symbolic mode, return the list (^ a b)."
           (math-simplify
            (math-mul
             (math-sub
-             coef 
+             coef
              (math-div (math-conditional-apply 'calcFunc-ln b) (if power 2 1)))
             units)))))))))
 
@@ -1762,17 +1762,17 @@ In symbolic mode, return the list (^ a b)."
             (coeff (math-simplify (math-div val units))))
         (math-mul
          (if (equal lunit '(var dB var-dB))
-             (math-mul 
+             (math-mul
               ref
-              (math-conditional-pow 
+              (math-conditional-pow
                10
                (math-div
                 coeff
                 (if power 10 20))))
-           (math-mul 
+           (math-mul
             ref
             (math-conditional-apply 'calcFunc-exp
-             (if power 
+             (if power
                  (math-mul 2 coeff)
                coeff))))
          runits)))))
@@ -1869,7 +1869,7 @@ In symbolic mode, return the list (^ a b)."
   (let* ((n (math-round num))
          (diff (math-abs
                 (math-sub num n))))
-    (if (< (math-compare diff 
+    (if (< (math-compare diff
                          (math-div (math-read-expr calc-note-threshold) 100)) 0)
         n
       num)))
@@ -1927,10 +1927,10 @@ If non-nil, return a list consisting of the note and the cents coefficient."
        (assoc (nth 1 note) math-notes)
        (integerp (nth 2 note))
        (setq rnote note)
-       (or 
+       (or
         (not cents)
         (Math-numberp (setq rcents
-                            (math-simplify 
+                            (math-simplify
                              (math-div cents '(var cents var-cents)))))))
       (list rnote rcents))
      ((and  ;; CENTS is a note, NOTE is cents.
@@ -1938,10 +1938,10 @@ If non-nil, return a list consisting of the note and the cents coefficient."
        (assoc (nth 1 cents) math-notes)
        (integerp (nth 2 cents))
        (setq rnote cents)
-       (or 
+       (or
         (not note)
         (Math-numberp (setq rcents
-                            (math-simplify 
+                            (math-simplify
                              (math-div note '(var cents var-cents)))))))
       (list rnote rcents)))))
 
@@ -1972,7 +1972,7 @@ If non-nil, return a list consisting of the note and the cents coefficient."
   "Return the scientific pitch notation corresponding to midi number MIDI."
   (let (midin cents)
     (if (math-integerp midi)
-        (setq midin midi 
+        (setq midin midi
               cents nil)
       (setq midin (math-floor midi)
             cents (math-mul 100 (math-sub midi midin))))
@@ -1989,7 +1989,7 @@ If non-nil, return a list consisting of the note and the cents coefficient."
            (n (math-sub (car nr) 1))
            (note (car (rassoc (cdr nr) math-notes))))
       (if cents
-          (list '+ (list 'calcFunc-subscr note n) 
+          (list '+ (list 'calcFunc-subscr note n)
                    (list '* cents '(var cents var-cents)))
         (list 'calcFunc-subscr note n)))))
 
@@ -2005,7 +2005,7 @@ If non-nil, return a list consisting of the note and the cents coefficient."
          440
          (math-pow
           2
-          (math-div 
+          (math-div
            (math-sub
             midi
             69)
@@ -2018,7 +2018,7 @@ If non-nil, return a list consisting of the note and the cents coefficient."
 
 (defun calcFunc-spn (expr)
   "Return EXPR written as scientific pitch notation + cents."
-  ;; Get the coeffecient of Hz
+  ;; Get the coefficient of Hz
   (let (note)
     (cond
      ((setq note (math-freqp expr))
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 55ac412b435..60a84bdff35 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -124,7 +124,7 @@
 ;;      target integral is not complete (and the time limit has not run out)
 ;;      choose an incomplete integral from the cache and, for every integral
 ;;      appearing in its RHS's, add those integrals to the cache using the
-;;      same substitition, parts, etc. rules.  The cache should be organized
+;;      same substitution, parts, etc. rules.  The cache should be organized
 ;;      as a priority queue, choosing the "simplest" incomplete integral at
 ;;      each step, or choosing randomly among equally simple integrals.
 ;;      Simplicity equals small size, and few steps removed from the original
@@ -428,7 +428,7 @@ in normal mode."
   nil
   "If non-nil, use a separate face to indicate selected sub-formulas.
 If `calc-show-selections' is non-nil, then selected sub-formulas are shown
-by displaying the rest of the formula in `calc-nonselected-face'.  
+by displaying the rest of the formula in `calc-nonselected-face'.
 If `calc-show-selections' is nil, then selected sub-formulas are shown
 by displaying the sub-formula in `calc-selected-face'."
   :group 'calc
@@ -446,14 +446,14 @@ by displaying the sub-formula in `calc-selected-face'."
   :group 'calc
   :type '(string))
 
-(defcustom calc-note-threshold "1" 
+(defcustom calc-note-threshold "1"
   "The number of cents that a frequency should be near a note
 to be identified as that note."
   :type 'string
   :group 'calc)
 
 (defface calc-nonselected-face
-  '((t :inherit shadow       
+  '((t :inherit shadow
        :slant italic))
   "Face used to show the non-selected portion of a formula."
   :group 'calc)
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/icalendar.el b/lisp/calendar/icalendar.el
index 3ffd55db18d..62bea11e82e 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -112,7 +112,7 @@
 ;; Customizables
 ;; ======================================================================
 (defgroup icalendar nil
-  "Icalendar support."
+  "iCalendar support."
   :prefix "icalendar-"
   :group 'calendar)
 
@@ -234,7 +234,7 @@ code for the event, and your personal domain name."
   "Enable icalendar debug messages.")
 
 ;; ======================================================================
-;; NO USER SERVICABLE PARTS BELOW THIS LINE
+;; NO USER SERVICEABLE PARTS BELOW THIS LINE
 ;; ======================================================================
 
 (defconst icalendar--weekday-array ["SU" "MO" "TU" "WE" "TH" "FR" "SA"])
@@ -474,9 +474,9 @@ The strings are suitable for assembling into a TZ variable."
                     (week (if (eq day -1)
                               byday
                             (substring byday 0 -2))))
-               ;; "Translate" the icalendar way to specify the last
+               ;; "Translate" the iCalendar way to specify the last
                ;; (sun|mon|...)day in month to the tzset way.
-               (if (string= week "-1")  ; last day as icalendar calls it
+               (if (string= week "-1")  ; last day as iCalendar calls it
                    (setq week "5"))     ; last day as tzset calls it
                (concat "M" bymonth "." week "." (if (eq day -1) "0"
                                                   (int-to-string day))
@@ -907,7 +907,7 @@ would be \"pm\"."
                                               "\\\\," "," string)))))
 
 ;; ======================================================================
-;; Export -- convert emacs-diary to icalendar
+;; Export -- convert emacs-diary to iCalendar
 ;; ======================================================================
 
 ;;;###autoload
@@ -915,7 +915,7 @@ would be \"pm\"."
   "Export diary file to iCalendar format.
 All diary entries in the file DIARY-FILENAME are converted to iCalendar
 format.  The result is appended to the file ICAL-FILENAME."
-  (interactive "FExport diary data from file: 
+  (interactive "FExport diary data from file:
 Finto iCalendar file: ")
   (save-current-buffer
     (set-buffer (find-file diary-filename))
@@ -1063,7 +1063,7 @@ FExport diary data into iCalendar file: ")
     found-error))
 
 (defun icalendar--convert-to-ical (nonmarker entry-main)
-  "Convert a diary entry to icalendar format.
+  "Convert a diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (or
@@ -1194,7 +1194,7 @@ Returns an alist."
 
 ;; subroutines for icalendar-export-region
 (defun icalendar--convert-ordinary-to-ical (nonmarker entry-main)
-  "Convert \"ordinary\" diary entry to icalendar format.
+  "Convert \"ordinary\" diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match
@@ -1291,7 +1291,7 @@ Returns day number."
     result))
 
 (defun icalendar--convert-weekly-to-ical (nonmarker entry-main)
-  "Convert weekly diary entry to icalendar format.
+  "Convert weekly diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (and (string-match (concat nonmarker
@@ -1373,7 +1373,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
     nil))
 
 (defun icalendar--convert-yearly-to-ical (nonmarker entry-main)
-  "Convert yearly diary entry to icalendar format.
+  "Convert yearly diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
@@ -1453,7 +1453,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
     nil))
 
 (defun icalendar--convert-sexp-to-ical (nonmarker entry-main)
-  "Convert complex sexp diary entry to icalendar format -- unsupported!
+  "Convert complex sexp diary entry to iCalendar format -- unsupported!
 
 FIXME!
 
@@ -1480,7 +1480,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
          nil)))
 
 (defun icalendar--convert-block-to-ical (nonmarker entry-main)
-  "Convert block diary entry to icalendar format.
+  "Convert block diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
@@ -1556,10 +1556,10 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
     nil))
 
 (defun icalendar--convert-float-to-ical (nonmarker entry-main)
-  "Convert float diary entry to icalendar format -- partially unsupported!
-  
+  "Convert float diary entry to iCalendar format -- partially unsupported!
+
   FIXME! DAY from diary-float yet unimplemented.
-  
+
   NONMARKER is a regular expression matching the start of non-marking
   entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker "%%\\((diary-float .+\\) ?$") entry-main)
@@ -1619,7 +1619,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
     nil))
 
 (defun icalendar--convert-date-to-ical (nonmarker entry-main)
-  "Convert `diary-date' diary entry to icalendar format -- unsupported!
+  "Convert `diary-date' diary entry to iCalendar format -- unsupported!
 
 FIXME!
 
@@ -1635,7 +1635,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
     nil))
 
 (defun icalendar--convert-cyclic-to-ical (nonmarker entry-main)
-  "Convert `diary-cyclic' diary entry to icalendar format.
+  "Convert `diary-cyclic' diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
@@ -1709,7 +1709,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
     nil))
 
 (defun icalendar--convert-anniversary-to-ical (nonmarker entry-main)
-  "Convert `diary-anniversary' diary entry to icalendar format.
+  "Convert `diary-anniversary' diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
@@ -1783,7 +1783,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
     nil))
 
 ;; ======================================================================
-;; Import -- convert icalendar to emacs-diary
+;; Import -- convert iCalendar to emacs-diary
 ;; ======================================================================
 
 ;;;###autoload
@@ -1794,8 +1794,8 @@ Argument ICAL-FILENAME output iCalendar file.
 Argument DIARY-FILENAME input `diary-file'.
 Optional argument NON-MARKING determines whether events are created as
 non-marking or not."
-  (interactive "fImport iCalendar data from file: 
-Finto diary file: 
+  (interactive "fImport iCalendar data from file:
+Finto diary file:
 p")
   ;; clean up the diary file
   (save-current-buffer
@@ -1825,19 +1825,19 @@ buffer `*icalendar-errors*'."
   (interactive)
   (save-current-buffer
     ;; prepare ical
-    (message "Preparing icalendar...")
+    (message "Preparing iCalendar...")
     (set-buffer (icalendar--get-unfolded-buffer (current-buffer)))
     (goto-char (point-min))
-    (message "Preparing icalendar...done")
+    (message "Preparing iCalendar...done")
     (if (re-search-forward "^BEGIN:VCALENDAR\\s-*$" nil t)
         (let (ical-contents ical-errors)
           ;; read ical
-          (message "Reading icalendar...")
+          (message "Reading iCalendar...")
           (beginning-of-line)
           (setq ical-contents (icalendar--read-element nil nil))
-          (message "Reading icalendar...done")
+          (message "Reading iCalendar...done")
           ;; convert ical
-          (message "Converting icalendar...")
+          (message "Converting iCalendar...")
           (setq ical-errors (icalendar--convert-ical-to-diary
                              ical-contents
                              diary-file do-not-ask non-marking))
@@ -1848,11 +1848,11 @@ buffer `*icalendar-errors*'."
                 (save-current-buffer
                   (set-buffer b)
                   (save-buffer)))))
-          (message "Converting icalendar...done")
+          (message "Converting iCalendar...done")
           ;; return t if no error occurred
           (not ical-errors))
       (message
-       "Current buffer does not contain icalendar contents!")
+       "Current buffer does not contain iCalendar contents!")
       ;; return nil, i.e. import did not work
       nil)))
 
@@ -2056,12 +2056,12 @@ written into the buffer `*icalendar-errors*'."
           (set-buffer (get-buffer-create "*icalendar-errors*"))
           (erase-buffer)
           (insert error-string)))
-    (message "Converting icalendar...done")
+    (message "Converting iCalendar...done")
     found-error))
 
 ;; subroutines for importing
 (defun icalendar--convert-recurring-to-diary (e dtstart-dec start-t end-t)
-  "Convert recurring icalendar event E to diary format.
+  "Convert recurring iCalendar event E to diary format.
 
 DTSTART-DEC is the DTSTART property of E.
 START-T is the event's start time in diary format.
@@ -2274,7 +2274,7 @@ END-T is the event's end time in diary format."
     result))
 
 (defun icalendar--convert-non-recurring-all-day-to-diary (event start-d end-d)
-  "Convert non-recurring icalendar EVENT to diary format.
+  "Convert non-recurring iCalendar EVENT to diary format.
 
 DTSTART is the decoded DTSTART property of E.
 Argument START-D gives the first day.
@@ -2339,7 +2339,7 @@ the entry."
 ;; Examples
 ;; ======================================================================
 (defun icalendar-import-format-sample (event)
-  "Example function for formatting an icalendar EVENT."
+  "Example function for formatting an iCalendar EVENT."
   (format (concat "SUMMARY=`%s' DESCRIPTION=`%s' LOCATION=`%s' ORGANIZER=`%s' "
                   "STATUS=`%s' URL=`%s' CLASS=`%s'")
           (or (icalendar--get-event-property event 'SUMMARY) "")
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index 1ec474e828e..c9b8fdac613 100644
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -407,7 +407,7 @@ discover the reason."
     (if arg
         (run-hooks 'timeclock-done-hook))))
 
-;; Should today-only be removed in favour of timeclock-relative? - gm
+;; Should today-only be removed in favor of timeclock-relative? - gm
 (defsubst timeclock-workday-remaining (&optional today-only)
   "Return the number of seconds until the workday is complete.
 The amount returned is relative to the value of `timeclock-workday'.
@@ -547,7 +547,7 @@ non-nil, the amount returned will be relative to past time worked."
 
 (defalias 'timeclock-seconds-to-time 'seconds-to-time)
 
-;; Should today-only be removed in favour of timeclock-relative? - gm
+;; Should today-only be removed in favor of timeclock-relative? - gm
 (defsubst timeclock-when-to-leave (&optional today-only)
   "Return a time value representing the end of today's workday.
 If TODAY-ONLY is non-nil, the value returned will be relative only to
@@ -569,7 +569,7 @@ This string is relative to the value of `timeclock-workday'.  If
 SHOW-SECONDS is non-nil, the value printed/returned will include
 seconds.  If TODAY-ONLY is non-nil, the value returned will be
 relative only to the time worked today, and not to past time."
-  ;; Should today-only be removed in favour of timeclock-relative? - gm
+  ;; Should today-only be removed in favor of timeclock-relative? - gm
   (interactive)
   (let* ((then (timeclock-when-to-leave today-only))
          (string
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 4c59e2634ae..de232c25e3f 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -31,7 +31,7 @@
 ;;      TODO is a major mode for EMACS which offers functionality to
 ;;      treat most lines in one buffer as a list of items one has to
 ;;      do.  There are facilities to add new items, which are
-;;      categorised, to edit or even delete items from the buffer.
+;;      categorized, to edit or even delete items from the buffer.
 ;;      The buffer contents are currently compatible with the diary,
 ;;      so that the list of todo-items will show up in the FANCY diary
 ;;      mode.
@@ -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
@@ -536,7 +536,7 @@ Use `todo-categories' instead.")
     (unless (zerop (buffer-size buf))
       (and (null todo-categories)
            (null todo-cats)
-           (error "Error in %s: File is non-empty but contains no category" 
+           (error "Error in %s: File is non-empty but contains no category"
                   todo-file-do)))
     (unless cat (setq cat (read-from-minibuffer prompt)))
     (with-current-buffer buf
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 2dc345b45da..e5969a3c291 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,21 @@
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * semantic/lex.el (semantic-lex-tokens):
+        * semantic/tag-ls.el (semantic-tag-protected-p):
+        * srecode/mode.el (srecode-prefix-map): Fix typos.
+
+2011-11-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ede/project-am.el (project-compile-target-command): Fix typo.
+
+2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ede/auto.el (ede-project-autoload):
+        * ede/proj-comp.el (ede-makefile-rule):
+        * semantic/analyze.el (semantic-analyze-current-context):
+        * semantic/ctxt.el (semantic-get-local-variables):
+        * semantic/tag-ls.el (semantic-tag-calculate-parent): Fix typos.
+
 2011-11-03  David Engster  <dengste@eml.cc>
 
         * srecode.el:
@@ -444,7 +462,7 @@
         * semantic/decorate/include.el
         (semantic-decoration-on-unknown-includes): Change light bgcolor.
         (semantic-decoration-on-includes-highlight-default): Check that
-        the include tag has a postion.
+        the include tag has a position.
 
         * semantic/complete.el (semantic-collector-local-members):
         (semantic-complete-read-tag-local-members)
@@ -547,7 +565,7 @@
         (semantic-analyzer-debug-missing-innertype): Change "prefix" to
         "symbol" in messages.
 
-        * semantic/analyze/refs.el: (semantic-analyze-refs-impl)
+        * semantic/analyze/refs.el (semantic-analyze-refs-impl)
         (semantic-analyze-refs-proto): When calculating value, make sure
         the found tag is 'similar' to the originating tag.
         (semantic--analyze-refs-find-tags-with-parent): Attempt to
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index cd910f35a6a..e50e9993af0 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -955,7 +955,7 @@ we move to."
 
 (defun data-debug-line-expandable-p ()
   "Return non-nil if the current line is expandable.
-Lines that are not expandable are assumed to not be contractable."
+Lines that are not expandable are assumed to not be contractible."
   (not (get-text-property (point) 'ddebug-noexpand)))
 
 (defun data-debug-expand-current-line ()
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 14f09517b1d..987351a25e0 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -909,7 +909,7 @@ Optional ROOTRETURN will return the root project for DIR."
         ;; recomment as we go
         ;;nil
         ))
-     ;; Do nothing if we are buiding an EDE project already
+     ;; Do nothing if we are building an EDE project already.
      (ede-constructing
       nil)
      ;; Load in the project in question.
diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el
index 09535ffce6b..d08ab543b82 100644
--- a/lisp/cedet/ede/auto.el
+++ b/lisp/cedet/ede/auto.el
@@ -49,7 +49,7 @@ routine instead.")
                  :documentation
                  "Initializers passed to the project object.
 These are used so there can be multiple types of projects
-associated with a single object class, based on the initilizeres used.")
+associated with a single object class, based on the initializers used.")
    (load-type :initarg :load-type
               :documentation "Fn symbol used to load this project file.")
    (class-sym :initarg :class-sym
diff --git a/lisp/cedet/ede/custom.el b/lisp/cedet/ede/custom.el
index fed1a1b2155..ac0907e8e7f 100644
--- a/lisp/cedet/ede/custom.el
+++ b/lisp/cedet/ede/custom.el
@@ -40,7 +40,7 @@
 
 ;;; Customization Commands
 ;;
-;; These commands initialize custoization of EDE control objects.
+;; These commands initialize customization of EDE control objects.
 
 ;;;###autoload
 (defun ede-customize-project ()
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index b8759dd06ee..c1ca8b69208 100644
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -63,7 +63,7 @@ DIR is the directory to search from."
     (if proj
         (ede-up-directory (file-name-directory
                            (oref proj :file)))
-      ;; No pre-existing project.  Lets take a wild-guess if we have
+      ;; No pre-existing project.  Let's take a wild-guess if we have
       ;; an Emacs project here.
       (when (string-match "emacs[^/]*" dir)
         (let ((base (substring dir 0 (match-end 0))))
@@ -121,7 +121,7 @@ Return nil if there isn't one.
 Argument DIR is the directory it is created for.
 ROOTPROJ is nil, since there is only one project."
   (or (ede-emacs-file-existing dir)
-      ;; Doesn't already exist, so lets make one.
+      ;; Doesn't already exist, so let's make one.
       (let* ((vertuple (ede-emacs-version dir)))
         (ede-emacs-project (car vertuple)
                            :name (car vertuple)
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 3d165c39016..6179d304464 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -101,7 +101,7 @@ of the anchor file for the project."
                  (setq ans SP)
                (ede-find-subproject-for-directory SP dir)))))
         ans)
-    ;; We can use inodes, so lets try it.
+    ;; We can use inodes, so let's try it.
     (let ((ans nil)
           (inode (ede--inode-for-dir dir)))
       (ede-map-subprojects
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index 7eef0a4121e..d73a32a8bcb 100644
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -43,10 +43,10 @@
 ;;
 ;; Customization:
 ;;
-;; Since these projects are all so increadibly generic, a user will
+;; Since these projects are all so incredibly generic, a user will
 ;; need to configure some aspects of the project by hand.  In order to
 ;; enable this without configuring the project objects directly (which
-;; are auto-generated) a special ede-generic-confg object is defined to
+;; are auto-generated) a special ede-generic-config object is defined to
 ;; hold the basics.  Generic projects will identify and use these
 ;; config files.
 ;;
@@ -70,7 +70,7 @@
 ;; subclasses `ede-generic-target'.  The slots `shortname' and
 ;; `extension' should be given new initial values.
 ;;
-;; Optionally, any target method used by EDE can then be overriden.
+;; Optionally, any target method used by EDE can then be overridden.
 ;; The ede-generic-target-c-cpp has some example methods setting up
 ;; the pre-processor map and system include path.
 ;;
@@ -105,7 +105,7 @@
                   :group (default build)
                   :documentation
                   "Command used for debugging this project.")
-   ;; C target customixations
+   ;; C target customizations
    (c-include-path :initarg :c-include-path
                    :initform nil
                    :type list
@@ -133,7 +133,7 @@
 Return nil if there isn't one.
 Argument DIR is the directory it is created for.
 ROOTPROJ is nil, since there is only one project."
-  ;; Doesn't already exist, so lets make one.
+  ;; Doesn't already exist, so let's make one.
   (let* ((alobj ede-constructing)
          (this nil))
     (when (not alobj) (error "Cannot load generic project without the autoload instance"))
@@ -249,7 +249,7 @@ All directories need at least one target.")
   "EDE Generic Project target for Misc files.
 All directories need at least one target.")
 
-;;; Automatic target aquisition.
+;;; Automatic target acquisition.
 (defun ede-generic-find-matching-target (class dir targets)
   "Find a target that is a CLASS and is in DIR in the list of TARGETS."
   (let ((match nil))
diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el
index e11286c710e..0ed9c3054ef 100644
--- a/lisp/cedet/ede/linux.el
+++ b/lisp/cedet/ede/linux.el
@@ -62,7 +62,7 @@ DIR is the directory to search from."
     (if proj
         (ede-up-directory (file-name-directory
                            (oref proj :file)))
-      ;; No pre-existing project.  Lets take a wild-guess if we have
+      ;; No pre-existing project.  Let's take a wild-guess if we have
       ;; an Linux project here.
       (when (string-match "linux[^/]*" dir)
         (let ((base (substring dir 0 (match-end 0))))
@@ -101,7 +101,7 @@ Return nil if there isn't one.
 Argument DIR is the directory it is created for.
 ROOTPROJ is nil, since there is only one project."
   (or (ede-linux-file-existing dir)
-      ;; Doesn't already exist, so lets make one.
+      ;; Doesn't already exist, so let's make one.
       (ede-linux-project "Linux"
                          :name "Linux"
                          :version (ede-linux-version dir)
diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el
index 63991c54e7f..718fdf58b11 100644
--- a/lisp/cedet/ede/makefile-edit.el
+++ b/lisp/cedet/ede/makefile-edit.el
@@ -71,7 +71,7 @@
     (end-of-line)
     (= (preceding-char) ?\\)))
 
-;;; Programatic editing of a Makefile
+;;; Programmatic editing of a Makefile
 ;;
 (defun makefile-move-to-macro (macro &optional next)
   "Move to the definition of MACRO.  Return t if found.
diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el
index 08fc98728e1..05290158189 100644
--- a/lisp/cedet/ede/pconf.el
+++ b/lisp/cedet/ede/pconf.el
@@ -149,7 +149,7 @@ don't do it.  A value of nil means to just do it.")
           ))))
 
 (defmethod ede-proj-configure-recreate ((this ede-proj-project))
-  "Delete project THISes configure script and start over."
+  "Delete project THIS's configure script and start over."
   (if (not (ede-proj-configure-file this))
       (error "Could not determine configure.ac for %S" (object-name this)))
   (let ((b (get-file-buffer (ede-proj-configure-file this))))
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index 1a2843f7651..ae5796e042b 100644
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -149,7 +149,7 @@ belonging to the target name.")
           :type list
           :custom (repeat string)
           :documentation "Scripts to execute.
-These scripst will be executed in sh (Unless the SHELL variable is overriden).
+These scripts will be executed in sh (Unless the SHELL variable is overridden).
 Do not prefix with TAB.
 Each individual element of this list can be either a string, or
 a lambda function.  (The custom element does not yet express that.")
diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el
index 4d68e1544a7..1c9b9bea0f4 100644
--- a/lisp/cedet/ede/proj-misc.el
+++ b/lisp/cedet/ede/proj-misc.el
@@ -50,7 +50,7 @@ All listed sources are included in the distribution.")
 
 (defvar ede-misc-source
   (ede-sourcecode "ede-misc-source"
-                  :name "Miscelaneous"
+                  :name "Miscellaneous"
                   :sourcepattern ".*")
   "Miscellaneous field definition.")
 
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 40e6165251c..79022be6a5f 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -584,7 +584,7 @@ Converts all symbols into the objects to be used."
       link)))
 
 
-;;; Target type specific autogenerating gobbldegook.
+;;; Target type specific autogenerating gobbledygook.
 ;;
 
 (defun ede-proj-makefile-type (&optional proj)
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index ec54d8151bc..316309092e7 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -428,7 +428,7 @@ Argument COMMAND is the command to use for compiling the target."
 If a given set of projects has already been loaded, then do nothing
 but return the project for the directory given.
 Optional ROOTPROJ is the root EDE project."
-  (let* ((ede-constructiong t)
+  (let* ((ede-constructing t)
          (amo (object-assoc (expand-file-name "Makefile.am" directory)
                             'file ede-projects)))
     (when (not amo)
@@ -659,7 +659,7 @@ Strip out duplicates, and recurse on variables."
       ;; their object still exists!
       ;; FIGURE THIS OUT
       (project-am-expand-subdirlist 'csubprojexpanded csubproj)
-      ;; Ok, now lets look at all our sub-projects.
+      ;; Ok, now let's look at all our sub-projects.
       (mapc (lambda (sp)
               (let* ((subdir (file-name-as-directory
                               (expand-file-name
@@ -836,7 +836,7 @@ nil means that this buffer belongs to no-one."
   (oref this :name))
 
 (defmethod project-compile-target-command ((this project-am-texinfo))
-  "Default target t- use when compling a texinfo file."
+  "Default target t- use when compiling a texinfo file."
   (let ((n (oref this :name)))
     (if (string-match "\\.texi?\\(nfo\\)?" n)
         (setq n (replace-match ".info" t t n)))
diff --git a/lisp/cedet/ede/speedbar.el b/lisp/cedet/ede/speedbar.el
index 252ce47df67..fdf61b51b68 100644
--- a/lisp/cedet/ede/speedbar.el
+++ b/lisp/cedet/ede/speedbar.el
@@ -297,7 +297,7 @@ INDENT is the current indentation level."
   (let ((file (ede-find-nearest-file-line)))
     (speedbar-find-file-in-frame file)
     (save-excursion (speedbar-stealthy-updates))
-    ;; Reset the timer with a new timeout when cliking a file
+    ;; Reset the timer with a new timeout when clicking a file
     ;; in case the user was navigating directories, we can cancel
     ;; that other timer.
 ;    (speedbar-set-timer speedbar-update-speed)
diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el
index 71960ddecd4..065ac6d0559 100644
--- a/lisp/cedet/inversion.el
+++ b/lisp/cedet/inversion.el
@@ -419,7 +419,7 @@ INSTALLDIR path."
           ;;(message "%S added to `load-path'" default-directory)
           (add-to-list 'load-path default-directory))
         ;; We get to this point iff we do not accept or there is no
-        ;; system file.  Lets check the version of what we just
+        ;; system file.  Let's check the version of what we just
         ;; installed... just to be safe.
         (let ((newver (inversion-find-version package)))
           (if (not newver)
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index d077dd95f3c..0e7657642c2 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -637,7 +637,7 @@ SYMBOL is a function that can be overridden."
 
 (defun mode-local-print-bindings (table)
   "Print bindings in TABLE."
-  (let (us ;; List of unpecified symbols
+  (let (us ;; List of unspecified symbols
         mc ;; List of mode local constants
         mv ;; List of mode local variables
         ov ;; List of overloaded functions
@@ -656,7 +656,7 @@ SYMBOL is a function that can be overridden."
      table)
     ;; Print symbols by type
     (when us
-      (princ "\n  !! Unpecified symbols\n")
+      (princ "\n  !! Unspecified symbols\n")
       (mapc 'mode-local-print-binding us))
     (when mc
       (princ "\n  ** Mode local constants\n")
diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index 74dc1ecde31..e3d2bd967b6 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -77,7 +77,7 @@ this flag is ignored."
      (:background "#AAAA33"))
     (((class color) (background light))
      (:background "#FFFFAA")))
-  "*Face used at beginning of a highight."
+  "*Face used at beginning of a highlight."
   :group 'pulse)
 
 (defface pulse-highlight-face
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 34d886b6807..639b46ad2cf 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -1015,7 +1015,7 @@ Throw away all the old tags, and recreate the tag database."
                 :visible semantic-mode
                 :button (:toggle . global-semanticdb-minor-mode))))
 
-;; The `semantic-mode' command, in conjuction with the
+;; The `semantic-mode' command, in conjunction with the
 ;; `semantic-default-submodes' variable, toggles Semantic's various
 ;; auxiliary minor modes.
 
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 5cdd1577a6e..43e998b852e 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -106,7 +106,7 @@ called in a dereference sequence.")
    (prefixclass :initarg :prefixclass
                 :type list
                 :documentation "Tag classes expected at this context.
-These are clases for tags, such as 'function, or 'variable.")
+These are classes for tags, such as 'function, or 'variable.")
    (prefixtypes :initarg :prefixtypes
            :type list
            :documentation "List of tags defining types for :prefix.
@@ -287,7 +287,7 @@ Optional argument THROWSYM specifies a symbol the throw on non-recoverable error
 
     ;; For the middle entries
     (while s
-      ;; Using the tag found in TMP, lets find the tag
+      ;; Using the tag found in TMP, let's find the tag
       ;; representing the full typeographic information of its
       ;; type, and use that to determine the search context for
       ;; (car s)
@@ -302,7 +302,7 @@ Optional argument THROWSYM specifies a symbol the throw on non-recoverable error
                                      (mapcar 'semantic-tag-type-members
                                              tagtype))))
                          (oset miniscope fullscope rawscope)))
-                     ;; Now analayze the type to remove metatypes.
+                     ;; Now analyze the type to remove metatypes.
                      (or (semantic-analyze-type tmp miniscope)
                          tmp))
                     (t
@@ -476,7 +476,7 @@ If called interactively, display interesting information about POSITION
 in a separate buffer.
 Returns an object based on symbol `semantic-analyze-context'.
 
-This function can be overriden with the symbol `analyze-context'.
+This function can be overridden with the symbol `analyze-context'.
 When overriding this function, your override will be called while
 cursor is at POSITION.  In addition, your function will not be called
 if a cached copy of the return object is found."
diff --git a/lisp/cedet/semantic/analyze/complete.el b/lisp/cedet/semantic/analyze/complete.el
index ae993a743d6..89937f45ec8 100644
--- a/lisp/cedet/semantic/analyze/complete.el
+++ b/lisp/cedet/semantic/analyze/complete.el
@@ -188,7 +188,7 @@ FLAGS can be any number of:
       ;; Reset c.
       (setq c nil)
 
-      ;; Loop over all the found matches, and catagorize them
+      ;; Loop over all the found matches, and categorize them
       ;; as being possible features.
       (while (and loopc do-typeconstraint)
 
diff --git a/lisp/cedet/semantic/bovine.el b/lisp/cedet/semantic/bovine.el
index 1dfbb72d416..036a6f38724 100644
--- a/lisp/cedet/semantic/bovine.el
+++ b/lisp/cedet/semantic/bovine.el
@@ -240,7 +240,7 @@ list of semantic tokens found."
                           matchlist nil) ;;generate exit condition
                     (if (not end)
                         (setq out nil)))
-                  ;; Nothin?
+                  ;; Nothing?
                   ))
               (setq result
                     (if (eq s starting-stream)
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 1076402ac91..9a862c64d10 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -240,7 +240,7 @@ Return the defined symbol as a special spp lex token."
                         (goto-char (match-end 0))
                         (looking-at "(")))
            (semantic-lex-spp-replacements-enabled nil)
-           ;; Temporarilly override the lexer to include
+           ;; Temporarily override the lexer to include
            ;; special items needed inside a macro
            (semantic-lex-analyzer #'semantic-cpp-lexer)
            (raw-stream
@@ -344,7 +344,7 @@ Uses known macro tables in SPP to determine what block to skip."
                  (string= sym "0"))
             (and ifdef (not (semantic-lex-spp-symbol-p sym)))
             (and ifndef (semantic-lex-spp-symbol-p sym)))
-        ;; The if indecates to skip this preprocessor section
+        ;; The if indicates to skip this preprocessor section.
         (let ((pt nil))
           ;; (message "%s %s yes" ift sym)
           (beginning-of-line)
@@ -650,7 +650,7 @@ as for the parent."
                 (setq depth 0)
 
                 ;; This is a copy of semantic-parse-region-default where we
-                ;; are doing something special with the lexication of the
+                ;; are doing something special with the lexing of the
                 ;; contents of the semantic-list token.  Stuff not used by C
                 ;; removed.
                 (let ((tokstream
@@ -1092,7 +1092,7 @@ Optional argument STAR and REF indicate the number of * and & in the typedef."
               ;; `throws' as a common name for things that toss
               ;; exceptions about.
               :throws (nth 5 tokenpart)
-              ;; Reemtrant is a C++ thingy.  Add it here
+              ;; Reentrant is a C++ thingy.  Add it here
               :reentrant-flag (if (member "reentrant" (nth 6 tokenpart)) t)
               ;; A function post-const is funky.  Try stuff
               :methodconst-flag (if (member "const" (nth 6 tokenpart)) t)
@@ -1128,7 +1128,7 @@ Optional PARENT and COLOR are ignored."
 
 (define-mode-local-override semantic-format-tag-canonical-name
   c-mode (tag &optional parent color)
-  "Create a cannonical name for TAG.
+  "Create a canonical name for TAG.
 PARENT specifies a parent class.
 COLOR indicates that the text should be type colorized.
 Enhances the base class to search for the entire parent
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index cfdd4cf6f6c..98f744dca6e 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -463,7 +463,7 @@ Return a bovination list to use."
           ;; Try an Emacs 22 fcn.  This throws errors.
           (find-library-name (semantic-tag-name tag))
         (error
-         (message "semantic: connot find source file %s"
+         (message "semantic: cannot find source file %s"
                   (semantic-tag-name tag))))
     ;; No handy function available.  (Older Emacsen)
     (let* ((lib (locate-library (semantic-tag-name tag)))
@@ -515,7 +515,7 @@ Optional argument NOSNARF is ignored."
   (let ((d (semantic-tag-docstring tag)))
     (when (not d)
       (cond ((semantic-tag-with-position-p tag)
-             ;; Doc isn't in the tag itself.  Lets pull it out of the
+             ;; Doc isn't in the tag itself.  Let's pull it out of the
              ;; sources.
              (let ((semantic-elisp-store-documentation-in-tag t))
                (setq tag (with-current-buffer (semantic-tag-buffer tag)
@@ -534,9 +534,9 @@ Optional argument NOSNARF is ignored."
                      (t
                       (setq d (documentation-property
                                sym 'variable-documentation)))))
-             ;; Label it as system doc.. perhaps just for debugging
+             ;; Label it as system doc. perhaps just for debugging
              ;; purposes.
-             (if d (setq d (concat "Sytem Doc: \n" d)))
+             (if d (setq d (concat "System Doc: \n" d)))
              ))
       )
 
@@ -823,7 +823,7 @@ In Emacs Lisp this is easily defined by parenthesis bounding."
   (&optional point)
   "Return a list of tag classes allowed at POINT.
 Emacs Lisp knows much more about the class of the tag needed to perform
-completion than some languages.  We distincly know if we are to be a
+completion than some languages.  We distinctly know if we are to be a
 function name, variable name, or any type of symbol.  We could identify
 fields and such to, but that is for some other day."
   (save-excursion
@@ -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 18c7b5a1a50..2b3841bd594 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -54,7 +54,7 @@
 ;;
 ;; Here, we will treat each section separately (excluding D)
 ;; They can then be strung together in user-visible commands to
-;; fulfil specific needs.
+;; fulfill specific needs.
 ;;
 ;; COLLECTORS:
 ;;
@@ -891,7 +891,7 @@ making the action of homing in on a token faster.")
 This completion is calculated and saved for future use.")
    (last-whitespace-completion :type (or null string)
                                :documentation "The last whitespace completion.
-For partial completion, SPC will disabiguate over whitespace type
+For partial completion, SPC will disambiguate over whitespace type
 characters.  This is the last calculated version.")
    (current-exact-match :type list
                         :protection :protected
@@ -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."
@@ -1353,7 +1353,7 @@ to click on the items to aid in completion.")
 (defmethod semantic-displayor-show-request ((obj semantic-displayor-traditional))
   "A request to show the current tags table."
 
-  ;; NOTE TO SELF.  Find the character to type next, and emphesize it.
+  ;; NOTE TO SELF.  Find the character to type next, and emphasize it.
 
   (with-output-to-temp-buffer "*Completions*"
     (display-completion-list
@@ -1377,7 +1377,7 @@ given tag, by highlighting its location.")
    )
   "Abstract displayor supporting `focus'.
 A displayor which has the ability to focus in on one tag.
-Focusing is a way of differentiationg between multiple tags
+Focusing is a way of differentiating among multiple tags
 which have the same name."
   :abstract t)
 
@@ -1618,7 +1618,7 @@ Display mechanism using tooltip for a list of possible completions.")
                  (string= (this-command-keys) "\C-i"))
             (oset obj typing-count (1+ typing-count)))
         ;; At this point, we know we have too many items.
-        ;; Lets be brave, and truncate l
+        ;; Let's be brave, and truncate l
         (setcdr (nthcdr (oref obj max-tags) l) nil)
         (setq msg (mapconcat 'identity l "\n"))
         (cond
diff --git a/lisp/cedet/semantic/ctxt.el b/lisp/cedet/semantic/ctxt.el
index 2eddfdc1c8e..4fef5937bc3 100644
--- a/lisp/cedet/semantic/ctxt.el
+++ b/lisp/cedet/semantic/ctxt.el
@@ -154,7 +154,7 @@ Return non-nil if there is no upper context."
 (define-overloadable-function semantic-get-local-variables (&optional point)
   "Get the local variables based on POINT's context.
 Local variables are returned in Semantic tag format.
-This can be overriden with `get-local-variables'."
+This can be overridden with `get-local-variables'."
   ;; Disable parsing messages
   (let ((semantic--progress-reporter nil))
     (save-excursion
@@ -410,7 +410,7 @@ Depends on `semantic-type-relation-separator-character'."
           ;; Set our end point.
           (setq end (point))
 
-          ;; Now that we have gotten started, lets do the rest.
+          ;; Now that we have gotten started, let's do the rest.
           (condition-case nil
               (while (save-excursion
                        (forward-char -1)
diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el
index d719fde3174..fe5f3c193df 100644
--- a/lisp/cedet/semantic/db-ebrowse.el
+++ b/lisp/cedet/semantic/db-ebrowse.el
@@ -219,7 +219,7 @@ warn instead."
 
 ;JAVE this just instantiates a default empty ebrowse struct?
 ; how would new instances wind up here?
-; the ebrowse class isnt singleton, unlike the emacs lisp one
+; the ebrowse class isn't singleton, unlike the emacs lisp one
 (defvar-mode-local c++-mode semanticdb-project-system-databases
   ()
   "Search Ebrowse for symbols.")
@@ -296,7 +296,7 @@ If there is no database for DIRECTORY available, then
         (when (string= (oref (car dbs) reference-directory) directory)
           (setq found (car dbs))))
       (setq dbs (cdr dbs)))
-    ;;STATIC means DBE cant be used as object, only as a class
+    ;;STATIC means DBE can't be used as object, only as a class
     (let* ((ebrowse-data (semanticdb-ebrowse-get-ebrowse-structure directory))
            (dat (car (cdr ebrowse-data)))
            (ebd (car dat))
@@ -331,7 +331,7 @@ If there is no database for DIRECTORY available, then
 ;JAVE what it actually seems to do is split the original tree in "tables" associated with files
 ; im not sure it actually works:
 ;   the filename slot sometimes gets to be nil,
-;      apparently for classes which definition cant be found, yet needs to be included in the tree
+;      apparently for classes which definition can't be found, yet needs to be included in the tree
 ;      like library baseclasses
 ;   a file can define several classes
   (let ((T (car (cdr data))));1st comes a header, then the tree
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index 661bc8d6841..943ccf23031 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -289,7 +289,7 @@ Argument OBJ is the object to write."
         (when (and (boundp semantic-show-unmatched-syntax-mode)
                    semantic-show-unmatched-syntax-mode)
           ;; Only do this if the user runs unmatched syntax
-          ;; mode display enties.
+          ;; mode display entries.
           (oset obj unmatched-syntax
                 (semantic-show-unmatched-lex-tokens-fetch))
           )
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 34718d1fdd2..35aef5d16ef 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -862,7 +862,7 @@ instead."
           (let ((tab (car (car tmp)))
                 (tags (cdr (car tmp))))
             (dolist (T tags)
-              ;; Normilzation gives specialty database tables a chance
+              ;; Normalization gives specialty database tables a chance
               ;; to convert into a more stable tag format.
               (let* ((norm (semanticdb-normalize-one-tag tab T))
                      (ntab (car norm))
@@ -918,7 +918,7 @@ but should be good enough for debugging assertions."
                          result
                          " ")
               ">")
-    ;; Longer results should have an abreviated form.
+    ;; Longer results should have an abbreviated form.
     (format "#<FIND RESULT %d TAGS in %d FILES>"
             (semanticdb-find-result-length result)
             (length result))))
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-typecache.el b/lisp/cedet/semantic/db-typecache.el
index 0096c1aab09..a4c4bd99f26 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -97,7 +97,7 @@ Said object must support `semantic-reset' methods.")
   (when (semantic-find-tags-by-class 'type new-tags)
     ;; Reset our index
     (oset tc filestream nil)
-    t ;; Return true, our core file tags have changed in a relavant way.
+    t ;; Return true, our core file tags have changed in a relevant way.
     )
 
   ;; NO CODE HERE
@@ -368,7 +368,7 @@ a master list."
                   (semanticdb-typecache-merge-streams
                    incstream
                    ;; Getting the cache from this table will also cause this
-                   ;; file to update it's cache from it's decendants.
+                   ;; file to update its cache from its decendents.
                    ;;
                    ;; In theory, caches are only built for most includes
                    ;; only once (in the loop before this one), so this ends
@@ -473,7 +473,7 @@ found tag to be loaded."
         ;;       find a type/namespace because everything else is excluded.
 
         ;; If this is not the last entry from the list, then it
-        ;; must be a type or a namespace.  Lets double check.
+        ;; must be a type or a namespace.  Let's double check.
         (when (cdr type)
 
           ;; From above, there is only one tag in ans, and we prefer
@@ -511,7 +511,7 @@ found tag to be loaded."
           ;; This won't liven up the tag since we have a copy, but
           ;; we ought to be able to get there and go to the right line.
           (find-file-noselect lastfile)
-        ;; We don't want to find-file match, so instead lets
+        ;; We don't want to find-file match, so instead let's
         ;; push the filename onto the return tag.
         (when lastans
           (setq lastans (semantic-tag-copy lastans nil lastfile))
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index 65897b96adb..3d2128db29a 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -459,7 +459,7 @@ other than :table."
       (setq cache (cdr cache)))
     (if obj
         obj ;; Just return it.
-      ;; No object, lets create a new one and return that.
+      ;; No object, let's create a new one and return that.
       (setq obj (funcall desired-class "Cache" :table table))
       (object-add-to-list table 'cache obj)
       obj)))
@@ -510,7 +510,7 @@ other than :table."
       (setq cache (cdr cache)))
     (if obj
         obj ;; Just return it.
-      ;; No object, lets create a new one and return that.
+      ;; No object, let's create a new one and return that.
       (setq obj (funcall desired-class "Cache" :db db))
       (object-add-to-list db 'cache obj)
       obj)))
@@ -606,7 +606,7 @@ The file associated with OBJ does not need to be in a buffer."
   ;; The lexical table should be good too.
   (when (featurep 'semantic/lex-spp)
     (oset table lexical-table (semantic-lex-spp-save-table)))
-  ;; this implies dirtyness
+  ;; this implies dirtiness
   (semanticdb-set-dirty table)
 
   ;; Synchronize the index
@@ -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
@@ -941,7 +941,7 @@ DONTLOAD does not affect the creation of new database objects."
           (setq fullfile (file-truename file))
           )
 
-        ;; If we have a table, but no fullfile, that's ok.  Lets get the filename
+        ;; If we have a table, but no fullfile, that's ok.  Let's get the filename
         ;; from the table which is pre-truenamed.
         (when (and (not fullfile) tab)
           (setq fullfile (semanticdb-full-filename tab)))
diff --git a/lisp/cedet/semantic/decorate.el b/lisp/cedet/semantic/decorate.el
index ee356ad3a9e..4eeac8de141 100644
--- a/lisp/cedet/semantic/decorate.el
+++ b/lisp/cedet/semantic/decorate.el
@@ -107,7 +107,7 @@ the extent 'intangible' property does not exist."
   "Hook used in modification hooks to prevent modification.
 Allows deletion of the entire text.
 Argument OVERLAY, AFTER, START, END, and LEN are passed in by the system."
-  ;; Stolen blithly from cpp.el in Emacs 21.1
+  ;; Stolen blithely from cpp.el in Emacs 21.1
   (if (and (not after)
            (or (< (semantic-overlay-start overlay) start)
                (> (semantic-overlay-end overlay) end)))
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index a37f43d177f..766a13023e8 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -459,7 +459,7 @@ to add the path to Semantic's search.
 If this is an include file that belongs to your project, then you may
 need to update `semanticdb-project-roots' or better yet, use `ede'
 to manage your project.  See the ede manual for projects that will
-wrap existing project code for Semantic's benifit.
+wrap existing project code for Semantic's benefit.
 ")
 
       (when (or (eq mm 'c++-mode) (eq mm 'c-mode))
@@ -739,7 +739,7 @@ any decorated referring includes.")
   "Refresh any highlighting in buffers referred to by TABLE.
 If TABLE is not in a buffer, do nothing."
   ;; This cache removal may seem odd in that we are "creating one", but
-  ;; since we cant get in the fcn unless one exists, this ought to be
+  ;; since we can't get in the fcn unless one exists, this ought to be
   ;; ok.
   (let ((c (semanticdb-cache-get
             table 'semantic-decoration-unparsed-include-cache)))
diff --git a/lisp/cedet/semantic/doc.el b/lisp/cedet/semantic/doc.el
index e5579d09113..ec3b5878c63 100644
--- a/lisp/cedet/semantic/doc.el
+++ b/lisp/cedet/semantic/doc.el
@@ -56,7 +56,7 @@ If nosnarf if 'lex, then only return the lex token."
           ;; Check just before the definition.
           (when (semantic-tag-with-position-p tag)
             (semantic-documentation-comment-preceeding-tag tag nosnarf))
-          ;;  Lets look for comments either after the definition, but before code:
+          ;;  Let's look for comments either after the definition, but before code:
           ;; Not sure yet.  Fill in something clever later....
           nil))))))
 
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index 307071e743c..a007f21b69f 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -316,7 +316,7 @@ See `semantic-edits-change-leaf-tag' for details on parents."
                   (setq list-to-search nil)))
         ;; Search list is nil.
         ))
-    ;; If we have a search list, lets go.  Otherwise nothing.
+    ;; If we have a search list, let's go.  Otherwise nothing.
     (while (and list-to-search (not found))
       (if (cdr list-to-search)
           ;; We end when the start of the CDR is after the end of our
@@ -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.
@@ -537,7 +537,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
       ;; We want to take some set of changes, and group them
       ;; together into a small change group. One change forces
       ;; a reparse of a larger region (the size of some set of
-      ;; tags it encompases.)  It may contain several tags.
+      ;; tags it encompasses.)  It may contain several tags.
       ;; That region may have other changes in it (several small
       ;; changes in one function, for example.)
       ;; Optimize for the simple cases here, but try to handle
@@ -595,7 +595,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
                ;; Feb 06 -
                ;; IDed when the first cache-list tag is after
                ;; our change, meaning there is nothing before
-               ;; the chnge.
+               ;; the change.
                ((> (semantic-tag-start (car cache-list))
                    (semantic-overlay-end (car changes)))
                 (setq last-cond "Beginning of buffer")
diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el
index c2d07fbcc35..b4d94321bc1 100644
--- a/lisp/cedet/semantic/find.el
+++ b/lisp/cedet/semantic/find.el
@@ -574,7 +574,7 @@ FUNCTION must return non-nil if an element of STREAM will be included
 in the new list.
 
 If optional argument SEARCH-PARTS is non-nil, all sub-parts of tags
-are searched.  The overloadable function `semantic-tag-componenets' is
+are searched.  The overloadable function `semantic-tag-components' is
 used for the searching child lists.  If SEARCH-PARTS is the symbol
 'positiononly, then only children that have positional information are
 searched.
diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index 381801559da..876ec9bbd4a 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -431,7 +431,7 @@ Optional argument COLOR means highlight the prototype with font-lock colors."
          (doc (semantic-tag-docstring tag buf)))
     (when (and (not doc) (not buf) fname)
       ;; If there is no doc, and no buffer, but we have a filename,
-      ;; lets try again.
+      ;; let's try again.
       (save-match-data
         (setq buf (find-file-noselect fname)))
       (setq doc (semantic-tag-docstring tag buf)))
@@ -603,7 +603,7 @@ This associates a symbol, such as 'public with the st ring \"+\".")
   "Convert PROTECTION-SYMBOL to a string for UML.
 By default, uses `semantic-format-tag-protection-symbol-to-string-assoc-list'
 to convert.
-By defaul character returns are:
+By default character returns are:
   public    -- +
   private   -- -
   protected -- #.
diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el
index 137759d46ac..a7d150ec4a9 100644
--- a/lisp/cedet/semantic/html.el
+++ b/lisp/cedet/semantic/html.el
@@ -126,7 +126,7 @@ html parser.  PNT is the new point to set."
 NAME is the name of this section.
 MEMBERS is a list of semantic tags representing the elements that make
 up this section.
-LEVEL is the levelling level.
+LEVEL is the leveling level.
 START and END define the location of data described by the tag."
   (let ((anchorp (eq level 11)))
     (append (semantic-tag name
diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el
index 57067936a90..95a68673b8c 100644
--- a/lisp/cedet/semantic/ia-sb.el
+++ b/lisp/cedet/semantic/ia-sb.el
@@ -36,7 +36,7 @@
     nil
   (setq semantic-ia-sb-key-map (speedbar-make-specialized-keymap))
 
-  ;; Basic featuers.
+  ;; Basic features.
   (define-key semantic-ia-sb-key-map "\C-m" 'speedbar-edit-line)
   (define-key semantic-ia-sb-key-map "I" 'semantic-ia-sb-show-tag-info)
   )
diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el
index 69b1dba0bcf..2aae39d4b21 100644
--- a/lisp/cedet/semantic/ia.el
+++ b/lisp/cedet/semantic/ia.el
@@ -115,11 +115,11 @@ Completion options are calculated with `semantic-analyze-possible-completions'."
       (if (null syms)
           (if (semantic-analyze-context-p a)
               ;; This is a clever hack.  If we were unable to find any
-              ;; smart completions, lets divert to how senator derives
+              ;; smart completions, let's divert to how senator derives
               ;; completions.
               ;;
               ;; This is a way of making this fcn more useful since
-              ;; the smart completion engine sometimes failes.
+              ;; the smart completion engine sometimes fails.
               (semantic-complete-symbol))
         ;; Use try completion to seek a common substring.
         (let ((tc (try-completion (or pre "")  syms)))
@@ -199,7 +199,7 @@ Completion options are calculated with `semantic-analyze-possible-completions'."
         )
     (if pf
         (message "%s" (semantic-format-tag-summarize pf nil t))
-      (message "No summary info availalble"))))
+      (message "No summary info available"))))
 
 ;;; Variants
 ;;
@@ -245,14 +245,14 @@ Completion options are calculated with `semantic-analyze-possible-completions'."
 ;; Jump to a destination based on the local context.
 ;;
 ;; This shows how to use the analyzer context, and the
-;; analyer references objects to choose a good destination.
+;; analyzer references objects to choose a good destination.
 
 (defun semantic-ia--fast-jump-helper (dest)
   "Jump to DEST, a Semantic tag.
 This helper manages the mark, buffer switching, and pulsing."
   ;; We have a tag, but in C++, we usually get a prototype instead
-  ;; because of header files.  Lets try to find the actual
-  ;; implementaion instead.
+  ;; because of header files.  Let's try to find the actual
+  ;; implementation instead.
   (when (semantic-tag-prototype-p dest)
     (let* ((refs (semantic-analyze-tag-references dest))
            (impl (semantic-analyze-refs-impl refs t))
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 1c1233303e9..b49d1db1ad5 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -427,7 +427,7 @@ datasets."
 
 (defun semantic-idle-scheduler-work-parse-neighboring-files ()
   "Parse all the files in similar directories to buffers being edited."
-  ;; Lets check to see if EDE matters.
+  ;; Let's check to see if EDE matters.
   (let ((ede-auto-add-method 'never))
     (dolist (a auto-mode-alist)
       (when (eq (cdr a) major-mode)
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index e7e1da55ce3..7566c08f13a 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -96,7 +96,7 @@ This option is ignored if `semantic-imenu-bucketize-file' is nil."
 (defcustom semantic-imenu-bucketize-type-members t
   "*Non-nil if members of a type should be grouped into buckets.
 A nil value means to keep them in the same order.
-Overriden to nil if `semantic-imenu-bucketize-file' is nil."
+Overridden to nil if `semantic-imenu-bucketize-file' is nil."
   :group 'semantic-imenu
   :type 'boolean)
 (make-variable-buffer-local 'semantic-imenu-bucketize-type-members)
@@ -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
@@ -393,7 +393,7 @@ Optional argument PARENT is a tag parent of STREAM."
                                         semantic-imenu-bucketize-file)
                                    (semantic-create-imenu-index-1 parts tag)
                                  (semantic-create-imenu-subindex parts))))
-                          ;; Only add a *definition* if we have a postion
+                          ;; Only add a *definition* if we have a position
                           ;; in that type tag.
                           (if (semantic-tag-with-position-p tag)
                               (cons
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index e49968b07e7..03a3f1b0cb1 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -639,7 +639,7 @@ and what valid VAL values are."
 
 ;;; Macro Merging
 ;;
-;; Used when token streams from different macros include eachother.
+;; Used when token streams from different macros include each other.
 ;; Merged macro streams perform in place replacements.
 
 (defun semantic-lex-spp-merge-streams (raw-stream)
@@ -709,7 +709,7 @@ ARGVALUES are values for any arg list, or nil."
 
 ;;; Symbol Is Macro
 ;;
-;; An analyser that will push tokens from a macro in place
+;; An analyzer that will push tokens from a macro in place
 ;; of the macro symbol.
 ;;
 (defun semantic-lex-spp-anlyzer-do-replace (sym val beg end)
@@ -1067,7 +1067,7 @@ of type `spp-macro-undef' is to be created."
 ;;
 ;; These analyzers help a language define how include files
 ;; are identified.  These are ONLY for languages that perform
-;; an actual textual includesion, and not for imports.
+;; an actual textual inclusion, and not for imports.
 ;;
 ;; This section is supposed to allow the macros from the headers to be
 ;; added to the local dynamic macro table, but that hasn't been
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index d6b8e1a8bf5..fca367ecb8c 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -491,7 +491,7 @@ For compatibility with Semantic 1.x it defaults to `semantic-flex'.")
     (symbol)
     (whitespace)
     )
-  "An alist of of semantic token types.
+  "An alist of semantic token types.
 As of December 2001 (semantic 1.4beta13), this variable is not used in
 any code.  The only use is to refer to the doc-string from elsewhere.
 
@@ -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
@@ -1437,7 +1437,7 @@ Return either a paren token or a semantic list token depending on
 ;;; Comment lexer
 ;;
 ;; Predefined lexers that could be used instead of creating new
-;; analyers.
+;; analyzers.
 
 (define-lex semantic-comment-lexer
   "A simple lexical analyzer that handles comments.
@@ -1677,7 +1677,7 @@ When the lexer encounters the open-paren delimiter \"(\":
 ;;; Lexical Safety
 ;;
 ;; The semantic lexers, unlike other lexers, can throw errors on
-;; unbalanced syntax.  Since editing is all about changeging test
+;; unbalanced syntax.  Since editing is all about changing text
 ;; we need to provide a convenient way to protect against syntactic
 ;; inequalities.
 
@@ -1758,7 +1758,7 @@ If there is no error, then the last value of FORMS is returned."
 (semantic-alias-obsolete 'semantic-flex-map-keywords 'semantic-lex-map-keywords "23.2")
 (semantic-alias-obsolete 'semantic-flex-keywords 'semantic-lex-keywords "23.2")
 (semantic-alias-obsolete 'semantic-flex-buffer 'semantic-lex-buffer "23.2")
-(semantic-alias-obsolete 'semantic-flex-list   'semantic-lex-list "23.2")
+(semantic-alias-obsolete 'semantic-flex-list 'semantic-lex-list "23.2")
 
 ;; This simple scanner uses the syntax table to generate a stream of
 ;; simple tokens of the form:
@@ -1769,7 +1769,7 @@ If there is no error, then the last value of FORMS is returned."
 ;; objects boundary.
 
 (defvar semantic-flex-tokens semantic-lex-tokens
-  "An alist of of semantic token types.
+  "An alist of semantic token types.
 See variable `semantic-lex-tokens'.")
 
 (defvar semantic-flex-unterminated-syntax-end-function
diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el
index 88b0cc33d43..8c3d6c17cf4 100644
--- a/lisp/cedet/semantic/sb.el
+++ b/lisp/cedet/semantic/sb.el
@@ -87,7 +87,7 @@ Restore the old current buffer when completed."
 ;;    @ type
 ;;    = default value
 ;;
-;;  +> keywrd Type
+;;  +> keyword Type
 ;;   +> type part
 ;;
 ;;  +>  -> click to see additional information
@@ -313,7 +313,7 @@ TEXT TOKEN and INDENT are the details."
     (save-excursion (speedbar-stealthy-updates))
     (semantic-go-to-tag token parent)
     (switch-to-buffer (current-buffer))
-    ;; Reset the timer with a new timeout when cliking a file
+    ;; Reset the timer with a new timeout when clicking a file
     ;; in case the user was navigating directories, we can cancel
     ;; that other timer.
     ;; (speedbar-set-timer dframe-update-speed)
@@ -399,7 +399,7 @@ Returns the tag list, or t for an error."
     (if (listp out)
         (condition-case nil
             (progn
-              ;; This brings externally defind methods into
+              ;; This brings externally defined methods into
               ;; their classes, and creates meta classes for
               ;; orphans.
               (setq out (semantic-adopt-external-members out))
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 53695015e4a..16deb245527 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -186,7 +186,7 @@ Use `semantic-ctxt-scoped-types' to find types."
   (save-excursion
     (goto-char position)
     (let ((code-scoped-types nil))
-      ;; Lets ask if any types are currently scoped.  Scoped
+      ;; Let's ask if any types are currently scoped.  Scoped
       ;; classes and types provide their public methods and types
       ;; in source code, but are unrelated hierarchically.
       (let ((sp (semantic-ctxt-scoped-types)))
@@ -249,7 +249,7 @@ are from nesting data types."
       ;;    Analyze the stack of tags we are nested in as parents.
       ;;
 
-      ;; If we have a pparent tag, lets go there
+      ;; If we have a pparent tag, let's go there
       ;; an analyze that stack of tags.
       (when (and pparent (semantic-tag-with-position-p pparent))
         (semantic-go-to-tag pparent)
@@ -384,7 +384,7 @@ be found."
 ;;------------------------------------------------------------
 
 (define-overloadable-function semantic-analyze-scoped-tags (typelist parentlist)
-  "Return accessable tags when TYPELIST and PARENTLIST is in scope.
+  "Return accessible tags when TYPELIST and PARENTLIST is in scope.
 Tags returned are not in the global name space, but are instead
 scoped inside a class or namespace.  Such items can be referenced
 without use of \"object.function()\" style syntax due to an
@@ -412,7 +412,7 @@ implicit \"object\"."
           ))
       (setq typelist (cdr typelist)))
 
-    ;; Loop over the types (which should be sorted by postion
+    ;; Loop over the types (which should be sorted by position)
     ;; adding to the scopelist as we go, and using the scopelist
     ;; for additional searching!
     (while typelist2
@@ -424,7 +424,7 @@ implicit \"object\"."
                           currentscope))
       (setq typelist2 (cdr typelist2)))
 
-    ;; Collect all the types (class, etc) that are in our heratage.
+    ;; Collect all the types (class, etc) that are in our heritage.
     ;; These are types that we can extract members from, not those
     ;; declared in using statements, or the like.
     ;; Get the PARENTS including nesting scope for this location.
diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el
index 1571622b29a..da250e66bb5 100644
--- a/lisp/cedet/semantic/symref/grep.el
+++ b/lisp/cedet/semantic/symref/grep.el
@@ -102,7 +102,7 @@ ROOTDIR is the root location to run the `find' from.
 FILEPATTERN is a string representing find flags for searching file patterns.
 GREPFLAGS are flags passed to grep, such as -n or -l.
 GREPPATTERN is the pattern used by grep."
-  ;; We have grep-compute-defaults.  Lets use it.
+  ;; We have grep-compute-defaults.  Let's use it.
   (grep-compute-defaults)
   (let* ((grep-expand-keywords semantic-symref-grep-expand-keywords)
          (cmd (grep-expand-template grep-find-template
diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el
index d118d9b6203..86fa382a766 100644
--- a/lisp/cedet/semantic/tag-file.el
+++ b/lisp/cedet/semantic/tag-file.el
@@ -125,7 +125,7 @@ Depends on `semantic-dependency-include-path' for searching.  Always searches
           (tag-fname nil))
       (cond ((semantic-tag-in-buffer-p tag)
              ;; If the tag has an overlay and buffer associated with it,
-             ;; switch to that buffer so that we get the right override metohds.
+             ;; switch to that buffer so that we get the right override methods.
              (set-buffer (semantic-tag-buffer tag)))
             ((semantic-tag-file-name tag)
              ;; If it didn't have a buffer, but does have a file
diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el
index 8f54698d506..4d001322108 100644
--- a/lisp/cedet/semantic/tag-ls.el
+++ b/lisp/cedet/semantic/tag-ls.el
@@ -41,7 +41,7 @@
 
 (define-overloadable-function semantic-tag-calculate-parent (tag)
   "Attempt to calculate the parent of TAG.
-The default behavior (if not overriden with `tag-calculate-parent')
+The default behavior (if not overridden with `tag-calculate-parent')
 is to search a buffer found with TAG, and if externally defined,
 search locally, then semanticdb for that tag (when enabled.)")
 
@@ -98,7 +98,7 @@ See `semantic-tag-protection'."
     prot))
 
 (defun semantic-tag-protected-p (tag protection &optional parent)
-  "Non-nil if TAG is is protected.
+  "Non-nil if TAG is protected.
 PROTECTION is a symbol which can be returned by the method
 `semantic-tag-protection'.
 PARENT is the parent data type which contains TAG.
@@ -106,7 +106,7 @@ PARENT is the parent data type which contains TAG.
 For these PROTECTIONs, true is returned if TAG is:
 @table @asis
 @item nil
-  Always true
+  Always true.
 @item  private
   True if nil.
 @item protected
@@ -221,7 +221,7 @@ something without an implementation."
 
 (define-overloadable-function semantic-tag-full-name (tag &optional stream-or-buffer)
   "Return the fully qualified name of TAG in the package hierarchy.
-STREAM-OR-BUFFER can be anything convertable by `semantic-something-to-stream',
+STREAM-OR-BUFFER can be anything convertible by `semantic-something-to-stream',
 but must be a toplevel semantic tag stream that contains TAG.
 A Package Hierarchy is defined in UML by the way classes and methods
 are organized on disk.  Some language use this concept such that a
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 30c5a5cf8b6..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+{")
@@ -483,7 +483,7 @@ that start with that symbol."
 ;; This section provides specialized access into texinfo files.
 ;; Because texinfo files often directly refer to functions and programs
 ;; it is useful to access the texinfo file from the C code for document
-;; maintainance.
+;; maintenance.
 (defun semantic-texi-associated-files (&optional buffer)
   "Find texinfo files associated with BUFFER."
   (save-excursion
@@ -579,7 +579,7 @@ Note: TYPE not yet implemented."
 ;;          (setq doctag (if docstring sourcetag nil))))
 ;;        (setq tags (cdr tags)))))
 ;;     ;; If we found a prototype of the function that has some doc, but not the
-;;     ;; actual function, lets make due with that.
+;;     ;; actual function, let's make due with that.
 ;;     (if (not docstring)
 ;;      (cond ((stringp docstringvar)
 ;;             (setq docstring docstringvar
@@ -597,7 +597,7 @@ Note: TYPE not yet implemented."
 ;;     ;; If we have a string, do the replacement.
 ;;     (delete-region (semantic-tag-start tag)
 ;;                 (semantic-tag-end tag))
-;;     ;; Use useful functions from the docaument library.
+;;     ;; Use useful functions from the document library.
 ;;    (srecode-texi-insert-tag-as-doc doctag)
 ;;    ;(semantic-insert-foreign-tag doctag)
 ;;     ))
diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index 095a817f08d..1f52e9eb3b6 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -108,7 +108,7 @@ line ends at the end of the buffer, leave the point there."
 (defun wisent-python-forward-line-skip-indented ()
   "Move point to the next logical line, skipping indented lines.
 That is the next line whose indentation is less than or equal to the
-identation of the current line."
+indentation of the current line."
   (let ((indent (current-indentation)))
     (while (progn (wisent-python-forward-line)
                   (and (not (eobp))
@@ -291,7 +291,7 @@ To be implemented for Python!  For now just return nil."
    ;; Character used to separation a parent/child relationship
    semantic-type-relation-separator-character '(".")
    semantic-command-separation-character ";"
-   ;; The following is no more necessary as semantic-lex is overriden
+   ;; The following is no more necessary as semantic-lex is overridden
    ;; in python-mode.
    ;; semantic-lex-analyzer 'wisent-python-lexer
 
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 052999bf7c8..d3623d6022f 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -62,11 +62,11 @@
    (dictionary :initarg :dictionary
                :type (or null srecode-dictionary)
                :documentation
-               "List of section dictinaries.
+               "List of section dictionaries.
 The compiled template can contain lists of section dictionaries,
 or values that are expected to be passed down into different
 section macros.  The template section dictionaries are merged in with
-any incomming dictionaries values.")
+any incoming dictionaries values.")
    (binding :initarg :binding
             :documentation
             "Preferred keybinding for this template in `srecode-minor-mode-map'.")
@@ -552,7 +552,7 @@ A list of defined variables VARS provides a variable table."
           (when (not hs)
             (setq hs (make-hash-table :test 'equal :size 20))
             (puthash context hs contexthash))
-          ;; Put into that contenxt's hash.
+          ;; Put into that context's hash.
           (puthash objname (car lp) hs)
           )
 
diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el
index cae52428e75..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
@@ -73,7 +73,7 @@ Some useful context values used by the provided srecode templates are:
   )
 
 (defun srecode-calculate-nearby-things ()
-  ;; NOTE: May need to add bounes to this FCN
+  ;; NOTE: May need to add bounds to this FCN
   "Calculate the CONTEXT type items nearby the current point.
 Assume that what we want to insert next is based on what is just
 before point.  If there is nothing, then assume it is whatever is
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 521532bed33..62ceff82448 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -202,7 +202,7 @@ associated with a buffer or parent."
                                               :size 20)
                    :origin   origin)))
         ;; Only set up the default variables if we are being built
-        ;; directroy for a particular buffer.
+        ;; directly for a particular buffer.
         (when initfrombuff
           ;; Variables from the table we are inserting from.
           ;; @todo - get a better tree of tables.
@@ -280,7 +280,7 @@ inserted dictionaries."
           (progn
             (srecode-dictionary-show-section new "FIRST")
             (srecode-dictionary-show-section new "LAST"))
-        ;; Not the very first one.  Lets clean up CAR.
+        ;; Not the very first one.  Let's clean up CAR.
         (let ((tail (car (last ov))))
           (srecode-dictionary-hide-section tail "LAST")
           (srecode-dictionary-show-section tail "NOTLAST")
@@ -436,7 +436,7 @@ The root dictionary is usually for a current or active insertion."
 
 ;;; COMPOUND VALUE METHODS
 ;;
-;; Compound values must provide at least the toStriong method
+;; Compound values must provide at least the toString method
 ;; for use in converting the compound value into sometehing insertable.
 
 (defmethod srecode-compound-toString ((cp srecode-dictionary-compound-value)
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index a52cadbfb2c..134b5310ab3 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -122,7 +122,7 @@ RESULT is a string."
     ("read" . "Reads from")
     ("reset" . "Resets the parameters and returns")
     ("scan" . "Scans the ")
-    ("setup\\|init\\(iallize\\)?" . "Initializes the ")
+    ("setup\\|init\\(ialize\\)?" . "Initializes the ")
     ("select" . "Chooses the ")
     ("send" . "Sends a")
     ("re?c\\(v\\|ieves?\\)" . "Receives a ")
@@ -167,7 +167,7 @@ doesn't always work correctly."
     ("str\\(ing\\)?" . "string")
     ("use?r" . "user")
     ("num\\(ber\\)?" . "number")
-    ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;commen sylable
+    ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;common sylable
     )
   "List of common English abbreviations or full words.
 These are nouns (as opposed to verbs) for use in creating expanded
@@ -720,7 +720,7 @@ allocating something based on its type."
   "Convert tag or string PARAM into a name,comment pair.
 Optional COMMENTLIST is list of previously existing comments to
 use instead in alist form.  If the name doesn't appear in the list of
-standard names, then englishify it instead."
+standard names, then english it instead."
   (let ((cmt "")
         (aso srecode-document-autocomment-param-alist)
         (fnd nil)
@@ -811,8 +811,8 @@ not account for verb parts."
             (if (string-match (car (car al)) (downcase ts))
                 (progn
                   (setq newstr (concat newstr (cdr (car al))))
-                  ;; don't terminate because we may actuall have 2 words
-                  ;; next to eachother we didn't identify before
+                  ;; don't terminate because we may actually have 2 words
+                  ;; next to each other we didn't identify before
                   (setq llow t)))
             (setq al (cdr al)))
           (if (not llow) (setq newstr (concat newstr ts)))
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index 80e6f9d8d1c..d87dc315829 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -61,7 +61,7 @@
   (oset st lastdict dict))
 
 (defmethod srecode-extract-state-set-anchor ((st srecode-extract-state))
-  "Reset the achor point on extract state ST."
+  "Reset the anchor point on extract state ST."
   (oset st anchor (point)))
 
 (defmethod srecode-extract-state-extract ((st srecode-extract-state)
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el
index 088781cfb53..f13fb17ca8f 100644
--- a/lisp/cedet/srecode/fields.el
+++ b/lisp/cedet/srecode/fields.el
@@ -101,7 +101,7 @@ Has virtual :start and :end initializers.")
             ))
 
     ;; Create a temporary overlay now.  We have to use an overlay and
-    ;; not a marker becaues of the in-front insertion rules.  The rules
+    ;; not a marker because of the in-front insertion rules.  The rules
     ;; are backward from what is wanted while typing.
     (setq olay (make-overlay start end (current-buffer) t nil))
     (overlay-put olay 'srecode-init-only t)
@@ -338,7 +338,7 @@ PRE-LEN is used in the after mode for the length of the changed text."
            (inhibit-modification-hooks t)
            )
       ;; Sometimes a field is deleted, but we might still get a stray
-      ;; event.  Lets just ignore those events.
+      ;; event.  Let's just ignore those events.
       (when (slot-boundp field 'overlay)
         ;; First, fixup the two overlays, in case they got confused.
         (let ((main (oref field overlay))
diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el
index fdca64a7da1..b947c63f4dd 100644
--- a/lisp/cedet/srecode/find.el
+++ b/lisp/cedet/srecode/find.el
@@ -103,7 +103,7 @@ If TAB is nil, then always return t."
   (let ((proj (oref tab :project)))
     ;; Return t if the project wasn't set.
     (if (not proj) t
-      ;; If the project directory was set, lets check it.
+      ;; If the project directory was set, let's check it.
       (let ((dd (expand-file-name default-directory))
             (projexp (regexp-quote (directory-file-name proj))))
         (if (string-match (concat "^" projexp) dd)
@@ -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/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 84964a9e8b4..60f277b2c9f 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -255,7 +255,7 @@ ST can be a class, or an object."
       (let ((c (oref st code)))
         (srecode-push st)
         (srecode-insert-code-stream c dictionary))
-    ;; Poping the stack is protected
+    ;; Popping the stack is protected.
     (srecode-pop st)))
 
 (defun srecode-insert-code-stream (code dictionary)
@@ -936,7 +936,7 @@ with the dictionaries found in the dictionary."
   (if (srecode-dictionary-lookup-name dictionary (oref sti :object-name))
       ;; If we have a value, then call the next method
       (srecode-insert-method-helper sti dictionary 'includedtemplate)
-    ;; If we don't have a special dictitonary, then just insert with the
+    ;; If we don't have a special dictionary, then just insert with the
     ;; current dictionary.
     (srecode-insert-subtemplate sti dictionary 'includedtemplate))
   )
@@ -946,7 +946,7 @@ with the dictionaries found in the dictionary."
 ;; It will first insert the included template, then insert the embedded
 ;; template wherever the $^$ in the included template was.
 ;;
-;; Since it uses dual inheretance, it will magically get the end-matching
+;; Since it uses dual inheritance, it will magically get the end-matching
 ;; behavior of #, with the including feature of >.
 ;;
 (defclass srecode-template-inserter-include-wrap (srecode-template-inserter-include srecode-template-inserter-section-start)
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index bb2db79acc6..23d09bc9a4b 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -61,7 +61,7 @@
         (define-key km (format "%c" k) 'srecode-bind-insert)
         (setq k (1+ k))))
     km)
-  "Keymap used behind the srecode prefix key in in srecode minor mode.")
+  "Keymap used behind the srecode prefix key in srecode minor mode.")
 
 (defvar srecode-menu-bar
   (list
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 4a1a15c1d12..956bdfbd97a 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -394,7 +394,7 @@ as `function' will leave point where code might be inserted."
         (srecode-semantic-apply-tag-to-dict tagobj dict)))
 
     ;; Insert dict-entries into the dictionary LAST so that previous
-    ;; items can be overriden.
+    ;; items can be overridden.
     (let ((entries dict-entries))
       (while entries
         (srecode-dictionary-set-value dict
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 5a407aad135..0a99b7869e8 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -483,7 +483,7 @@ section or ? for an ask variable."
 
         (if (> start (point))
             ;; If our starting point is after the found point, that
-            ;; means we are not inside the macro.  Retur nil.
+            ;; means we are not inside the macro.  Return nil.
             nil
           ;; We are inside the macro, extract the text so far.
           (let* ((macroend (match-beginning 0))
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index 33440d04432..acfc2486711 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -231,7 +231,7 @@ This is to take advantage of TeXinfo's markup symbols."
     (if buffer
         (progn (set-buffer buffer)
                (srecode-texi-texify-docstring string))
-      ;; Else, no buffer, so lets do something else
+      ;; Else, no buffer, so let's do something else
       (with-mode-local texinfo-mode
         (srecode-texi-texify-docstring string)))))
 
diff --git a/lisp/color.el b/lisp/color.el
index 5b67eb58a63..487e280dd59 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -28,7 +28,7 @@
 ;; complements, and computing CIEDE2000 color distances.
 ;;
 ;; Supported color representations include RGB (red, green, blue), HSV
-;; (hue, saturation, value), HSL (hue, saturation, luminence), sRGB,
+;; (hue, saturation, value), HSL (hue, saturation, luminance), sRGB,
 ;; CIE XYZ, and CIE L*a*b* color components.
 
 ;;; Code:
diff --git a/lisp/comint.el b/lisp/comint.el
index b91b82adb21..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))
@@ -3442,7 +3442,7 @@ Also print a message when redirection is completed."
   :group 'comint
   :type 'boolean)
 
-;; Directly analagous to comint-preoutput-filter-functions
+;; Directly analogous to comint-preoutput-filter-functions
 (defvar comint-redirect-filter-functions nil
   "List of functions to call before inserting redirected process output.
 Each function gets one argument, a string containing the text received
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 3760a7a9d74..1d6b42f48e6 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -400,8 +400,8 @@ since it could result in memory overflow and make Emacs crash."
                        (const :tag "Never (nil)" :value nil)
                        (const :tag "Only on ttys" :value tty)
                        (other :tag "Always" t)) "23.1")
-             (window-splits windows boolean "24.1")
-             (window-nest windows boolean "24.1")
+             (window-combination-resize windows boolean "24.1")
+             (window-combination-limit windows boolean "24.1")
              ;; xdisp.c
              (show-trailing-whitespace whitespace-faces boolean nil
                                        :safe booleanp)
diff --git a/lisp/desktop.el b/lisp/desktop.el
index cdc787dfde9..8a61bec0eea 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -4,7 +4,7 @@
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Keywords: convenience
-;; Favourite-brand-of-beer: None, I hate beer.
+;; Favorite-brand-of-beer: None, I hate beer.
 
 ;; This file is part of GNU Emacs.
 
@@ -1176,7 +1176,7 @@ directory DIRNAME."
           (setq desktop-buffer-fail-count (1+ desktop-buffer-fail-count))
           (setq result nil))
         ;; Restore buffer list order with new buffer at end. Don't change
-        ;; the order for old desktop files (old desktop module behaviour).
+        ;; the order for old desktop files (old desktop module behavior).
         (unless (< desktop-file-version 206)
           (mapc 'bury-buffer buffer-list)
           (when result (bury-buffer result)))
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/dired-aux.el b/lisp/dired-aux.el
index b09096978fd..b63940cec2d 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -347,7 +347,7 @@ This calls touch."
                   ;; Do the operation and record failures.
                   failures (nconc (apply function (append args pending))
                                   failures)
-                  ;; Transfer the elemens of PENDING onto PAST
+                  ;; Transfer the elements of PENDING onto PAST
                   ;; and clear it out.  Now PAST contains the first N files
                   ;; specified (for some N), and FILES contains the rest.
                   past (nconc past pending)
@@ -1490,7 +1490,7 @@ ARG as in `dired-get-marked-files'.
 Optional arg MARKER-CHAR as in `dired-create-files'.
 Optional arg OP1 is an alternate form for OPERATION if there is
   only one file.
-Optional arg HOW-TO determiness how to treat the target.
+Optional arg HOW-TO determines how to treat the target.
   If HOW-TO is nil, use `file-directory-p' to determine if the
    target is a directory.  If so, the marked file(s) are created
    inside that directory.  Otherwise, the target is a plain file;
diff --git a/lisp/dired.el b/lisp/dired.el
index 4e03d61a06e..32a7f749681 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -704,7 +704,7 @@ Don't use that together with FILTER."
 
 (defun dired-file-name-at-point ()
   "Try to get a file name at point in the current dired buffer.
-This hook is inteneded to be put in `file-name-at-point-functions'."
+This hook is intended to be put in `file-name-at-point-functions'."
   (let ((filename (dired-get-filename nil t)))
     (when filename
       (if (file-directory-p filename)
@@ -1025,7 +1025,7 @@ BEG..END is the line where the file info is located."
   ;; spaces there (and within the filename as well, of course).
   (save-excursion
     (let (file file-col other other-col)
-      ;; Check that there is indeed a file, and that there is anoter adjacent
+      ;; Check that there is indeed a file, and that there is another adjacent
       ;; file with which to align, and that additional spaces are needed to
       ;; align the filenames.
       (when (and (setq file (progn (goto-char beg)
@@ -3667,7 +3667,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 ;;;;;;  dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
 ;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
 ;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "0ffe89ae728efb341dfacff6c85e2ba4")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "2026ac587f0d9e893bae7662ff9d9318")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index a245a91c5c1..976848e155d 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -664,8 +664,8 @@
 
 ;; @@@ Enabling automatic advice activation:
 ;; =========================================
-;; Automatic advice activation is enabled by default. It can be disabled by
-;; doint `M-x ad-stop-advice' and enabled again with `M-x ad-start-advice'.
+;; Automatic advice activation is enabled by default. It can be disabled with
+;; `M-x ad-stop-advice' and enabled again with `M-x ad-start-advice'.
 
 ;; @@ Caching of advised definitions:
 ;; ==================================
@@ -1608,7 +1608,7 @@
 ;; fii
 ;;
 ;; Now we advise `fii' to use an optional second argument that controls the
-;; amount of incrementation. A list following the (optional) position
+;; amount of incrementing. A list following the (optional) position
 ;; argument of the advice will be interpreted as an argument list
 ;; specification. This means you cannot specify an empty argument list, and
 ;; why would you want to anyway?
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 6d5067151d3..b3ac23b2b76 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -514,6 +514,13 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE
             (let ((secondary-autoloads-file-buf
                    (if (local-variable-p 'generated-autoload-file)
                        (current-buffer))))
+              ;; Ignore a buffer-local setting if it points to the
+              ;; global value.  Otherwise we end up writing a mix of md5s
+              ;; and time-stamps to the global file.  (Bug#10049)
+              (and secondary-autoloads-file-buf
+                   outfile
+                   (not otherbuf)
+                   (setq secondary-autoloads-file-buf nil))
               (with-current-buffer (marker-buffer output-start)
                 (save-excursion
                   ;; Insert the section-header line which lists the file name
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 7b98ade2422..0630f5f4e4e 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -527,7 +527,7 @@
            ;; However, don't actually bother calling `ignore'.
            `(prog1 nil . ,(mapcar 'byte-optimize-form (cdr form))))
 
-          ;; Neeeded as long as we run byte-optimize-form after cconv.
+          ;; Needed as long as we run byte-optimize-form after cconv.
           ((eq fn 'internal-make-closure) form)
 
           ((byte-code-function-p fn)
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 84aaf8718ed..2e05e93d569 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -743,7 +743,7 @@ BYTES and PC are updated after evaluating all the arguments."
 
 (defmacro byte-compile-push-bytecode-const2 (opcode const2 bytes pc)
   "Push OPCODE and the two-byte constant CONST2 onto BYTES, and add 3 to PC.
-CONST2 may be evaulated multiple times."
+CONST2 may be evaluated multiple times."
   `(byte-compile-push-bytecodes ,opcode (logand ,const2 255) (lsh ,const2 -8)
                                 ,bytes ,pc))
 
@@ -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/cconv.el b/lisp/emacs-lisp/cconv.el
index 742a98f5e7b..c6e157be776 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -26,21 +26,21 @@
 
 ;; This takes a piece of Elisp code, and eliminates all free variables from
 ;; lambda expressions.  The user entry points are cconv-closure-convert and
-;; cconv-closure-convert-toplevel(for toplevel forms).
+;; cconv-closure-convert-toplevel (for toplevel forms).
 ;; All macros should be expanded beforehand.
 ;;
 ;; Here is a brief explanation how this code works.
-;; Firstly, we analyse the tree by calling cconv-analyse-form.
+;; Firstly, we analyze the tree by calling cconv-analyse-form.
 ;; This function finds all mutated variables, all functions that are suitable
 ;; for lambda lifting and all variables captured by closure. It passes the tree
 ;; once, returning a list of three lists.
 ;;
-;; Then we calculate the intersection of first and third lists returned by
+;; Then we calculate the intersection of the first and third lists returned by
 ;; cconv-analyse form to find all mutated variables that are captured by
 ;; closure.
 
 ;; Armed with this data, we call cconv-closure-convert-rec, that rewrites the
-;; tree recursivly, lifting lambdas where possible, building closures where it
+;; tree recursively, lifting lambdas where possible, building closures where it
 ;; is needed and eliminating mutable variables used in closure.
 ;;
 ;; We do following replacements :
@@ -142,7 +142,7 @@ Returns a form where all lambdas don't have any free variables."
   (let ((cconv-freevars-alist '())
         (cconv-lambda-candidates '())
         (cconv-captured+mutated '()))
-    ;; Analyse form - fill these variables with new information.
+    ;; Analyze form - fill these variables with new information.
     (cconv-analyse-form form '())
     (setq cconv-freevars-alist (nreverse cconv-freevars-alist))
     (cconv-convert form nil nil))) ; Env initially empty.
@@ -581,7 +581,7 @@ FORM is the parent form that binds this var."
 
 (defun cconv-analyse-form (form env)
   "Find mutated variables and variables captured by closure.
-Analyse lambdas if they are suitable for lambda lifting.
+Analyze lambdas if they are suitable for lambda lifting.
 - FORM is a piece of Elisp code after macroexpansion.
 - ENV is an alist mapping each enclosing lexical variable to its info.
    I.e. each element has the form (VAR . (READ MUTATED CAPTURED CALLED)).
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index 56930a74693..e9f2ec54601 100644
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -169,7 +169,7 @@ Make sure the width/height is correct."
               :initform t)
    (name-face :initarg :name-face
               :initform 'bold)
-   (labels-face :initarg :lables-face
+   (labels-face :initarg :labels-face
                 :initform 'italic)
    (chart :initarg :chart
           :initform nil)
@@ -634,7 +634,7 @@ SORT-PRED if desired."
             (setq extlst (cons s extlst)
                   cntlst (cons 1 cntlst)))))
       (setq flst (cdr flst)))
-    ;; Lets create the chart!
+    ;; Let's create the chart!
     (chart-bar-quickie 'vertical "Files Extension Distribution"
                        extlst "File Extensions"
                        cntlst "# of occurrences"
@@ -693,7 +693,7 @@ SORT-PRED if desired."
                      ;(car (nth 5 data)) ; floats are Emacs only
                      ;(cdr (nth 5 data))
                      )))
-    ;; Lets create the chart!
+    ;; Let's create the chart!
     (chart-bar-quickie 'vertical "Emacs Runtime Storage Usage"
                        names "Storage Items"
                        nums "Objects")))
@@ -710,7 +710,7 @@ SORT-PRED if desired."
     (if (fboundp 'x-display-list)
         (setq names (append names '("x-displays"))
               nums (append nums (list (length (x-display-list))))))
-    ;; Lets create the chart!
+    ;; Let's create the chart!
     (chart-bar-quickie 'vertical "Emacs List Size Chart"
                        names "Various Lists"
                        nums "Objects")))
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/edebug.el b/lisp/emacs-lisp/edebug.el
index 176b906632c..86c7e59fd07 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1285,7 +1285,7 @@ expressions; a `progn' form will be returned enclosing these forms."
   ;; Wrap a form, usually a defining form, but any evaluated one.
   ;; If speclist is non-nil, this is being called by edebug-defining-form.
   ;; Otherwise it is being called from edebug-read-and-maybe-wrap-form1.
-  ;; This is a hack, but I havent figured out a simpler way yet.
+  ;; This is a hack, but I haven't figured out a simpler way yet.
   (let* ((form-data-entry (edebug-get-form-data-entry form-begin form-end))
          ;; Set this marker before parsing.
          (edebug-form-begin-marker
diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index 139f5e6a4ce..278dff0f085 100644
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -54,7 +54,7 @@ not been set, use values from the parent."
 
 (defmethod slot-unbound ((object eieio-instance-inheritor) class slot-name fn)
   "If a slot OBJECT in this CLASS is unbound, try to inherit, or throw a signal.
-SLOT-NAME is the offending slot.  FN is the function signalling the error."
+SLOT-NAME is the offending slot.  FN is the function signaling the error."
   (if (slot-boundp object 'parent-instance)
       ;; It may not look like it, but this line recurses back into this
       ;; method if the parent instance's slot is unbound.
@@ -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/emacs-lisp/eieio-speedbar.el b/lisp/emacs-lisp/eieio-speedbar.el
index d28ecd9615b..4ff3cc01978 100644
--- a/lisp/emacs-lisp/eieio-speedbar.el
+++ b/lisp/emacs-lisp/eieio-speedbar.el
@@ -282,7 +282,7 @@ Add one of the child classes to this class to the parent list of a class."
   :abstract t)
 
 
-;;; Methods to eieio-speedbar-* which do not need to be overriden
+;;; Methods to eieio-speedbar-* which do not need to be overridden
 ;;
 (defmethod eieio-speedbar-make-tag-line ((object eieio-speedbar)
                                          depth)
@@ -409,7 +409,7 @@ Optional DEPTH is the depth we start at."
         default-directory))))
 
 
-;;; Methods to the eieio-speedbar-* classes which need to be overriden.
+;;; Methods to the eieio-speedbar-* classes which need to be overridden.
 ;;
 (defmethod eieio-speedbar-object-children ((object eieio-speedbar))
   "Return a list of children to be displayed in speedbar.
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 352bd245ba4..5e29a85d386 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -395,7 +395,7 @@ It creates an autoload function for CNAME's constructor."
           (aset newc class-parent (cons SC (aref newc class-parent)))
           )
 
-        ;; turn this into a useable self-pointing symbol
+        ;; turn this into a usable self-pointing symbol
         (set cname cname)
 
         ;; Store the new class vector definition into the symbol.  We need to
@@ -509,7 +509,7 @@ See `defclass' for more information."
         ;; save parent in child
         (aset newc class-parent (list eieio-default-superclass))))
 
-    ;; turn this into a useable self-pointing symbol
+    ;; turn this into a usable self-pointing symbol
     (set cname cname)
 
     ;; These two tests must be created right away so we can have self-
@@ -553,7 +553,7 @@ See `defclass' for more information."
       (put cname 'cl-deftype-handler
            (list 'lambda () `(list 'satisfies (quote ,csym)))))
 
-    ;; before adding new slots, lets add all the methods and classes
+    ;; before adding new slots, let's add all the methods and classes
     ;; in from the parent class
     (eieio-copy-parents-into-subclass newc superclasses)
 
@@ -826,7 +826,7 @@ if default value is nil."
   ;; Make sure we duplicate those items that are sequences.
   (condition-case nil
       (if (sequencep d) (setq d (copy-sequence d)))
-    ;; This copy can fail on a cons cell with a non-cons in the cdr.  Lets skip it if it doesn't work.
+    ;; This copy can fail on a cons cell with a non-cons in the cdr.  Let's skip it if it doesn't work.
     (error nil))
   (if (sequencep type) (setq type (copy-sequence type)))
   (if (sequencep cust) (setq cust (copy-sequence cust)))
@@ -958,7 +958,7 @@ if default value is nil."
           (progn
             (eieio-perform-slot-validation-for-default a type value skipnil)
             ;; Here we have found a :class version of a slot.  This
-            ;; requires a very different aproach.
+            ;; requires a very different approach.
             (aset newc class-class-allocation-a (cons a (aref newc class-class-allocation-a)))
             (aset newc class-class-allocation-doc (cons doc (aref newc class-class-allocation-doc)))
             (aset newc class-class-allocation-type (cons type (aref newc class-class-allocation-type)))
@@ -1470,7 +1470,7 @@ created by the :initarg tag."
          (c (eieio-slot-name-index class obj slot)))
     (if (not c)
         ;; It might be missing because it is a :class allocated slot.
-        ;; Lets check that info out.
+        ;; Let's check that info out.
         (if (setq c (eieio-class-slot-name-index class slot))
             ;; Oref that slot.
             (aref (aref (class-v class) class-class-allocation-values) c)
@@ -1503,7 +1503,7 @@ Fills in OBJ's SLOT with its default value."
          (c (eieio-slot-name-index cl obj slot)))
     (if (not c)
         ;; It might be missing because it is a :class allocated slot.
-        ;; Lets check that info out.
+        ;; Let's check that info out.
         (if (setq c
                   (eieio-class-slot-name-index cl slot))
             ;; Oref that slot.
@@ -1549,7 +1549,7 @@ Fills in OBJ's SLOT with VALUE."
   (let ((c (eieio-slot-name-index (object-class-fast obj) obj slot)))
     (if (not c)
         ;; It might be missing because it is a :class allocated slot.
-        ;; Lets check that info out.
+        ;; Let's check that info out.
         (if (setq c
                   (eieio-class-slot-name-index (aref obj object-class) slot))
             ;; Oset that slot.
@@ -1581,7 +1581,7 @@ Fills in the default value in CLASS' in SLOT with VALUE."
          (c (eieio-slot-name-index class nil slot)))
     (if (not c)
         ;; It might be missing because it is a :class allocated slot.
-        ;; Lets check that info out.
+        ;; Let's check that info out.
         (if (setq c (eieio-class-slot-name-index class slot))
             (progn
               ;; Oref that slot.
@@ -2563,7 +2563,7 @@ This is usually a symbol that starts with `:'."
 
 ;;;
 ;; We want all objects created by EIEIO to have some default set of
-;; behaviours so we can create object utilities, and allow various
+;; behaviors so we can create object utilities, and allow various
 ;; types of error checking.  To do this, create the default EIEIO
 ;; class, and when no parent class is specified, use this as the
 ;; default.  (But don't store it in the other classes as the default,
@@ -3051,7 +3051,7 @@ Optional argument GROUP is the sub-group of slots to display.
 
 ;;;### (autoloads (eieio-help-mode-augmentation-maybee eieio-describe-generic
 ;;;;;;  eieio-describe-constructor eieio-describe-class eieio-browse)
-;;;;;;  "eieio-opt" "eieio-opt.el" "1bed0a56310f402683419139ebc18d7f")
+;;;;;;  "eieio-opt" "eieio-opt.el" "4fb6625c3a007438aab4e8e77b6c73c2")
 ;;; Generated autoloads from eieio-opt.el
 
 (autoload 'eieio-browse "eieio-opt" "\
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 901b6d1bf6a..9822b556f34 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -434,7 +434,7 @@ In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'."
           nil
         (list (eldoc-current-symbol) argument-index)))))
 
-;; Move to the beginnig of current sexp.  Return the number of nested
+;; Move to the beginning of current sexp.  Return the number of nested
 ;; sexp the point was over or after.
 (defun eldoc-beginning-of-sexp ()
   (let ((parse-sexp-ignore-comments t)
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index 0b8aa034500..dd3e02b8388 100644
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -296,7 +296,7 @@ If necessary, this first calls `elint-initialize'."
   (elint-display-log)
   (elint-set-mode-line t)
   (mapc 'elint-top-form (elint-update-env))
-  ;; Tell the user we're finished.  This is terribly klugy: we set
+  ;; Tell the user we're finished.  This is terribly kludgy: we set
     ;; elint-top-form-logged so elint-log-message doesn't print the
     ;; ** top form ** header...
   (elint-set-mode-line)
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 2afe42dc070..8b64cd84bb1 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -248,7 +248,7 @@ Emacs bug 6581 at URL `http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6581'."
     ;; We disallow nil since `ert-test-at-point' and related functions
     ;; want to return a test name, but also need an out-of-band value
     ;; on failure.  Nil is the most natural out-of-band value; using 0
-    ;; or "" or signalling an error would be too awkward.
+    ;; or "" or signaling an error would be too awkward.
     ;;
     ;; Note that nil is still a valid value for the `name' slot in
     ;; ert-test objects.  It designates an anonymous test.
@@ -448,7 +448,7 @@ arguments: INNER-FORM and FORM-DESCRIPTION-FORM, where INNER-FORM
 is an expression equivalent to FORM, and FORM-DESCRIPTION-FORM is
 an expression that returns a description of FORM.  INNER-EXPANDER
 should return code that calls INNER-FORM and performs the checks
-and error signalling specific to the particular variant of
+and error signaling specific to the particular variant of
 `should'.  The code that INNER-EXPANDER returns must not call
 FORM-DESCRIPTION-FORM before it has called INNER-FORM."
   (lexical-let ((inner-expander inner-expander))
@@ -489,17 +489,17 @@ Returns nil."
 
 Determines whether CONDITION matches TYPE and EXCLUDE-SUBTYPES,
 and aborts the current test as failed if it doesn't."
-  (let ((signalled-conditions (get (car condition) 'error-conditions))
+  (let ((signaled-conditions (get (car condition) 'error-conditions))
         (handled-conditions (etypecase type
                               (list type)
                               (symbol (list type)))))
-    (assert signalled-conditions)
-    (unless (ert--intersection signalled-conditions handled-conditions)
+    (assert signaled-conditions)
+    (unless (ert--intersection signaled-conditions handled-conditions)
       (ert-fail (append
                  (funcall form-description-fn)
                  (list
                   :condition condition
-                  :fail-reason (concat "the error signalled did not"
+                  :fail-reason (concat "the error signaled did not"
                                        " have the expected type")))))
     (when exclude-subtypes
       (unless (member (car condition) handled-conditions)
@@ -507,7 +507,7 @@ and aborts the current test as failed if it doesn't."
                    (funcall form-description-fn)
                    (list
                     :condition condition
-                    :fail-reason (concat "the error signalled was a subtype"
+                    :fail-reason (concat "the error signaled was a subtype"
                                          " of the expected type"))))))))
 
 ;; FIXME: The expansion will evaluate the keyword args (if any) in
@@ -515,7 +515,7 @@ and aborts the current test as failed if it doesn't."
 (defmacro* should-error (form &rest keys &key type exclude-subtypes)
   "Evaluate FORM and check that it signals an error.
 
-The error signalled needs to match TYPE.  TYPE should be a list
+The error signaled needs to match TYPE.  TYPE should be a list
 of condition names.  (It can also be a non-nil symbol, which is
 equivalent to a singleton list containing that symbol.)  If
 EXCLUDE-SUBTYPES is nil, the error matches TYPE if one of its
@@ -523,7 +523,7 @@ condition names is an element of TYPE.  If EXCLUDE-SUBTYPES is
 non-nil, the error matches TYPE if it is an element of TYPE.
 
 If the error matches, returns (ERROR-SYMBOL . DATA) from the
-error.  If not, or if no error was signalled, abort the test as
+error.  If not, or if no error was signaled, abort the test as
 failed."
   (unless type (setq type ''error))
   (ert--expand-should
@@ -2120,7 +2120,7 @@ To be used in the ERT results buffer."
 
 EWOC-FN specifies the direction and should be either `ewoc-prev'
 or `ewoc-next'.  If there are no more nodes in that direction, an
-error is signalled with the message ERROR-MESSAGE."
+error is signaled with the message ERROR-MESSAGE."
   (loop
    (setq node (funcall ewoc-fn ert--results-ewoc node))
    (when (null node)
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 9408c0a3c9d..f9e7fe44824 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -769,7 +769,7 @@ this command arranges for all errors to enter the debugger."
 Reset the `defvar' and `defcustom' variables to the initial value.
 Reinitialize the face according to the `defface' specification."
   ;; The code in edebug-defun should be consistent with this, but not
-  ;; the same, since this gets a macroexpended form.
+  ;; the same, since this gets a macroexpanded form.
   (cond ((not (listp form))
          form)
         ((and (eq (car form) 'defvar)
diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el
index 8000dcd53dd..6905589e5be 100644
--- a/lisp/emacs-lisp/regi.el
+++ b/lisp/emacs-lisp/regi.el
@@ -161,7 +161,7 @@ useful information:
                 (progn (goto-char end) (regi-pos 'bonl))
                 (progn (goto-char start) (regi-pos 'bol)))))
 
-        ;; lets find the special tags and remove them from the working
+        ;; let's find the special tags and remove them from the working
         ;; frame. note that only the last special tag is used.
         (mapc
          (function
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index 56efd142198..2e388d20114 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -393,7 +393,7 @@ FORM is of the form `(and FORM1 ...)'."
 (defun rx-anything (form)
   "Match any character."
   (if (consp form)
-      (error "rx `anythng' syntax error: %s" form))
+      (error "rx `anything' syntax error: %s" form))
   (rx-or (list 'or 'not-newline ?\n)))
 
 
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index cad7c8419b2..d43ba6c0d3e 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -69,13 +69,23 @@
 ;;     (exp ("IF" exp "ELSE" exp "END") ("CASE" cases "END"))
 ;;     (cases (cases "ELSE" insts) ...)
 ;;   The IF-rule implies ELSE=END and the CASE-rule implies ELSE>END.
-;;   FIXME: we could try to resolve such conflicts automatically by changing
-;;   the way BNF rules such as the IF-rule is handled.  I.e. rather than
-;;   IF=ELSE and ELSE=END, we could turn them into IF<ELSE and ELSE>END
-;;   and IF=END,
+;;   This can be resolved simply with:
+;;     (exp ("IF" expelseexp "END") ("CASE" cases "END"))
+;;     (expelseexp (exp) (exp "ELSE" exp))
+;;     (cases (cases "ELSE" insts) ...)
+;; - Another source of conflict is when a terminator/separator is used to
+;;   terminate elements at different levels, as in:
+;;     (decls ("VAR" vars) (decls "," decls))
+;;     (vars (id) (vars "," vars))
+;;   often these can be resolved by making the lexer distinguish the two
+;;   kinds of commas, e.g. based on the following token.
 
 ;; TODO & BUGS:
 ;;
+;; - We could try to resolve conflicts such as the IFexpELSEexpEND -vs-
+;;   CASE(casesELSEexp)END automatically by changing the way BNF rules such as
+;;   the IF-rule is handled.  I.e. rather than IF=ELSE and ELSE=END, we could
+;;   turn them into IF<ELSE and ELSE>END and IF=END.
 ;; - Using the structural information SMIE gives us, it should be possible to
 ;;   implement a `smie-align' command that would automatically figure out what
 ;;   there is to align and how to do it (something like: align the token of
@@ -107,6 +117,10 @@
 
 ;;; Code:
 
+;; FIXME:
+;; - smie-indent-comment doesn't interact well with mis-indented lines (where
+;;   the indent rules don't do what the user wants).  Not sure what to do.
+
 (eval-when-compile (require 'cl))
 
 (defgroup smie nil
@@ -130,7 +144,7 @@
 ;; - a 2 dimensional precedence table (key word "prec2"), is a 2D
 ;;   table recording the precedence relation (can be `<', `=', `>', or
 ;;   nil) between each pair of tokens.
-;; - a precedence-level table (key word "grammar"), which is a alist
+;; - a precedence-level table (key word "grammar"), which is an alist
 ;;   giving for each token its left and right precedence level (a
 ;;   number or nil).  This is used in `smie-grammar'.
 ;; The prec2 tables are only intermediate data structures: the source
@@ -138,6 +152,8 @@
 ;; turns them into a levels table, which is what's used by the rest of
 ;; the SMIE code.
 
+(defvar smie-warning-count 0)
+
 (defun smie-set-prec2tab (table x y val &optional override)
   (assert (and x y))
   (let* ((key (cons x y))
@@ -149,7 +165,8 @@
             ;; be able to distinguish the two cases so that overrides
             ;; don't hide real conflicts.
             (puthash key (gethash key override) table)
-          (display-warning 'smie (format "Conflict: %s %s/%s %s" x old val y)))
+          (display-warning 'smie (format "Conflict: %s %s/%s %s" x old val y))
+          (incf smie-warning-count))
       (puthash key val table))))
 
 (put 'smie-precs->prec2 'pure t)
@@ -193,21 +210,54 @@ one of those elements share the same precedence level and associativity."
       prec2)))
 
 (put 'smie-bnf->prec2 'pure t)
-(defun smie-bnf->prec2 (bnf &rest precs)
+(defun smie-bnf->prec2 (bnf &rest resolvers)
+  "Convert the BNF grammar into a prec2 table.
+BNF is a list of nonterminal definitions of the form:
+  \(NONTERM RHS1 RHS2 ...)
+where each RHS is a (non-empty) list of terminals (aka tokens) or non-terminals.
+Not all grammars are accepted:
+- an RHS cannot be an empty list (this is not needed, since SMIE allows all
+  non-terminals to match the empty string anyway).
+- an RHS cannot have 2 consecutive non-terminals: between each non-terminal
+  needs to be a terminal (aka token).  This is a fundamental limitation of
+  the parsing technology used (operator precedence grammar).
+Additionally, conflicts can occur:
+- The returned prec2 table holds constraints between pairs of
+  token, and for any given pair only one constraint can be
+  present, either: T1 < T2, T1 = T2, or T1 > T2.
+- A token can either be an `opener' (something similar to an open-paren),
+  a `closer' (like a close-paren), or `neither' of the two (e.g. an infix
+  operator, or an inner token like \"else\").
+Conflicts can be resolved via RESOLVERS, which is a list of elements that can
+be either:
+- a precs table (see `smie-precs->prec2') to resolve conflicting constraints,
+- a constraint (T1 REL T2) where REL is one of = < or >."
   ;; FIXME: Add repetition operator like (repeat <separator> <elems>).
   ;; Maybe also add (or <elem1> <elem2>...) for things like
   ;; (exp (exp (or "+" "*" "=" ..) exp)).
   ;; Basically, make it EBNF (except for the specification of a separator in
   ;; the repetition, maybe).
-  (let ((nts (mapcar 'car bnf))         ;Non-terminals
-        (first-ops-table ())
-        (last-ops-table ())
-        (first-nts-table ())
-        (last-nts-table ())
-        (prec2 (make-hash-table :test 'equal))
-        (override (apply 'smie-merge-prec2s
-                         (mapcar 'smie-precs->prec2 precs)))
-        again)
+  (let* ((nts (mapcar 'car bnf))        ;Non-terminals.
+         (first-ops-table ())
+         (last-ops-table ())
+         (first-nts-table ())
+         (last-nts-table ())
+         (smie-warning-count 0)
+         (prec2 (make-hash-table :test 'equal))
+         (override
+          (let ((precs ())
+                (over (make-hash-table :test 'equal)))
+            (dolist (resolver resolvers)
+              (cond
+               ((and (= 3 (length resolver)) (memq (nth 1 resolver) '(= < >)))
+                (smie-set-prec2tab
+                 over (nth 0 resolver) (nth 2 resolver) (nth 1 resolver)))
+               ((memq (caar resolver) '(left right assoc nonassoc))
+                (push resolver precs))
+               (t (error "Unknown resolver %S" resolver))))
+            (apply #'smie-merge-prec2s over
+                   (mapcar 'smie-precs->prec2 precs))))
+         again)
     (dolist (rules bnf)
       (let ((nt (car rules))
             (last-ops ())
@@ -287,8 +337,11 @@ one of those elements share the same precedence level and associativity."
           (setq rhs (cdr rhs)))))
     ;; Keep track of which tokens are openers/closer, so they can get a nil
     ;; precedence in smie-prec2->grammar.
-    (puthash :smie-open/close-alist (smie-bnf-classify bnf) prec2)
-    (puthash :smie-closer-alist (smie-bnf-closer-alist bnf) prec2)
+    (puthash :smie-open/close-alist (smie-bnf--classify bnf) prec2)
+    (puthash :smie-closer-alist (smie-bnf--closer-alist bnf) prec2)
+    (if (> smie-warning-count 0)
+        (display-warning
+         'smie (format "Total: %d warnings" smie-warning-count)))
     prec2))
 
 ;; (defun smie-prec2-closer-alist (prec2 include-inners)
@@ -343,7 +396,7 @@ one of those elements share the same precedence level and associativity."
 ;;                openers)
 ;;       alist)))
 
-(defun smie-bnf-closer-alist (bnf &optional no-inners)
+(defun smie-bnf--closer-alist (bnf &optional no-inners)
   ;; We can also build this closer-alist table from a prec2 table,
   ;; but it takes more work, and the order is unpredictable, which
   ;; is a problem for smie-close-block.
@@ -371,37 +424,33 @@ from the table, e.g. the table will not include things like (\"if\" . \"else\").
                 (pushnew (cons (car rhs) term) alist :test #'equal)))))))
     (nreverse alist)))
 
-(defun smie-bnf-classify (bnf)
+(defun smie-bnf--set-class (table token class)
+  (let ((prev (gethash token table class)))
+    (puthash token
+             (cond
+              ((eq prev class) class)
+              ((eq prev t) t) ;Non-terminal.
+              (t (display-warning
+                  'smie
+                  (format "token %s is both %s and %s" token class prev))
+                 'neither))
+             table)))
+
+(defun smie-bnf--classify (bnf)
   "Return a table classifying terminals.
-Each terminal can either be an `opener', a `closer', or neither."
+Each terminal can either be an `opener', a `closer', or `neither'."
   (let ((table (make-hash-table :test #'equal))
-        (nts (mapcar #'car bnf))
         (alist '()))
     (dolist (category bnf)
-      (puthash (car category) 'neither table) ;Remove non-terminals.
+      (puthash (car category) t table)) ;Mark non-terminals.
+    (dolist (category bnf)
       (dolist (rhs (cdr category))
         (if (null (cdr rhs))
-            (puthash (pop rhs) 'neither table)
-          (let ((first (pop rhs)))
-            (puthash first
-                     (if (memq (gethash first table) '(nil opener))
-                         'opener
-                       (unless (member first nts)
-                         (error "SMIE: token %s is both opener and non-opener"
-                                first))
-                       'neither)
-                     table))
-          (while (cdr rhs)
-            (puthash (pop rhs) 'neither table)) ;Remove internals.
-          (let ((last (pop rhs)))
-            (puthash last
-                     (if (memq (gethash last table) '(nil closer))
-                         'closer
-                       (unless (member last nts)
-                         (error "SMIE: token %s is both closer and non-closer"
-                                last))
-                       'neither)
-                     table)))))
+            (smie-bnf--set-class table (pop rhs) 'neither)
+          (smie-bnf--set-class table (pop rhs) 'opener)
+          (while (cdr rhs)              ;Remove internals.
+            (smie-bnf--set-class table (pop rhs) 'neither))
+          (smie-bnf--set-class table (pop rhs) 'closer))))
     (maphash (lambda (tok v)
                (when (memq v '(closer opener))
                  (push (cons tok v) alist)))
@@ -692,8 +741,22 @@ Possible return values:
                    ;; Keep looking as long as we haven't matched the
                    ;; topmost operator.
                    (levels
-                    (if (numberp (funcall op-forw toklevels))
-                        (push toklevels levels)))
+                    (cond
+                     ((numberp (funcall op-forw toklevels))
+                      (push toklevels levels))
+                     ;; FIXME: For some languages, we can express the grammar
+                     ;; OK, but next-sexp doesn't stop where we'd want it to.
+                     ;; E.g. in SML, we'd want to stop right in front of
+                     ;; "local" if we're scanning (both forward and backward)
+                     ;; from a "val/fun/..." at the same level.
+                     ;; Same for Pascal/Modula2's "procedure" w.r.t
+                     ;; "type/var/const".
+                     ;;
+                     ;; ((and (functionp (cadr (funcall op-forw toklevels)))
+                     ;;       (funcall (cadr (funcall op-forw toklevels))
+                     ;;                levels))
+                     ;;  (setq levels nil))
+                     ))
                    ;; We matched the topmost operator.  If the new operator
                    ;; is the last in the corresponding BNF rule, we're done.
                    ((not (numberp (funcall op-forw toklevels)))
@@ -759,7 +822,7 @@ Possible return values:
    (indirect-function 'smie-op-left)
    halfsexp))
 
-;;; Miscellanous commands using the precedence parser.
+;;; Miscellaneous commands using the precedence parser.
 
 (defun smie-backward-sexp-command (&optional n)
   "Move backward through N logical elements."
@@ -980,7 +1043,7 @@ function should return nil for arguments it does not expect.
 
 OFFSET can be:
 nil                             use the default indentation rule.
-`(column . COLUMN)              indent to column COLUMN.
+\(column . COLUMN)              indent to column COLUMN.
 NUMBER                          offset by NUMBER, relative to a base token
                                 which is the current token for :after and
                                 its parent for :before.
@@ -1579,8 +1642,9 @@ KEYWORDS are additional arguments, which can use the following keywords:
                      (while (setq closer (pop closers))
                        (unless (and closers
                                     ;; FIXME: this eliminates prefixes of other
-                                    ;; closers, but we should probably elimnate
-                                    ;; prefixes of other keywords as well.
+                                    ;; closers, but we should probably
+                                    ;; eliminate prefixes of other keywords
+                                    ;; as well.
                                     (string-prefix-p closer (car closers)))
                          (push (aref closer (1- (length closer))) triggers)))
                      (delete-dups triggers)))))))
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index 75c9a01323d..e16970c6804 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -321,7 +321,7 @@ This mode is usually not used directly; instead, other major
 modes are derived from it, using `define-derived-mode'.
 
 In this major mode, the buffer is divided into multiple columns,
-which are labelled using the header line.  Each non-empty line
+which are labeled using the header line.  Each non-empty line
 belongs to one \"entry\", and the entries can be sorted according
 to their column values.
 
diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el
index cc3e633f098..7144138445c 100644
--- a/lisp/emacs-lisp/tcover-unsafep.el
+++ b/lisp/emacs-lisp/tcover-unsafep.el
@@ -100,7 +100,7 @@
       . (risky-local-variable format-alist))
     ( (setq buffer-display-count (delete-file "x"))
       . (function delete-file))
-    ;;These are actualy safe (they signal errors)
+    ;;These are actually safe (they signal errors)
     ( (apply '(x) '(1 2 3))
       . (function (x)))
     ( (let (((x))) 1)
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 4c83e7e2e0d..8f991575eda 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -509,7 +509,7 @@ eliminated by adding more test cases."
       (set-buffer-modified-p changed))))
 
 (defun testcover-mark-all (&optional buffer)
-  "Mark all forms in BUFFER that did not get completley tested during
+  "Mark all forms in BUFFER that did not get completely tested during
 coverage tests.  This function creates many overlays."
   (interactive "bMark forms in buffer: ")
   (if buffer
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index 010e32857c5..71e607140de 100644
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -34,7 +34,7 @@
 ;; you put (setq crisp-load-scroll-all t) in your .emacs before
 ;; loading this package.  If this feature is enabled, it will bind
 ;; meta-f1 to the scroll-all mode toggle.  The scroll-all package
-;; duplicates the scroll-alling feature in CRiSP.
+;; duplicates the scroll-all feature in CRiSP.
 
 ;; Also, the default keybindings for brief/CRiSP override the M-x
 ;; key to exit the editor.  If you don't like this functionality, you
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 5d90ac694a4..76cab39f5b2 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -741,7 +741,7 @@ If command is repeated at same position, delete the rectangle."
   ;; We try to reuse overlays where possible because this is more efficient
   ;; and results in less flicker.
   ;; If cua--rectangle-virtual-edges is nil and the buffer contains tabs or short lines,
-  ;; the higlighted region may not be perfectly rectangular.
+  ;; the highlighted region may not be perfectly rectangular.
   (let ((deactivate-mark deactivate-mark)
         (old cua--rectangle-overlays)
         (new nil)
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/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 24a38236176..fcab8b57c1e 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -871,7 +871,7 @@ Otherwise return the normal value."
     (abbreviate-file-name file)))
 
 ;; Sit for VAL milliseconds.  XEmacs doesn't support the millisecond arg
-;; in sit-for, so this function smoothes out the differences.
+;; in sit-for, so this function smooths out the differences.
 (defsubst viper-sit-for-short (val &optional nodisp)
   (sit-for (/ val 1000.0) nodisp))
 
@@ -1112,7 +1112,7 @@ Otherwise return the normal value."
        lis)))
 
 
-;; Smoothes out the difference between Emacs' unread-command-events
+;; Smooths out the difference between Emacs' unread-command-events
 ;; and XEmacs unread-command-event.  Arg is a character, an event, a list of
 ;; events or a sequence of keys.
 ;;
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 38a881845df..b2035e8ede6 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -777,7 +777,7 @@ It also can't undo some Viper settings."
   (viper-unbind-mouse-search-key)
   (viper-unbind-mouse-insert-key)
   ;; In emacs, we have to advice handle-switch-frame
-  ;; This advice is undone earlier, when all advices matchine "viper-" are
+  ;; This advice is undone earlier, when all advices matching "viper-" are
   ;; deactivated.
   (if (featurep 'xemacs)
       (remove-hook 'mouse-leave-frame-hook 'viper-remember-current-frame))
@@ -1050,7 +1050,7 @@ It also can't undo some Viper settings."
                                          (memq 'down (event-modifiers (aref key 1)))))
                                 (read-event))))))
     ) ; (if (featurep 'xemacs)
-  
+
   (if (featurep 'xemacs)
       ;; XEmacs
       (defadvice describe-key-briefly
@@ -1076,7 +1076,7 @@ It also can't undo some Viper settings."
                                (prefix-numeric-value current-prefix-arg))
                            1))))
     ) ; (if (featurep 'xemacs)
-  
+
   (defadvice find-file (before viper-add-suffix-advice activate)
     "Use `read-file-name' for reading arguments."
     (interactive (cons (read-file-name "Find file: " nil default-directory)
diff --git a/lisp/epg.el b/lisp/epg.el
index 9ca07e213b4..00c00f9c9d3 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -356,7 +356,7 @@ query by itself and Emacs can intercept them."
 PROGRESS-CALLBACK is either a function, or a cons-cell whose
 car is a function and cdr is a callback data.
 
-The function gets five arguments: the context, the operation
+The function gets six arguments: the context, the operation
 description, the character to display a progress unit, the
 current amount done, the total amount to be done, and the
 callback data (if any)."
@@ -2031,7 +2031,7 @@ CIPHER must be a file data object.
 
 If you use this function, you will need to wait for the completion of
 `epg-gpg-program' by using `epg-wait-for-completion' and call
-`epg-reset' to clear a temporaly output file.
+`epg-reset' to clear a temporary output file.
 If you are unsure, use synchronous version of this function
 `epg-decrypt-file' or `epg-decrypt-string' instead."
   (unless (epg-data-file cipher)
@@ -2097,7 +2097,7 @@ For a normal or a cleartext signature, SIGNED-TEXT should be nil.
 
 If you use this function, you will need to wait for the completion of
 `epg-gpg-program' by using `epg-wait-for-completion' and call
-`epg-reset' to clear a temporaly output file.
+`epg-reset' to clear a temporary output file.
 If you are unsure, use synchronous version of this function
 `epg-verify-file' or `epg-verify-string' instead."
   (epg-context-set-operation context 'verify)
@@ -2195,7 +2195,7 @@ Otherwise, it makes a cleartext signature.
 
 If you use this function, you will need to wait for the completion of
 `epg-gpg-program' by using `epg-wait-for-completion' and call
-`epg-reset' to clear a temporaly output file.
+`epg-reset' to clear a temporary output file.
 If you are unsure, use synchronous version of this function
 `epg-sign-file' or `epg-sign-string' instead."
   (epg-context-set-operation context 'sign)
@@ -2299,7 +2299,7 @@ If RECIPIENTS is nil, it performs symmetric encryption.
 
 If you use this function, you will need to wait for the completion of
 `epg-gpg-program' by using `epg-wait-for-completion' and call
-`epg-reset' to clear a temporaly output file.
+`epg-reset' to clear a temporary output file.
 If you are unsure, use synchronous version of this function
 `epg-encrypt-file' or `epg-encrypt-string' instead."
   (epg-context-set-operation context 'encrypt)
@@ -2414,7 +2414,7 @@ If RECIPIENTS is nil, it performs symmetric encryption."
 
 If you use this function, you will need to wait for the completion of
 `epg-gpg-program' by using `epg-wait-for-completion' and call
-`epg-reset' to clear a temporaly output file.
+`epg-reset' to clear a temporary output file.
 If you are unsure, use synchronous version of this function
 `epg-export-keys-to-file' or `epg-export-keys-to-string' instead."
   (epg-context-set-operation context 'export-keys)
@@ -2457,7 +2457,7 @@ KEYS is a data object.
 
 If you use this function, you will need to wait for the completion of
 `epg-gpg-program' by using `epg-wait-for-completion' and call
-`epg-reset' to clear a temporaly output file.
+`epg-reset' to clear a temporary output file.
 If you are unsure, use synchronous version of this function
 `epg-import-keys-from-file' or `epg-import-keys-from-string' instead."
   (epg-context-set-operation context 'import-keys)
@@ -2498,7 +2498,7 @@ KEY-ID-LIST is a list of key IDs.
 
 If you use this function, you will need to wait for the completion of
 `epg-gpg-program' by using `epg-wait-for-completion' and call
-`epg-reset' to clear a temporaly output file.
+`epg-reset' to clear a temporary output file.
 If you are unsure, use synchronous version of this function
 `epg-receive-keys' instead."
   (epg-context-set-operation context 'receive-keys)
@@ -2526,7 +2526,7 @@ KEYS is a list of key IDs"
 
 If you use this function, you will need to wait for the completion of
 `epg-gpg-program' by using `epg-wait-for-completion' and call
-`epg-reset' to clear a temporaly output file.
+`epg-reset' to clear a temporary output file.
 If you are unsure, use synchronous version of this function
 `epg-delete-keys' instead."
   (epg-context-set-operation context 'delete-keys)
@@ -2558,7 +2558,7 @@ If you are unsure, use synchronous version of this function
 
 If you use this function, you will need to wait for the completion of
 `epg-gpg-program' by using `epg-wait-for-completion' and call
-`epg-reset' to clear a temporaly output file.
+`epg-reset' to clear a temporary output file.
 If you are unsure, use synchronous version of this function
 `epg-sign-keys' instead."
   (epg-context-set-operation context 'sign-keys)
@@ -2593,7 +2593,7 @@ PARAMETERS specifies parameters for the key.
 
 If you use this function, you will need to wait for the completion of
 `epg-gpg-program' by using `epg-wait-for-completion' and call
-`epg-reset' to clear a temporaly output file.
+`epg-reset' to clear a temporary output file.
 If you are unsure, use synchronous version of this function
 `epg-generate-key-from-file' or `epg-generate-key-from-string' instead."
   (epg-context-set-operation context 'generate-key)
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index d72d3f51bb1..9a029893352 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * erc-notify.el (erc-notify-interval, erc-cmd-NOTIFY): Fix typos.
+
 2011-10-20  Chong Yidong  <cyd@gnu.org>
 
         * erc.el (define-erc-module): Fix autogenerated docstring to
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01
index 4016586abc7..001ab42926f 100644
--- a/lisp/erc/ChangeLog.01
+++ b/lisp/erc/ChangeLog.01
@@ -160,9 +160,9 @@
 
         * debian/control: integrated erc-speak back into erc
 
-        * debian/maint/conffiles, debian/maint/conffiles.in, debian/maint/postinst, 
-          debian/maint/postinst.in, debian/maint/prerm, debian/maint/prerm.in, 
-          debian/scripts/install, debian/scripts/install.in, debian/scripts/remove, 
+        * debian/maint/conffiles, debian/maint/conffiles.in, debian/maint/postinst,
+          debian/maint/postinst.in, debian/maint/prerm, debian/maint/prerm.in,
+          debian/scripts/install, debian/scripts/install.in, debian/scripts/remove,
           debian/scripts/remove.in, debian/scripts/startup.erc-speak:
         since erc-speak is gone, resurrect the static files, and update them to support the latest erc
 
@@ -220,7 +220,7 @@
         * erc.el:
         * Applied antifuchs/mhp patches, the latest on erc-help, unmodified
         * New variable: erc-reuse-buffers default to t.
-        * Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same, 
+        * Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same,
           then one can assume thats the same channel/query target again.
 
 2001-11-23  Mario Lang  <mlang@delysid.org>
@@ -238,7 +238,7 @@
 
         * erc.el: * New local variable, erc-announced-server-name
         * erc-mode-line-format supports a new symbol, target-and/or-server
-        * The mode-line displays the announced server name now (for autojoin later..., 
+        * The mode-line displays the announced server name now (for autojoin later...,
           greets Adam)
         * New macro, erc-server-hook-list for a nice way to define the defcustoms of the erc-server-*-hook's
           Thanks go to the guy from #emacs who helped with that
@@ -457,7 +457,7 @@
         * erc.el: * Reduction patch 2
           This time, we move the input ring handling into erc-ring.el
           Remember that you need (require 'erc-ring) in your .emacs to get the input handling as a feature
-          And remeber, that you don't need it if you don't use input ring :-)
+          And remember, that you don't need it if you don't use input ring :-)
 
         * erc-ring.el: * Initial checkin
 
@@ -603,11 +603,11 @@
 
         * debian/control: added the new erc-speak package
 
-        * debian/README.erc-speak, debian/maint/postinst.in, debian/maint/prerm.in, 
+        * debian/README.erc-speak, debian/maint/postinst.in, debian/maint/prerm.in,
           debian/scripts/install.in, debian/scripts/remove.in:
         new file
 
-        * debian/maint/postinst, debian/maint/prerm, debian/scripts/install, 
+        * debian/maint/postinst, debian/maint/prerm, debian/scripts/install,
           debian/scripts/remove:
         removed, superseded by its .in counterpart
 
@@ -625,7 +625,7 @@
 2001-10-23  Mario Lang  <mlang@delysid.org>
 
         * erc-speak.el:
-        * Added a new personality for channel name announcement, This makes streams of flooded channels much easier to listen to, 
+        * Added a new personality for channel name announcement, This makes streams of flooded channels much easier to listen to,
           especially if you are on more than one channel simultaneously.
 
         * erc.el:
@@ -643,7 +643,7 @@
         * Removed now really obsolete code. Package size reduced by 50%
 
         * erc-speak.el:
-        * Very important fix! Now erc-speak is really complete. Messages don't get cut anymore. Be sure to use auditory icons, 
+        * Very important fix! Now erc-speak is really complete. Messages don't get cut anymore. Be sure to use auditory icons,
           it's reallllly cool now!!!
 
         * erc-speak.el: *** empty log message ***
@@ -655,9 +655,9 @@
 
         * debian/changelog: oops, silly typo
 
-        * debian/changelog, debian/control, debian/copyright, 
-          debian/maint/conffiles, debian/maint/postinst, debian/maint/prerm, 
-          debian/rules, debian/scripts/install, debian/scripts/remove, 
+        * debian/changelog, debian/control, debian/copyright,
+          debian/maint/conffiles, debian/maint/postinst, debian/maint/prerm,
+          debian/rules, debian/scripts/install, debian/scripts/remove,
           debian/scripts/startup:
         initial check-in
 
@@ -666,7 +666,7 @@
         * erc.el:
         * Changed erc-insert-hook to get two arguments, START and END of the region
           which got inserted. CAREFUL! This could break stuff, but it makes the hook
-          much more useable.
+          much more usable.
 
         * erc.el:
         * Made erc-smiley a new option, currently set to t to showoff this feature. :)
@@ -826,11 +826,11 @@
         * (erc-complete-nick): Add ": " only if one completes directly after the erc-prompt, otherwise, add just one space
 
         * erc.el:
-        * Changed menu-definition to use easymenu (hopefully this now works under Xemacs)
+        * Changed menu-definition to use easymenu (hopefully this now works under XEmacs)
         * Fix for custom problem with :must-match on XEmacs (thanks shapr)
         * Added /COUNTRY command using (what-domain) from package mail-extr (shapr)
         * Fix for case-sensitivity problem with pals (they are now all downcased)
-        * Different (erc-version) function which now can take prefix argument to insert the version information into the current buffer, 
+        * Different (erc-version) function which now can take prefix argument to insert the version information into the current buffer,
           instead of just displaying it in the minibuffer.
 
 2001-09-10  Mario Lang  <mlang@delysid.org>
@@ -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>
 
@@ -1055,4 +1054,3 @@
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
-
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index 09ab1cb3796..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:
@@ -1373,7 +1373,7 @@
 
         * erc-menu.el:
         * changed how we check if we should activate "Track hidden channels" and
-          whether it should be selected - fixes a bug Xemacs where whole menu bar
+          whether it should be selected - fixes a bug XEmacs where whole menu bar
           does not work if menu is loaded
 
         * erc-menu.el:
@@ -1545,7 +1545,7 @@
 
         * added s461 to english catalog
 
-        * fixed bug where Xemacs would not quit if erc-quit-reason was
+        * fixed bug where XEmacs would not quit if erc-quit-reason was
           set to erc-quit-reason-various and assoc-default was not defined
 
 2002-06-04  Andreas Fuchs  <asf@void.at>
@@ -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 7f82a9bcbe2..322f7c93f7d 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -323,7 +323,7 @@
 
         * erc.el(erc-modules): Add some more symbols to the set
 
-        * erc.el(erc-modules):  * erc.el(erc-modules): Add :greedy t to the set in 
+        * erc.el(erc-modules):  * erc.el(erc-modules): Add :greedy t to the set in
 
         * erc-dcc.el:
         More autoloads which make dcc autoload upon ctcp dcc query received.
@@ -744,7 +744,7 @@
 
 2003-04-27  Damien Elmes  <erc@repose.cx>
 
-        * erc.el:       * erc.el: erc-modules: added 
+        * erc.el:       * erc.el: erc-modules: added
 
 2003-04-27  Alex Schroeder  <alex@gnu.org>
 
@@ -1232,7 +1232,7 @@
 
 2003-01-19  Mario Lang  <mlang@delysid.org>
 
-        * debian/README.Debian, debian/changelog, debian/scripts/install, 
+        * debian/README.Debian, debian/changelog, debian/scripts/install,
           debian/scripts/startup.erc, Makefile:
         Prepare for 20030119 debian package
 
@@ -1305,7 +1305,7 @@
         * (erc-current-logfile): call expand-file-name, so that downcase doesn't mess up ~
 
         * erc.el: * (erc-mode): Define a proper case-table.
-        * (erc-downcase): just call downcase for now, lets see if the case-table is portable, if yes, we'll remove all erc-downcase references anyway...
+        * (erc-downcase): just call downcase for now, let's see if the case-table is portable, if yes, we'll remove all erc-downcase references anyway...
 
         * erc-button.el: * (erc-button-add-buttons): regex-quote the nick
 
@@ -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>
@@ -1600,7 +1600,8 @@
 
         * erc-dcc.el: * erc-dcc-ipv4-regexp: New constant
         * (erc-ip-to-decimal): Use it.
-        * erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp:        * erc-dcc-host: :type
+        * erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp:
+        * erc-dcc-host: :type
         * (pcomplete/erc-mode/DCC): Add completion for GET and CLOSE.
         * Some docstring/comment fixes.
 
@@ -1609,8 +1610,8 @@
         POS in any case, otherwise, linewrap occurs.
 
         * erc-dcc.el:
-        * Fixed the unibyte-multibyte problem (now a dcc get buffer is (set-buffer-multibyte nil), 
-          and saves correctly (tried with 21.3.50). Thanks to Eli for suggesting it!
+        * Fixed the unibyte-multibyte problem (now a dcc get buffer is (set-buffer-multibyte nil),
+          and saves correctly (tried with 21.3.50)). Thanks to Eli for suggesting it!
         * Added :start-time plist property/value to GET handling so that we can calculate elapsed-time.
         * Some (unwind-protect (progn (set-buffer ...) ...)) constructs replaced with (with-current-buffer ...)
 
@@ -1691,12 +1692,12 @@
 
 2003-01-11  Mario Lang  <mlang@delysid.org>
 
-        * erc-dcc.el:   * erc-dcc.el: * (erc-dcc-do-LIST-command): Fix 
+        * erc-dcc.el:   * erc-dcc.el: * (erc-dcc-do-LIST-command): Fix
 
         * erc-dcc.el:
         * buffer-local variables erc-dcc-sent-marker and erc-dcc-send-confirmed marker removed
           Keep This info in erc-dcc-member :sent and :confirmed plist values
-        * :     * :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer 
+        * :     * :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer
         * erc-dcc-send-connect-hook: New hook, defaults to erc-dcc-send-block and erc-dcc-send-connected, which now prints a msg...
 
         * erc-dcc.el:
@@ -1985,7 +1986,7 @@
         (erc-server-PRIVMSG-or-NOTICE): Capitalized first word in message to user.
 
         * erc.el(erc-scroll-to-bottom):
-        Temporarilly bind resize-mini-windows to nil so that
+        Temporarily bind resize-mini-windows to nil so that
             users who have it set to a non-nil value will not suffer from premature
             minibuffer shrinkage due to the below recenter call.  I have no idea why
             this works, but it solves the problem, and has no negative side effects.
@@ -2160,4 +2161,3 @@ See ChangeLog.02 for earlier changes.
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
-
diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04
index 7db040fd23f..ff47372b8e3 100644
--- a/lisp/erc/ChangeLog.04
+++ b/lisp/erc/ChangeLog.04
@@ -136,7 +136,7 @@
 2004-12-14  Diane Murray  <disumu@x3y2z1.net>
 
         * erc.el: The last change to `erc-mode-line-format' introduced a
-        bug in Xemacs - it can't handle the #(" "...) strings at all.  The
+        bug in XEmacs - it can't handle the #(" "...) strings at all.  The
         following changes fix the bug and simplify the mode-line handling
         considerably.  (erc-mode-line-format): Now defined as a string
         which will be formatted using `format-spec' and take the place of
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index a15e038dddc..74172b2573f 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -263,7 +263,7 @@ exceeds `erc-autoaway-idle-seconds'."
   "Set the away state globally.
 
 If NOTEST is specified, do not check to see whether there is an
-activer server buffer available."
+active server buffer available."
   ;; Note that the idle timer runs, even when Emacs is inactive.  In
   ;; order to prevent flooding when we connect, we test for an
   ;; existing process.
@@ -284,4 +284,3 @@ activer server buffer available."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
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-notify.el b/lisp/erc/erc-notify.el
index 1b245ec2e33..10f6806ec12 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -46,7 +46,7 @@ status change."
   :type '(repeat string))
 
 (defcustom erc-notify-interval 60
-  "*Time interval (in seconds) for checking online status of notificated
+  "*Time interval (in seconds) for checking online status of notified
 people."
   :group 'erc-notify
   :type 'integer)
@@ -88,7 +88,7 @@ strings."
 (defun erc-notify-install-message-catalogs ()
   (erc-define-catalog
    'english
-   '((notify_current . "Notificated people online: %l")
+   '((notify_current . "Notified people online: %l")
      (notify_list    . "Current notify list: %l")
      (notify_on      . "Detected %n on IRC network %m")
      (notify_off     . "%n has left IRC network %m"))))
@@ -197,11 +197,11 @@ nick from `erc-last-ison' to prevent any further notifications."
 ;;;###autoload
 (defun erc-cmd-NOTIFY (&rest args)
   "Change `erc-notify-list' or list current notify-list members online.
-Without args, list the current list of notificated people online,
+Without args, list the current list of notified people online,
 with args, toggle notify status of people."
   (cond
    ((null args)
-    ;; Print current notificated people (online)
+    ;; Print current notified people (online)
     (let ((ison (erc-with-server-buffer erc-last-ison)))
       (if (not ison)
           (erc-display-message
@@ -250,4 +250,3 @@ with args, toggle notify status of people."
 ;; 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 2d8c2565f69..a218dd12555 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1569,7 +1569,7 @@ symbol, it may have these values:
     ;; current ERC buffer.
     ;; if buf-name is taken by a different connection (or by something !erc)
     ;; then see if "buf-name/server" meets the same criteria
-    (dolist (candidate (list buf-name (concat buf-name "/" server))) 
+    (dolist (candidate (list buf-name (concat buf-name "/" server)))
       (if (and (not buffer-name)
                erc-reuse-buffers
                (get-buffer candidate)
@@ -4001,7 +4001,7 @@ and as second argument the event parsed as a vector."
        (not (string-match "^\C-a\\ACTION.*\C-a$" message))))
 
 (defun erc-format-privmessage (nick msg privp msgp)
-  "Format a PRIVMSG in an insertible fashion."
+  "Format a PRIVMSG in an insertable fashion."
   (let* ((mark-s (if msgp (if privp "*" "<") "-"))
          (mark-e (if msgp (if privp "*" ">") "-"))
          (str    (format "%s%s%s %s" mark-s nick mark-e msg))
@@ -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-alias.el b/lisp/eshell/em-alias.el
index 4e1dbd41045..04ba19d407d 100644
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -74,7 +74,7 @@
 ;; session, it is likely that they are experiencing a spelling
 ;; difficulty associated with a certain command.  To combat this,
 ;; Eshell will offer to automatically define an alias for that
-;; mispelled command, once a given tolerance threshold has been
+;; misspelled command, once a given tolerance threshold has been
 ;; reached.
 
 ;; Whenever the same bad command name is encountered
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index db9b003895f..df1f7b67e29 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -90,7 +90,7 @@ This option slows down recursive glob processing by quite a bit."
 
 (defcustom eshell-error-if-no-glob nil
   "If non-nil, it is an error for a glob pattern not to match.
- This mimcs the behavior of zsh if non-nil, but bash if nil."
+ This mimics the behavior of zsh if non-nil, but bash if nil."
   :type 'boolean
   :group 'eshell-glob)
 
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 993e9d63a94..db5e98062a9 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -609,7 +609,7 @@ See also `eshell-read-history'."
                                            history))))
                  (setq index (1- index)))
                (let ((fhist (list t)))
-                 ;; uniqify the list, but preserve the order
+                 ;; uniquify the list, but preserve the order
                  (while history
                    (unless (member (car history) fhist)
                      (nconc fhist (list (car history))))
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/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 1fb8b7f4c32..dcb23967645 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -311,7 +311,7 @@ special character that is not itself a backslash."
                   (char-to-string (char-before))))
         ;; allow \\<RET> to mean a literal "\" character followed by a
         ;; normal return, rather than a backslash followed by a line
-        ;; continuator (i.e., "\\ + \n" rather than "\ + \\n").  This
+        ;; continuation (i.e., "\\ + \n" rather than "\ + \\n").  This
         ;; is necessary because backslashes in Eshell are not special
         ;; unless they either precede something special, or precede a
         ;; backslash that precedes something special.  (Mainly this is
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 52c8c2ddc20..7b90797eb43 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -247,7 +247,7 @@ will have to visit the file 'eshell-cmd.el' and run the command
   '(eshell-named-command
     eshell-lisp-command
     eshell-process-identity)
-  "A list of functions which might return an ansychronous process.
+  "A list of functions which might return an asynchronous process.
 If they return a process object, execution of the calling Eshell
 command will wait for completion (in the background) before finishing
 the command."
@@ -480,25 +480,20 @@ implemented via rewriting, rather than as a function."
       (let ((body (car (last terms))))
         (setcdr (last terms 2) nil)
         `(let ((for-items
-                ;; Apparently, eshell-do-eval only works for immutable
-                ;; let-bindings, i.e. we cannot use `setq' on `for-items'.
-                ;; Instead we store the list in the car of a cons-cell (which
-                ;; acts as a ref-cell) so we can setcar instead of setq.
-                (list
-                 (append
-                  ,@(mapcar
-                     (lambda (elem)
-                       (if (listp elem)
-                           elem
-                         `(list ,elem)))
-                     (cdr (cddr terms))))))
+                (append
+                 ,@(mapcar
+                    (lambda (elem)
+                      (if (listp elem)
+                          elem
+                        `(list ,elem)))
+                    (cdr (cddr terms)))))
                (eshell-command-body '(nil))
                (eshell-test-body '(nil)))
-           (while (consp (car for-items))
-             (let ((,(intern (cadr terms)) (caar for-items)))
+           (while (consp for-items)
+             (let ((,(intern (cadr terms)) (car for-items)))
                (eshell-protect
                 ,(eshell-invokify-arg body t)))
-             (setcar for-items (cdar for-items)))
+             (setq for-items (cdr for-items)))
            (eshell-close-handles
             eshell-last-command-status
             (list 'quote eshell-last-command-result))))))
@@ -766,9 +761,8 @@ This macro calls itself recursively, with NOTFIRST non-nil."
     `(eshell-copy-handles
       (progn
         ,(when (cdr pipeline)
-           `(let (nextproc)
-              (setq nextproc
-                    (eshell-do-pipelines (quote ,(cdr pipeline)) t))
+           `(let ((nextproc
+                   (eshell-do-pipelines (quote ,(cdr pipeline)) t)))
               (eshell-set-output-handle ,eshell-output-handle
                                         'append nextproc)
               (eshell-set-output-handle ,eshell-error-handle
@@ -796,10 +790,9 @@ This macro calls itself recursively, with NOTFIRST non-nil."
 Output of each command is passed as input to the next one in the pipeline.
 This is used on systems where `start-process' is not supported."
   (when (setq pipeline (cadr pipeline))
-    `(let (result)
+    `(progn
        ,(when (cdr pipeline)
-          `(let (output-marker)
-             (setq output-marker ,(point-marker))
+          `(let ((output-marker ,(point-marker)))
              (eshell-set-output-handle ,eshell-output-handle
                                        'append output-marker)
              (eshell-set-output-handle ,eshell-error-handle
@@ -811,21 +804,21 @@ This is used on systems where `start-process' is not supported."
           (when (memq (car head) eshell-deferrable-commands)
             (ignore
              (setcar head
-                       (intern-soft
-                        (concat (symbol-name (car head)) "*"))))))
-         ;; The last process in the pipe should get its handles
+                     (intern-soft
+                      (concat (symbol-name (car head)) "*"))))))
+       ;; The last process in the pipe should get its handles
        ;; redirected as we found them before running the pipe.
        ,(if (null (cdr pipeline))
             `(progn
                (setq eshell-current-handles tail-handles)
                (setq eshell-in-pipeline-p nil)))
-       (setq result ,(car pipeline))
-       ;; tailproc gets the result of the last successful process in
-       ;; the pipeline.
-       (setq tailproc (or result tailproc))
-       ,(if (cdr pipeline)
-            `(eshell-do-pipelines-synchronously (quote ,(cdr pipeline))))
-       result)))
+       (let ((result ,(car pipeline)))
+         ;; tailproc gets the result of the last successful process in
+         ;; the pipeline.
+         (setq tailproc (or result tailproc))
+         ,(if (cdr pipeline)
+              `(eshell-do-pipelines-synchronously (quote ,(cdr pipeline))))
+         result))))
 
 (defalias 'eshell-process-identity 'identity)
 
@@ -890,8 +883,7 @@ Returns a string comprising the output from the command."
          (eshell-print "errors\n"))
      (if eshell-debug-command
          (eshell-print "commands\n")))
-    ((or (string= (car args) "-h")
-         (string= (car args) "--help"))
+    ((member (car args) '("-h" "--help"))
      (eshell-print "usage: eshell-debug [kinds]
 
 This command is used to aid in debugging problems related to Eshell
@@ -1091,6 +1083,11 @@ be finished later after the completion of an asynchronous subprocess."
           (eshell-manipulate "handling special form"
             (setcar args `(eshell-do-eval ',(car args) ,synchronous-p))))
         (eval form))
+       ((eq (car form) 'setq)
+        (if (cddr args) (error "Unsupported form (setq X1 E1 X2 E2..)"))
+        (eshell-manipulate "evaluating arguments to setq"
+          (setcar (cdr args) (eshell-do-eval (cadr args) synchronous-p)))
+        (list 'quote (eval form)))
        (t
         (if (and args (not (memq (car form) '(run-hooks))))
             (eshell-manipulate
@@ -1127,11 +1124,12 @@ be finished later after the completion of an asynchronous subprocess."
           ;; Thus, aliases can even contain references to asynchronous
           ;; sub-commands, and things will still work out as they
           ;; should.
-          (let (result new-form)
-            (if (setq new-form
-                      (catch 'eshell-replace-command
-                        (ignore
-                         (setq result (eval form)))))
+          (let* (result
+                 (new-form
+                  (catch 'eshell-replace-command
+                    (ignore
+                     (setq result (eval form))))))
+            (if new-form
                 (progn
                   (eshell-manipulate "substituting replacement form"
                     (setcar form (car new-form))
@@ -1247,25 +1245,23 @@ or an external command."
 PRINTER and ERRPRINT are functions to use for printing regular
 messages, and errors.  FORM-P should be non-nil if FUNC-OR-FORM
 represent a lisp form; ARGS will be ignored in that case."
-  (let (result)
-    (eshell-condition-case err
-        (progn
-          (setq result
-                (save-current-buffer
-                  (if form-p
-                      (eval func-or-form)
-                    (apply func-or-form args))))
-          (and result (funcall printer result))
-          result)
-      (error
-       (let ((msg (error-message-string err)))
-         (if (and (not form-p)
-                  (string-match "^Wrong number of arguments" msg)
-                  (fboundp 'eldoc-get-fnsym-args-string))
-             (let ((func-doc (eldoc-get-fnsym-args-string func-or-form)))
-               (setq msg (format "usage: %s" func-doc))))
-         (funcall errprint msg))
-       nil))))
+  (eshell-condition-case err
+      (let ((result
+             (save-current-buffer
+               (if form-p
+                   (eval func-or-form)
+                 (apply func-or-form args)))))
+        (and result (funcall printer result))
+        result)
+    (error
+     (let ((msg (error-message-string err)))
+       (if (and (not form-p)
+                (string-match "^Wrong number of arguments" msg)
+                (fboundp 'eldoc-get-fnsym-args-string))
+           (let ((func-doc (eldoc-get-fnsym-args-string func-or-form)))
+             (setq msg (format "usage: %s" func-doc))))
+       (funcall errprint msg))
+     nil)))
 
 (defsubst eshell-apply* (printer errprint func args)
   "Call FUNC, with ARGS, trapping errors and return them as output.
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 9abb0c8ecc0..43d56a5b89f 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -607,7 +607,7 @@ will return the parsed command."
                  (setq command (eshell-parse-command (cons beg end)
                                                      args t)))))
         (ignore
-         (message "Expecting completion of delimeter %c ..."
+         (message "Expecting completion of delimiter %c ..."
                   (if (listp delim)
                       (car delim)
                     delim)))
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 424d246a2b6..b508fd5352f 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -81,7 +81,7 @@ Setting this to nil is offered as an aid to debugging only."
 Numeric form is tested using the regular expression
 `eshell-number-regexp'.
 
-NOTE: If you find that numeric conversions are intefering with the
+NOTE: If you find that numeric conversions are interfering with the
 specification of filenames (for example, in calling `find-file', or
 some other Lisp function that deals with files, not numbers), add the
 following in your .emacs file:
@@ -140,14 +140,13 @@ function `string-to-number'."
 (defmacro eshell-condition-case (tag form &rest handlers)
   "If `eshell-handle-errors' is non-nil, this is `condition-case'.
 Otherwise, evaluates FORM with no error handling."
+  (declare (indent 2))
   (if eshell-handle-errors
       `(condition-case ,tag
            ,form
          ,@handlers)
     form))
 
-(put 'eshell-condition-case 'lisp-indent-function 2)
-
 (defun eshell-find-delimiter
   (open close &optional bound reverse-p backslash-p)
   "From point, find the CLOSE delimiter corresponding to OPEN.
@@ -275,14 +274,14 @@ Prepend remote identification of `default-directory', if any."
     text))
 
 (defmacro eshell-for (for-var for-list &rest forms)
-  "Iterate through a list"
+  "Iterate through a list."
+  (declare (indent 2))
   `(let ((list-iter ,for-list))
      (while list-iter
        (let ((,for-var (car list-iter)))
          ,@forms)
        (setq list-iter (cdr list-iter)))))
 
-(put 'eshell-for 'lisp-indent-function 2)
 
 (make-obsolete 'eshell-for 'dolist "24.1")
 
diff --git a/lisp/expand.el b/lisp/expand.el
index 544d0b1cb17..beb76321781 100644
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -111,7 +111,7 @@
     ("while" "while () {\n\n}" (8 12))
     ("default" "default:\n\nbreak;" 10)
     ("main" "int\nmain(int argc, char * argv[])\n{\n\n}\n" 37))
-  "Expansions for C mode. See `expand-add-abbrevs'.")
+  "Expansions for C mode.  See `expand-add-abbrevs'.")
 
 ;; lisp example from Jari Aalto <jaalto@tre.tele.nokia.fi>
 (defconst expand-sample-lisp-mode-expand-list
@@ -181,7 +181,7 @@
      (list 12 14))
 
     )
-   "Expansions for Lisp mode. See `expand-add-abbrevs'.")
+   "Expansions for Lisp mode.  See `expand-add-abbrevs'.")
 
 ;; perl example from Jari Aalto <jaalto@tre.tele.nokia.fi>
 (defconst expand-sample-perl-mode-expand-list
@@ -257,20 +257,20 @@
    (list "rtu"  "return ;"      (list 8))
 
    )
-  "Expansions for Perl mode. See `expand-add-abbrevs'.")
+  "Expansions for Perl mode.  See `expand-add-abbrevs'.")
 
 ;;; Code:
 
 ;;;###autoload
 (defun expand-add-abbrevs (table abbrevs)
-  "Add a list of abbrev to abbrev table TABLE.
+  "Add a list of abbreviations to abbrev table TABLE.
 ABBREVS is a list of abbrev definitions; each abbrev description entry
 has the form (ABBREV EXPANSION ARG).
 
 ABBREV is the abbreviation to replace.
 
 EXPANSION is the replacement string or a function which will make the
-expansion.  For example you, could use the DMacros or skeleton packages
+expansion.  For example, you could use the DMacros or skeleton packages
 to generate such functions.
 
 ARG is an optional argument which can be a number or a list of
@@ -279,7 +279,7 @@ beginning of the expanded text.
 
 If ARG is a list of numbers, point is placed according to the first
 member of the list, but you can visit the other specified positions
-cyclicaly with the functions `expand-jump-to-previous-slot' and
+cyclically with the functions `expand-jump-to-previous-slot' and
 `expand-jump-to-next-slot'.
 
 If ARG is omitted, point is placed at the end of the expanded text."
@@ -293,18 +293,15 @@ If ARG is omitted, point is placed at the end of the expanded text."
 (defvar expand-list nil "Temporary variable used by the Expand package.")
 
 (defvar expand-pos nil
-  "If non-nil, stores a vector containing markers to positions defined by the last expansion.
-This variable is local to a buffer.")
+  "If non-nil, stores a vector containing markers to positions defined by the last expansion.")
 (make-variable-buffer-local 'expand-pos)
 
 (defvar expand-index 0
-  "Index of the last marker used in `expand-pos'.
-This variable is local to a buffer.")
+  "Index of the last marker used in `expand-pos'.")
 (make-variable-buffer-local 'expand-index)
 
 (defvar expand-point nil
-  "End of the expanded region.
-This variable is local to a buffer.")
+  "End of the expanded region.")
 (make-variable-buffer-local 'expand-point)
 
 (defun expand-add-abbrev (table abbrev expansion arg)
diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index e8680b65d96..a3562944039 100644
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@@ -59,7 +59,7 @@ IMAGESPEC is the image data, and DOCSTRING is documentation for the image."
            (defimage ,variable ,imagespec ,docstring)
            (put (quote ,variable) 'ezimage t)))
 
-;; This hack is for the ezimage install which has an icons direcory for
+;; This hack is for the ezimage install which has an icons directory for
 ;; the default icons to be used.
 ;; (add-to-list 'load-path
 ;;           (concat (file-name-directory
diff --git a/lisp/faces.el b/lisp/faces.el
index 45173eb35da..7bc103ca699 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2457,7 +2457,7 @@ It is used for characters of no fonts too."
 ;;; Manipulating font names.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;; This is here for compatibilty with Emacs 20.2.  For example,
+;; This is here for compatibility with Emacs 20.2.  For example,
 ;; international/fontset.el uses x-resolve-font-name.  The following
 ;; functions are not used in the face implementation itself.
 
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 97105ed422b..74df9883324 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -523,7 +523,7 @@ The optional NOMODIFY argument suppresses the extra search."
   ;; (ffap-file-remote-p "/ffap.el:80")
   (or (and ffap-ftp-regexp
            (string-match ffap-ftp-regexp filename)
-           ;; Convert "/host.com://dir" to "/host:/dir", to handle a dieing
+           ;; Convert "/host.com://dir" to "/host:/dir", to handle a dying
            ;; practice of advertising ftp files as "host.dom://filename".
            (if (string-match "//" filename)
                ;; (replace-match "/" nil nil filename)
diff --git a/lisp/files-x.el b/lisp/files-x.el
index a6320b32e50..ca847097184 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -149,7 +149,7 @@ from the Local Variables list ignoring the input argument VALUE."
 
         (goto-char (point-max))
         (let ((comment-style 'plain)
-              (comment-start (or comment-start ";;; ")))
+              (comment-start (or comment-start ";; ")))
           (comment-region
            (prog1 (setq beg (point))
              (insert "\nLocal Variables:\nEnd:\n"))
diff --git a/lisp/files.el b/lisp/files.el
index aac415c1a96..0f167ce3ffa 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2603,7 +2603,7 @@ we don't actually set it to the same mode the buffer already has."
                    (if (looking-at auto-mode-interpreter-regexp)
                        (match-string 2)
                      ""))
-            ;; Map interpreter name to a mode, signalling we're done at the
+            ;; Map interpreter name to a mode, signaling we're done at the
             ;; same time.
             done (assoc (file-name-nondirectory mode)
                         interpreter-mode-alist))
@@ -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
@@ -6500,7 +6500,7 @@ Otherwise, trash FILENAME using the freedesktop.org conventions,
                                  (setq tries 0 success t))
                              (file-already-exists nil))
                      (setq tries (1- tries))
-                     ;; Uniqify new-fn.  (Some file managers do not
+                     ;; Uniquify new-fn.  (Some file managers do not
                      ;; like Emacs-style backup file names---e.g. bug
                      ;; 170956 in Konqueror bug tracker.)
                      (setq new-fn (make-temp-name (concat base-fn "_")))))
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/follow.el b/lisp/follow.el
index b387427a47f..7375b15ad16 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -87,7 +87,7 @@
 ;;   to turn it off.
 
 
-;; The command `follow-delete-other-windows-and-split' maximises the
+;; The command `follow-delete-other-windows-and-split' maximizes the
 ;; visible area of the current buffer.
 ;;
 ;; I recommend adding it, and `follow-mode', to hotkeys in the global
@@ -118,7 +118,7 @@
 ;; (setq pixel-vertical-clip-threshold 30)
 
 
-;; The correct way to configurate Follow mode, or any other mode for
+;; The correct way to configure Follow mode, or any other mode for
 ;; that matter, is to create one or more functions that do
 ;; whatever you would like to do.  These functions are then added to
 ;; a hook.
@@ -560,7 +560,7 @@ Keys specific to Follow mode:
 
 ;; `scroll-up' and `-down', but for windows in Follow mode.
 ;;
-;; Almost like the real thing, excpet when the cursor ends up outside
+;; Almost like the real thing, except when the cursor ends up outside
 ;; the top or bottom...  In our case however, we end up outside the
 ;; window and hence we are recenterd.  Should we let `recenter' handle
 ;; the point position we would never leave the selected window.  To do
@@ -652,7 +652,7 @@ the rightmost is selected.  If ARG is nil, the leftmost window is
 selected if the original window is the first one in the frame.
 
 To bind this command to a hotkey, place the following line
-in your `~/.emacs' file, replacing [f7] by your favourite key:
+in your `~/.emacs' file, replacing [f7] by your favorite key:
     (global-set-key [f7] 'follow-delete-other-windows-and-split)"
   (interactive "P")
   (let ((other (or (and (null arg)
@@ -894,7 +894,7 @@ Returns (end-pos end-of-buffer-p)"
                   (save-restriction
                     ;; Fix a mis-feature in `vertical-motion':
                     ;; The start of the window is assumed to
-                    ;; coinside with the start of a line.
+                    ;; coincide with the start of a line.
                     (narrow-to-region (point) (point-max))
                     (not (= height (vertical-motion height))))))
           (list (point) buffer-end-p))))))
@@ -1064,7 +1064,7 @@ Return the selected window."
 ;; it wasn't just moved here. (I.e. M-> shall not unconditionally place
 ;; the point in the selected window.)
 ;;
-;; (Compatibility cludge: in Emacs `window-end' is equal to `point-max';
+;; (Compatibility kludge: in Emacs `window-end' is equal to `point-max';
 ;; in XEmacs, it is equal to `point-max + 1'. Should I really bother
 ;; checking `window-end' now when I check `end-of-buffer' explicitly?)
 
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/frame.el b/lisp/frame.el
index 8359fed14a4..f63179de1f1 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1299,7 +1299,7 @@ Each element of the alist has the form (display . (width . height)),
 e.g. (\":0.0\" . (287 . 215)).
 
 If `display' equals t, it specifies dimensions for all graphical
-displays not explicitely specified."
+displays not explicitly specified."
   :version "22.1"
   :type '(alist :key-type (choice (string :tag "Display name")
                                   (const :tag "Default" t))
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 2c00229c76e..b0ef0439404 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1446,7 +1446,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     "REGDB_STRING"
     "REGDB_UNINSTALL_NAME"
     "REMOTE_DRIVE"
-    "REMOVALE_DRIVE"
+    "REMOVEABLE_DRIVE"
     "REPLACE_ITEM"
     "REPLACE"
     "RESET"
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index fbbf3bad5a8..a9db3c23fef 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,19 @@
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * gnus-sum.el (gnus-summary-make-menu-bar):
+        * gnus-uu.el (gnus-uu-decode-postscript)
+        (gnus-uu-decode-postscript-and-save):
+        * mailcap.el (mailcap-print-command):
+        * registry.el (registry-lookup, registry-lookup-breaks-before-lexbind):
+        Fix typos.
+
+2011-11-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * gnus-art.el (gnus-article-part-wrapper):
+        * shr-color.el (shr-color-visible-distance-min)
+        (shr-color-relative-to-absolute, set-minimum-interval)
+        (shr-color-visible): Fix typos.
+
 2011-11-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-sum.el (gnus-articles-to-read): Change wording in prompt to be
@@ -316,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)
 
@@ -969,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>
@@ -1820,7 +1836,7 @@
 
 2011-03-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * gnus-sum.el (gnus-articles-to-read): Revert back to old behaviour if
+        * gnus-sum.el (gnus-articles-to-read): Revert back to old behavior if
         we're selecting a group with unread articles.
 
         * nnimap.el (nnimap-open-connection-1): Allow `network-only', too.
@@ -2559,7 +2575,7 @@
         * gnus-sum.el (gnus-user-date): Rename back from
         gnus-summary-user-date since user code refers to it.
 
-        * shr.el (shr-render-td): Store the actual background colour used.
+        * shr.el (shr-render-td): Store the actual background color used.
 
         * message.el (message-setup-1): Don't bind the constant
         -forbidden-properties.
@@ -2647,9 +2663,9 @@
 
 2011-02-01  Lars Ingebrigtsen  <larsi@gnus.org>
 
-        * shr.el (shr-render-td): Only do colours at the final rendering.
+        * shr.el (shr-render-td): Only do colors at the final rendering.
         Should be slightly faster.
-        (shr-insert-table): Fix up TD background colours when doing the
+        (shr-insert-table): Fix up TD background colors when doing the
         vertical padding.
 
         * gnus-art.el (article-date-ut): Protect against articles with no Date
@@ -2777,7 +2793,7 @@
 
 2011-01-27  Lars Ingebrigtsen  <larsi@gnus.org>
 
-        * shr.el (shr-put-color): Special-case background colours: Do put them
+        * shr.el (shr-put-color): Special-case background colors: Do put them
         at the blank parts at the front of the lines.
 
         * gnus-draft.el (gnus-draft-clear-marks): New function to be run as an
@@ -3782,7 +3798,7 @@
 
 2010-11-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * shr-color.el (shr-color-visible): Don't bug out if the colour names
+        * shr-color.el (shr-color-visible): Don't bug out if the color names
         don't exist.
 
 2010-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
@@ -3854,7 +3870,7 @@
 
 2010-11-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * shr.el (shr-color-check): Protect against non-existent colour names.
+        * shr.el (shr-color-check): Protect against non-existent color names.
 
 2010-11-24  Julien Danjou  <julien@danjou.info>
 
@@ -3880,7 +3896,7 @@
 2010-11-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * shr.el (shr-insert-color-overlay): Split stuff like
-        "#444444 !important" to find the real colour.
+        "#444444 !important" to find the real color.
         (shr-tag-font): Resurrect shr-tag-font again, since it's needed to
         parse <font color="red"> entries.
 
@@ -4422,7 +4438,7 @@
         gnus-original-article-buffer is alive.
 
         * nndoc.el (nndoc-dissect-buffer): Reverse the order of the articles to
-        reflect the order they're in in the digest.
+        reflect the order they are in the digest.
 
         * gnus.el (gnus-group-startup-message): Move point to the start of the
         buffer.
@@ -4488,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.
@@ -4557,7 +4573,7 @@
 
         * shr.el (shr-put-image): Use point even if only inserting text.
         (shr-put-image): Save excursion when inserting alt text on non-graphic
-        display, so the behaviour is the same when we are on a graphic display.
+        display, so the behavior is the same when we are on a graphic display.
 
         * nnir.el (nnir-run-swish-e): Remove hyrex support.
 
@@ -5178,7 +5194,7 @@
         bidning gnus-agent variables.
 
         * shr.el (shr-render-td): Use a cache for the table rendering function
-        to avoid getting an exponential rendering behaviour in nested tables.
+        to avoid getting an exponential rendering behavior in nested tables.
         (shr-insert): Rework the line-breaking algorithm.
         (shr-insert): Don't leave trailing spaces.
         (shr-insert-table): Also insert empty TDs.
@@ -5991,15 +6007,15 @@
         highlight again, so that the highlight is correct.
 
         * gnus-picon.el (gnus-picon): Remove again.
-        (gnus-picon-create-glyph): Set the background XPM colour explicitly.
+        (gnus-picon-create-glyph): Set the background XPM color explicitly.
 
         * gnus-art.el (gnus-treatment-function-alist): Insert picons after
-        doing the header highlightling, so that the background colour of the
+        doing the header highlightling, so that the background color of the
         picon is correct.
 
         * gnus-picon.el (gnus-picon-xbm): Remove obsolete face.
         (gnus-picon): Ditto.
-        (gnus-picon): Reinstate.  The background colour for picons is white.
+        (gnus-picon): Reinstate.  The background color for picons is white.
         (gnus-picon-insert-glyph): Make the background white.
 
         * nnml.el (nnml-open-nov): Don't return dead buffers.
@@ -6783,7 +6799,7 @@
 
         * gnus-start.el (gnus-get-unread-articles): Allow the backends to
         update the group info.  This makes the nndraft groups, for instance, go
-        back to their old behaviour.
+        back to their old behavior.
 
         * gnus-sum.el (gnus-select-newsgroup): Indent.
 
@@ -7175,7 +7191,7 @@
 
         * gnus-agent.el (gnus-agent-auto-agentize-methods): Change the default
         so that nnimap methods aren't agentized by default.  There's apparently
-        many problems related to agent/imap behaviour.
+        many problems related to agent/imap behavior.
 
         * gnus-art.el (gnus-article-copy-string): New command and key binding.
 
@@ -7220,7 +7236,7 @@
         storage than before.
 
         * gnus.el (gnus-refer-article-method): Change default to 'current.
-        When referring an article, the common behaviour is to refer it from the
+        When referring an article, the common behavior is to refer it from the
         current select method, not the native select method.  The chances of
         the native select method having the message in question is rather slim
         these days.
@@ -7236,7 +7252,7 @@
         * gnus-sum.el (gnus-summary-goto-unread): Change default to nil, so
         that commands like `d' (and the like) go to the next line in the
         buffer, instead of the next unread article.  I think this is the
-        behaviour that is most natural for most users.
+        behavior that is most natural for most users.
         (gnus-single-article-buffer): Change default to nil, so that people can
         have as many article buffers open as they have summary buffer.  I think
         this is the most natural way for the groups to behave.
@@ -7411,7 +7427,7 @@
         UTF-8.  This seems to fix problems with some German web feeds.
 
         * gnus.el (gnus-group-startup-message): Put the xpm version of the logo
-        at the top so that the proper colours are applied.
+        at the top so that the proper colors are applied.
 
         * gnus-art.el (gnus-article-view-part): Doc fix.
 
@@ -11844,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>
 
@@ -14889,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>
 
@@ -16517,7 +16533,7 @@
 2005-06-16  Arne Jørgensen  <arne@arnested.dk>
 
         * smime.el (smime-cert-by-ldap-1): Detect PEM format without
-        header by looking for magic "MII" at the beginnig.
+        header by looking for magic "MII" at the beginning.
 
 2005-06-16  Miles Bader  <miles@gnu.org>
 
@@ -20046,7 +20062,7 @@
         * mail-source.el (mail-source-delete-crash-box): Refactor.
         (mail-source-fetch): Use it.
         (mail-source-fetch-file): Ditto.
-        (mail-source-fetch-directory): Run postscript in loop.
+        (mail-source-fetch-directory): Run PostScript in loop.
         (mail-source-fetch-pop): Delete.
         (mail-source-fetch-maildir): Ditto.
         (mail-source-fetch-imap): Ditto.
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index 7448808b20f..86c4eea59ab 100644
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -1336,7 +1336,7 @@
 
 1998-05-07  Hrvoje Niksic  <hniksic@srce.hr>
 
-        * nnmail.el: (nnmail-get-split-group): Use `regexp-quote'
+        * nnmail.el (nnmail-get-split-group): Use `regexp-quote'
         when file name is a part of pattern.
 
         * nnmail.el (nnmail-crosspost-link-function): Ditto.
@@ -2540,7 +2540,7 @@
         `gnus-simplify-ignored-prefixes'.
         (gnus-summary-set-display-table): Keep TAB.
 
-1998-01-15   <Use-Author-Address-Header@[127.1]>
+1998-01-15  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
 
         * gnus-art.el (gnus-request-article-this-buffer): Put it into the
         backlog.
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 779c84296f4..dcdf1c2934b 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -5562,7 +5562,7 @@
 
 2003-01-14  Kevin Greiner  <kgreiner@xpediantsolutions.com>
         * gnus-agent.el (gnus-agent-get-undownloaded-list): Include the
-        fictious headers generated by nnagent (ie. Undownloaded Article
+        fictitious headers generated by nnagent (ie. Undownloaded Article
         ####) in the list of articles that have not been downloaded.
 
         * gnus-int.el (): Added require declarations to resolve
@@ -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/gmm-utils.el b/lisp/gnus/gmm-utils.el
index 8deb27379a3..f913ddb5378 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -140,7 +140,7 @@ This is a copy of the `lazy' widget in Emacs 22.1 provided for compatibility."
 ;;   :mouse-2 command-on-mouse-2-press
 ;;   :mouse-3 command-on-mouse-3-press) ;; typically a menu of related commands
 ;;
-;; Combinations of mouse-[23] plus shift and/or controll might be overkill.
+;; Combinations of mouse-[23] plus shift and/or control might be overkill.
 ;;
 ;; Then use (plist-get rs-command :none), (plist-get rs-command :shift)
 
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 669f9675536..bf7f31e6392 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -1130,7 +1130,7 @@ article's mark is toggled."
                    (setq alist (cdr alist)))
                   ((> a h)
                    ;; Headers that are not in the alist should be
-                   ;; fictious (see nnagent-retrieve-headers); they
+                   ;; fictitious (see nnagent-retrieve-headers); they
                    ;; imply that this article isn't in the agent.
                    (gnus-agent-append-to-list tail-undownloaded h)
                    (gnus-agent-append-to-list tail-unfetched    h)
@@ -1368,7 +1368,7 @@ downloaded into the agent."
           ;; disable the set read each time this server is opened.
           ;; NOTE: Opening this group will restore the valid local
           ;; range but it will also expand the local range to
-          ;; incompass the new active range.
+          ;; encompass the new active range.
           (gnus-agent-set-local group agent-min (1- active-min)))))))
 
 (defun gnus-agent-save-group-info (method group active)
@@ -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)
@@ -3613,7 +3613,7 @@ articles in every agentized group? "))
                                 (setq r d
                                       d (directory-file-name d)))
                               ;; if ANY ancestor was NOT in keep hash and
-                              ;; it it's already in to-remove, add it to
+                              ;; it's already in to-remove, add it to
                               ;; to-remove.
                               (if (and r
                                        (not (member r to-remove)))
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 0068fbad6e2..dd41947a2af 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -535,7 +535,7 @@ that the symbol of the saver function, which is specified by
 
 ;; Note that "Rmail format" is mbox since Emacs 23, but Babyl before.
 (defcustom gnus-default-article-saver 'gnus-summary-save-in-rmail
-  "A function to save articles in your favourite format.
+  "A function to save articles in your favorite format.
 The function will be called by way of the `gnus-summary-save-article'
 command, and friends such as `gnus-summary-save-article-rmail'.
 
@@ -1559,7 +1559,7 @@ node `(gnus)Gravatars' for details."
           gnus-treat-from-picon
           gnus-treat-from-gravatar
           gnus-treat-mail-gravatar)
-      ;; If there's much decoration, the user might prefer a boundery.
+      ;; If there's much decoration, the user might prefer a boundary.
       'head
     nil)
   "Draw a boundary at the end of the headers.
@@ -5418,8 +5418,8 @@ If no internal viewer is available, use an external viewer."
 
 (defun gnus-article-part-wrapper (n function &optional no-handle interactive)
   "Call FUNCTION on MIME part N.
-Unless NO-HANDLE, call FUNCTION with N-th MIME handle as it's only argument.
-If INTERACTIVE, call FUNCTION interactivly."
+Unless NO-HANDLE, call FUNCTION with N-th MIME handle as its only argument.
+If INTERACTIVE, call FUNCTION interactively."
   (let (window frame)
     ;; Check whether the article is displayed.
     (unless (and (gnus-buffer-live-p gnus-article-buffer)
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index 0b5a7ebf1f9..9f86e74bd99 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -157,7 +157,7 @@ There are currently two built-in format functions:
 ;; I just ignore it.
 ;;;###autoload
 (defun gnus-user-format-function-d (header)
-  ;; Returns an aproximative delay string for the next occurrence of this
+  ;; Return an approximate delay string for the next occurrence of this
   ;; message. The delay is given only in the first non zero unit.
   ;; Code partly stolen from article-make-date-line
   (let* ((extras (mail-header-extra header))
diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el
index c38b0cd3606..b4d23ff579c 100644
--- a/lisp/gnus/gnus-dired.el
+++ b/lisp/gnus/gnus-dired.el
@@ -251,7 +251,7 @@ file to save in."
           (if (eq gnus-dired-mail-mode 'gnus-user-agent)
               (gnus-print-buffer)
             ;; FIXME:
-            (error "MIME print only implemeted via Gnus")))
+            (error "MIME print only implemented via Gnus")))
         (ps-despool print-to))))
    ((file-symlink-p file-name)
      (error "File is a symlink to a nonexistent target"))
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index ec98b2ff749..2d8587ace3f 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -553,7 +553,7 @@ The following commands are available:
   (gnus-server-list-servers))
 
 (defun gnus-server-copy-server (from to)
-  "Copy a server definiton to a new name."
+  "Copy a server definition to a new name."
   (interactive
    (list
     (or (gnus-server-server-name)
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 7c63d5e2653..b18b78df063 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1678,7 +1678,7 @@ If SCAN, request a scan of that group as well."
 
     ;; Sort the methods based so that the primary and secondary
     ;; methods come first.  This is done for legacy reasons to try to
-    ;; ensure that side-effect behaviour doesn't change from previous
+    ;; ensure that side-effect behavior doesn't change from previous
     ;; Gnus versions.
     (setq type-cache
           (sort (nreverse type-cache)
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 6ffc5d9e821..5380595eadb 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -364,7 +364,7 @@ newsgroups, set the variable to nil in `gnus-select-group-hook'."
 This variable can either be the symbols `first' (place point on the
 first subject), `unread' (place point on the subject line of the first
 unread article), `best' (place point on the subject line of the
-higest-scored article), `unseen' (place point on the subject line of
+highest-scored article), `unseen' (place point on the subject line of
 the first unseen article), `unseen-or-unread' (place point on the subject
 line of the first unseen article or, if all articles have been seen, on the
 subject line of the first unread article), or a function to be called to
@@ -2529,7 +2529,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs))))
               ["Unshar and save" gnus-uu-decode-unshar-and-save t]
               ["Save" gnus-uu-decode-save t]
               ["Binhex" gnus-uu-decode-binhex t]
-              ["Postscript" gnus-uu-decode-postscript t]
+              ["PostScript" gnus-uu-decode-postscript t]
               ["All MIME parts" gnus-summary-save-parts t])
              ("Cache"
               ["Enter article" gnus-cache-enter-article t]
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index f1a2ed43e26..17af1a38333 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -430,7 +430,7 @@ inheritance."
                                         regexp list-topic topic-level)
   "List all newsgroups with unread articles of level LEVEL or lower.
 Use the `gnus-group-topics' to sort the groups.
-If PREDICTE is a function, list groups that the function returns non-nil;
+If PREDICATE is a function, list groups that the function returns non-nil;
 if it is t, list groups that have no unread articles.
 If LOWEST is non-nil, list all newsgroups of level LOWEST or higher."
   (set-buffer gnus-group-buffer)
diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el
index 15c3d41bece..50a33809946 100644
--- a/lisp/gnus/gnus-uu.el
+++ b/lisp/gnus/gnus-uu.el
@@ -41,7 +41,7 @@
   :group 'gnus)
 
 (defgroup gnus-extract-view nil
-  "Viewwing extracted files."
+  "Viewing extracted files."
   :group 'gnus-extract)
 
 (defgroup gnus-extract-archive nil
@@ -727,7 +727,7 @@ When called interactively, prompt for REGEXP."
 ;; All PostScript functions written by Erik Selberg <speed@cs.washington.edu>.
 
 (defun gnus-uu-decode-postscript (&optional n)
-  "Gets postscript of the current article."
+  "Gets PostScript of the current article."
   (interactive "P")
   (gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article n))
 
@@ -738,7 +738,7 @@ When called interactively, prompt for REGEXP."
     (gnus-uu-decode-postscript n)))
 
 (defun gnus-uu-decode-postscript-and-save (n dir)
-  "Extracts postscript and saves the current article."
+  "Extracts PostScript and saves the current article."
   (interactive
    (list current-prefix-arg
          (file-name-as-directory
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index a1a8abc3086..ecd5b3b525b 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -54,7 +54,7 @@
   :type 'boolean)
 
 (defcustom gnus-use-frames-on-any-display nil
-  "*If non-nil, frames on all displays will be considered useable by Gnus.
+  "*If non-nil, frames on all displays will be considered usable by Gnus.
 When nil, only frames on the same display as the selected frame will be
 used to display Gnus windows."
   :version "22.1"
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 924d974eb3c..5f385ec1054 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -3582,7 +3582,7 @@ that that variable is buffer-local to the summary buffers."
                  (equal (nth 1 m1) (nth 1 m2)))))))
 
 (defsubst gnus-sloppily-equal-method-parameters (m1 m2)
-  ;; Check parameters for sloppy equalness.
+  ;; Check parameters for sloppy equality.
   (let ((p1 (copy-sequence (cddr m1)))
         (p2 (copy-sequence (cddr m2)))
         e1 e2)
diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el
index 8cfd9b9f903..dade86ab174 100644
--- a/lisp/gnus/html2text.el
+++ b/lisp/gnus/html2text.el
@@ -123,7 +123,7 @@ If this list contains the element \"font\".")
 This is an alist where each dotted pair consists of a tag, and then
 the name of a function to be called when this tag is found.  The
 function is called with the arguments p1, p2, p3 and p4. These are
-demontrated below:
+demonstrated below:
 
 \"<b> This is bold text </b>\"
  ^   ^                 ^    ^
@@ -410,7 +410,7 @@ fashion, quite close to pure guess-work. It does work in some cases though."
   (while (re-search-forward "^<br>$" nil t)
     (delete-region (match-beginning 0) (match-end 0)))
   ;; Removing lonely <br> on a single line, if they are left intact we
-  ;; dont have any paragraphs at all.
+  ;; don't have any paragraphs at all.
   (goto-char (point-min))
   (while (not (eobp))
     (let ((p1 (point)))
diff --git a/lisp/gnus/mail-parse.el b/lisp/gnus/mail-parse.el
index 06aac776486..0fcc206cf71 100644
--- a/lisp/gnus/mail-parse.el
+++ b/lisp/gnus/mail-parse.el
@@ -22,7 +22,7 @@
 
 ;; This file contains wrapper functions for a wide range of mail
 ;; parsing functions.  The idea is that there are low-level libraries
-;; that impement according to various specs (RFC2231, DRUMS, USEFOR),
+;; that implement according to various specs (RFC2231, DRUMS, USEFOR),
 ;; but that programmers that want to parse some header (say,
 ;; Content-Type) will want to use the latest spec.
 ;;
diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index 7959104d646..cbfa05bb87d 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -82,7 +82,7 @@ This is a compatibility function for different Emacsen."
                          (list lpr-switches)
                        lpr-switches)))
              " ")
-  "Shell command (including switches) used to print Postscript files.")
+  "Shell command (including switches) used to print PostScript files.")
 
 ;; Postpone using defcustom for this as it's so big and we essentially
 ;; have to have two copies of the data around then.  Perhaps just
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 1d0830afd28..176857633e1 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -2503,7 +2503,7 @@ Return the number of headers removed."
      (point-max)))
   (goto-char (point-min)))
 
-;; FIXME: clarify diffference: message-narrow-to-head,
+;; FIXME: clarify difference: message-narrow-to-head,
 ;; message-narrow-to-headers-or-head, message-narrow-to-headers
 (defun message-narrow-to-head ()
   "Narrow the buffer to the head of the message.
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 37ee59e9b4b..36c56e0921b 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1494,7 +1494,7 @@ be determined."
     (or (not image)
         (if (featurep 'xemacs)
             ;; XEmacs' glyphs can actually tell us about their width, so
-            ;; lets be nice and smart about them.
+            ;; let's be nice and smart about them.
             (or mm-inline-large-images
                 (and (<= (glyph-width image) (window-pixel-width))
                      (<= (glyph-height image) (window-pixel-height))))
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index db7ac1b44f8..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,
@@ -72,7 +72,7 @@
 ;; * nndiary-get-new-mail, nndiary-mail-source and nndiary-split-methods:
 ;;   NNDiary has some experimental parts, in the sense Gnus normally uses only
 ;;   one mail back ends for mail retreival and splitting. This back end is
-;;   also an attempt to make it behave differently. For Gnus developpers: as
+;;   also an attempt to make it behave differently. For Gnus developers: as
 ;;   you can see if you snarf into the code, that was not a very difficult
 ;;   thing to do. Something should be done about the respooling breakage
 ;;   though.
@@ -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/nnmail.el b/lisp/gnus/nnmail.el
index d83467a1ed5..93e8544b633 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1799,7 +1799,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
          (i 0)
          (new 0)
          (total 0)
-         incoming incomings source)
+         source)
     (when (and (nnmail-get-value "%s-get-new-mail" method)
                sources)
       (while (setq source (pop sources))
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index 66ed90be823..4ad9d11f906 100644
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -204,7 +204,7 @@
 (add-hook 'gnus-summary-mode-hook 'nnmairix-summary-mode-hook)
 
 ;; ;;;###autoload
-;; (defun nnmairix-initalize (&optional force)
+;; (defun nnmairix-initialize (&optional force)
 ;;   (interactive "P")
 ;;   (if (not (or (file-readable-p "~/.mairixrc")
 ;;             force))
@@ -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"
@@ -512,7 +512,7 @@ Other back ends might or might not work.")
        ;; Everything else is an error
        (t
         (nnheader-report
-         'nnmairix "Error running marix. See buffer %s for details"
+         'nnmairix "Error running mairix. See buffer %s for details"
          nnmairix-mairix-output-buffer)
         nil))))))
 
@@ -1634,7 +1634,7 @@ search in raw mode."
       (nnheader-message 3 "Couldn't find original article"))))
 
 (defun nnmairix-determine-original-group-from-registry (mid)
-  "Try to determinale original group for message-id MID from the registry."
+  "Try to determine original group for message-id MID from the registry."
   (when (gnus-bound-and-true-p 'gnus-registry-enabled)
     (unless (string-match "^<" mid)
       (set mid (concat "<" mid)))
diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el
index 8e158f7ca0f..5fd309a5c7d 100644
--- a/lisp/gnus/registry.el
+++ b/lisp/gnus/registry.el
@@ -149,7 +149,7 @@
 
   (defmethod registry-lookup ((db registry-db) keys)
     "Search for KEYS in the registry-db THIS.
-Returns a alist of the key followed by the entry in a list, not a cons cell."
+Returns an alist of the key followed by the entry in a list, not a cons cell."
     (let ((data (oref db :data)))
       (delq nil
             (mapcar
@@ -160,7 +160,7 @@ Returns a alist of the key followed by the entry in a list, not a cons cell."
 
   (defmethod registry-lookup-breaks-before-lexbind ((db registry-db) keys)
     "Search for KEYS in the registry-db THIS.
-Returns a alist of the key followed by the entry in a list, not a cons cell."
+Returns an alist of the key followed by the entry in a list, not a cons cell."
     (let ((data (oref db :data)))
       (delq nil
             (loop for key in keys
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index e82192b91d6..feed078034c 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -285,11 +285,11 @@ Should be called narrowed to the head of the message."
                        mail-parse-charset)
                   (mm-encode-coding-region (point) (point-max)
                                            mail-parse-charset)))
-             ;; We get this when CC'ing messsages to newsgroups with
+             ;; We get this when CC'ing messages to newsgroups with
              ;; 8-bit names.  The group name mail copy just got
              ;; unconditionally encoded.  Previously, it would ask
              ;; whether to encode, which was quite confusing for the
-             ;; user.  If the new behavior is wrong, tell me. I have
+             ;; user.  If the new behavior is wrong, tell me.  I have
              ;; left the old code commented out below.
              ;; -- Per Abrahamsen <abraham@dina.kvl.dk> Date: 2001-10-07.
              ;; Modified by Dave Love, with the commented-out code changed
diff --git a/lisp/gnus/shr-color.el b/lisp/gnus/shr-color.el
index 36dd65f4a2d..4fd35659e08 100644
--- a/lisp/gnus/shr-color.el
+++ b/lisp/gnus/shr-color.el
@@ -41,7 +41,7 @@ Must be between 0 and 100."
 
 (defcustom shr-color-visible-distance-min 5
   "Minimum color distance between two colors to be considered visible.
-This value is used to compare result for `ciede2000'. Its an
+This value is used to compare result for `ciede2000'.  It's an
 absolute value without any unit."
   :group 'shr
   :type 'integer)
@@ -198,7 +198,8 @@ absolute value without any unit."
 Each entry should have the form (COLOR-NAME . HEXADECIMAL-COLOR).")
 
 (defun shr-color-relative-to-absolute (number)
-  "Convert a relative NUMBER to absolute. If NUMBER is absolute, return NUMBER.
+  "Convert a relative NUMBER to absolute.
+If NUMBER is absolute, return NUMBER.
 This will convert \"80 %\" to 204, \"100 %\" to 255 but \"123\" to \"123\"."
   (let ((string-length (- (length number) 1)))
     ;; Is this a number with %?
@@ -269,7 +270,7 @@ Like rgb() or hsl()."
 (defun set-minimum-interval (val1 val2 min max interval &optional fixed)
   "Set minimum interval between VAL1 and VAL2 to INTERVAL.
 The values are bound by MIN and MAX.
-If FIXED is t, then val1 will not be touched."
+If FIXED is t, then VAL1 will not be touched."
   (let ((diff (abs (- val1 val2))))
     (unless (>= diff interval)
       (if fixed
@@ -319,10 +320,10 @@ If FIXED is t, then val1 will not be touched."
 
 (defun shr-color-visible (bg fg &optional fixed-background)
   "Check that BG and FG colors are visible if they are drawn on each other.
-Return (bg fg) if they are. If they are too similar, two new
+Return (bg fg) if they are.  If they are too similar, two new
 colors are returned instead.
 If FIXED-BACKGROUND is set, and if the color are not visible, a
-new background color will not be computed. Only the foreground
+new background color will not be computed.  Only the foreground
 color will be adapted to be visible on BG."
   ;; Convert fg and bg to CIE Lab
   (let ((fg-norm (color-name-to-rgb fg))
@@ -334,7 +335,7 @@ color will be adapted to be visible on BG."
              (bg-lab (apply 'color-srgb-to-lab bg-norm))
              ;; Compute color distance using CIE DE 2000
              (fg-bg-distance (color-cie-de2000 fg-lab bg-lab))
-             ;; Compute luminance distance (substract L component)
+             ;; Compute luminance distance (subtract L component)
              (luminance-distance (abs (- (car fg-lab) (car bg-lab)))))
         (if (and (>= fg-bg-distance shr-color-visible-distance-min)
                  (>= luminance-distance shr-color-visible-luminance-min))
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 7b9af3302af..e8db24c3561 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -53,17 +53,17 @@ fit these criteria."
   :group 'shr
   :type 'regexp)
 
-(defcustom shr-table-horizontal-line ? 
+(defcustom shr-table-horizontal-line ?
   "Character used to draw horizontal table lines."
   :group 'shr
   :type 'character)
 
-(defcustom shr-table-vertical-line ? 
+(defcustom shr-table-vertical-line ?
   "Character used to draw vertical table lines."
   :group 'shr
   :type 'character)
 
-(defcustom shr-table-corner ? 
+(defcustom shr-table-corner ?
   "Character used to draw table corners."
   :group 'shr
   :type 'character)
@@ -583,7 +583,7 @@ Return a string with image data."
   "Return a function to display an image.
 CONTENT-FUNCTION is a function to retrieve an image for a cid url that
 is an argument.  The function to be returned takes three arguments URL,
-START, and END.  Note that START and END should be merkers."
+START, and END.  Note that START and END should be markers."
   `(lambda (url start end)
      (when url
        (if (string-match "\\`cid:" url)
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 5c2e775a211..a0c1d4f108b 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -1,4 +1,4 @@
-;;; sieve-manage.el --- Implementation of the managesive protocol in elisp
+;;; sieve-manage.el --- Implementation of the managesieve protocol in elisp
 
 ;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el
index 2111d34eac5..a44a03b6913 100644
--- a/lisp/gnus/sieve.el
+++ b/lisp/gnus/sieve.el
@@ -21,7 +21,7 @@
 
 ;;; Commentary:
 
-;; This file contain utilities to facilate upload, download and
+;; This file contain utilities to facilitate upload, download and
 ;; general management of sieve scripts.  Currently only the
 ;; Managesieve protocol is supported (using sieve-manage.el), but when
 ;; (useful) alternatives become available, they might be supported as
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index f0951b7b803..128bda6f516 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -588,7 +588,7 @@ A string or a list of strings is returned."
                   (filter &optional host attributes attrsonly withdn))
 
 (defun smime-cert-by-ldap-1 (mail host)
-  "Get cetificate for MAIL from the ldap server at HOST."
+  "Get certificate for MAIL from the ldap server at HOST."
   (let ((ldapresult
          (funcall
           (if (featurep 'xemacs)
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 95b5fb578f4..6c94dbdd2c4 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -102,7 +102,7 @@ Reports is as ham when HAM is set."
       (customize-set-variable
        spam-report-resend-to
        (read-from-minibuffer "email address to resend SPAM/HAM to? ")))
-    ;; This is ganked from the `gnus-summary-resend-message' function.
+    ;; This is yanked from the `gnus-summary-resend-message' function.
     ;; It involves rendering the SPAM, which is undesirable, but there does
     ;; not seem to be a nicer way to achieve this.
     ;; select this particular article
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index fa152f688c4..869dbc9bc0e 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -156,7 +156,7 @@ last rule in your split configuration."
   :group 'spam)
 
 (defcustom spam-autodetect-recheck-messages nil
-  "Should spam.el recheck all meessages when autodetecting?
+  "Should spam.el recheck all messages when autodetecting?
 Normally this is nil, so only unseen messages will be checked."
   :type 'boolean
   :group 'spam)
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 5e034b14fde..efdc237d11f 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -256,7 +256,7 @@ if the variable `help-downcase-arguments' is non-nil."
               ;; so let's skip over it
               (search-backward "(")
               (goto-char (scan-sexps (point) 1)))))
-        ;; Highlight aguments in the USAGE string
+        ;; Highlight arguments in the USAGE string
         (setq usage (help-do-arg-highlight (buffer-string) args))
         ;; Highlight arguments in the DOC string
         (setq doc (and doc (help-do-arg-highlight doc args))))))
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 5d67a6c4f4c..5906683071b 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -141,7 +141,7 @@ The format is (FUNCTION ARGS...).")
   'help-function 'describe-character-set
   'help-echo (purecopy "mouse-2, RET: describe this character set"))
 
-;; make some more ideosyncratic button types
+;; Make some more idiosyncratic button types.
 
 (define-button-type 'help-symbol
   :supertype 'help-xref
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index 46db4280688..0dee4157d78 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -480,7 +480,7 @@ This is the opposite of `hilit-chg-hide-changes'."
 (defun hilit-chg-make-ov (prop start end)
   (or prop
       (error "hilit-chg-make-ov: prop is nil"))
-  ;; For the region create overlays with a distincive face
+  ;; For the region create overlays with a distinctive face
   ;; and the text property 'hilit-chg.
   (let ((ov (make-overlay start end))
         (face (if (eq prop 'hilit-chg-delete)
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 75bc1f9743c..69da8fc6110 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -391,7 +391,7 @@ undoes the expansion."
               lst)))
 
 ;; Check if current buffer matches any atom or regexp in LST.
-;; Atoms are interpreted as major modes, strings as regexps mathing the name.
+;; Atoms are interpreted as major modes, strings as regexps matching the name.
 (defun he-buffer-member (lst)
   (or (memq major-mode lst)
       (progn
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index ffef8cdf7b7..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
@@ -360,7 +360,7 @@ commands in `hfy-etags-cmd-alist'."
   :type '(repeat symbol))
 
 (defun hfy-which-etags ()
-  "Return a string indicating which flavour of etags we are using."
+  "Return a string indicating which flavor of etags we are using."
   (let ((v (shell-command-to-string (concat hfy-etags-bin " --version"))))
     (cond ((string-match "exube" v) "exuberant ctags")
           ((string-match "GNU E" v) "emacs etags"    )) ))
@@ -586,7 +586,7 @@ If a window system is unavailable, calls `hfy-fallback-colour-values'."
 (defvar hfy-cperl-mode-kludged-p nil)
 
 (defun hfy-kludge-cperl-mode ()
-  "CPerl mode does its damndest not to do some of its fontification when not
+  "CPerl mode does its damnedest not to do some of its fontification when not
 in a windowing system - try to trick it..."
   (if (not hfy-cperl-mode-kludged-p)
       (progn (if (not window-system)
@@ -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
@@ -1768,13 +1768,13 @@ hyperlinks as appropriate."
   "Return a list of files under DIRECTORY.
 Strips any leading \"./\" from each filename."
   ;;(message "hfy-list-files");;DBUG
-  ;; FIXME: this changes the dir of the currrent buffer.  Is that right??
+  ;; FIXME: this changes the dir of the current buffer.  Is that right??
   (cd directory)
   (mapcar (lambda (F) (if (string-match "^./\\(.*\\)" F) (match-string 1 F) F))
           (split-string (shell-command-to-string hfy-find-cmd))) )
 
-;; strip the filename off, return a directiry name
-;; not a particularly thorough implementaion, but it will be
+;; strip the filename off, return a directory name
+;; not a particularly thorough implementation, but it will be
 ;; fed pretty carefully, so it should be Ok:
 (defun hfy-dirname (file)
   "Return everything preceding the last \"/\" from a relative filename FILE,
@@ -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/ibuffer.el b/lisp/ibuffer.el
index 17ddddbd17a..3f3b0b7a843 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -2504,7 +2504,7 @@ Other commands:
 
 ** Information on Filtering:
 
- You can filter your ibuffer view via different critera.  Each Ibuffer
+ You can filter your ibuffer view via different criteria.  Each Ibuffer
 buffer has its own stack of active filters.  For example, suppose you
 are working on an Emacs Lisp project.  You can create an Ibuffer
 buffer displays buffers in just `emacs-lisp' modes via
diff --git a/lisp/ido.el b/lisp/ido.el
index fda4c0316f7..f425fd5fc63 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -258,7 +258,7 @@
 ;; The highlighting of matching items is controlled via ido-use-faces.
 ;; The faces used are ido-first-match, ido-only-match and
 ;; ido-subdir.
-;; Colouring of the matching item was suggested by
+;; Coloring of the matching item was suggested by
 ;; Carsten Dominik (dominik@strw.leidenuniv.nl).
 
 ;; Replacement for read-buffer and read-file-name
@@ -770,7 +770,7 @@ can be completed using TAB,
 (defcustom ido-use-virtual-buffers nil
   "If non-nil, refer to past buffers as well as existing ones.
 Essentially it works as follows: Say you are visiting a file and
-the buffer gets cleaned up by mignight.el.  Later, you want to
+the buffer gets cleaned up by midnight.el.  Later, you want to
 switch to that buffer, but find it's no longer open.  With
 virtual buffers enabled, the buffer name stays in the buffer
 list (using the `ido-virtual' face, and always at the end), and if
@@ -3152,7 +3152,7 @@ for first matching file."
 ;;; CREATE LIST OF ALL CURRENT FILES
 
 (defun ido-all-completions ()
-  ;; Return unsorted list of all competions.
+  ;; Return unsorted list of all completions.
   (let ((ido-process-ignore-lists nil)
         (ido-directory-too-big nil))
     (cond
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 30223e69ae0..f3e7caab174 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -638,7 +638,7 @@ These properties are determined by the Image mode variables
 `image-transform-resize' and `image-transform-rotation'.  The
 return value is suitable for appending to an image spec.
 
-Recaling and rotation properties only take effect if Emacs is
+Rescaling and rotation properties only take effect if Emacs is
 compiled with ImageMagick support."
   (when (or image-transform-resize
             (not (equal image-transform-rotation 0.0)))
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index 41da9d12c99..8a5cca18496 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -313,7 +313,7 @@ should be harmless."
   (interactive)
   (info-xref-check-list (info-xref-all-info-files)))
 
-;; An alternative for geting only top-level files here would be to simply
+;; An alternative for getting only top-level files here would be to simply
 ;; return all files and have info-xref-check-list not follow "Indirect:".
 ;; The current way seems better because it (potentially) gets the proper
 ;; top-level filename into the error messages, and suppresses duplicate "not
diff --git a/lisp/info.el b/lisp/info.el
index b8deb3c9c7f..4f2f33d017c 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -231,6 +231,12 @@ want to set `Info-refill-paragraphs'."
                  (const :tag "Replace tag and hide reference" t)
                  (const :tag "Hide tag and reference" hide)
                  (other :tag "Only replace tag" tag))
+  :set (lambda (sym val)
+         (set sym val)
+         (dolist (buffer (buffer-list))
+           (with-current-buffer buffer
+             (when (eq major-mode 'Info-mode)
+               (revert-buffer t t)))))
   :group 'info)
 
 (defcustom Info-refill-paragraphs nil
@@ -264,7 +270,7 @@ Before leaving the initial Info node, where isearch was started,
 it fails once with the error message [initial node], and with
 subsequent C-s/C-r continues through other nodes without failing
 with this error message in other nodes.  When isearch fails for
-the rest of the manual, it wraps aroung the whole manual and
+the rest of the manual, it wraps around the whole manual and
 restarts the search from the top/final node depending on
 search direction.
 
@@ -811,10 +817,6 @@ otherwise, that defaults to `Top'."
            (concat default-directory (buffer-name))))
   (Info-find-node-2 nil nodename))
 
-;; It's perhaps a bit nasty to kill the *info* buffer to force a re-read,
-;; but at least it keeps this routine (which is for makeinfo-buffer and
-;; Info-revert-buffer-function) out of the way of normal operations.
-;;
 (defun Info-revert-find-node (filename nodename)
   "Go to an Info node FILENAME and NODENAME, re-reading disk contents.
 When *info* is already displaying FILENAME and NODENAME, the window position
@@ -822,27 +824,23 @@ is preserved, if possible."
   (or (eq major-mode 'Info-mode) (switch-to-buffer "*info*"))
   (let ((old-filename Info-current-file)
         (old-nodename Info-current-node)
-        (old-buffer-name (buffer-name))
+        (window-selected (eq (selected-window) (get-buffer-window)))
         (pcolumn      (current-column))
         (pline        (count-lines (point-min) (line-beginning-position)))
         (wline        (count-lines (point-min) (window-start)))
-        (old-history-forward Info-history-forward)
-        (old-history  Info-history)
         (new-history  (and Info-current-file
                            (list Info-current-file Info-current-node (point)))))
-    (kill-buffer (current-buffer))
-    (switch-to-buffer (or old-buffer-name "*info*"))
-    (Info-mode)
+    ;; When `Info-current-file' is nil, `Info-find-node-2' rereads the file.
+    (setq Info-current-file nil)
     (Info-find-node filename nodename)
-    (setq Info-history-forward old-history-forward)
-    (setq Info-history old-history)
     (if (and (equal old-filename Info-current-file)
              (equal old-nodename Info-current-node))
         (progn
           ;; note goto-line is no good, we want to measure from point-min
-          (goto-char (point-min))
-          (forward-line wline)
-          (set-window-start (selected-window) (point))
+          (when window-selected
+            (goto-char (point-min))
+            (forward-line wline)
+            (set-window-start (selected-window) (point)))
           (goto-char (point-min))
           (forward-line pline)
           (move-to-column pcolumn))
@@ -1087,7 +1085,7 @@ a case-insensitive match is tried."
                      ;; Add anchors to the history too
                      (setq Info-history-list
                            (cons new-history
-                                 (delete new-history Info-history-list))))
+                                 (remove new-history Info-history-list))))
                    (goto-char anchorpos))
                   ((numberp Info-point-loc)
                    (forward-line (- Info-point-loc 2))
@@ -1514,7 +1512,7 @@ escaped (\\\",\\\\)."
         ;; Add a new unique history item to full history list
         (let ((new-history (list Info-current-file Info-current-node)))
           (setq Info-history-list
-                (cons new-history (delete new-history Info-history-list)))
+                (cons new-history (remove new-history Info-history-list)))
           (setq Info-history-forward nil))
         (if (not (eq Info-fontify-maximum-menu-size nil))
             (Info-fontify-node))
@@ -1846,7 +1844,9 @@ If DIRECTION is `backward', search in the reverse direction."
                     (setq list nil)))
               (if found
                   (message "")
-                (signal 'search-failed (list regexp))))
+                (signal 'search-failed (if isearch-mode
+                                           (list regexp "end of the manual")
+                                         (list regexp)))))
           (if (not found)
               (progn (Info-read-subfile osubfile)
                      (goto-char opoint)
@@ -2153,7 +2153,7 @@ If SAME-FILE is non-nil, do not move to a different Info file."
   (insert "Recently Visited Nodes\n")
   (insert "**********************\n\n")
   (insert "* Menu:\n\n")
-  (let ((hl (delete '("*History*" "Top") Info-history-list)))
+  (let ((hl (remove '("*History*" "Top") Info-history-list)))
     (while hl
       (let ((file (nth 0 (car hl)))
             (node (nth 1 (car hl))))
@@ -3328,7 +3328,7 @@ Return a list of matches where each element is in the format
         (Info-directory)
         ;; current-node and current-file are nil when they invoke info-apropos
         ;; as the first Info command, i.e. info-apropos loads info.el.  In that
-        ;; case, we use (DIR)Top instead, to avoid signalling an error after
+        ;; case, we use (DIR)Top instead, to avoid signaling an error after
         ;; the search is complete.
         (when (null current-node)
           (setq current-file Info-current-file)
@@ -3403,7 +3403,7 @@ Build a menu of the possible matches."
 (declare-function finder-unknown-keywords "finder" ())
 (declare-function lm-commentary "lisp-mnt" (&optional file))
 (defvar finder-keywords-hash)
-(defvar package-alist)                  ; finder requires package
+(defvar package--builtins)              ; finder requires package
 
 (defun Info-finder-find-node (_filename nodename &optional _no-going-back)
   "Finder-specific implementation of `Info-find-node-2'."
@@ -3417,14 +3417,14 @@ Build a menu of the possible matches."
     (insert "***************\n\n")
     (insert "* Menu:\n\n")
     (dolist (assoc (append '((all . "All package info")
-                             (unknown . "unknown keywords"))
+                             (unknown . "Unknown keywords"))
                            finder-known-keywords))
       (let ((keyword (car assoc)))
         (insert (format "* %s %s.\n"
                         (concat (symbol-name keyword) ": "
-                                "kw:" (symbol-name keyword) ".")
+                                "Keyword " (symbol-name keyword) ".")
                         (cdr assoc))))))
-   ((equal nodename "unknown")
+   ((equal nodename "Keyword unknown")
     ;; Display unknown keywords
     (insert (format "\n\^_\nFile: %s,  Node: %s,  Up: Top\n\n"
                     Info-finder-file nodename))
@@ -3434,24 +3434,29 @@ Build a menu of the possible matches."
     (mapc
      (lambda (assoc)
        (insert (format "* %-14s %s.\n"
-                       (concat (symbol-name (car assoc)) "::")
+                       (concat (symbol-name (car assoc)) ": "
+                               "Keyword " (symbol-name (car assoc)) ".")
                        (cdr assoc))))
      (finder-unknown-keywords)))
-   ((equal nodename "all")
+   ((equal nodename "Keyword all")
     ;; Display all package info.
     (insert (format "\n\^_\nFile: %s,  Node: %s,  Up: Top\n\n"
                     Info-finder-file nodename))
     (insert "Finder Package Info\n")
     (insert "*******************\n\n")
-    (dolist (package package-alist)
-      (insert (format "%s - %s\n"
-                      (format "*Note %s::" (nth 0 package))
-                      (nth 1 package)))))
-   ((string-match "\\`kw:" nodename)
+    (insert "* Menu:\n\n")
+    (let (desc)
+      (dolist (package package--builtins)
+        (setq desc (cdr-safe package))
+        (when (vectorp desc)
+          (insert (format "* %-16s %s.\n"
+                          (concat (symbol-name (car package)) "::")
+                          (aref desc 2)))))))
+   ((string-match "\\`Keyword " nodename)
     (setq nodename (substring nodename (match-end 0)))
     ;; Display packages that match the keyword
     ;; or the list of keywords separated by comma.
-    (insert (format "\n\^_\nFile: %s,  Node: kw:%s,  Up: Top\n\n"
+    (insert (format "\n\^_\nFile: %s,  Node: Keyword %s,  Up: Top\n\n"
                     Info-finder-file nodename))
     (insert "Finder Packages\n")
     (insert "***************\n\n")
@@ -3463,11 +3468,11 @@ Build a menu of the possible matches."
                                (split-string nodename ",[ \t\n]*" t)
                              (list nodename))))
           hits desc)
-      (dolist (kw keywords)
-        (push (copy-tree (gethash kw finder-keywords-hash)) hits))
+      (dolist (keyword keywords)
+        (push (copy-tree (gethash keyword finder-keywords-hash)) hits))
       (setq hits (delete-dups (apply 'append hits)))
       (dolist (package hits)
-        (setq desc (cdr-safe (assq package package-alist)))
+        (setq desc (cdr-safe (assq package package--builtins)))
         (when (vectorp desc)
           (insert (format "* %-16s %s.\n"
                           (concat (symbol-name package) "::")
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 47426784e51..55aee4d53db 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -410,7 +410,7 @@ with L, LRE, or LRO Unicode bidi character type.")
                   ("�-ྐྵྺྻྼ"       "w"     ?0) ;
                   ("ིེཻོཽྀ"       "w"       ?2) ; upper vowel
                   ("ཾྂྃ྆྇ྈྉྊྋ" "w"    ?2) ; upper modifier
-                  ("྄ཱུ༙༵༷"       "w"       ?3) ; lowel vowel/modifier
+                  ("྄ཱུ༙༵༷"       "w"       ?3) ; lower vowel/modifier
                   ("཰"                "w" ?3)             ; invisible vowel a
                   ("༠-༩༪-༳"             "w"     ?6) ; digit
                   ("་�-༒༔ཿ"        "."     ?|) ; line-break char
@@ -466,7 +466,7 @@ with L, LRE, or LRO Unicode bidi character type.")
 
 ;; Tai Viet
 (let ((deflist '(;; chars       syntax  category
-                 ((?ꪀ.  ?ꪯ) "w"     ?0) ; cosonant
+                 ((?ꪀ.  ?ꪯ) "w"     ?0) ; consonant
                  ("ꪱꪵꪶ"           "w"     ?1) ; vowel base
                  ((?ꪹ . ?ꪽ) "w"     ?1) ; vowel base
                  ("ꪰꪲꪳꪷꪸꪾ"  "w"     ?2) ; vowel upper
@@ -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/fontset.el b/lisp/international/fontset.el
index 777779e5ec5..9f6520c7238 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -700,7 +700,7 @@ Internal use only.  Should be called at startup time."
 ;;         HPHEBREW8 8-bit character set
 ;; "HP-Japanese15"                                 [36]
 ;;         HPJAPAN15 15-bit character set,
-;;         modified from industry defacto
+;;         modified from industry de facto
 ;;         standard Shift-JIS
 ;; "HP-Kana8"                                      [36]
 ;;         HPKANA8 8-bit character set
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index cccf65b8051..efb910a3ef6 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -958,7 +958,7 @@ the current buffer."
         (insert "\n  ---<fallback to the default of the default fontset>---")
         (put-text-property (line-beginning-position) (point) 'face 'highlight)))
       (if (and start1 end2)
-          ;; Reoder the printed information to match with the font
+          ;; Reorder the printed information to match with the font
           ;; searching strategy; i.e. FONTSET, the default fontset,
           ;; default of FONTSET, default of the default fontset.
           (transpose-regions start1 end1 start2 end2))
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index cac37b3b8c5..6888056704d 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -120,14 +120,14 @@ MAX-N is the maximum byte value of that.
 
 `:min-code'
 
-VALUE must be an integer specifying the mininum code point of the
+VALUE must be an integer specifying the minimum code point of the
 charset.  If omitted, it is calculated from `:code-space'.  VALUE may
 be a cons (HIGH . LOW), where HIGH is the most significant 16 bits of
 the code point and LOW is the least significant 16 bits.
 
 `:max-code'
 
-VALUE must be an integer specifying the maxinum code point of the
+VALUE must be an integer specifying the maximum code point of the
 charset.  If omitted, it is calculated from `:code-space'.  VALUE may
 be a cons (HIGH . LOW), where HIGH is the most significant 16 bits of
 the code point and LOW is the least significant 16 bits.
@@ -1566,7 +1566,7 @@ of `ctext-non-standard-encodings-alist'.")
 
 ;; Return an alist of CHARSET vs CTEXT-USAGE-INFO generated from
 ;; `ctext-non-standard-encodings' and a list specified by the key
-;; `ctext-non-standard-encodings' for the currrent language
+;; `ctext-non-standard-encodings' for the current language
 ;; environment.  CTEXT-USAGE-INFO is one of the element of
 ;; `ctext-non-standard-encodings-alist' or nil.  In the former case, a
 ;; character in CHARSET is encoded using extended segment.  In the
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/international/quail.el b/lisp/international/quail.el
index 3f83841f60d..a29b729dcf0 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -2011,7 +2011,7 @@ minibuffer and the selected frame has no other windows)."
                 (set-window-dedicated-p win t))
               (quail-minibuffer-message
                (format " [%s]" current-input-method-title)))
-          ;; Show the guidance in the next line of the currrent
+          ;; Show the guidance in the next line of the current
           ;; minibuffer.
           (quail-minibuffer-message
            (format "  [%s]\n%s"
@@ -2701,7 +2701,7 @@ KEY BINDINGS FOR CONVERSION
 
 (put 'quail-decode-map 'char-table-extra-slots 0)
 
-;; Generate a halfly-cooked decode map (char-table) for the current
+;; Generate a half-cooked decode map (char-table) for the current
 ;; Quail map.  An element for a character C is a key string or a list
 ;; of a key strings to type to input C.  The lenth of key string is at
 ;; most 2.  If it is 2, more keys may be required to input C.
@@ -2974,7 +2974,7 @@ of each directory."
       (if (not (re-search-forward leim-list-entry-regexp nil t))
           nil
 
-        ;; Remove garbages after the header.
+        ;; Remove garbage after the header.
         (goto-char (match-beginning 0))
         (if (< pos (point))
             (delete-region pos (point)))
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index e68dc8bdc17..757322aa0ce 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -305,7 +305,7 @@ SPC, 6, 3, 4, or 7 specifing a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy
                (cond ((looking-at "PROMPT:[ \t]*")
                       (goto-char (match-end 0))
                       (setq tit-prompt (tit-read-key-value))
-                      ;; Some TIT dictionaies that are encoded by
+                      ;; Some TIT dictionaries that are encoded by
                       ;; euc-china contains invalid character at the tail.
                       (let* ((last (aref tit-prompt (1- (length tit-prompt))))
                              (split (split-char last)))
@@ -734,7 +734,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
 ;; dictionary in the buffer DICBUF.  The input method name of the
 ;; Quail package is NAME, and the title string is TITLE.
 
-;; TSANG-P is non-nil, genereate $(06AQo(B input method.  Otherwise
+;; TSANG-P is non-nil, generate $(06AQo(B input method.  Otherwise
 ;; generate $(0X|/y(B (simple version of $(06AQo(B).  If BIG5-P is non-nil, the
 ;; input method is for inputting Big5 characters.  Otherwise the input
 ;; method is for inputting CNS characters.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 3ffe6e8a656..39ed7adc9c4 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -542,8 +542,8 @@ Each set is a vector of the form:
 (defvar isearch-string "")  ; The current search string.
 (defvar isearch-message "") ; text-char-description version of isearch-string
 
-(defvar isearch-message-prefix-add nil) ; Additonal text for the message prefix
-(defvar isearch-message-suffix-add nil) ; Additonal text for the message suffix
+(defvar isearch-message-prefix-add nil) ; Additional text for the message prefix
+(defvar isearch-message-suffix-add nil) ; Additional text for the message suffix
 
 (defvar isearch-success t)      ; Searching is currently successful.
 (defvar isearch-error nil)      ; Error message for failed search.
@@ -1162,11 +1162,10 @@ The following additional command keys are active while editing.
 
           (unwind-protect
               (let* ((message-log-max nil)
-                     ;; Protect global value of search rings from updating
-                     ;; by `read-from-minibuffer'.  It should be updated only
-                     ;; by `isearch-update-ring' in `isearch-done', not here.
-                     (search-ring search-ring)
-                     (regexp-search-ring regexp-search-ring)
+                     ;; Don't add a new search string to the search ring here
+                     ;; in `read-from-minibuffer'. It should be added only
+                     ;; by `isearch-update-ring' called from `isearch-done'.
+                     (history-add-new-input nil)
                      ;; Binding minibuffer-history-symbol to nil is a work-around
                      ;; for some incompatibility with gmhist.
                      (minibuffer-history-symbol))
@@ -2243,7 +2242,7 @@ If there is no completion possible, say so and continue searching."
 ;; Searching
 
 (defvar isearch-search-fun-function nil
-  "Overrides the default `isearch-search-fun' behaviour.
+  "Overrides the default `isearch-search-fun' behavior.
 This variable's value should be a function, which will be called
 with no arguments, and should return a function that takes three
 arguments: STRING, BOUND, and NOERROR.
@@ -2674,25 +2673,27 @@ by other Emacs features."
     ;; something important did indeed change
     (lazy-highlight-cleanup t) ;kill old loop & remove overlays
     (setq isearch-lazy-highlight-error isearch-error)
-    (when (not isearch-error)
-      (setq isearch-lazy-highlight-start-limit beg
-            isearch-lazy-highlight-end-limit end)
-      (setq isearch-lazy-highlight-window       (selected-window)
-            isearch-lazy-highlight-window-start (window-start)
-            isearch-lazy-highlight-window-end   (window-end)
-            isearch-lazy-highlight-start        (point)
-            isearch-lazy-highlight-end          (point)
-            isearch-lazy-highlight-wrapped      nil
-            isearch-lazy-highlight-last-string  isearch-string
-            isearch-lazy-highlight-case-fold-search isearch-case-fold-search
-            isearch-lazy-highlight-regexp       isearch-regexp
-            isearch-lazy-highlight-space-regexp search-whitespace-regexp
-            isearch-lazy-highlight-word         isearch-word
-            isearch-lazy-highlight-forward      isearch-forward)
+    ;; It used to check for `(not isearch-error)' here, but actually
+    ;; lazy-highlighting might find matches to highlight even when
+    ;; `isearch-error' is non-nil.  (Bug#9918)
+    (setq isearch-lazy-highlight-start-limit beg
+          isearch-lazy-highlight-end-limit end)
+    (setq isearch-lazy-highlight-window       (selected-window)
+          isearch-lazy-highlight-window-start (window-start)
+          isearch-lazy-highlight-window-end   (window-end)
+          isearch-lazy-highlight-start        (point)
+          isearch-lazy-highlight-end          (point)
+          isearch-lazy-highlight-wrapped      nil
+          isearch-lazy-highlight-last-string  isearch-string
+          isearch-lazy-highlight-case-fold-search isearch-case-fold-search
+          isearch-lazy-highlight-regexp       isearch-regexp
+          isearch-lazy-highlight-space-regexp search-whitespace-regexp
+          isearch-lazy-highlight-word         isearch-word
+          isearch-lazy-highlight-forward      isearch-forward)
       (unless (equal isearch-string "")
         (setq isearch-lazy-highlight-timer
               (run-with-idle-timer lazy-highlight-initial-delay nil
-                                   'isearch-lazy-highlight-update))))))
+                                   'isearch-lazy-highlight-update)))))
 
 (defun isearch-lazy-highlight-search ()
   "Search ahead for the next or previous match, for lazy highlighting.
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index a7d3328526a..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
@@ -163,7 +163,7 @@
 ;; Font-Lock
 
 ;; font-lock is used to highlight the first matching buffer.  To
-;; switch this off, set (setq iswitchb-use-faces nil).  Colouring of
+;; switch this off, set (setq iswitchb-use-faces nil).  Coloring of
 ;; the matching buffer name was suggested by Carsten Dominik
 ;; (dominik@strw.leidenuniv.nl)
 
@@ -1110,7 +1110,7 @@ Return the modified list with the last element prepended to it."
           (if (fboundp 'set-buffer-major-mode)
               (set-buffer-major-mode newbufcreated))
           (iswitchb-visit-buffer newbufcreated))
-      ;; else wont create new buffer
+      ;; else won't create new buffer
       (message "no buffer matching `%s'" buf))))
 
 (defun iswitchb-window-buffer-p  (buffer)
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index e47f571db71..eea3009faf4 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -1020,7 +1020,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
           (setq executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events))
                 next-index executing-kbd-macro-index)))))
 
-    ;; Query the user; stop macro exection temporarily
+    ;; Query the user; stop macro execution temporarily.
     (let ((macro executing-kbd-macro)
           (executing-kbd-macro nil)
           (defining-kbd-macro nil))
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index bb242a50acc..444f4d519da 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -582,7 +582,7 @@ See also the descriptions of the variables
             (narrow-to-region p (point))
             (robin-invert-region (point-min) (point-max) "ethiopic-sera")
 
-            ;; ethio-quote-vowel-alwyas
+            ;; ethio-quote-vowel-always
             (goto-char (point-min))
             (while (re-search-forward "'[eauio]" nil t)
               (save-excursion
diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el
index 22ccd56dab3..13a645a9975 100644
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -61,7 +61,7 @@
               (features ethio-util)
               (sample-text . "�ደ�")
               (documentation .
-"This language envrironment provides these function key bindings:
+"This language environment provides these function key bindings:
     [f3]   ethio-fidel-to-sera-buffer
     [S-f3] ethio-fidel-to-sera-region
     [C-f3] ethio-fidel-to-sera-marker
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 6dfc03d0f5f..3c2cb083ff6 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -146,8 +146,8 @@ These languages are supported with the Latin-3 (ISO-8859-3) character set:
              (input-method . "latin-4-postfix")
              (documentation . "\
 These languages are supported with the Latin-4 (ISO-8859-4) character set:
- Danish, English, Estonian, Finnish, German, Greenlandic, Lappish,
- Latvian, Lithuanian, and Norwegian."))
+ Danish, English, Estonian, Finnish, German, Greenlandic, Latvian,
+ Lithuanian, Norwegian, and Sami."))
  '("European"))
 
 
@@ -226,7 +226,7 @@ See also the Turkish environment."))
   "ISO 2022 based 8-bit encoding for Latin-8 (MIME:ISO-8859-14)."
   :coding-type 'charset
   ;; `W' for `Welsh', since `C' for `Celtic' is taken.
-  :mnemonic ?W                          
+  :mnemonic ?W
   :charset-list '(iso-8859-14)
   :mime-charset 'iso-8859-14)
 
@@ -610,9 +610,10 @@ method and applying Turkish case rules for the characters i, I, $(D)E(B, $(D*
 (define-coding-system 'mac-roman
   "Mac Roman Encoding (MIME:MACINTOSH)."
   :coding-type 'charset
-  :mnemonic ?M 
+  :mnemonic ?M
   :charset-list '(mac-roman)
   :mime-charset 'macintosh)
+(define-coding-system-alias 'macintosh 'mac-roman)
 
 (define-coding-system 'next
   "NeXTstep encoding"
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index 81c5577fa57..008eb92dbbc 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -371,8 +371,8 @@ consonant.  It is a list vowel characters or 0.  The element 0
 indicate the place to embed a consonant.
 
 Optional WITH-MAA-SAKOD-RULE is a rule to re-order and modify VOWEL
-follwoing a consonant and preceding a maa-sakod character.  If it is
-nil, NO-MAA-SAKOD-RULE is used.  The maa-sakod character is alwasy
+following a consonant and preceding a maa-sakod character.  If it is
+nil, NO-MAA-SAKOD-RULE is used.  The maa-sakod character is always
 appended at the tail.
 
 For instance, rule `(\"(1`WM(B\" (?(1`(B t ?(1W(B ?(1M(B))' tells that this vowel
diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el
index b9c250fd700..25a10633a28 100644
--- a/lisp/language/romanian.el
+++ b/lisp/language/romanian.el
@@ -35,7 +35,7 @@
               (unibyte-display . iso-8859-2)
               (tutorial . "TUTORIAL.ro")
               (sample-text . "Bunã ziua, bine aþi venit!")
-              (documentation . "Rmoanian environment using Latin-2 encoding.
+              (documentation . "Romanian environment using Latin-2 encoding.
 An environment for generic Latin-10 encoding is also available."))
  '("European"))
 
diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index 97d5037f3c5..4034566afca 100644
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -28,7 +28,7 @@
 
 ;;; Commentary:
 
-;; For Vietnames, the character sets VISCII, VSCII and TCVN-5712 are
+;; For Vietnamese, the character sets VISCII, VSCII and TCVN-5712 are
 ;; supported.
 
 ;;; Code:
@@ -84,7 +84,7 @@
                 (documentation . "\
 For Vietnamese, Emacs uses special charsets internally.
 They can be decoded from and encoded to VISCII, VSCII, TCVN-5712, VIQR
-and windows-1258.  VSCII is deprecated in favour of TCVN-5712.  The
+and windows-1258.  VSCII is deprecated in favor of TCVN-5712.  The
 Current setting gives higher priority to the coding system VISCII than
 TCVN-5712.  If you prefer TCVN-5712, please do: (prefer-coding-system
 'vietnamese-tcvn).  There are two Vietnamese input methods: VIQR and
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 0ce53fcb9a3..7f595db4814 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -11099,7 +11099,7 @@ the rightmost is selected.  If ARG is nil, the leftmost window is
 selected if the original window is the first one in the frame.
 
 To bind this command to a hotkey, place the following line
-in your `~/.emacs' file, replacing [f7] by your favourite key:
+in your `~/.emacs' file, replacing [f7] by your favorite key:
     (global-set-key [f7] 'follow-delete-other-windows-and-split)
 
 \(fn &optional ARG)" t nil)
@@ -20621,7 +20621,7 @@ normalized footnotes towards the end of the pre-processing buffer.
 Some exporters like docbook, odt, etc. expect that footnote
 definitions be available before any references to them.  Such
 exporters can let bind `org-footnote-insert-pos-for-preprocessor' to
-symbol 'point-min to achieve the desired behaviour.
+symbol 'point-min to achieve the desired behavior.
 
 Additional note on `org-footnote-insert-pos-for-preprocessor':
 1. This variable has not effect when FOR-PREPROCESSOR is nil.
@@ -26109,7 +26109,7 @@ That's all.  Here's the board after two moves:
 
                 o   o   o
 
-Pick your favourite shortcuts:
+Pick your favorite shortcuts:
 
 \\{solitaire-mode-map}
 
@@ -27789,7 +27789,7 @@ This mode is usually not used directly; instead, other major
 modes are derived from it, using `define-derived-mode'.
 
 In this major mode, the buffer is divided into multiple columns,
-which are labelled using the header line.  Each non-empty line
+which are labeled using the header line.  Each non-empty line
 belongs to one \"entry\", and the entries can be sorted according
 to their column values.
 
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 0b569199935..da20e4cb7ca 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -144,7 +144,7 @@ These are symbols with hooklike values whose names don't end in
 pertinent symbols.")
 
 (defvar unload-function-defs-list nil
-  "List of defintions in the Lisp library being unloaded.
+  "List of definitions in the Lisp library being unloaded.
 
 This is meant to be used by `FEATURE-unload-function'; see the
 documentation of `unload-feature' for details.")
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index f4b29958aab..eaac5c17cd3 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -83,7 +83,7 @@
 ;; work properly.  If you don't know what custom is all about and want
 ;; to edit your user option elisp variables the old fashioned way,
 ;; just imagine that all the "defcustom" stuff you see below is really
-;; "defvar", and ignore everthing else.  For info about custom, see
+;; "defvar", and ignore everything else.  For info about custom, see
 ;; <URL:http://www.dina.kvl.dk/~abraham/custom/>.
 ;;
 ;; This code does in elisp a superset of the stuff that used to be done
@@ -336,7 +336,7 @@
 ;;           for FQM files if you're a VM user
 ;;         change buffer-substring calls to buffer-substring-no-properties for
 ;;           speed-up (suggested by Howard Melman <howard@silverstream.com>)
-;;         feedmail-sendmail-f-doesnt-sell-me-out to contol "-f" in call to sendmail
+;;         feedmail-sendmail-f-doesnt-sell-me-out to control "-f" in call to sendmail
 ;;           in feedmail-buffer-to-sendmail
 ;;         better trapping of odd conditions during the running of the queue;
 ;;           thanks to Yigal Hochberg for helping me test much of this by remote
@@ -1356,7 +1356,7 @@ for you.  Add this function to `mail-send-hook' with something like this:
         (add-hook 'mail-send-hook 'feedmail-mail-send-hook-splitter)
 
 Then add the functions you want called to either `feedmail-mail-send-hook-queued'
-or `feedmail-mail-send-hook', as apprpriate.  The distinction is that
+or `feedmail-mail-send-hook', as appropriate.  The distinction is that
 `feedmail-mail-send-hook' will be called when you send mail from a composition
 buffer (typically by typing C-c C-c), whether the message is sent immediately
 or placed in the queue or drafts directory.  `feedmail-mail-send-hook-queued' is
@@ -2188,7 +2188,7 @@ you can set `feedmail-queue-reminder-alist' to nil."
             (if (or (eq user-sez ?\C-m) (eq user-sez ?\C-j) (eq user-sez ?y))
                 (setq user-sez d-char))
             ;; these char-to-int things are because of some
-            ;; incomprensible difference between the two in
+            ;; incomprehensible difference between the two in
             ;; byte-compiled stuff between Emacs and XEmacs
             ;; (well, I'm sure someone could comprehend it,
             ;; but I say 'uncle')
@@ -2410,7 +2410,7 @@ mapped to mostly alphanumerics for safety."
         (a-re-dtcb  "^\\(To\\|Cc\\|Bcc\\):")
         (a-re-dtc   "^\\(To\\|Cc\\):")
         (a-re-db    "^Bcc:")
-        ;; to get a temporary changable copy
+        ;; to get a temporary changeable copy
         (mail-header-separator mail-header-separator)
         )
     (unwind-protect
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index c3a7da41823..12826001d86 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1961,7 +1961,7 @@ place.  It affects how `mail-extract-address-components' works."
        ("gw" "Guinea-Bissau")
        ("gy" "Guyana")
        ("hk" "Hong Kong")
-       ("hm" "Heard Island and Mcdonald Islands")
+       ("hm" "Heard Island and McDonald Islands")
        ("hn" "Honduras")
        ("hr" "Croatia"          "Croatia (Hrvatska)")
        ("ht" "Haiti")
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/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index 70226b26965..14a76746797 100644
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -317,7 +317,7 @@ it from rmail file.  Called for each new message retrieved by
           ;; that this email is spam, output the email to the spam
           ;; rmail file, mark the email for deletion, leave the
           ;; while loop and return nil so that an rmail summary line
-          ;; wont be displayed for this message: (FIXME ?)
+          ;; won't be displayed for this message: (FIXME ?)
           (if (and (car maybe-spam) (cdr maybe-spam))
               (setq exit-while-loop t)
             ;; Else, spam was not yet found, proceed to next element
@@ -554,4 +554,4 @@ checks to see if the old format is used, and updates it if necessary."
 
 (provide 'rmail-spam-filter)
 
-;;; rmail-spam-fitler ends here
+;;; rmail-spam-filter ends here
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 76c9b87f881..a8efe10ec76 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -631,33 +631,29 @@ Element N specifies the summary line for message N+1.")
 This is set to nil by default.")
 
 (defcustom rmail-enable-mime t
-  "If non-nil, RMAIL uses MIME features.
-If the value is t, RMAIL automatically shows MIME decoded message.
-If the value is neither t nor nil, RMAIL does not show MIME decoded message
-until a user explicitly requires it.
-
-Even if the value is non-nil, you can't use MIME features
-unless the feature specified by `rmail-mime-feature' is available."
-  :type '(choice (const :tag "on" t)
-                 (const :tag "off" nil)
-                 (other :tag "when asked" ask))
+  "If non-nil, RMAIL automatically displays decoded MIME messages.
+For this to work, the feature specified by `rmail-mime-feature' must
+be available."
+  :type 'boolean
   :version "23.3"
   :group 'rmail)
 
-(defvar rmail-enable-mime-composing t
-  "*If non-nil, RMAIL uses `rmail-insert-mime-forwarded-message-function' to forward.")
+(defcustom rmail-enable-mime-composing t
+  "If non-nil, use `rmail-insert-mime-forwarded-message-function' to forward."
+  :type 'boolean
+  :version "24.1"                       ; nil -> t
+  :group 'rmail)
 
-;; FIXME unused.
 (defvar rmail-show-mime-function nil
-  "Function to show MIME decoded message of RMAIL file.
+  "Function of no argument called to show a decoded MIME message.
 This function is called when `rmail-enable-mime' is non-nil.
-It is called with no argument.")
+The package providing MIME support should set this.")
 
 ;;;###autoload
 (defvar rmail-insert-mime-forwarded-message-function nil
   "Function to insert a message in MIME format so it can be forwarded.
-This function is called if `rmail-enable-mime' or
-`rmail-enable-mime-composing' is non-nil.
+This function is called if `rmail-enable-mime' and
+`rmail-enable-mime-composing' are non-nil.
 It is called with one argument FORWARD-BUFFER, which is a
 buffer containing the message to forward.  The current buffer
 is the outgoing mail buffer.")
@@ -687,13 +683,18 @@ where MSG is the message number, REGEXP is the regular
 expression, LIMIT is the position specifying the end of header.")
 
 (defvar rmail-mime-feature 'rmailmm
-  "Feature to require to load MIME support in Rmail.
-When starting Rmail, if `rmail-enable-mime' is non-nil,
-this feature is required with `require'.
-
-The default value is `rmailmm'")
-
-;; FIXME this is unused.
+  "Feature to require for MIME support in Rmail.
+When starting Rmail, if `rmail-enable-mime' is non-nil, this
+feature is loaded with `require'.  The default value is `rmailmm'.
+
+The library should set the variable `rmail-show-mime-function'
+to an appropriate value, and optionally also set
+`rmail-search-mime-message-function',
+`rmail-search-mime-header-function',
+`rmail-insert-mime-forwarded-message-function', and
+`rmail-insert-mime-resent-message-function'.")
+
+;; FIXME this is unused since 23.1.
 (defvar rmail-decode-mime-charset t
   "*Non-nil means a message is decoded by MIME's charset specification.
 If this variable is nil, or the message has not MIME specification,
@@ -703,6 +704,9 @@ If the variable `rmail-enable-mime' is non-nil, this variable is
 ignored, and all the decoding work is done by a feature specified by
 the variable `rmail-mime-feature'.")
 
+(make-obsolete-variable 'rmail-decode-mime-charset
+                        "it does nothing." "23.1")
+
 (defvar rmail-mime-charset-pattern
   (concat "^content-type:[ \t]*text/plain;"
           "\\(?:[ \t\n]*\\(?:format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*"
@@ -837,10 +841,10 @@ isn't provided."
        (display-warning
         'rmail
         (format "Although MIME support is requested
-by setting `rmail-enable-mime' to non-nil, the required feature
+through `rmail-enable-mime' being non-nil, the required feature
 `%s' (the value of `rmail-mime-feature')
 is not available in the current session.
-So, the MIME support is turned off for the moment."
+So, MIME support is turned off for the moment."
                 rmail-mime-feature)
         :warning)
        (setq rmail-enable-mime nil)))))
@@ -2071,7 +2075,7 @@ Call with point at the end of the message."
 (defun rmail-add-mbox-headers ()
   "Validate the RFC2822 format for the new messages.
 Point should be at the first new message.
-An error is signalled if the new messages are not RFC2822
+An error is signaled if the new messages are not RFC2822
 compliant.
 Unless an Rmail attribute header already exists, add it to the
 new messages.  Return the number of new messages."
@@ -2440,7 +2444,7 @@ Output a helpful message unless NOMSG is non-nil."
         ;; the entry for message N+1, which marks
         ;; the end of message N.  (N = number of messages).
         (setq messages-head (list (point-marker)))
-        (setq messages-after-point 
+        (setq messages-after-point
               (or (rmail-set-message-counters-counter (min (point) point-save))
                   0))
 
@@ -2700,6 +2704,7 @@ The current mail message becomes the message displayed."
           ;; inspect this value to determine how to toggle.
           (set (make-local-variable 'rmail-header-style) header-style))
         (if (and rmail-enable-mime
+                 rmail-show-mime-function
                  (re-search-forward "mime-version: 1.0" nil t))
             (let ((rmail-buffer mbox-buf)
                   (rmail-view-buffer view-buf))
@@ -3096,7 +3101,7 @@ but probably is garbage."
     ;; correspond to the lines in the inbox file.
     (goto-char (point-min))
     (if header-field
-        (progn 
+        (progn
           (re-search-forward (concat "^" (regexp-quote header-field)) nil t)
           (forward-line line-number-within))
       (search-forward "\n\n" nil t)
@@ -3134,10 +3139,9 @@ but probably is garbage."
   ;; This is adequate because its only caller, rmail-search,
   ;; unswaps the buffers.
   (goto-char (rmail-msgbeg msg))
-  (if rmail-enable-mime
-      (if rmail-search-mime-message-function
-          (funcall rmail-search-mime-message-function msg regexp)
-        (error "You must set `rmail-search-mime-message-function'"))
+  (if (and rmail-enable-mime
+           rmail-search-mime-message-function)
+      (funcall rmail-search-mime-message-function msg regexp)
     (re-search-forward regexp (rmail-msgend msg) t)))
 
 (defvar rmail-search-last-regexp nil)
@@ -3804,7 +3808,8 @@ see the documentation of `rmail-resend'."
             ;; Insert after header separator--before signature if any.
             (rfc822-goto-eoh)
             (forward-line 1)
-            (if (and rmail-enable-mime rmail-enable-mime-composing)
+            (if (and rmail-enable-mime rmail-enable-mime-composing
+                     rmail-insert-mime-forwarded-message-function)
                 (prog1
                     (funcall rmail-insert-mime-forwarded-message-function
                              forward-buffer)
@@ -3860,10 +3865,9 @@ typically for purposes of moderating a list."
     (unwind-protect
         (with-current-buffer tembuf
           ;;>> Copy message into temp buffer
-          (if rmail-enable-mime
-              (if rmail-insert-mime-resent-message-function
+          (if (and rmail-enable-mime
+                   rmail-insert-mime-resent-message-function)
                   (funcall rmail-insert-mime-resent-message-function mailbuf)
-                (error "You must set `rmail-insert-mime-resent-message-function'"))
             (insert-buffer-substring mailbuf))
           (goto-char (point-min))
           ;; Delete any Sender field, since that's not specifiable.
@@ -4445,7 +4449,7 @@ encoded string (and the same mask) will decode the string."
 ;;; Start of automatically extracted autoloads.
 
 ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "rmailedit.el"
-;;;;;;  "090ad9432c3bf9a6098bb9c3d7c71baf")
+;;;;;;  "7f9bff22ed0bbac561c97fd1e3ab503d")
 ;;; Generated autoloads from rmailedit.el
 
 (autoload 'rmail-edit-current-message "rmailedit" "\
@@ -4500,28 +4504,29 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "2c8675d7c069c68bc36a4003b15448d1")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "6296f0170a37670c49a88a1b92d78187")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
-Toggle displaying of a MIME message.
-
-The actualy behavior depends on the value of `rmail-enable-mime'.
+Toggle the display of a MIME message.
 
-If `rmail-enable-mime' is t (default), this command change the
-displaying of a MIME message between decoded presentation form
-and raw data.
+The actual behavior depends on the value of `rmail-enable-mime'.
 
-With ARG, toggle the displaying of the current MIME entity only.
+If `rmail-enable-mime' is non-nil (the default), this command toggles
+the display of a MIME message between decoded presentation form and
+raw data.  With optional prefix argument ARG, it toggles the display only
+of the MIME entity at point, if there is one.  The optional argument
+STATE forces a particular display state, rather than toggling.
+`raw' forces raw mode, any other non-nil value forces decoded mode.
 
-If `rmail-enable-mime' is nil, this creates a temporary
-\"*RMAIL*\" buffer holding a decoded copy of the message.  Inline
-content-types are handled according to
-`rmail-mime-media-type-handlers-alist'.  By default, this
-displays text and multipart messages, and offers to download
-attachments as specfied by `rmail-mime-attachment-dirs-alist'.
+If `rmail-enable-mime' is nil, this creates a temporary \"*RMAIL*\"
+buffer holding a decoded copy of the message. Inline content-types are
+handled according to `rmail-mime-media-type-handlers-alist'.
+By default, this displays text and multipart messages, and offers to
+download attachments as specified by `rmail-mime-attachment-dirs-alist'.
+The arguments ARG and STATE have no effect in this case.
 
-\(fn &optional ARG)" t nil)
+\(fn &optional ARG STATE)" t nil)
 
 ;;;***
 
@@ -4601,7 +4606,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order.
 
 ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
 ;;;;;;  rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels
-;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "3817e21639db697abe5832d3223ecfc2")
+;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "35e07b0a5ea8e41971f31a8780eba6bb")
 ;;; Generated autoloads from rmailsum.el
 
 (autoload 'rmail-summary "rmailsum" "\
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index 868ca15923f..7e70f66ef11 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -78,6 +78,7 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'.
 
 
 (defvar rmail-old-text)
+(defvar rmail-old-mime-state)
 (defvar rmail-old-pruned nil
   "Non-nil means the message being edited originally had pruned headers.")
 (put 'rmail-old-pruned 'permanent-local t)
@@ -86,6 +87,10 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'.
   "Holds the headers of this message before editing started.")
 (put 'rmail-old-headers 'permanent-local t)
 
+;; Everything we use from here is a defsubst.
+(eval-when-compile
+  (require 'rmailmm))
+
 ;;;###autoload
 (defun rmail-edit-current-message ()
   "Edit the contents of this message."
@@ -96,6 +101,28 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'.
   (make-local-variable 'rmail-old-pruned)
   (setq rmail-old-pruned (rmail-msg-is-pruned))
   (rmail-edit-mode)
+  (set (make-local-variable 'rmail-old-mime-state)
+       (and rmail-enable-mime
+            ;; If you use something else, you are on your own.
+            (eq rmail-mime-feature 'rmailmm)
+            (rmail-mime-message-p)
+            (let ((entity (get-text-property (point-min) 'rmail-mime-entity)))
+              ;; rmailmm has got its hands on the message.
+              ;; Even if the message is in `raw' state, boundaries etc
+              ;; are still missing.  All we can do is insert the real
+              ;; raw message.  (Bug#9840)
+              (when (and entity
+                         (not (equal "text/plain"
+                                     (car (rmail-mime-entity-type entity)))))
+                (let ((inhibit-read-only t))
+                  (erase-buffer)
+                  (insert-buffer-substring
+                   rmail-view-buffer
+                   (aref (rmail-mime-entity-header entity) 0)
+                   (aref (rmail-mime-entity-body entity) 1)))
+                (goto-char (point-min))
+                ;; t = decoded; raw = raw.
+                (aref (aref (rmail-mime-entity-display entity) 0) 0)))))
   (make-local-variable 'rmail-old-text)
   (setq rmail-old-text
         (save-restriction
@@ -134,7 +161,10 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'.
       (error "There must be a blank line at the end of the headers"))
   ;; Disguise any "From " lines so they don't start a new message.
   (goto-char (point-min))
-  (or rmail-old-pruned (forward-line 1))
+  ;; This tries to skip the mbox From.  FIXME less fragile to go to EOH?
+  (if (or rmail-old-mime-state
+          (not rmail-old-pruned))
+      (forward-line 1))
   (while (re-search-forward "^>*From " nil t)
     (beginning-of-line)
     (insert ">")
@@ -145,6 +175,7 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'.
   (rmail-ensure-blank-line)
   (let ((old rmail-old-text)
         (pruned rmail-old-pruned)
+        (mime-state rmail-old-mime-state)
         ;; People who know what they are doing might have modified the
         ;; buffer's encoding if editing the message included inserting
         ;; characters that were unencodable by the original message's
@@ -256,7 +287,9 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'.
 ;;;    (if (boundp 'rmail-summary-vector)
 ;;;     (aset rmail-summary-vector (1- rmail-current-message) nil))
     (rmail-show-message)
-    (rmail-toggle-header (if pruned 1 0)))
+    (rmail-toggle-header (if pruned 1 0))
+    ;; Restore mime display state.
+    (and mime-state (rmail-mime nil mime-state)))
   (run-hooks 'rmail-mode-hook))
 
 (defun rmail-abort-edit ()
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index d3351255583..31e34cd098f 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -155,7 +155,7 @@ MIME entities.")
 (defun rmail-mime-entity (type disposition transfer-encoding
                                display header tagline body children handler
                                &optional truncated)
-  "Retrun a newly created MIME-entity object from arguments.
+  "Return a newly created MIME-entity object from arguments.
 
 A MIME-entity is a vector of 10 elements:
 
@@ -180,16 +180,16 @@ The corresponding TYPE argument must be:
   \(\"boundary\" . \"----=_NextPart_000_0104_01C617E4.BDEC4C40\"))
 
 TRANSFER-ENCODING corresponds to MIME header
-Content-Transfer-Encoding, and is a lowercased string.
+Content-Transfer-Encoding, and is a lower-case string.
 
 DISPLAY is a vector [CURRENT NEW], where CURRENT indicates how
-the header, tagline, and body of the entity are displayed now,
-and NEW indicates how their displaying should be updated.
-Both elements are vector [HEADER-DISPLAY TAGLINE-DISPLAY BODY-DISPLAY],
-where each element is a symbol for the corresponding item that
-has these values:
+the header, tag line, and body of the entity are displayed now,
+and NEW indicates how their display should be updated.
+Both elements are vectors [HEADER-DISPLAY TAGLINE-DISPLAY BODY-DISPLAY],
+where each constituent element is a symbol for the corresponding
+item with these values:
   nil: not displayed
-  t: displayed by the decoded presentation form
+  t:   displayed by the decoded presentation form
   raw: displayed by the raw MIME data (for the header and body only)
 
 HEADER and BODY are vectors [BEG END DISPLAY-FLAG], where BEG and
@@ -201,11 +201,11 @@ presentation form.
 TAGLINE is a vector [TAG BULK-DATA DISPLAY-FLAG], where TAG is a
 string indicating the depth and index number of the entity,
 BULK-DATA is a cons (SIZE . TYPE) indicating the size and type of
-an attached data, DISPLAY-FLAG non-nil means that the tagline is,
-by default, displayed.
+an attached data, DISPLAY-FLAG non-nil means that the tag line is
+displayed by default.
 
 CHILDREN is a list of child MIME-entities.  A \"multipart/*\"
-entity have one or more children.  A \"message/rfc822\" entity
+entity has one or more children.  A \"message/rfc822\" entity
 has just one child.  Any other entity has no child.
 
 HANDLER is a function to insert the entity according to DISPLAY.
@@ -281,13 +281,20 @@ TRUNCATED is non-nil if the text of this entity was truncated."
 
 (define-button-type 'rmail-mime-save 'action 'rmail-mime-save)
 
+;; Display options returned by rmail-mime-entity-display.
+;; Value is on of nil, t, raw.
+(defsubst rmail-mime-display-header (disp)  (aref disp 0))
+(defsubst rmail-mime-display-tagline (disp) (aref disp 1))
+(defsubst rmail-mime-display-body (disp)    (aref disp 2))
+
 (defun rmail-mime-entity-segment (pos &optional entity)
   "Return a vector describing the displayed region of a MIME-entity at POS.
 Optional 2nd argument ENTITY is the MIME-entity at POS.
-The value is a vector [ INDEX HEADER TAGLINE BODY END], where
-  INDEX: index into the returned vector indicating where POS is (1..3).
+The value is a vector [INDEX HEADER TAGLINE BODY END], where
+  INDEX: index into the returned vector indicating where POS is (1..3)
   HEADER: the position of the beginning of a header
-  TAGLINE: the position of the beginning of a tagline
+  TAGLINE: the position of the beginning of a tag line, including
+           the newline that precedes it
   BODY: the position of the beginning of a body
   END: the position of the end of the entity."
   (save-excursion
@@ -305,21 +312,32 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
             (index 1)
             tagline-beg body-beg end)
         (goto-char beg)
-        (if (aref current 0)
+        ;; If the header is displayed, get past it to the tagline.
+        (if (rmail-mime-display-header current)
             (search-forward "\n\n" nil t))
         (setq tagline-beg (point))
         (if (>= pos tagline-beg)
             (setq index 2))
-        (if (aref current 1)
-            (forward-line 1))
+        ;; If the tagline is displayed, get past it to the body.
+        (if (rmail-mime-display-tagline current)
+            ;; The next foward-line call must be in sync with how
+            ;; `rmail-mime-insert-tagline' formats the tagline.  The
+            ;; body begins after the empty line that ends the tagline.
+            (forward-line 3))
         (setq body-beg (point))
         (if (>= pos body-beg)
             (setq index 3))
-        (if (aref current 2)
+        ;; If the body is displayed, find its end.
+        (if (rmail-mime-display-body current)
             (let ((tag (aref (rmail-mime-entity-tagline entity) 0))
                   tag2)
               (setq end (next-single-property-change beg 'rmail-mime-entity
                                                      nil (point-max)))
+              ;; `tag' is either an empty string or "/n" where n is
+              ;; the number of the part of the multipart MIME message.
+              ;; The loop below finds the next location whose
+              ;; `rmail-mime-entity' property specifies a tag of a
+              ;; different value.
               (while (and (< end (point-max))
                           (setq entity (get-text-property end 'rmail-mime-entity)
                                 tag2 (aref (rmail-mime-entity-tagline entity) 0))
@@ -331,7 +349,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
         (vector index beg tagline-beg body-beg end)))))
 
 (defun rmail-mime-shown-mode (entity)
-  "Make MIME-entity ENTITY displayed by the default way."
+  "Make MIME-entity ENTITY display in the default way."
   (let ((new (aref (rmail-mime-entity-display entity) 1)))
     (aset new 0 (aref (rmail-mime-entity-header entity) 2))
     (aset new 1 (aref (rmail-mime-entity-tagline entity) 2))
@@ -340,7 +358,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
     (rmail-mime-shown-mode child)))
 
 (defun rmail-mime-hidden-mode (entity)
-  "Make MIME-entity ENTITY displayed in the hidden mode."
+  "Make MIME-entity ENTITY display in hidden mode."
   (let ((new (aref (rmail-mime-entity-display entity) 1)))
     (aset new 0 nil)
     (aset new 1 t)
@@ -349,7 +367,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
     (rmail-mime-hidden-mode child)))
 
 (defun rmail-mime-raw-mode (entity)
-  "Make MIME-entity ENTITY displayed in the raw mode."
+  "Make MIME-entity ENTITY display in raw mode."
   (let ((new (aref (rmail-mime-entity-display entity) 1)))
     (aset new 0 'raw)
     (aset new 1 nil)
@@ -357,13 +375,17 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
   (dolist (child (rmail-mime-entity-children entity))
     (rmail-mime-raw-mode child)))
 
-(defun rmail-mime-toggle-raw (entity)
-  "Toggle on and off the raw display mode of MIME-entity ENTITY."
+(defun rmail-mime-toggle-raw (&optional state)
+  "Toggle on and off the raw display mode of MIME-entity at point.
+With optional argument STATE, force the specified display mode.
+Use `raw' for raw mode, and any other non-nil value for decoded mode."
   (let* ((pos (if (eobp) (1- (point-max)) (point)))
          (entity (get-text-property pos 'rmail-mime-entity))
          (current (aref (rmail-mime-entity-display entity) 0))
          (segment (rmail-mime-entity-segment pos entity)))
-    (if (not (eq (aref current 0) 'raw))
+    (if (or (eq state 'raw)
+            (and (not state)
+                 (not (eq (rmail-mime-display-header current) 'raw))))
         ;; Enter the raw mode.
         (rmail-mime-raw-mode entity)
       ;; Enter the shown mode.
@@ -376,7 +398,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
         (restore-buffer-modified-p modified)))))
 
 (defun rmail-mime-toggle-hidden ()
-  "Hide or show the body of MIME-entity at point."
+  "Hide or show the body of the MIME-entity at point."
   (interactive)
   (when (rmail-mime-message-p)
     (let* ((rmail-mime-mbox-buffer rmail-view-buffer)
@@ -385,7 +407,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
            (entity (get-text-property pos 'rmail-mime-entity))
            (current (aref (rmail-mime-entity-display entity) 0))
            (segment (rmail-mime-entity-segment pos entity)))
-      (if (aref current 2)
+      (if (rmail-mime-display-body current)
           ;; Enter the hidden mode.
           (progn
             ;; If point is in the body part, move it to the tagline
@@ -424,14 +446,17 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
 
 (defun rmail-mime-insert-tagline (entity &rest item-list)
   "Insert a tag line for MIME-entity ENTITY.
-ITEM-LIST is a list of strings or button-elements (list) to be added
+ITEM-LIST is a list of strings or button-elements (list) to add
 to the tag line."
+  ;; Precede the tagline by an empty line to make it a separate
+  ;; paragraph, so that it is aligned to the left margin of the window
+  ;; even if preceded by a right-to-left paragraph.
   (insert "\n[")
   (let ((tag (aref (rmail-mime-entity-tagline entity) 0)))
     (if (> (length tag) 0) (insert (substring tag 1) ":")))
   (insert (car (rmail-mime-entity-type entity)) " ")
   (insert-button (let ((new (aref (rmail-mime-entity-display entity) 1)))
-                   (if (aref new 2) "Hide" "Show"))
+                   (if (rmail-mime-display-body new) "Hide" "Show"))
                  :type 'rmail-mime-toggle
                  'help-echo "mouse-2, RET: Toggle show/hide")
   (dolist (item item-list)
@@ -439,6 +464,9 @@ to the tag line."
       (if (stringp item)
           (insert item)
         (apply 'insert-button item))))
+  ;; Follow the tagline by an empty line to make it a separate
+  ;; paragraph, so that the paragraph direction of the following text
+  ;; is determined based on that text.
   (insert "]\n\n"))
 
 (defun rmail-mime-update-tagline (entity)
@@ -459,12 +487,14 @@ to the tag line."
     (delete-region (button-start button) (point))
     (put-text-property (point) (button-end button) 'rmail-mime-entity entity)
     (restore-buffer-modified-p modified)
-    (forward-line 1)))
+    ;; The following call to forward-line must be in sync with how
+    ;; rmail-mime-insert-tagline formats the tagline.
+    (forward-line 2)))
 
 (defun rmail-mime-insert-header (header)
   "Decode and insert a MIME-entity header HEADER in the current buffer.
 HEADER is a vector [BEG END DEFAULT-STATUS].
-See `rmail-mime-entity' for the detail."
+See `rmail-mime-entity' for details."
   (let ((pos (point))
         (last-coding-system-used nil))
     (save-restriction
@@ -484,7 +514,7 @@ See `rmail-mime-entity' for the detail."
       (insert "\n"))))
 
 (defun rmail-mime-find-header-encoding (header)
-  "Retun the last coding system used to decode HEADER.
+  "Return the last coding system used to decode HEADER.
 HEADER is a header component of a MIME-entity object (see
 `rmail-mime-entity')."
   (with-temp-buffer
@@ -553,28 +583,32 @@ HEADER is a header component of a MIME-entity object (see
           (delete-region (point-min) (point-max))))
 
     ;; header
-    (if (eq (aref current 0) (aref new 0))
+    (if (eq (rmail-mime-display-header current)
+            (rmail-mime-display-header new))
         (goto-char (aref segment 2))
-      (if (aref current 0)
+      (if (rmail-mime-display-header current)
           (delete-char (- (aref segment 2) (aref segment 1))))
-      (if (aref new 0)
+      (if (rmail-mime-display-header new)
           (rmail-mime-insert-header header)))
     ;; tagline
-    (if (eq (aref current 1) (aref new 1))
-        (if (or (not (aref current 1))
-                (eq (aref current 2) (aref new 2)))
+    (if (eq (rmail-mime-display-tagline current)
+            (rmail-mime-display-tagline new))
+        (if (or (not (rmail-mime-display-tagline current))
+                (eq (rmail-mime-display-body current)
+                    (rmail-mime-display-body new)))
             (forward-char (- (aref segment 3) (aref segment 2)))
           (rmail-mime-update-tagline entity))
-      (if (aref current 1)
+      (if (rmail-mime-display-tagline current)
           (delete-char (- (aref segment 3) (aref segment 2))))
-      (if (aref new 1)
+      (if (rmail-mime-display-tagline new)
           (rmail-mime-insert-tagline entity)))
     ;; body
-    (if (eq (aref current 2) (aref new 2))
+    (if (eq (rmail-mime-display-body current)
+            (rmail-mime-display-body new))
         (forward-char (- (aref segment 4) (aref segment 3)))
-      (if (aref current 2)
+      (if (rmail-mime-display-body current)
           (delete-char (- (aref segment 4) (aref segment 3))))
-      (if (aref new 2)
+      (if (rmail-mime-display-body new)
           (rmail-mime-insert-decoded-text entity)))
     (put-text-property beg (point) 'rmail-mime-entity entity)))
 
@@ -722,22 +756,25 @@ directly."
     (setq beg (point))
 
     ;; header
-    (if (eq (aref current 0) (aref new 0))
+    (if (eq (rmail-mime-display-header current)
+            (rmail-mime-display-header new))
         (goto-char (aref segment 2))
-      (if (aref current 0)
+      (if (rmail-mime-display-header current)
           (delete-char (- (aref segment 2) (aref segment 1))))
-      (if (aref new 0)
+      (if (rmail-mime-display-header new)
           (rmail-mime-insert-header header)))
 
     ;; tagline
-    (if (eq (aref current 1) (aref new 1))
-        (if (or (not (aref current 1))
-                (eq (aref current 2) (aref new 2)))
+    (if (eq (rmail-mime-display-tagline current)
+            (rmail-mime-display-tagline new))
+        (if (or (not (rmail-mime-display-tagline current))
+                (eq (rmail-mime-display-body current)
+                    (rmail-mime-display-body new)))
             (forward-char (- (aref segment 3) (aref segment 2)))
           (rmail-mime-update-tagline entity))
-      (if (aref current 1)
+      (if (rmail-mime-display-tagline current)
           (delete-char (- (aref segment 3) (aref segment 2))))
-      (if (aref new 1)
+      (if (rmail-mime-display-tagline new)
           (rmail-mime-insert-tagline
            entity
            " Save:"
@@ -760,11 +797,12 @@ directly."
            ;;        'image-data data))
            )))
     ;; body
-    (if (eq (aref current 2) (aref new 2))
+    (if (eq (rmail-mime-display-body current)
+            (rmail-mime-display-body new))
         (forward-char (- (aref segment 4) (aref segment 3)))
-      (if (aref current 2)
+      (if (rmail-mime-display-body current)
           (delete-char (- (aref segment 4) (aref segment 3))))
-      (if (aref new 2)
+      (if (rmail-mime-display-body new)
           (cond ((eq (cdr bulk-data) 'text)
                  (rmail-mime-insert-decoded-text entity))
                 ((cdr bulk-data)
@@ -882,7 +920,7 @@ The other arguments are the same as `rmail-mime-multipart-handler'."
              ;; We're handling what's left of a truncated message.
              (setq next (point-max-marker)))
             (t
-             ;; The original code signalled an error as below, but
+             ;; The original code signaled an error as below, but
              ;; this line may be a boundary of nested multipart.  So,
              ;; we just set `next' to nil to skip this line
              ;; (rmail-mm-get-boundary-error-message
@@ -974,27 +1012,31 @@ This is the epilogue.  It is also to be ignored."))
         (beg (point))
         (segment (rmail-mime-entity-segment (point) entity)))
     ;; header
-    (if (eq (aref current 0) (aref new 0))
+    (if (eq (rmail-mime-display-header current)
+            (rmail-mime-display-header new))
         (goto-char (aref segment 2))
-      (if (aref current 0)
+      (if (rmail-mime-display-header current)
           (delete-char (- (aref segment 2) (aref segment 1))))
-      (if (aref new 0)
+      (if (rmail-mime-display-header new)
           (rmail-mime-insert-header header)))
     ;; tagline
-    (if (eq (aref current 1) (aref new 1))
-        (if (or (not (aref current 1))
-                (eq (aref current 2) (aref new 2)))
+    (if (eq (rmail-mime-display-tagline current)
+            (rmail-mime-display-tagline new))
+        (if (or (not (rmail-mime-display-tagline current))
+                (eq (rmail-mime-display-body current)
+                    (rmail-mime-display-body new)))
             (forward-char (- (aref segment 3) (aref segment 2)))
           (rmail-mime-update-tagline entity))
-      (if (aref current 1)
+      (if (rmail-mime-display-tagline current)
           (delete-char (- (aref segment 3) (aref segment 2))))
-      (if (aref new 1)
+      (if (rmail-mime-display-tagline new)
           (rmail-mime-insert-tagline entity)))
 
     (put-text-property beg (point) 'rmail-mime-entity entity)
 
     ;; body
-    (if (eq (aref current 2) (aref new 2))
+    (if (eq (rmail-mime-display-body current)
+            (rmail-mime-display-body new))
         (forward-char (- (aref segment 4) (aref segment 3)))
       (dolist (child (rmail-mime-entity-children entity))
         (rmail-mime-insert child)))
@@ -1011,7 +1053,7 @@ point should be at the beginning of the body.
 
 CONTENT-TYPE, CONTENT-DISPOSITION, and CONTENT-TRANSFER-ENCODING
 are the values of the respective parsed headers.  The latter should
-be downcased.  The parsed headers for CONTENT-TYPE and CONTENT-DISPOSITION
+be lower-case.  The parsed headers for CONTENT-TYPE and CONTENT-DISPOSITION
 have the form
 
   \(VALUE . ALIST)
@@ -1196,7 +1238,7 @@ modified."
 
 (defun rmail-mime-parse ()
   "Parse the current Rmail message as a MIME message.
-The value is a MIME-entiy object (see `rmail-mime-entity').
+The value is a MIME-entity object (see `rmail-mime-entity').
 If an error occurs, return an error message string."
   (let ((rmail-mime-mbox-buffer (if (rmail-buffers-swapped-p)
                                     rmail-view-buffer
@@ -1224,7 +1266,7 @@ This function will be called recursively if multiple parts are
 available."
   (let ((current (aref (rmail-mime-entity-display entity) 0))
         (new (aref (rmail-mime-entity-display entity) 1)))
-    (if (not (eq (aref new 0) 'raw))
+    (if (not (eq (rmail-mime-display-header new) 'raw))
         ;; Not a raw-mode.  Each handler should handle it.
         (funcall (rmail-mime-entity-handler entity) entity)
       (let ((header (rmail-mime-entity-header entity))
@@ -1233,14 +1275,15 @@ available."
             (beg (point))
             (segment (rmail-mime-entity-segment (point) entity)))
         ;; header
-        (if (eq (aref current 0) (aref new 0))
+        (if (eq (rmail-mime-display-header current)
+                (rmail-mime-display-header new))
             (goto-char (aref segment 2))
-          (if (aref current 0)
+          (if (rmail-mime-display-header current)
               (delete-char (- (aref segment 2) (aref segment 1))))
           (insert-buffer-substring rmail-mime-mbox-buffer
                                      (aref header 0) (aref header 1)))
         ;; tagline
-        (if (aref current 1)
+        (if (rmail-mime-display-tagline current)
             (delete-char (- (aref segment 3) (aref segment 2))))
         ;; body
         (let ((children (rmail-mime-entity-children entity)))
@@ -1249,9 +1292,10 @@ available."
                 (put-text-property beg (point) 'rmail-mime-entity entity)
                 (dolist (child children)
                   (rmail-mime-insert child)))
-            (if (eq (aref current 2) (aref new 2))
+            (if (eq (rmail-mime-display-body current)
+                    (rmail-mime-display-body new))
                 (forward-char (- (aref segment 4) (aref segment 3)))
-              (if (aref current 2)
+              (if (rmail-mime-display-body current)
                 (delete-char (- (aref segment 4) (aref segment 3))))
               (insert-buffer-substring rmail-mime-mbox-buffer
                                        (aref body 0) (aref body 1))
@@ -1265,36 +1309,35 @@ available."
   (setq font-lock-defaults '(rmail-font-lock-keywords t t nil nil)))
 
 ;;;###autoload
-(defun rmail-mime (&optional arg)
-  "Toggle displaying of a MIME message.
-
-The actualy behavior depends on the value of `rmail-enable-mime'.
-
-If `rmail-enable-mime' is t (default), this command change the
-displaying of a MIME message between decoded presentation form
-and raw data.
-
-With ARG, toggle the displaying of the current MIME entity only.
-
-If `rmail-enable-mime' is nil, this creates a temporary
-\"*RMAIL*\" buffer holding a decoded copy of the message.  Inline
-content-types are handled according to
-`rmail-mime-media-type-handlers-alist'.  By default, this
-displays text and multipart messages, and offers to download
-attachments as specfied by `rmail-mime-attachment-dirs-alist'."
-  (interactive "P")
+(defun rmail-mime (&optional arg state)
+  "Toggle the display of a MIME message.
+
+The actual behavior depends on the value of `rmail-enable-mime'.
+
+If `rmail-enable-mime' is non-nil (the default), this command toggles
+the display of a MIME message between decoded presentation form and
+raw data.  With optional prefix argument ARG, it toggles the display only
+of the MIME entity at point, if there is one.  The optional argument
+STATE forces a particular display state, rather than toggling.
+`raw' forces raw mode, any other non-nil value forces decoded mode.
+
+If `rmail-enable-mime' is nil, this creates a temporary \"*RMAIL*\"
+buffer holding a decoded copy of the message. Inline content-types are
+handled according to `rmail-mime-media-type-handlers-alist'.
+By default, this displays text and multipart messages, and offers to
+download attachments as specified by `rmail-mime-attachment-dirs-alist'.
+The arguments ARG and STATE have no effect in this case."
+  (interactive (list current-prefix-arg nil))
   (if rmail-enable-mime
       (with-current-buffer rmail-buffer
         (if (rmail-mime-message-p)
             (let ((rmail-mime-mbox-buffer rmail-view-buffer)
                   (rmail-mime-view-buffer rmail-buffer)
-                  (entity (get-text-property (point) 'rmail-mime-entity)))
-              (if arg
-                  (if entity
-                      (rmail-mime-toggle-raw entity))
-                (goto-char (point-min))
-                (rmail-mime-toggle-raw
-                 (get-text-property (point) 'rmail-mime-entity))))
+                  (entity (get-text-property
+                           (progn
+                             (or arg (goto-char (point-min)))
+                             (point)) 'rmail-mime-entity)))
+              (if (or (not arg) entity) (rmail-mime-toggle-raw state)))
           (message "Not a MIME message")))
     (let* ((data (rmail-apply-in-message rmail-current-message 'buffer-string))
            (buf (get-buffer-create "*RMAIL*"))
@@ -1315,12 +1358,12 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
       (view-buffer buf))))
 
 (defun rmail-mm-get-boundary-error-message (message type disposition encoding)
-  "Return MESSAGE with more information on the main mime components."
+  "Return MESSAGE with more information on the main MIME components."
   (error "%s; type: %s; disposition: %s; encoding: %s"
          message type disposition encoding))
 
 (defun rmail-show-mime ()
-  "Function to set in `rmail-show-mime-function' (which see)."
+  "Function to use for the value of `rmail-show-mime-function'."
   (let ((entity (rmail-mime-parse))
         (rmail-mime-mbox-buffer rmail-buffer)
         (rmail-mime-view-buffer rmail-view-buffer)
@@ -1332,7 +1375,7 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
           (if (consp rmail-mime-coding-system)
               ;; Decoding is done by rfc2047-decode-region only for a
               ;; header.  But, as the used coding system may have been
-              ;; overriden by mm-charset-override-alist, we can't
+              ;; overridden by mm-charset-override-alist, we can't
               ;; trust (car rmail-mime-coding-system).  So, here we
               ;; try the decoding again with mm-charset-override-alist
               ;; bound to nil.
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 3926b426a67..c168ca9d8f5 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -377,11 +377,12 @@ display message number MSG."
     (rmail-maybe-set-message-counters)
     ;; Insert the new message after the last old message.
     (widen)
-    ;; Make sure the last old message ends with a blank line.
-    (goto-char (point-max))
-    (rmail-ensure-blank-line)
-    ;; Insert the new message at the end.
-    (narrow-to-region (point-max) (point-max))
+    (unless (zerop (buffer-size))
+      ;; Make sure the last old message ends with a blank line.
+      (goto-char (point-max))
+      (rmail-ensure-blank-line)
+      ;; Insert the new message at the end.
+      (narrow-to-region (point-max) (point-max)))
     (insert-buffer-substring tembuf)
     (rmail-count-new-messages t)
     ;; FIXME should re-use existing windows.
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index b95651d3b69..e6a0a34f33b 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -268,10 +268,7 @@ Setting this option to nil might speed up the generation of summaries."
 (defun rmail-summary ()
   "Display a summary of all messages, one line per message."
   (interactive)
-  (rmail-new-summary "All" '(rmail-summary) nil)
-  (unless (or (zerop (buffer-size))             ; empty summary
-              (get-buffer-window rmail-buffer))
-    (rmail-summary-beginning-of-message)))
+  (rmail-new-summary "All" '(rmail-summary) nil))
 
 ;;;###autoload
 (defun rmail-summary-by-labels (labels)
@@ -345,10 +342,9 @@ Emacs will list the message in the summary."
 (defun rmail-message-regexp-p-1 (msg regexp)
   ;; Search functions can expect to start from the beginning.
   (narrow-to-region (point) (save-excursion (search-forward "\n\n") (point)))
-  (if rmail-enable-mime
-      (if rmail-search-mime-header-function
-          (funcall rmail-search-mime-header-function msg regexp (point))
-        (error "You must set `rmail-search-mime-header-function'"))
+  (if (and rmail-enable-mime
+           rmail-search-mime-header-function)
+      (funcall rmail-search-mime-header-function msg regexp (point))
     (re-search-forward regexp nil t)))
 
 ;;;###autoload
@@ -411,7 +407,8 @@ nil for FUNCTION means all messages."
     (with-current-buffer rmail-buffer
       (setq rmail-summary-buffer (rmail-new-summary-1 desc redo func args)
             ;; r-s-b is buffer-local.
-            sumbuf rmail-summary-buffer))
+            sumbuf rmail-summary-buffer
+            mesg rmail-current-message))
     ;; Now display the summary buffer and go to the right place in it.
     (unless was-in-summary
       (if (and (one-window-p)
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 23947795112..9c020ffadab 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -116,21 +116,21 @@
       menu-bar-separator)
 
     (define-key menu [ps-print-region]
-      `(menu-item ,(purecopy "Postscript Print Region (B+W)") ps-print-region
+      `(menu-item ,(purecopy "PostScript Print Region (B+W)") ps-print-region
                   :enable mark-active
                   :help ,(purecopy "Pretty-print marked region in black and white to PostScript printer")))
     (define-key menu [ps-print-buffer]
-      `(menu-item ,(purecopy "Postscript Print Buffer (B+W)") ps-print-buffer
+      `(menu-item ,(purecopy "PostScript Print Buffer (B+W)") ps-print-buffer
                   :enable (menu-bar-menu-frame-live-and-visible-p)
                   :help ,(purecopy "Pretty-print current buffer in black and white to PostScript printer")))
     (define-key menu [ps-print-region-faces]
-      `(menu-item ,(purecopy "Postscript Print Region")
+      `(menu-item ,(purecopy "PostScript Print Region")
                   ps-print-region-with-faces
                   :enable mark-active
                   :help ,(purecopy
                           "Pretty-print marked region to PostScript printer")))
     (define-key menu [ps-print-buffer-faces]
-      `(menu-item ,(purecopy "Postscript Print Buffer")
+      `(menu-item ,(purecopy "PostScript Print Buffer")
                   ps-print-buffer-with-faces
                   :enable (menu-bar-menu-frame-live-and-visible-p)
                   :help ,(purecopy "Pretty-print current buffer to PostScript printer")))
@@ -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/ChangeLog b/lisp/mh-e/ChangeLog
index ee9c9fca2b5..ca179a78b61 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * mh-search.el (mh-pick-parse-search-buffer): Fix typo.
+
 2011-09-20  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 8.3.
@@ -40,7 +44,7 @@
         switch-to-buffer. The previous change which used pop-to-buffer
         produced the wrong behavior.
 
-2011-07-12  Henrique Martins  <henrique@martins.cc>   (tiny change)
+2011-07-12  Henrique Martins  <henrique@martins.cc>  (tiny change)
 
         * mh-xface.el (mh-picon-get-image): Remove quote from block
         argument.
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 69ca927d5e7..b12c47e7f1f 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -610,7 +610,7 @@
         'utils) (mh-require-cl) calls:
 
           (eval-when-compile (require 'mh-acros))
-          (mh-require-cl)
+          (mh-require-cl)
 
 2004-08-10  Bill Wohler  <wohler@newt.com>
 
@@ -691,7 +691,7 @@
         variable `mh-scan-date-regexp'.
 
         * mh-customize.el (mh-auto-fields-prompt-flag): Made reference to
-        `mh-auto-fileds-lists'.
+        `mh-auto-fields-lists'.
         (mh-forward-hook): Fixed docstring typo.
 
 2004-08-07  Bill Wohler  <wohler@newt.com>
@@ -832,7 +832,7 @@
         and byte-compiles all the source files with a single instance of
         XEmacs.
         (dist): Added $(MH-E-XEMACS-SRC) to tarball.
-        (AUTO_PRELOADS): Removed, in favour of 'AUTOLOAD_PACKAGE_NAME' and
+        (AUTO_PRELOADS): Removed, in favor of 'AUTOLOAD_PACKAGE_NAME' and
         'AUTOLOAD_FILE'.
         (AUTOLOAD_PACKAGE_NAME): New.
         (AUTOLOAD_FILE): New.
@@ -1257,7 +1257,7 @@
 
         * Makefile (XEMACS_OPTIONS): Add '-no-autoloads' to give a cleaner
         build environment.
-        (AUTO_PRELOADS): Removed, in favour of 'AUTOLOAD_PACKAGE_NAME' and
+        (AUTO_PRELOADS): Removed, in favor of 'AUTOLOAD_PACKAGE_NAME' and
         'AUTOLOAD_FILE'.
         (AUTOLOAD_PACKAGE_NAME): New.
         (AUTOLOAD_FILE): New.
@@ -1469,7 +1469,7 @@
 
         * mh-mime.el (mh-mml-secure-message-sign-pgpmime): Add an optional
         dontsign argument to remove an existing secure message directive.
-        Update the docstring -- this fuction does not allow for
+        Update the docstring -- this function does not allow for
         encrypt/sign, just sign directives.
 
         * mh-mime.el (mh-mml-secure-message-sign-pgpmime): Use
@@ -1484,7 +1484,7 @@
         * mh-alias.el (Commentary): Removed as it is now in the manual.
         (mh-alias-system-aliases): Moved here from mh-customize.el. By
         definition, "system" definitions are not user-visible, and user
-        filenames are in the the Aliasfile: profile component, so this
+        filenames are in the Aliasfile: profile component, so this
         variable really shouldn't be a defcustom.
         (mh-alias-tstamp, mh-alias-filenames, mh-alias-reload)
         (mh-alias-add-alias, mh-alias-grab-from-field)
@@ -1960,8 +1960,8 @@
         switch between available variants.
         (mh-variants): Available MH variants are described in this variable.
         (mh-variant-in-use, mh-variant-p): Developers may check which
-        variant is currently in use with the variable `mh-variant-in-use'
-        or the function `mh-variant-p'.
+        variant is currently in use with the variable `mh-variant-in-use'
+        or the function `mh-variant-p'.
 
 2003-08-15  Bill Wohler  <wohler@newt.com>
 
@@ -3289,7 +3289,7 @@
         (mh-tick-add-overlay, mh-tick-remove-overlay, mh-notate-tick):
         These functions aren't needed any more, since overlays aren't used
         any more. Also overlays aren't portable to XEmacs, so nasty
-        conditional code that used overlays in Emacs and extents in Xemacs
+        conditional code that used overlays in Emacs and extents in XEmacs
         have been eliminated.
         (mh-toggle-tick): Generalize it to work on a range of messages
         like the other interactive messages.
@@ -4533,7 +4533,7 @@
 
         * mh-xemacs-toolbar.el: Remove the code since that gets generated
         when mh-tool-bar-define is expanded.
-        (mh-xemacs-icon-map): A alist to map GNU Emacs icon names to the
+        (mh-xemacs-icon-map): An alist to map GNU Emacs icon names to the
         actual icons to be used in XEmacs. This is used in
         mh-tool-bar-define.
 
@@ -5022,7 +5022,7 @@
         * mh-utils.el (mh-truncate-log-buffer): Modify the function to
         return the current size of mh-log-buffer. Also we are now a bit
         more careful in adding separators between consecutive messages.
-        (mh-exec-cmd): Fix a bug where the the log buffer would be
+        (mh-exec-cmd): Fix a bug where the log buffer would be
         displayed even if no error happened in the current command but
         the log buffer had messages from a previous error.
 
@@ -5130,7 +5130,7 @@
 
         * mh-utils.el (mh-face-display-function): Fix bug that was
         corrupting xface images when displayed with XEmacs' internal
-        xface image support.  Also make XEmacs honour 'mh-show-xface-face'
+        xface image support.  Also make XEmacs honor 'mh-show-xface-face'
         when using internal xface image support.
 
 2003-02-12  Peter S Galbraith  <psg@debian.org>
@@ -5959,7 +5959,7 @@
         to allow the user a customizable variable which will turn off
         folders based completion.
         (mh-prompt-for-folder): Use mh-folder-completing-read to read in
-        the folder name with hierachical completion (closes SF #664821).
+        the folder name with hierarchical completion (closes SF #664821).
 
         * mh-speed.el (mh-speed-folders, mh-speed-folders-cache)
         (mh-speed-folders-actual): Moved to mh-utils.el as mh-sub-folders,
@@ -8048,7 +8048,7 @@
 2002-10-26  Peter S Galbraith  <psg@debia.org>
 
         * mh-comp.el (mh-search-addr-regexp, mh-re-search-to-cc): Remove
-        `mh-re-search-to-cc' in favour of more generalized new function
+        `mh-re-search-to-cc' in favor of more generalized new function
         `mh-search-addr-regexp'.
         (mh-insert-mail-followup-to): Use it.
 
@@ -8162,7 +8162,7 @@
 
 2002-10-24  Bill Wohler  <wohler@newt.com>
 
-        * mh-e is completely checkdoc clean now.
+        * mh-e is completely checkdoc clean now.
 
         * mh-utils.el (mh-clean-message-header-flag): Renamed from
         mh-clean-message-header.
@@ -8594,7 +8594,7 @@
         mail-header-separator.
         (mh-send-letter): The default BCC encapsulation will make a MIME
         message unreadable.  If we are running nmh and the letter contains
-        a Bcc: and a Content-Type: field, add the -mime switch to to the
+        a Bcc: and a Content-Type: field, add the -mime switch to the
         arguments to send.
 
 2002-10-21  Peter S Galbraith  <psg@debian.org>
@@ -9213,7 +9213,7 @@
         font, you may set this variable to expand the single reply
         button into three buttons that won't lead to minibuffer prompt
         about who to reply to.
-        (mh-folder-tool-bar-map): Use mh-tool-bar-reply-3-buttons to
+        (mh-folder-tool-bar-map): Use mh-tool-bar-reply-3-buttons to
         decide how many buttons to use for replying.
 
         * mh-mime.el (mh-file-mime-type-substitutions)
@@ -9445,7 +9445,7 @@
         Non-fatal depencencies on the mm-decode, mm-uu and mm-view
         libraries.
 
-2002-07-15  Satyaki Das <satyaki@theforce.stanford.edu>
+2002-07-15  Satyaki Das  <satyaki@theforce.stanford.edu>
 
         * mh-utils.el (mh-require, mh-autoload): Remove these macros.
         (mh-decode-mime): Initialized to t iff the mm-decode library is
@@ -9455,8 +9455,8 @@
 2002-07-15  Mark D Baushke  <mdb@gnu.org>
 
         * mh-utils.el (mh-update-scan-format): Rewrite for compatibility
-        with Xemacs as replace-match appears not to have identical
-        functionality with FSF emacs.
+        with XEmacs as replace-match appears not to have identical
+        functionality with GNU Emacs.
         (mh-scan-msg-format-regexp): Deleted. This regexp is now hardcoded
         into the mh-update-scan-format function.
 
@@ -9610,7 +9610,7 @@
 2002-06-27  Satyaki Das  <satyaki@theforce.stanford.edu>
 
         * mh-e.el (mh-next-undeleted-msg): Get rid of optional arg
-        reverse-p. If there are no more undeleted messages the the point
+        reverse-p. If there are no more undeleted messages the point
         remains at its original position and a message is produced (closes
         SF #494304).
         (mh-previous-undeleted-msg): Change similar to
@@ -10337,7 +10337,7 @@
         arguments in XEmacs.
         (mh-send-letter): sendmail-coding-system not bound in XEmacs.
         (mh-send-letter): default-buffer-file-coding-system not bound in
-        Xemacs.
+        XEmacs.
 
         * mh-e.el (mh-delete-msg, mh-refile-msg, mh-undo):
         transient-mark-mode not bound in XEmacs.  The feature of
@@ -10456,10 +10456,10 @@
 
 2001-12-04  Eric Ding  <ericding@alum.mit.edu>
 
-        * mh-e.el: changes to face colors on dark backgrounds.
-        (mh-folder-followup-face): change to LightGoldenRod.
-        (mh-folder-date-face): change to snow3.
-        (mh-folder-msg-number-face): change to snow4.
+        * mh-e.el: changes to face colors on dark backgrounds.
+        (mh-folder-followup-face): change to LightGoldenRod.
+        (mh-folder-date-face): change to snow3.
+        (mh-folder-msg-number-face): change to snow4.
 
 2001-12-04  Bill Wohler  <wohler@newt.com>
 
@@ -11049,7 +11049,7 @@
         line, starting with Re:
         (mh-scan-body-regexp):
         Regexp matching the message body beginning displayed in scan lines.
-        (mh-scan.font-lock-regexp): Regexp matching output of the the
+        (mh-scan.font-lock-regexp): Regexp matching output of the
         optional scan.font-lock format file.
         (mh-folder-font-lock-keywords): New font-lock for folder-mode that
         uses the above regexps.
@@ -11336,7 +11336,7 @@
         typically have 70 lines in my Emacs frame, so having a default of
         4 was silly for my case.
         * mh-e.el (mh-update-sequences): Check for nil value of
-        mh-current-folder, which happens if mh-summary-height < 4
+        mh-current-folder, which happens if mh-summary-height < 4
         although I haven't tracked doen why that happens.
 
 2001-10-22  Peter S Galbraith  <psg@debian.org>
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index d1b3ccebf46..c6d60b3b2e2 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -272,7 +272,7 @@ Blind aliases or users from /etc/passwd are not expanded."
                       (completing-read prompt mh-alias-alist nil nil) ",")))))
       (if (not mh-alias-expand-aliases-flag)
           (mapconcat 'identity the-answer ", ")
-        ;; Loop over all elements, checking if in passwd aliast or blind first
+        ;; Loop over all elements, checking if in passwd alias or blind first
         (mapconcat 'mh-alias-expand the-answer ",\n ")))))
 
 ;;;###mh-autoload
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 882a8771e28..eceb7a5fe3a 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -504,7 +504,7 @@ See also `mh-compose-forward-as-mime-flag',
                                             folder msg)
                     ;; Was inserted before us, move to end of file to preserve order
                     (goto-char (point-max)))))))
-        ;; Postition just before forwarded message
+        ;; Position just before forwarded message.
         (if (re-search-forward "^------- Forwarded Message" nil t)
             (forward-line -1)
           (goto-char (mh-mail-header-end))
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index 07c558f60cc..88a6ed84055 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -1,4 +1,4 @@
-;;; mh-compat.el --- make MH-E compatibile with various versions of Emacs
+;;; mh-compat.el --- make MH-E compatible with various versions of Emacs
 
 ;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
 
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 458993ca8f1..b614cdb7991 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -2478,7 +2478,7 @@ of citations entirely, choose \"None\"."
     "Original-NNTP-"                    ; mail to news
     "Original-Path:"                    ; mail to news
     "Original-Received:"                ; mail to news
-    "Original-Recipt:"                  ; RFC 2298
+    "Original-Recipient:"               ; RFC 2298
     "Original-To:"                      ; mail to news
     "Original-X-"                       ; mail to news
     "Origination-Client:"               ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
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/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index a547dd8d80a..c06bc6649a5 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -646,7 +646,7 @@ Uses the pick method described in `mh-pick-execute-search'."
 
 (defun mh-pick-parse-search-buffer ()
   "Parse the search buffer contents.
-The function returns a alist. The car of each element is either
+The function returns an alist. The car of each element is either
 the header name to search in or nil to search the whole message.
 The cdr of the element is the pattern to search."
   (save-excursion
@@ -1791,7 +1791,7 @@ PROC is used to convert the value to actual data."
 ;; To add support for your favorite checksum program add a clause to
 ;; the cond statement in mh-checksum-choose. This should set the
 ;; variable mh-checksum-cmd to the command line needed to run the
-;; checsum program and should set mh-checksum-parser to a function
+;; checksum program and should set mh-checksum-parser to a function
 ;; which returns a cons cell containing the message number and
 ;; checksum string.
 
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 38785fc48e8..11e195d4f7f 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -51,7 +51,7 @@
 ;; - choose-completion doesn't know how to quote the text it inserts.
 ;;   E.g. it fails to double the dollars in file-name completion, or
 ;;   to backslash-escape spaces and other chars in comint completion.
-;;   - when completing ~/tmp/fo$$o, the highligting in *Completions*
+;;   - when completing ~/tmp/fo$$o, the highlighting in *Completions*
 ;;     is off by one position.
 ;;   - all code like PCM which relies on all-completions to match
 ;;     its argument gets confused because all-completions returns unquoted
@@ -2427,7 +2427,7 @@ PATTERN is as returned by `completion-pcm--string->pattern'."
   "Find all completions for STRING at POINT in TABLE, satisfying PRED.
 POINT is a position inside STRING.
 FILTER is a function applied to the return value, that can be used, e.g. to
-filter out additional entries (because TABLE migth not obey PRED)."
+filter out additional entries (because TABLE might not obey PRED)."
   (unless filter (setq filter 'identity))
   (let* ((beforepoint (substring string 0 point))
          (afterpoint (substring string point))
diff --git a/lisp/misearch.el b/lisp/misearch.el
index c533562f073..de1a32ff7d5 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -142,7 +142,7 @@ Intended to be added to `isearch-mode-hook'."
        ;; 1. First try searching in the initial buffer
        (let ((res (funcall search-fun string bound noerror)))
          ;; Reset wrapping for all-buffers pause after successful search
-         (if (and res (eq multi-isearch-pause t))
+         (if (and res (not bound) (eq multi-isearch-pause t))
              (setq multi-isearch-current-buffer nil))
          res)
        ;; 2. If the above search fails, start visiting next/prev buffers
@@ -173,8 +173,8 @@ Intended to be added to `isearch-mode-hook'."
                    found)
                ;; Return nil when multi-isearch-next-buffer-current-function fails
                ;; (`with-current-buffer' raises an error for nil returned from it).
-               (error nil))
-           (signal 'search-failed (list string "Repeat for next buffer"))))))))
+               (error (signal 'search-failed (list string "end of multi"))))
+           (signal 'search-failed (list string "repeat for next buffer"))))))))
 
 (defun multi-isearch-wrap ()
   "Wrap the multiple buffers search when search is failed.
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/mpc.el b/lisp/mpc.el
index 40ccb456400..238e8ad68ae 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -2358,7 +2358,7 @@ This is used so that they can be compared with `eq', which is needed for
         (let* ((currenttime (float-time))
                (last-time (- currenttime (car mpc-last-seek-time))))
           (if (< last-time (* 0.9 repeat-delay))
-              nil ;; Trottle
+              nil ;; Throttle
             (let* ((status (if (< last-time 1.0)
                                mpc-status (mpc-cmd-status)))
                    (songid (cdr (assq 'songid status)))
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 488a4fdb976..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.
@@ -721,7 +721,7 @@ parenthesized expressions in REGEXP for the components (in that order)."
           "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|"
           "^500 .*AUTH\\|^KERBEROS\\|"
           "^504 Unknown security mechanism\\|"
-          "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd
+          "^530 Please login with USER and PASS\\|" ; non kerberized vsFTPd
           "^534 Kerberos Authentication not enabled\\|"
           "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT")
   "Regular expression matching FTP messages that can be ignored."
@@ -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))))
@@ -4027,7 +4027,7 @@ E.g.,
               (concat bestmatch "/")
             bestmatch)))))
 
-;; Put these lines uncommmented in your .emacs if you want C-r to refresh
+;; Put these lines uncommented in your .emacs if you want C-r to refresh
 ;; ange-ftp's cache whilst doing filename completion.
 ;;
 ;;(define-key minibuffer-local-completion-map "\C-r" 'ange-ftp-re-read-dir)
@@ -4507,7 +4507,7 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
     ;; We used to follow symlinks on `file' here.  Apparently it was done
     ;; because some FTP servers react to "ls foo" by listing the symlink foo
     ;; rather than the directory it points to.  Now that ange-ftp-ls uses
-    ;; "cd foo; ls" instead, this is not necesssary any more.
+    ;; "cd foo; ls" instead, this is not necessary any more.
     (let ((beg (point))
           (end (point-marker)))
       (set-marker-insertion-type end t)
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 10a1fa5afc5..3ab1a345470 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -100,7 +100,7 @@
 ;; <URL:ftp://ftp.lysator.liu.se/pub/sgml>; hm--html-menus can be used
 ;; with this.
 
-;; This package generalises function html-previewer-process in Marc
+;; This package generalizes function html-previewer-process in Marc
 ;; Andreessen's html-mode (LCD modes/html-mode.el.Z).  See also the
 ;; ffap.el package.  The huge hyperbole package also contains similar
 ;; functions.
@@ -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.
@@ -389,7 +389,7 @@ Defaults to the value of `browse-url-epiphany-arguments' at the time
   :type '(repeat (string :tag "Argument"))
   :group 'browse-url)
 
-;; GNOME means of invoking either Mozilla or Netrape.
+;; GNOME means of invoking either Mozilla or Netscape.
 (defvar browse-url-gnome-moz-program "gnome-moz-remote")
 
 (defcustom browse-url-gnome-moz-arguments '()
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index e5eb2015418..03b84a45ea3 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -505,7 +505,7 @@ not well formed."
 
 (defun dbus-event-member-name (event)
   "Return the member name the event is coming from.
-It is either a signal name or a method name. The result is is a
+It is either a signal name or a method name. The result is a
 string.  EVENT is a D-Bus event, see `dbus-check-event'.  This
 function raises a `dbus-error' signal in case the event is not
 well formed."
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index 64b2d34af9c..1f6c4464808 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -53,7 +53,7 @@ These are the special commands of this mode:
     s -- Select the server at point.
     t -- Transpose the server at point and the previous one
     q -- Commit the changes and quit.
-    x -- Quit without commiting the changes."
+    x -- Quit without committing the changes."
   (interactive)
   (kill-all-local-variables)
   (setq major-mode 'eudc-hotlist-mode)
diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el
index 8c4bbb4a785..68a0a6a85d4 100644
--- a/lisp/net/mairix.el
+++ b/lisp/net/mairix.el
@@ -51,7 +51,7 @@
 ;; Currently, RMail, Gnus (with mbox files), and VM are supported as
 ;; mail programs, but it is pretty easy to interface it with other
 ;; ones as well.  Please see the docs and the source for details.
-;; In a nutshell: include your favourite mail program in
+;; In a nutshell: include your favorite mail program in
 ;; `mairix-mail-program' and write functions for
 ;; `mairix-display-functions' and `mairix-get-mail-header-functions'.
 ;; If you have written such functions for your Emacs mail program of
@@ -945,4 +945,3 @@ Use cursor keys or C-n,C-p to select next/previous search.\n\n")
 (provide 'mairix)
 
 ;;; mairix.el ends here
-
diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el
index 906044079cd..f1b3ce7fd05 100644
--- a/lisp/net/newst-plainview.el
+++ b/lisp/net/newst-plainview.el
@@ -783,11 +783,11 @@ Return new buffer position."
       (newsticker--buffer-set-uptodate nil)
       (newsticker--ticker-text-setup)
       (newsticker-buffer-update)
-      ;; go back to where we came frome
+      ;; Go back to where we came from.
       (goto-char pos)
       (end-of-line)
       (newsticker--buffer-goto '(feed) nil t))))
-  
+
 (defun newsticker-mark-all-items-at-point-as-read ()
   "Mark all items as read and clear ticker contents."
   (interactive)
@@ -1574,7 +1574,7 @@ property to '(<nt-type>-<nt-age> <nt-type> <nt-age>)."
       (while (and (setq pos2 (next-single-property-change pos1 'nt-type))
                   (<= pos2 end)
                   (> pos2 pos1))
-        ;; must shift one char to the left in order to handle inivisible
+        ;; must shift one char to the left in order to handle invisible
         ;; newlines, motion in invisible text areas and all that correctly
         (put-text-property (1- pos1) (1- pos2)
                            'invisible
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 5e38a905ad5..8ff74a94eb0 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -227,7 +227,7 @@ their id stays constant."
         (string= (widget-get node1 :tag) (widget-get node2 :tag)))))
 
 (defun newsticker--treeview-do-get-node-of-feed (feed-name startnode)
-   "Recursivly search node for feed FEED-NAME starting from STARTNODE."
+   "Recursively search node for feed FEED-NAME starting from STARTNODE."
    ;;(message "%s/%s" feed-name (widget-get startnode :nt-feed))
    (if (string= feed-name (or (widget-get startnode :nt-feed)
                               (widget-get startnode :nt-vfeed)))
@@ -245,7 +245,7 @@ their id stays constant."
                                               newsticker--treeview-vfeed-tree)))
 
 (defun newsticker--treeview-do-get-node (id startnode)
-   "Recursivly search node with ID starting from STARTNODE."
+   "Recursively search node with ID starting from STARTNODE."
    (if (newsticker--treeview-ids-eq id (widget-get startnode :nt-id))
        (throw 'found startnode)
      (let ((children (widget-get startnode :children)))
@@ -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/newsticker.el b/lisp/net/newsticker.el
index 3a2cf3f04f7..0a1e07e63f1 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -106,7 +106,7 @@
 ;; asynchronous download of headlines.  The modeline in the `*newsticker*'
 ;; buffer informs whenever new headlines have arrived.  Clicking
 ;; mouse-button 2 or pressing RET in this buffer on a headline will call
-;; browse-url to load the corresponding news story in your favourite web
+;; browse-url to load the corresponding news story in your favorite web
 ;; browser.
 
 ;; The scrolling, or flashing of headlines in the echo area, can be started
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 3f1437f0799..a31ec496c16 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -26,7 +26,7 @@
 ;;
 ;; This package provides a simple method of inserting a URL based on the
 ;; text at point in the current buffer. This is part of an on-going effort
-;; to increase the information I provide people while reducing the ammount
+;; to increase the information I provide people while reducing the amount
 ;; of typing I need to do. No-doubt there are undiscovered Emacs packages
 ;; out there that do all of this and do it better, feel free to point me to
 ;; them, in the mean time I'm having fun playing with Emacs Lisp.
@@ -189,7 +189,7 @@ in your ~/.emacs (after loading/requiring quickurl).")
   "Local keymap for a `quickurl-list-mode' buffer.")
 
 (defvar quickurl-list-buffer-name "*quickurl-list*"
-  "Name for the URL listinig buffer.")
+  "Name for the URL listing buffer.")
 
 (defvar quickurl-list-last-buffer nil
   "`current-buffer' when `quickurl-list' was called.")
@@ -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/secrets.el b/lisp/net/secrets.el
index 9fa5eb32d43..7e0eaff1dce 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -78,7 +78,7 @@
 ;;   (secrets-create-collection "my collection")
 
 ;; There exists a special collection called "session", which has the
-;; lifetime of the corrresponding client session (aka Emacs'
+;; lifetime of the corresponding client session (aka Emacs'
 ;; lifetime).  It is created automatically when Emacs uses the Secret
 ;; Service interface, and it is deleted when Emacs is killed.
 ;; Therefore, it can be used to store and retrieve secret items
@@ -379,7 +379,7 @@ returned, and it will be stored in `secrets-session-path'."
 (defun secrets-prompt-handler (&rest args)
   "Handler for signals emitted by `secrets-interface-prompt'."
   ;; An empty object path is always identified as `secrets-empty-path'
-  ;; or `nil'.  Either we set it explicitely, or it is returned by the
+  ;; or `nil'.  Either we set it explicitly, or it is returned by the
   ;; "Completed" signal.
   (if (car args) ;; dismissed
       (setq secrets-prompt-signal (list secrets-empty-path))
@@ -431,7 +431,7 @@ returned, and it will be stored in `secrets-session-path'."
    (secrets-get-collections)))
 
 (defun secrets-collection-path (collection)
-  "Return the object path of collection labelled COLLECTION.
+  "Return the object path of collection labeled COLLECTION.
 If COLLECTION is nil, return the session collection path.
 If there is no such COLLECTION, return nil."
   (or
@@ -454,7 +454,7 @@ If there is no such COLLECTION, return nil."
          (throw 'collection-found collection-path))))))
 
 (defun secrets-create-collection (collection)
-  "Create collection labelled COLLECTION if it doesn't exist.
+  "Create collection labeled COLLECTION if it doesn't exist.
 Return the D-Bus object path for collection."
   (let ((collection-path (secrets-collection-path collection)))
     ;; Create the collection.
@@ -480,7 +480,7 @@ For the time being, only the alias \"default\" is supported."
    "Label"))
 
 (defun secrets-set-alias (collection alias)
-  "Set ALIAS as alias of collection labelled COLLECTION.
+  "Set ALIAS as alias of collection labeled COLLECTION.
 For the time being, only the alias \"default\" is supported."
   (let ((collection-path (secrets-collection-path collection)))
     (unless (secrets-empty-path collection-path)
@@ -497,7 +497,7 @@ For the time being, only the alias \"default\" is supported."
    alias :object-path secrets-empty-path))
 
 (defun secrets-unlock-collection (collection)
-  "Unlock collection labelled COLLECTION.
+  "Unlock collection labeled COLLECTION.
 If successful, return the object path of the collection."
   (let ((collection-path (secrets-collection-path collection)))
     (unless (secrets-empty-path collection-path)
@@ -509,7 +509,7 @@ If successful, return the object path of the collection."
     collection-path))
 
 (defun secrets-delete-collection (collection)
-  "Delete collection labelled COLLECTION."
+  "Delete collection labeled COLLECTION."
   (let ((collection-path (secrets-collection-path collection)))
     (unless (secrets-empty-path collection-path)
       (secrets-prompt
@@ -636,7 +636,7 @@ The object path of the created item is returned."
         (car result)))))
 
 (defun secrets-item-path (collection item)
-  "Return the object path of item labelled ITEM in COLLECTION.
+  "Return the object path of item labeled ITEM in COLLECTION.
 If there is no such item, return nil."
   (let ((collection-path (secrets-unlock-collection collection)))
     (catch 'item-found
@@ -645,7 +645,7 @@ If there is no such item, return nil."
           (throw 'item-found item-path))))))
 
 (defun secrets-get-secret (collection item)
-  "Return the secret of item labelled ITEM in COLLECTION.
+  "Return the secret of item labeled ITEM in COLLECTION.
 If there is no such item, return nil."
   (let ((item-path (secrets-item-path collection item)))
     (unless (secrets-empty-path item-path)
@@ -656,7 +656,7 @@ If there is no such item, return nil."
          "GetSecret" :object-path secrets-session-path))))))
 
 (defun secrets-get-attributes (collection item)
-  "Return the lookup attributes of item labelled ITEM in COLLECTION.
+  "Return the lookup attributes of item labeled ITEM in COLLECTION.
 If there is no such item, or the item has no attributes, return nil."
   (unless (stringp collection) (setq collection "default"))
   (let ((item-path (secrets-item-path collection item)))
@@ -669,7 +669,7 @@ If there is no such item, or the item has no attributes, return nil."
         secrets-interface-item "Attributes")))))
 
 (defun secrets-get-attribute (collection item attribute)
-  "Return the value of ATTRIBUTE of item labelled ITEM in COLLECTION.
+  "Return the value of ATTRIBUTE of item labeled ITEM in COLLECTION.
 If there is no such item, or the item doesn't own this attribute, return nil."
   (cdr (assoc attribute (secrets-get-attributes collection item))))
 
diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el
index e9783d46ba8..8112ed5b177 100644
--- a/lisp/net/snmp-mode.el
+++ b/lisp/net/snmp-mode.el
@@ -676,7 +676,7 @@ controls whether case is significant."
 ;; v2 SMI TEXTUAL-CONVENTION macro template
 ;;
 (tempo-define-template "snmpv2-textual-convention"
-  '(> (P "Texual Convention Type: ") " ::= TEXTUAL-CONVENTION" n>
+  '(> (P "Textual Convention Type: ") " ::= TEXTUAL-CONVENTION" n>
     "STATUS  "
     (if tempo-interactive
         (snmp-completing-read "Status: " snmp-mode-status-list nil t)
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index d6949e4d250..74f51d148ef 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -373,7 +373,7 @@ binding) but the same name."
 
 (defstruct (soap-sequence-type (:include soap-element))
   parent                                ; OPTIONAL WSDL-TYPE name
-  elements                              ; LIST of SOAP-SEQUCENCE-ELEMENT
+  elements                              ; LIST of SOAP-SEQUENCE-ELEMENT
   )
 
 (defstruct (soap-array-type (:include soap-element))
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index b35ca3bbd18..56087a3aef6 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -162,6 +162,11 @@ FILE must be a local file name on a connection identified via VEC."
 ;;;###tramp-autoload
 (defun tramp-flush-file-property (vec file)
   "Remove all properties of FILE in the cache context of VEC."
+  ;; Remove file property of symlinks.
+  (let ((truename (tramp-get-file-property vec file "file-truename" nil)))
+    (when (and (stringp truename)
+               (not (string-equal file truename)))
+      (tramp-flush-file-property vec truename)))
   ;; Unify localname.
   (setq vec (copy-sequence vec))
   (aset vec 3 (tramp-run-real-handler 'directory-file-name (list file)))
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 5054f1d232d..89c7db241d8 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -412,7 +412,7 @@ element is not omitted."
   (program &optional infile destination display &rest args)
   "Calls `call-process' on the local host.
 This is needed because for some Emacs flavors Tramp has
-defadviced `call-process' to behave like `process-file'.  The
+defadvised `call-process' to behave like `process-file'.  The
 Lisp error raised when PROGRAM is nil is trapped also, returning 1."
   (let ((default-directory
           (if (file-remote-p default-directory)
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 269b47be20c..fda88351253 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -39,7 +39,7 @@
 ;; Consequently, GNU Emacs 23.1 with enabled D-Bus bindings is a
 ;; precondition.
 
-;; The GVFS D-Bus interface is said to be instable.  There are even no
+;; The GVFS D-Bus interface is said to be unstable.  There are even no
 ;; introspection data.  The interface, as discovered during
 ;; development time, is given in respective comments.
 
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 55732194bc8..51fc6e295f0 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -549,7 +549,7 @@ as given in your `~/.profile'."
   "*List of environment variables to be set on the remote host.
 
 Each element should be a string of the form ENVVARNAME=VALUE.  An
-entry ENVVARNAME= diables the corresponding environment variable,
+entry ENVVARNAME= disables the corresponding environment variable,
 which might have been set in the init files like ~/.profile.
 
 Special handling is applied to the PATH environment, which should
@@ -1058,106 +1058,110 @@ target of the symlink differ."
 (defun tramp-sh-handle-file-truename (filename &optional counter prev-dirs)
   "Like `file-truename' for Tramp files."
   (with-parsed-tramp-file-name (expand-file-name filename) nil
-    (with-file-property v localname "file-truename"
-      (let ((result nil))                       ; result steps in reverse order
-        (tramp-message v 4 "Finding true name for `%s'" filename)
-        (cond
-         ;; Use GNU readlink --canonicalize-missing where available.
-         ((tramp-get-remote-readlink v)
-          (setq result
-                (tramp-send-command-and-read
-                 v
-                 (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\""
-                         (tramp-get-remote-readlink v)
-                         (tramp-shell-quote-argument localname)))))
-
-         ;; Use Perl implementation.
-         ((and (tramp-get-remote-perl v)
-               (tramp-get-connection-property v "perl-file-spec" nil)
-               (tramp-get-connection-property v "perl-cwd-realpath" nil))
-          (tramp-maybe-send-script
-           v tramp-perl-file-truename "tramp_perl_file_truename")
-          (setq result
-                (tramp-send-command-and-read
-                 v
-                 (format "tramp_perl_file_truename %s"
-                         (tramp-shell-quote-argument localname)))))
-
-         ;; Do it yourself.  We bind `directory-sep-char' here for
-         ;; XEmacs on Windows, which would otherwise use backslash.
-         (t (let* ((directory-sep-char ?/)
-                   (steps (tramp-compat-split-string localname "/"))
-                   (localnamedir (tramp-run-real-handler
-                                  'file-name-as-directory (list localname)))
-                   (is-dir (string= localname localnamedir))
-                   (thisstep nil)
-                   (numchase 0)
-                   ;; Don't make the following value larger than
-                   ;; necessary.  People expect an error message in a
-                   ;; timely fashion when something is wrong;
-                   ;; otherwise they might think that Emacs is hung.
-                   ;; Of course, correctness has to come first.
-                   (numchase-limit 20)
-                   symlink-target)
-              (while (and steps (< numchase numchase-limit))
-                (setq thisstep (pop steps))
-                (tramp-message
-                 v 5 "Check %s"
-                 (mapconcat 'identity
-                            (append '("") (reverse result) (list thisstep))
-                            "/"))
-                (setq symlink-target
-                      (nth 0 (file-attributes
-                              (tramp-make-tramp-file-name
-                               method user host
-                               (mapconcat 'identity
-                                          (append '("")
-                                                  (reverse result)
-                                                  (list thisstep))
-                                          "/")))))
-                (cond ((string= "." thisstep)
-                       (tramp-message v 5 "Ignoring step `.'"))
-                      ((string= ".." thisstep)
-                       (tramp-message v 5 "Processing step `..'")
-                       (pop result))
-                      ((stringp symlink-target)
-                       ;; It's a symlink, follow it.
-                       (tramp-message v 5 "Follow symlink to %s" symlink-target)
-                       (setq numchase (1+ numchase))
-                       (when (file-name-absolute-p symlink-target)
-                         (setq result nil))
-                       ;; If the symlink was absolute, we'll get a string like
-                       ;; "/user@host:/some/target"; extract the
-                       ;; "/some/target" part from it.
-                       (when (tramp-tramp-file-p symlink-target)
-                         (unless (tramp-equal-remote filename symlink-target)
-                           (tramp-error
-                            v 'file-error
-                            "Symlink target `%s' on wrong host" symlink-target))
-                         (setq symlink-target localname))
-                       (setq steps
-                             (append (tramp-compat-split-string
-                                      symlink-target "/")
-                                     steps)))
-                      (t
-                       ;; It's a file.
-                       (setq result (cons thisstep result)))))
-              (when (>= numchase numchase-limit)
-                (tramp-error
-                 v 'file-error
-                 "Maximum number (%d) of symlinks exceeded" numchase-limit))
-              (setq result (reverse result))
-              ;; Combine list to form string.
-              (setq result
-                    (if result
-                        (mapconcat 'identity (cons "" result) "/")
-                      "/"))
-              (when (and is-dir (or (string= "" result)
-                                    (not (string= (substring result -1) "/"))))
-                (setq result (concat result "/"))))))
-
-        (tramp-message v 4 "True name of `%s' is `%s'" filename result)
-        (tramp-make-tramp-file-name method user host result)))))
+    (tramp-make-tramp-file-name method user host
+      (with-file-property v localname "file-truename"
+        (let ((result nil))                     ; result steps in reverse order
+          (tramp-message v 4 "Finding true name for `%s'" filename)
+          (cond
+           ;; Use GNU readlink --canonicalize-missing where available.
+           ((tramp-get-remote-readlink v)
+            (setq result
+                  (tramp-send-command-and-read
+                   v
+                   (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\""
+                           (tramp-get-remote-readlink v)
+                           (tramp-shell-quote-argument localname)))))
+
+           ;; Use Perl implementation.
+           ((and (tramp-get-remote-perl v)
+                 (tramp-get-connection-property v "perl-file-spec" nil)
+                 (tramp-get-connection-property v "perl-cwd-realpath" nil))
+            (tramp-maybe-send-script
+             v tramp-perl-file-truename "tramp_perl_file_truename")
+            (setq result
+                  (tramp-send-command-and-read
+                   v
+                   (format "tramp_perl_file_truename %s"
+                           (tramp-shell-quote-argument localname)))))
+
+           ;; Do it yourself.  We bind `directory-sep-char' here for
+           ;; XEmacs on Windows, which would otherwise use backslash.
+           (t (let* ((directory-sep-char ?/)
+                     (steps (tramp-compat-split-string localname "/"))
+                     (localnamedir (tramp-run-real-handler
+                                    'file-name-as-directory (list localname)))
+                     (is-dir (string= localname localnamedir))
+                     (thisstep nil)
+                     (numchase 0)
+                     ;; Don't make the following value larger than
+                     ;; necessary.  People expect an error message in
+                     ;; a timely fashion when something is wrong;
+                     ;; otherwise they might think that Emacs is hung.
+                     ;; Of course, correctness has to come first.
+                     (numchase-limit 20)
+                     symlink-target)
+                (while (and steps (< numchase numchase-limit))
+                  (setq thisstep (pop steps))
+                  (tramp-message
+                   v 5 "Check %s"
+                   (mapconcat 'identity
+                              (append '("") (reverse result) (list thisstep))
+                              "/"))
+                  (setq symlink-target
+                        (nth 0 (file-attributes
+                                (tramp-make-tramp-file-name
+                                 method user host
+                                 (mapconcat 'identity
+                                            (append '("")
+                                                    (reverse result)
+                                                    (list thisstep))
+                                            "/")))))
+                  (cond ((string= "." thisstep)
+                         (tramp-message v 5 "Ignoring step `.'"))
+                        ((string= ".." thisstep)
+                         (tramp-message v 5 "Processing step `..'")
+                         (pop result))
+                        ((stringp symlink-target)
+                         ;; It's a symlink, follow it.
+                         (tramp-message
+                          v 5 "Follow symlink to %s" symlink-target)
+                         (setq numchase (1+ numchase))
+                         (when (file-name-absolute-p symlink-target)
+                           (setq result nil))
+                         ;; If the symlink was absolute, we'll get a
+                         ;; string like "/user@host:/some/target";
+                         ;; extract the "/some/target" part from it.
+                         (when (tramp-tramp-file-p symlink-target)
+                           (unless (tramp-equal-remote filename symlink-target)
+                             (tramp-error
+                              v 'file-error
+                              "Symlink target `%s' on wrong host"
+                              symlink-target))
+                           (setq symlink-target localname))
+                         (setq steps
+                               (append (tramp-compat-split-string
+                                        symlink-target "/")
+                                       steps)))
+                        (t
+                         ;; It's a file.
+                         (setq result (cons thisstep result)))))
+                (when (>= numchase numchase-limit)
+                  (tramp-error
+                   v 'file-error
+                   "Maximum number (%d) of symlinks exceeded" numchase-limit))
+                (setq result (reverse result))
+                ;; Combine list to form string.
+                (setq result
+                      (if result
+                          (mapconcat 'identity (cons "" result) "/")
+                        "/"))
+                (when (and is-dir
+                           (or (string= "" result)
+                               (not (string= (substring result -1) "/"))))
+                  (setq result (concat result "/"))))))
+
+          (tramp-message v 4 "True name of `%s' is `%s'" localname result)
+          result)))))
 
 ;; Basic functions.
 
@@ -4307,7 +4311,7 @@ connection if a previous connection has died for some reason."
                          (tramp-compat-temporary-file-directory)))))
                      spec)
 
-                ;; Add arguments for asynchrononous processes.
+                ;; Add arguments for asynchronous processes.
                 (when (and process-name async-args)
                   (setq login-args (append async-args login-args)))
 
@@ -5029,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/tramp.el b/lisp/net/tramp.el
index 5fca1018095..0ee6ad8dea4 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -152,7 +152,7 @@ local host, so if you want to use `~' in those commands, you should
 choose a shell here which groks tilde expansion.  `/bin/sh' normally
 does not understand tilde expansion.
 
-For encoding and deocding, commands like the following are executed:
+For encoding and decoding, commands like the following are executed:
 
     /bin/sh -c COMMAND < INPUT > OUTPUT
 
@@ -3851,7 +3851,7 @@ Only works for Bourne-like shells."
 ;;   expects English?  Or just to set LC_MESSAGES to "C" if Tramp
 ;;   expects only English messages?  (Juri Linkov)
 ;; * Make shadowfile.el grok Tramp filenames.  (Bug#4526, Bug#4846)
-;; * I was wondering it it would be possible to use tramp even if I'm
+;; * I was wondering if it would be possible to use tramp even if I'm
 ;;   actually using sshfs.  But when I launch a command I would like
 ;;   to get it executed on the remote machine where the files really
 ;;   are.  (Andrea Crotti)
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el
index 56e9cb68c61..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)
@@ -409,7 +409,7 @@ If there is no registered search engine at all, the function returns `nil'."
         (setq vendor-id (xesam-get-property engine "vendor.id")
               hit-fields (xesam-get-property engine "hit.fields"))
 
-        ;; Ususally, `hit.fields' shall describe supported fields.
+        ;; Usually, `hit.fields' shall describe supported fields.
         ;; That is not the case now, so we set it ourselves.
         ;; Hopefully, this will change later.
         (setq hit-fields
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el
index d801a4c094c..cc538c224dc 100644
--- a/lisp/net/zeroconf.el
+++ b/lisp/net/zeroconf.el
@@ -249,7 +249,7 @@ qualified name, i.e., it contains DOMAIN.
 APROTOCOL stands for the network protocol family ADDRESS is
 encoded (`zeroconf-avahi-protocol-inet4' means INET4,
 `zeroconf-avahi-protocol-inet6' means INET6).  It can be
-different from PROTOCOL, when an adrress resolution has been
+different from PROTOCOL, when an address resolution has been
 requested for another protocol family but the default one.
 
 ADDRESS is the service address, encoded according to the
@@ -486,7 +486,7 @@ TYPE. The resulting list has the format
   (nth 9 (zeroconf-resolve-service service)))
 
 
-;;; Services signalling.
+;;; Services signaling.
 
 ;; Register for the service type browser.  Service registrations will
 ;; happen in `zeroconf-service-type-browser-handler', when there is an
diff --git a/lisp/nxml/nxml-outln.el b/lisp/nxml/nxml-outln.el
index 6a2a9daf7e4..53d2cabc2e5 100644
--- a/lisp/nxml/nxml-outln.el
+++ b/lisp/nxml/nxml-outln.el
@@ -60,7 +60,7 @@
 ;; form.  Single-line form is used when the outline state is hide-children
 ;; or there are no child sections; multi-line form is used otherwise.
 ;; There are two flavors of single-line form: with children and without.
-;; The with-childen flavor is used when there are child sections.
+;; The with-children flavor is used when there are child sections.
 ;; Single line with children looks like
 ;;    <+section>A section title...</>
 ;; Single line without children looks like
diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el
index cb06091dfcf..347db281f1a 100644
--- a/lisp/obsolete/iso-acc.el
+++ b/lisp/obsolete/iso-acc.el
@@ -32,7 +32,7 @@
 ;; In `iso-accents-mode', pseudo accent characters are used to
 ;; introduce accented keys.  The pseudo-accent characters are:
 ;;
-;;   '  (minute)    -> actue accent
+;;   '  (minute)    -> acute accent
 ;;   `  (backtick)  -> grave accent
 ;;   "  (second)    -> diaeresis
 ;;   ^  (caret)     -> circumflex
diff --git a/lisp/obsolete/pgg-gpg.el b/lisp/obsolete/pgg-gpg.el
index 064985f4566..2eafc631e98 100644
--- a/lisp/obsolete/pgg-gpg.el
+++ b/lisp/obsolete/pgg-gpg.el
@@ -384,7 +384,7 @@ passphrase cache or user."
     (pgg-process-when-success)))
 
 (defun pgg-gpg-update-agent ()
-  "Try to connet to gpg-agent and send UPDATESTARTUPTTY."
+  "Try to connect to gpg-agent and send UPDATESTARTUPTTY."
   (if (fboundp 'make-network-process)
       (let* ((agent-info (getenv "GPG_AGENT_INFO"))
              (socket (and agent-info
diff --git a/lisp/obsolete/s-region.el b/lisp/obsolete/s-region.el
index b06861c0efc..8fb6703aa25 100644
--- a/lisp/obsolete/s-region.el
+++ b/lisp/obsolete/s-region.el
@@ -4,7 +4,7 @@
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Keywords: terminals
-;; Favourite-brand-of-beer: None, I hate beer.
+;; Favorite-brand-of-beer: None, I hate beer.
 ;; Obsolete-since: 24.1
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index f6bd1ffa2d4..477daf75534 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,15 @@
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org-agenda.el (org-agenda-add-entry-text-descriptive-links)
+        (org-agenda-custom-commands, org-write-agenda, org-check-for-org-mode)
+        (org-search-syntax-table, org-modify-diary-entry-string)
+        (org-write-agenda):
+        * org-bbdb.el (org-bbdb-anniv-export-ical):
+        * org-bibtex.el (org-bibtex-fields):
+        * org-icalendar.el (org-icalendar-date-time-format):
+        * org-latex.el (org-export-latex-inline-image-extensions):
+        * org-list.el (org-list-insert-item): Fix typos.
+
 2011-11-11  Juanma Barranquero  <lekktu@gmail.com>
 
         * org-plot.el (org-plot/gnuplot-to-grid-data): Fix typo in docstring.
@@ -55,7 +67,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-publish.el (org-publish-index-generate-theindex): rename
+        * org-publish.el (org-publish-index-generate-theindex): Rename
         from `org-publish-index-generate-theindex.inc'.  Use the file
         theindex.org directly instead of including theindex.inc.
         (org-publish-projects): Don't delete .orgx files.
@@ -135,7 +147,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-timestamp-change): keep point in the same category
+        * org.el (org-timestamp-change): Keep point in the same category
         when updating a time-stamp.  This requires to be careful, as,
         depending on the locale, name of day might change of length during
         the process.
@@ -586,7 +598,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-in-block-p): new function.
+        * org.el (org-in-block-p): New function.
 
         * org-footnote.el (org-footnote-forbidden-blocks): New variable.
         (org-footnote-in-valid-context-p): New function.
@@ -880,131 +892,131 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-action): offer to create
+        * org-footnote.el (org-footnote-action): Offer to create
         definition when none is found.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-re): avoid matching inactive
+        * org-footnote.el (org-footnote-re): Avoid matching inactive
         time-stamps or check-box cookies.
-        (org-footnote-next-reference-or-definition): adapt to the new regexp.
+        (org-footnote-next-reference-or-definition): Adapt to the new regexp.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): if the last subtree
+        * org-exp.el (org-export-preprocess-string): If the last subtree
         is commented, footnotes inserted during normalizing at the end of
         the buffer may get deleted. This patch ensures deletion comes
         first, normalization second.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-footnotes-data): change docstring.
-        (org-export-footnotes-seen): renamed from
+        * org-exp.el (org-export-footnotes-data): Change docstring.
+        (org-export-footnotes-seen): Rename from
         org-export-footnotes-markers.
 
-        * org-ascii.el (org-export-as-ascii): apply change.
+        * org-ascii.el (org-export-as-ascii): Apply change.
 
-        * org-docbook.el (org-export-as-docbook): apply change.
+        * org-docbook.el (org-export-as-docbook): Apply change.
 
-        * org-footnote.el (org-footnote-normalize): apply change.
+        * org-footnote.el (org-footnote-normalize): Apply change.
 
-        * org-html.el (org-export-as-html): apply change.
+        * org-html.el (org-export-as-html): Apply change.
 
-        * org-latex.el (org-export-as-latex): apply change.
+        * org-latex.el (org-export-as-latex): Apply change.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el (org-export-latex-preprocess): rely on
+        * org-latex.el (org-export-latex-preprocess): Rely on
         `org-export-footnotes-markers' to retreive definition of the
         current footnote during export.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-normalize): remember footnotes
+        * org-footnote.el (org-footnote-normalize): Remember footnotes
         seen so far by the exporter when choosing the new marker.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-normalize): make use of
+        * org-footnote.el (org-footnote-normalize): Make use of
         `org-footnote-insert-pos-for-preprocessor'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-normalize): add `org-footnote'
+        * org-footnote.el (org-footnote-normalize): Add `org-footnote'
         property to footnote markers when preparing for exportation.
 
-        * org-html.el (org-export-as-html): read new property to decide
+        * org-html.el (org-export-as-html): Read new property to decide
         when to export a footnote.
 
-        * org-docbook.el (org-export-as-docbook): read new property to
+        * org-docbook.el (org-export-as-docbook): Read new property to
         decide when to export a footnote.
 
-        * org-latex.el (org-export-latex-preprocess): ensure footnote at
+        * org-latex.el (org-export-latex-preprocess): Ensure footnote at
         column 0 cannot end a list containing it by adding
         `original-indentation' property to it.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): normalize footnotes
+        * org-exp.el (org-export-preprocess-string): Normalize footnotes
         before marking lists ending.
 
-        * org-latex.el (org-export-latex-preprocess): work with labels as
+        * org-latex.el (org-export-latex-preprocess): Work with labels as
         strings and not as numbers.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-docbook.el (org-export-docbook-footnote-separator): new
-        variable
-        (org-export-as-docbook): add a separator between footnotes.
+        * org-docbook.el (org-export-docbook-footnote-separator): New
+        variable.
+        (org-export-as-docbook): Add a separator between footnotes.
 
-        * org-html.el (org-export-html-footnote-separator): new variable.
-        (org-export-as-html): add a separator between footnotes.
+        * org-html.el (org-export-html-footnote-separator): New variable.
+        (org-export-as-html): Add a separator between footnotes.
 
-        * org-latex.el (org-export-latex-footnote-separator): new
+        * org-latex.el (org-export-latex-footnote-separator): New
         variable.
-        (org-export-latex-preprocess): add a separator between footnotes.
+        (org-export-latex-preprocess): Add a separator between footnotes.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-exp.el (org-export-footnotes-markers)
-        (org-export-footnotes-data): new variables.
-        (org-export-preprocess-string): use a more explicit argument.
+        (org-export-footnotes-data): New variables.
+        (org-export-preprocess-string): Use a more explicit argument.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-goto-definition): now, determining
+        * org-footnote.el (org-footnote-goto-definition): Now, determining
         if point is at a footnote reference is entirely determined by
         `org-footnote-at-reference-p'. No need to check if pattern isn't
         at beginning of the line elsewhere.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-next-reference-or-definition): new
+        * org-footnote.el (org-footnote-next-reference-or-definition): New
         function.
 
-        * org.el (org-activate-footnote-links): activate the whole
+        * org.el (org-activate-footnote-links): Activate the whole
         footnote, but only fontify its label.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-normalize): make use of changes to
+        * org-footnote.el (org-footnote-normalize): Make use of changes to
         `org-footnote-at-reference-p' and creation of various functions..
         Also comment code.
-        (org-footnote-get-next-reference, org-footnote-delete-references,
-        org-footnote-delete-definitions): new functions
-        (org-footnote-goto-previous-reference, org-footnote-all-labels,
-        org-insert-footnote-reference-near-definition, org-footnote-delete):
-        rewrite to use org-footnote-get-next-reference.
+        (org-footnote-get-next-reference, org-footnote-delete-references)
+        (org-footnote-delete-definitions): New functions.
+        (org-footnote-goto-previous-reference, org-footnote-all-labels)
+        (org-insert-footnote-reference-near-definition, org-footnote-delete):
+        Rewrite to use org-footnote-get-next-reference.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-re): don't end an inline footnote
+        * org-footnote.el (org-footnote-re): Don't end an inline footnote
         at unrelated closing square brackets.
-        (org-footnote-at-reference-p): improve accuracy of the function to
+        (org-footnote-at-reference-p): Improve accuracy of the function to
         determine if point is at a reference and to extract definition of an
         inline footnote.
-        (org-footnote-all-labels, org-footnote-action, org-footnote-delete,
-        org-footnote-auto-adjust-maybe): make use of previous function.
+        (org-footnote-all-labels, org-footnote-action, org-footnote-delete)
+        (org-footnote-auto-adjust-maybe): Make use of previous function.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -1058,14 +1070,14 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-cycle-item-indentation): cycling back to
+        * org-list.el (org-cycle-item-indentation): Cycling back to
         original position deleted any additional information in the item,
         like a counter or a tag.
 
 2011-07-28  Pieter Praet  <pieter@praet.org>
 
         * org-crypt.el (org-crypt-disable-auto-save): New defcustom.
-        (org-decrypt-entry): before decrypting, check whether
+        (org-decrypt-entry): Before decrypting, check whether
         `auto-save-mode' is enabled for the current buffer, and act on it
         according to how `org-crypt-disable-auto-save' is set.  Remove
         comment re "encrypt[ing] Org auto-saved buffers".  Remove on-init
@@ -1249,29 +1261,29 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-C.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-C.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-asymptote.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-asymptote.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-awk.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-awk.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-clojure.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-clojure.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-haskell.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-haskell.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-latex.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-latex.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-lisp.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-lisp.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-ocaml.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-ocaml.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-perl.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-perl.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-python.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-python.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-ruby.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-ruby.el (ob-tangle): Initialize variable from `ob-tangle'.
 
-        * ob-tangle.el (ob-tangle): initialize variable from `ob-tangle'.
+        * ob-tangle.el (ob-tangle): Initialize variable from `ob-tangle'.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -1294,12 +1306,12 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-reset-checkbox-state-subtree): make the command
+        * org-list.el (org-reset-checkbox-state-subtree): Make the command
         more robust, and correctly update check-boxes in the whole
         sub-tree.
-        (org-update-checkbox-count): fix bug accumulating count of checkboxes
+        (org-update-checkbox-count): Fix bug accumulating count of checkboxes
         when walking a subtree.
-        (org-update-checkbox-count-maybe): add an optional argument passed to
+        (org-update-checkbox-count-maybe): Add an optional argument passed to
         org-update-checkbox-count.
 
 2011-07-28  Ted Zlatanov  <tzz@lifelogs.com>
@@ -1325,9 +1337,9 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-parse-list): replace transitional
+        * org-list.el (org-list-parse-list): Replace transitional
         check-boxes with "[CBTRANS]" string during parsing.
-        (org-list-to-generic): use the new property `:cbtrans' to configure
+        (org-list-to-generic): Use the new property `:cbtrans' to configure
         export string for transitional check-boxes.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -2793,7 +2805,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-html.el (org-export-as-html): fix export of email.
+        * org-html.el (org-export-as-html): Fix export of email.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -2814,11 +2826,11 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-crypt.el: remove useless TODO in comments.
+        * org-crypt.el: Remove useless TODO in comments.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-html.el (org-export-as-html): the default postamble now only
+        * org-html.el (org-export-as-html): The default postamble now only
         export a date paragraph if `org-export-time-stamp-file' is
         non-nil.
 
@@ -2924,9 +2936,9 @@
 
 2011-07-28  Manuel Giraud  <manuel.giraud@univ-nantes.fr>
 
-        * org-html.el (org-format-org-table-html): fix anchors in HTML
+        * org-html.el (org-format-org-table-html): Fix anchors in HTML
         export (thanks to <aankhen@gmail.com>)
-        (org-html-protect): fix a  bug that prevents some target to be
+        (org-html-protect): Fix a  bug that prevents some target to be
         rendered correctly.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -3011,15 +3023,15 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-capture.el (org-capture-put-target-region-and-position): New
-        function to store information about the target buffer.
+        * org-capture.el (org-capture-put-target-region-and-position):
+        New function to store information about the target buffer.
         (org-capture-set-target-location): Use it.
-        (org-capture-finalize): restore the target buffer in its
+        (org-capture-finalize): Restore the target buffer in its
         possibly narrowed state.  Also restore the cursor position.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-crypt.el (auto-save-default): make sure entries are
+        * org-crypt.el (auto-save-default): Make sure entries are
         encrypted before auto-saving.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -3035,7 +3047,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-narrow-to-subtree): ensure `org-back-to-heading'
+        * org.el (org-narrow-to-subtree): Ensure `org-back-to-heading'
         will move point to a real heading and not an inline task by
         wraping function into a `org-with-limited-levels' macro.
 
@@ -3059,7 +3071,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-table.el (org-table-fix-formulas-confirm): new custom
+        * org-table.el (org-table-fix-formulas-confirm): New custom
         variable.
         (org-table-insert-column, org-table-delete-column)
         (org-table-move-column, org-table-move-row)
@@ -3089,14 +3101,14 @@
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
-        * org-latex.el: place \title \author \date before
+        * org-latex.el: Place \title \author \date before
         \begin{document}.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-html.el (org-export-html-preamble)
-        (org-export-html-postamble): now default to `nil'.
-        (org-export-as-html): when :html-pre/postamble is nil, fall
+        (org-export-html-postamble): Now default to `nil'.
+        (org-export-as-html): When :html-pre/postamble is nil, fall
         back on the default pre/postamble, which depends on the
         :author-info, :email-info, :creator-info options.
 
@@ -3117,7 +3129,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-move-subtree-down): leave the cursor at the same
+        * org.el (org-move-subtree-down): Leave the cursor at the same
         column we were at.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -3130,7 +3142,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-exp.el (org-export-remove-headline-metadata): bugfix: don't
+        * org-exp.el (org-export-remove-headline-metadata): Bugfix: don't
         case-fold-search to avoid mixing TODO keywords with real headline
         words.
 
@@ -3156,7 +3168,7 @@
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-html.el (org-export-html-postamble-format)
-        (org-export-html-preamble-format): explain how to escape the
+        (org-export-html-preamble-format): Explain how to escape the
         `%' character.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -3333,14 +3345,14 @@
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
         * ob-latex.el (org-babel-execute:latex): Add imagemagick options,
-        and for file types other than png and pdf it uses imagemagick to
-        convert a compiled pdf file to the desired file type.
-        (convert-pdf): Convert a pdf file to a new file type using
+        and for file types other than png and PDF it uses imagemagick to
+        convert a compiled PDF file to the desired file type.
+        (convert-pdf): Convert a PDF file to a new file type using
         imagemagick.
 
 2011-07-28  Puneeth Chaganti  <punchagan@gmail.com>
 
-        * org-capture.el (org-capture-fill-template): fix bug with the
+        * org-capture.el (org-capture-fill-template): Fix bug with the
         display of interactive prompt in templates expansion.
 
 2011-07-28  Reiner Steib  <reiner.steib@gmx.de>
@@ -3499,7 +3511,7 @@
         * org.el (org-set-autofill-regexps): Use `org-item-re' in
         `paragraph-start' to recognize alphabetical lists.
         (org-fill-paragraph): Enforce a pre-computed fill-prefix before
-        calling `fill-paragraph' when point in in an item.  Also prevent
+        calling `fill-paragraph' when point is in an item.  Also prevent
         paragraphs getting merged into an adjacent list upon filling.
         (org-adaptive-fill-function): Make sure to determine real
         fill-prefix for auto-fill.
@@ -3597,7 +3609,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct): when a line has org-example
+        * org-list.el (org-list-struct): When a line has org-example
         property, skip the entire block.  This is needed during export,
         for example when src blocks in org markup contain lists, and are
         returned verbatim because org isn't in the list of interpreted
@@ -3706,7 +3718,7 @@
         * org-capture.el (org-capture-place-item): Reflect changes to
         `org-item-beginning-re'.
 
-        * org-docbook.el (org-export-docbook-list-line): handle New type
+        * org-docbook.el (org-export-docbook-list-line): Handle New type
         of items.
 
         * org-exp.el (org-export-mark-list-end)
@@ -4165,7 +4177,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-html.el (org-export-as-html): expand the HTML title.
+        * org-html.el (org-export-as-html): Expand the HTML title.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -4945,7 +4957,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-mark-list-ending): insert additional
+        * org-exp.el (org-export-mark-list-ending): Insert additional
         newline characters if end-list-marker is at a wrong position.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -5020,7 +5032,7 @@
         with code implementing the writing of graohical output to file.
         (org-babel-execute:R): Use `org-babel-R-graphical-output-file' to
         determine whether R is taking responsibility for writing output to
-        file; if so, this is signalled to ob.el by returning a nil result.
+        file; if so, this is signaled to ob.el by returning a nil result.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
@@ -5786,7 +5798,7 @@
 
 2010-12-11  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): delaying code block
+        * org-exp.el (org-export-preprocess-string): Delay code block
         processing a bit to allow correct list parsing in the export string.
 
 2010-12-11  Christopher Allan Webber  <cwebber@dustycloud.org>
@@ -5843,7 +5855,7 @@
 
 2010-12-11  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-lob.el (org-babel-lob-get-info): including pass-through
+        * ob-lob.el (org-babel-lob-get-info): Include pass-through
         header arguments in results variable header argument string.
 
 2010-12-11  David Maus  <dmaus@ictsoc.de>
@@ -5867,7 +5879,7 @@
 
 2010-12-11  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-indent-line-function): simplify code and remove bug that
+        * org.el (org-indent-line-function): Simplify code and remove bug that
         would insert a tab at the beginning of the line when trying to
         indent the item.
 
@@ -5891,7 +5903,7 @@
 
 2010-12-11  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-calc.el (org-babel-execute:calc): support for variables --
+        * ob-calc.el (org-babel-execute:calc): Support for variables --
         converts :var variables in calc variables.
 
 2010-12-11  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -7163,7 +7175,7 @@
         src blocks.
         (org-speed-command-default-hook): The default hook for
         org-speed-command-hook.  Factored out from org-self-insert-command
-        and mimics existing behaviour.
+        and mimics existing behavior.
         (org-self-insert-command): Modified to use org-speed-command-hook.
 
 2010-11-11  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -7469,7 +7481,7 @@
 
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-tangle.el: autoload org-babel-tangle-lang-exts from ob-tangle.
+        * ob-tangle.el: Autoload org-babel-tangle-lang-exts from ob-tangle.
 
 2010-11-11  Dan Davison  <davison@stats.ox.ac.uk>
 
@@ -8062,7 +8074,7 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-list.el (org-insert-item-internal): Guessing of blank lines
-        number is made by looking at neighbours items, if any.
+        number is made by looking at neighboring items, if any.
 
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
 
@@ -8431,7 +8443,7 @@
 
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-scheme.el: very preliminary support for evaluating scheme
+        * ob-scheme.el: Very preliminary support for evaluating scheme
         code blocks.
 
         * org.el (org-babel-load-languages): Adding scheme.
@@ -8541,7 +8553,7 @@
 
         * ob-latex.el (org-babel-execute:latex): Adding new ":fit" and
         ":border" header arguments which both use the "preview" latex
-        package to fit the resulting pdf image to the figure.
+        package to fit the resulting PDF image to the figure.
 
 2010-11-11  David Maus  <dmaus@ictsoc.de>
 
@@ -8600,8 +8612,8 @@
 
 2010-11-11  David Maus  <dmaus@ictsoc.de>
 
-        * org-agenda.el (org-write-agenda): Delete postscript file after
-        creating conversion to pdf.
+        * org-agenda.el (org-write-agenda): Delete PostScript file after
+        creating conversion to PDF.
 
 2010-11-11  David Maus  <dmaus@ictsoc.de>
 
@@ -10577,7 +10589,7 @@
         a list of symbols specifying which of the special keywords #+DATE,
         #+AUTHOR, #+EMAIL and #+TITLE should be hidden by font lock.
         (org-fontify-meta-lines-and-blocks): Changes to font-lock code
-        implementing new faces and hiding behaviour.
+        implementing new faces and hiding behavior.
 
         * org-faces.el (org-document-title): New face for #+TITLE lines.
         (org-document-info): New face for #+DATE, #+AUTHOR, #+EMAIL lines.
@@ -11440,7 +11452,7 @@
         package.
 
         * org-latex.el (org-export-latex-tables): Only add a caption when
-        macro in in longtable environments if one has been defined.
+        macro is in longtable environments if one has been defined.
 
         * org-html.el (org-export-as-html): Only take title from buffer if
         not exporting body-only.
@@ -13808,7 +13820,7 @@
 
 2009-08-06  Bastien Guerry  <bzg@altern.org>
 
-        * org.el (org-special-ctrl-a/e): Explicitely bind the value
+        * org.el (org-special-ctrl-a/e): Explicitly bind the value
         'reversed for this option to the "true line boundary first"
         behavior.
         (org-tags-match-list-sublevels): Document the 'indented value for
@@ -14727,7 +14739,7 @@
 
 2009-08-06  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org.el (org-sort-entries-or-items): Match TODO keywrds
+        * org.el (org-sort-entries-or-items): Match TODO keywords
         case-sensitively, when sorting.
         (org-priority): Do not match TODO keywords with wrong case.
 
@@ -15559,7 +15571,7 @@
         * org.el (org-agenda-tags-todo-honor-ignore-options):
         Declare variable.
 
-        * org-table.el (org-table-insert-hline): Fix typo in fuction call
+        * org-table.el (org-table-insert-hline): Fix typo in function call
         to `backward-char'.
 
         * org-exp.el (org-export-as-html): Remove the initial space from
@@ -16482,14 +16494,14 @@
 2008-11-23  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-export-latex.el (org-export-latex-subcontent):
-        Interprete target aliases as additonal labels.
+        Interpret target aliases as additional labels.
 
         * org-exp.el (org-export-target-aliases): New variable.
         (org-export-preprocess-string)
         (org-export-handle-invisible-targets): Fill the alias alist.
         (org-export-as-html): Remove the &nbsp; from the anchor, and also
         assign an id.
-        (org-html-level-start): Insert the target aliases as additonal
+        (org-html-level-start): Insert the target aliases as additional
         anchors.
 
         * org.el (org-edit-fixed-width-region): Fix bug when starting a new
@@ -17052,7 +17064,7 @@
         * org.el (org-entry-get-multivalued-property)
         (org-entry-protect-space, org-entry-restore-space):
         New functions.
-        (org-file-apps-defaults-macosx): Let postscript files be opened by
+        (org-file-apps-defaults-macosx): Let PostScript files be opened by
         preview.
         (org-time-stamp-inactive): Call `org-time-stamp'.
         (org-time-stamp): New argument `inactive'.  Also edit inacive
@@ -17290,7 +17302,7 @@
         (org-edit-fixed-width-region): Also try
         `org-edit-fixed-width-region'.
         (org-edit-fixed-width-region-mode): New option.
-        (org-activate-code): Only interprete lines starting with colon
+        (org-activate-code): Only interpret lines starting with colon
         plus a space as example lines.
 
         * org-remember.el (org-remember-templates): Add nil instead of
@@ -18037,4 +18049,3 @@
 
   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/org/ob-haskell.el b/lisp/org/ob-haskell.el
index cae07036c57..236dbba28f1 100644
--- a/lisp/org/ob-haskell.el
+++ b/lisp/org/ob-haskell.el
@@ -29,7 +29,7 @@
 ;; they can be run, but haskell code can also be run through an
 ;; interactive interpreter.
 ;;
-;; For now lets only allow evaluation using the haskell interpreter.
+;; For now let's only allow evaluation using the haskell interpreter.
 
 ;;; Requirements:
 
@@ -80,7 +80,7 @@
                    (cdr (member org-babel-haskell-eoe
                                 (reverse (mapcar #'org-babel-trim raw)))))))
     (org-babel-reassemble-table
-     (cond 
+     (cond
       ((equal result-type 'output)
        (mapconcat #'identity (reverse (cdr results)) "\n"))
       ((equal result-type 'value)
diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el
index a5bdcbf2f73..4fe61451982 100644
--- a/lisp/org/ob-ledger.el
+++ b/lisp/org/ob-ledger.el
@@ -30,7 +30,7 @@
 ;;
 ;; 1) there is no such thing as a "session" in ledger
 ;;
-;; 2) we are generally only going to return output from the leger program
+;; 2) we are generally only going to return output from the ledger program
 ;;
 ;; 3) we are adding the "cmdline" header argument
 ;;
diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el
index ee7a7cc212c..78d309b9e13 100644
--- a/lisp/org/ob-ocaml.el
+++ b/lisp/org/ob-ocaml.el
@@ -29,7 +29,7 @@
 ;; they can be run, but ocaml code can also be run through an
 ;; interactive interpreter.
 ;;
-;; For now lets only allow evaluation using the ocaml interpreter.
+;; For now let's only allow evaluation using the ocaml interpreter.
 
 ;;; Requirements:
 
@@ -99,7 +99,7 @@
    (lambda (pair) (format "let %s = %s;;" (car pair)
                           (org-babel-ocaml-elisp-to-ocaml (cdr pair))))
    (mapcar #'cdr (org-babel-get-header params :var))))
-  
+
 (defun org-babel-ocaml-elisp-to-ocaml (val)
   "Return a string of ocaml code which evaluates to VAL."
   (if (listp val)
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 9274438c18e..7a5c7c8a46a 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -32,7 +32,7 @@
 ;;
 ;; Also SQL evaluation generally takes place inside of a database.
 ;;
-;; For now lets just allow a generic ':cmdline' header argument.
+;; For now let's just allow a generic ':cmdline' header argument.
 ;;
 ;; TODO:
 ;;
@@ -40,7 +40,7 @@
 ;; - add more useful header arguments (user, passwd, database, etc...)
 ;; - support for more engines (currently only supports mysql)
 ;; - what's a reasonable way to drop table data into SQL?
-;; 
+;;
 
 ;;; Code:
 (require 'ob)
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 53a0c5587a2..50761ede7cb 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -156,7 +156,7 @@ and `org-agenda-entry-text-maxlines'."
   "Non-nil means export org-links as descriptive links in agenda added text.
 This variable applies to the text added to the agenda when
 `org-agenda-add-entry-text-maxlines' is larger than 0.
-When this variable nil, the URL will (also) be shown."
+When this variable is nil, the URL will (also) be shown."
   :group 'org-agenda
   :type 'boolean)
 
@@ -339,7 +339,7 @@ agenda dispatcher \\[org-agenda].  Each entry is a list like this:
 
 key      The key (one or more characters as a string) to be associated
          with the command.
-desc     A description of the command, when omitted or nil, a default
+desc     A description of the command; when omitted or nil, a default
          description is built using MATCH.
 type     The command type, any of the following symbols:
           agenda      The daily/weekly agenda.
@@ -354,7 +354,7 @@ type     The command type, any of the following symbols:
 match    What to search for:
           - a single keyword for TODO keyword searches
           - a tags match expression for tags searches
-          - a word search expression for text searches.
+          - a word search expression for text searches
           - a regular expression for occur searches
           For all other commands, this should be the empty string.
 settings  A list of option settings, similar to that in a let form, so like
@@ -363,7 +363,7 @@ settings  A list of option settings, similar to that in a let form, so like
 files     A list of files file to write the produced agenda buffer to
           with the command `org-store-agenda-views'.
           If a file name ends in \".html\", an HTML version of the buffer
-          is written out.  If it ends in \".ps\", a postscript version is
+          is written out.  If it ends in \".ps\", a PostScript version is
           produced.  Otherwise, only the plain text is written to the file.
 
 You can also define a set of commands, to create a composite agenda buffer.
@@ -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.
@@ -2744,8 +2744,8 @@ This ensures the export commands can easily use it."
 (defun org-write-agenda (file &optional open nosettings)
   "Write the current buffer (an agenda view) as a file.
 Depending on the extension of the file name, plain text (.txt),
-HTML (.html or .htm) or Postscript (.ps) is produced.
-If the extension is .ics, run icalendar export over all files used
+HTML (.html or .htm) or PostScript (.ps) is produced.
+If the extension is .ics, run iCalendar export over all files used
 to construct the agenda and limit the export to entries listed in the
 agenda now.
 With prefix argument OPEN, open the new file immediately.
@@ -2793,7 +2793,7 @@ higher priority settings."
               ((string-match "\\.ps\\'" file)
                (require 'ps-print)
                (ps-print-buffer-with-faces file)
-               (message "Postscript written to %s" file))
+               (message "PostScript written to %s" file))
               ((string-match "\\.pdf\\'" file)
                (require 'ps-print)
                (ps-print-buffer-with-faces
@@ -2972,7 +2972,7 @@ removed from the entry content.  Currently only `planning' is allowed here."
     (nreverse markers)))
 
 (defun org-create-marker-find-array (marker-list)
-  "Create a alist of files names with all marker positions in that file."
+  "Create an alist of files names with all marker positions in that file."
   (let (f tbl m a p)
     (while (setq m (pop marker-list))
       (setq p (marker-position m)
@@ -2997,7 +2997,7 @@ removed from the entry content.  Currently only `planning' is allowed here."
              (member (point) (cdr a)))))))
 
 (defun org-check-for-org-mode ()
-  "Make sure current buffer is in org-mode.  Error if not."
+  "Make sure current buffer is in Org-mode.  Error if not."
   (or (org-mode-p)
       (error "Cannot execute org-mode agenda command on buffer in %s"
              major-mode)))
@@ -3715,9 +3715,9 @@ given in `org-agenda-start-on-weekday'."
 (defvar org-todo-only nil)
 
 (defvar org-search-syntax-table nil
-  "Special syntax table for org-mode search.
-In this table, we have single quotes not as word constituents, to
-that when \"+Ameli\" is searched as a work, it will also match \"Ameli's\"")
+  "Special syntax table for Org-mode search.
+In this table, we have single quotes not as word constituents, so
+that when \"+Ameli\" is searched as a word, it will also match \"Ameli's\"")
 
 (defun org-search-syntax-table ()
   (unless org-search-syntax-table
@@ -4425,7 +4425,7 @@ date.  It also removes lines that contain only whitespace."
            (setq string (org-modify-diary-entry-string string))))))
 
 (defun org-modify-diary-entry-string (string)
-  "Add text properties to string, allowing org-mode to act on it."
+  "Add text properties to string, allowing Org-mode to act on it."
   (org-add-props string nil
     'mouse-face 'highlight
     'help-echo (if buffer-file-name
@@ -5059,7 +5059,7 @@ See also the user option `org-agenda-clock-consistency-checks'."
                               (/ (- tlend ts) 60))
                 face (or (plist-get pl :overlap-face) face)))
          ((and (> tlend 0) (> ts (+ tlend (* 60 maxgap))))
-          ;; There is a gap, lets see if we need to report it
+          ;; There is a gap, let's see if we need to report it
           (unless (org-agenda-check-clock-gap tlend ts gapok)
             (setq issue (format "Clocking gap: %d minutes"
                                   (/ (- ts tlend) 60))
diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index a7b6efae836..8401196c81a 100644
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/org-bbdb.el
@@ -357,7 +357,7 @@ This is used by Org to re-create the anniversary hash table."
           (bbdb-record-name (car (bbdb-completing-read-record "Name: ")))))
 
 (defun org-bbdb-anniv-export-ical ()
-  "Extract anniversaries from BBDB and convert them to icalendar format."
+  "Extract anniversaries from BBDB and convert them to iCalendar format."
   (require 'bbdb)
   (require 'diary-lib)
   (unless (hash-table-p org-bbdb-anniv-hash)
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el
index 5cebe50efd1..d5f9beea337 100644
--- a/lisp/org/org-beamer.el
+++ b/lisp/org/org-beamer.el
@@ -411,7 +411,7 @@ the value will be inserted right after the documentclass statement."
 
 
 ;; Functions to initialize and post-process
-;; These fuctions will be hooked into various places in the export process
+;; These functions will be hooked into various places in the export process
 
 (defun org-beamer-initialize-open-trackers ()
   "Reset variables that track if certain environments are open during export."
@@ -451,7 +451,7 @@ The effect is that these values will be accessible during export."
      ((stringp org-beamer-frame-level-now)
       (setq org-beamer-frame-level-now
             (string-to-number org-beamer-frame-level-now))))
-    ;; Find the header additons, most likely theme commands
+    ;; Find the header additions, most likely theme commands
     (setq org-beamer-header-extra
           (or (and (org-region-active-p)
                    (save-excursion
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index 5c9b37b2341..138d99a36d9 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -204,7 +204,7 @@
     (:pages        . "One or more page numbers or range of numbers, such as 42-111 or 7,41,73-97 or 43+ (the ‘+’ in this last example indicates pages following that don’t form simple range). BibTEX requires double dashes for page ranges (--).")
     (:publisher    . "The publisher’s name.")
     (:school       . "The name of the school where a thesis was written.")
-    (:series       . "The name of a series or set of books. When citing an entire book, the the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.")
+    (:series       . "The name of a series or set of books. When citing an entire book, the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.")
     (:title        . "The work’s title, typed as explained in the LaTeX book.")
     (:type         . "The type of a technical report for example, 'Research Note'.")
     (:volume       . "The volume of a journal or multi-volume book.")
@@ -221,7 +221,7 @@
 
 (defcustom org-bibtex-prefix nil
   "Optional prefix for all bibtex property names.
-For example setting to 'BIB_' would allow interoperability with fireforg."
+For example setting to 'BIB_' would allow interoperability with Fireforg."
   :group 'org-bibtex
   :type  'string)
 
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-clock.el b/lisp/org/org-clock.el
index de5087e163c..6279ed3df0d 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1261,7 +1261,7 @@ line and position cursor in that line."
             (and (re-search-forward org-property-end-re nil t)
                  (goto-char (match-beginning 0))))
         (throw 'exit t))
-      ;; Lets count the CLOCK lines
+      ;; Let's count the CLOCK lines
       (goto-char beg)
       (while (re-search-forward re end t)
         (setq first (or first (match-beginning 0))
@@ -2125,7 +2125,7 @@ the currently selected interval size."
   "Write out a clock table at position IPOS in the current buffer.
 TABLES is a list of tables with clocking data as produced by
 `org-clock-get-table-data'.  PARAMS is the parameter property list obtained
-from the dynamic block defintion."
+from the dynamic block definition."
   ;; This function looks quite complicated, mainly because there are a
   ;; lot of options which can add or remove columns.  I have massively
   ;; commented this function, the I hope it is understandable.  If
@@ -2641,4 +2641,3 @@ The details of what will be saved are regulated by the variable
 
 
 ;;; org-clock.el ends here
-
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 896acc5aeae..5e4935caa7e 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -272,7 +272,7 @@ Works on both Emacs and XEmacs."
     nil))
 
 (defmacro org-xemacs-without-invisibility (&rest body)
-  "Turn off exents with invisibility while executing BODY."
+  "Turn off extents with invisibility while executing BODY."
   `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol)
                                'all-extents-closed-open 'invisible))
          ext-inv-specs)
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 48eced9ea08..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
@@ -64,19 +64,19 @@
 ;; with the same name as the link; then, if unsuccessful, ask the user if
 ;; he/she wants to rebuild the 'TAGS' database and try again; then ask if
 ;; the user wishes to append 'tag' as a new toplevel heading at the end of
-;; the buffer; and finally, defer to org's default behaviour which is to
+;; the buffer; and finally, defer to org's default behavior which is to
 ;; search the entire text of the current buffer for 'tag'.
 ;;
-;; This behaviour can be modified by changing the value of
+;; This behavior can be modified by changing the value of
 ;; ORG-CTAGS-OPEN-LINK-FUNCTIONS. For example I have the following in my
-;; .emacs, which describes the same behaviour as the above paragraph with
+;; .emacs, which describes the same behavior as the above paragraph with
 ;; one difference:
 ;;
 ;; (setq org-ctags-open-link-functions
 ;;       '(org-ctags-find-tag
 ;;         org-ctags-ask-rebuild-tags-file-then-find-tag
 ;;         org-ctags-ask-append-topic
-;;         org-ctags-fail-silently))  ; <-- prevents org default behaviour
+;;         org-ctags-fail-silently))  ; <-- prevents org default behavior
 ;;
 ;;
 ;; Usage
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index ee8e6027706..35a51649452 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -2922,7 +2922,7 @@ to the value of `temporary-file-directory'."
           (org-load-modules-maybe)
           (unless org-local-vars
             (setq org-local-vars (org-get-local-variables)))
-          (eval ;; convert to fmt -- mimicing `org-run-like-in-org-mode'
+          (eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode'
            (list 'let org-local-vars
                  (list (intern (format "org-export-as-%s" fmt))
                        nil nil nil ''string t))))
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 223d2573fdb..0d47132d2f8 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -574,7 +574,7 @@ normalized footnotes towards the end of the pre-processing buffer.
 Some exporters like docbook, odt, etc. expect that footnote
 definitions be available before any references to them.  Such
 exporters can let bind `org-footnote-insert-pos-for-preprocessor' to
-symbol 'point-min to achieve the desired behaviour.
+symbol 'point-min to achieve the desired behavior.
 
 Additional note on `org-footnote-insert-pos-for-preprocessor':
 1. This variable has not effect when FOR-PREPROCESSOR is nil.
diff --git a/lisp/org/org-icalendar.el b/lisp/org/org-icalendar.el
index dd64fc2f783..8a2d66306f3 100644
--- a/lisp/org/org-icalendar.el
+++ b/lisp/org/org-icalendar.el
@@ -204,7 +204,7 @@ When nil of the empty string, use the abbreviation retrieved from Emacs."
   (if org-icalendar-use-UTC-date-time
       ":%Y%m%dT%H%M%SZ"
     ":%Y%m%dT%H%M%S")
-  "Format-string for exporting icalendar DATE-TIME.
+  "Format-string for exporting iCalendar DATE-TIME.
 See `format-time-string' for a full documentation.  The only
 difference is that `org-icalendar-timezone' is used for %Z.
 
diff --git a/lisp/org/org-latex.el b/lisp/org/org-latex.el
index 0402b2da964..7abf85a7092 100644
--- a/lisp/org/org-latex.el
+++ b/lisp/org/org-latex.el
@@ -304,8 +304,8 @@ markup defined, the first one in the association list will be used."
 
 (defcustom org-export-latex-href-format "\\href{%s}{%s}"
   "A printf format string to be applied to href links.
-The format must contain either two %s instances or just one.  
-If it contains two %s instances, the first will be filled with 
+The format must contain either two %s instances or just one.
+If it contains two %s instances, the first will be filled with
 the link, the second with the link description.  If it contains
 only one, the %s will be filled with the link."
   :group 'org-export-latex
@@ -594,7 +594,7 @@ and `org-export-with-tags' instead."
   "Extensions of image files that can be inlined into LaTeX.
 Note that the image extension *actually* allowed depend on the way the
 LaTeX file is processed.  When used with pdflatex, pdf, jpg and png images
-are OK.  When processing through dvi to Postscript, only ps and eps are
+are OK.  When processing through dvi to PostScript, only ps and eps are
 allowed.  The default we use here encompasses both."
   :group 'org-export-latex
   :type '(repeat (string :tag "Extension")))
@@ -2203,7 +2203,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
                 ;; a LaTeX issue, but we here implement a work-around anyway.
                 (setq path (org-export-latex-protect-amp path)
                       desc (org-export-latex-protect-amp desc)))
-              (insert 
+              (insert
                (if (string-match "%s.*%s" org-export-latex-href-format)
                    (format org-export-latex-href-format path desc)
                  (format org-export-latex-href-format path))))
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 866176e4e8f..9184f0c3d54 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -681,7 +681,7 @@ Assume point is at an item."
               (cond
                ((<= (point) lim-up)
                 ;; At upward limit: if we ended at an item, store it,
-                ;; else dimiss useless data recorded above BEG-CELL.
+                ;; else dismiss useless data recorded above BEG-CELL.
                 ;; Jump to part 2.
                 (throw 'exit
                        (setq itm-lst
@@ -1177,7 +1177,7 @@ some heuristics to guess the result."
        ;; When `org-blank-before-new-entry' says so, it is 1.
        ((eq insert-blank-p t) 1)
        ;; `plain-list-item' is 'auto.  Count blank lines separating
-       ;; neighbours items in list.
+       ;; neighboring items in list.
        (t (let ((next-p (org-list-get-next-item item struct prevs)))
             (cond
              ;; Is there a next item?
@@ -1207,7 +1207,7 @@ some heuristics to guess the result."
 If POS is before first character after bullet of the item, the
 new item will be created before the current one.
 
-STRUCT is the list structure.  PREVS is the the alist of previous
+STRUCT is the list structure.  PREVS is the alist of previous
 items, as returned by `org-list-prevs-alist'.
 
 Insert a checkbox if CHECKBOX is non-nil, and string AFTER-BULLET
@@ -2642,7 +2642,7 @@ If a region is active, all items inside will be moved."
 (defvar org-tab-ind-state)
 (defun org-cycle-item-indentation ()
   "Cycle levels of indentation of an empty item.
-The first run indents the item, if applicable.  Subsequents runs
+The first run indents the item, if applicable.  Subsequent runs
 outdent it at meaningful levels in the list.  When done, item is
 put back at its original position with its original bullet.
 
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index ddb3cf7b63a..0c924cd9f07 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -191,7 +191,7 @@ sitemap of files or summary page for a given project.
                            display folders first or last, respectively.
                            Any other value will mix files and folders.
   :sitemap-sort-files      The site map is normally sorted alphabetically.
-                           You can change this behaviour setting this to
+                           You can change this behavior setting this to
                            `chronologically', `anti-chronologically' or nil.
   :sitemap-ignore-case     Should sorting be case-sensitive?  Default nil.
 
@@ -1114,7 +1114,7 @@ so that the file including them will be republished as well."
       (let ((ctime (org-publish-cache-ctime-of-src filename)))
         (or (< pstamp ctime)
             (when included-files-ctime
-              (not (null (delq nil (mapcar (lambda(ct) (< ctime ct)) 
+              (not (null (delq nil (mapcar (lambda(ct) (< ctime ct))
                                            included-files-ctime))))))))))
 
 (defun org-publish-cache-set-file-property (filename property value &optional project-name)
diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index 2bc5ef92ae7..8819f416f1d 100644
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -63,7 +63,7 @@ and `org-remember-default-headline'.  To force prompting anyway, use
 \\[universal-argument] \\[org-remember-finalize] to file the note.
 
 When this variable is nil, \\[org-remember-finalize] gives you the prompts, and
-\\[universal-argument] \\[org-remember-finalize] triggers the fasttrack."
+\\[universal-argument] \\[org-remember-finalize] triggers the fast track."
   :group 'org-remember
   :type 'boolean)
 
@@ -1122,7 +1122,7 @@ See also the variable `org-reverse-note-order'."
   (condition-case nil
       (require 'remember)
     (error
-     ;; Lets install our own micro version of remember
+     ;; Let's install our own micro version of remember
      (defvar remember-register ?R)
      (defvar remember-mode-hook nil)
      (defvar remember-handler-functions nil)
@@ -1153,4 +1153,3 @@ See also the variable `org-reverse-note-order'."
 
 
 ;;; org-remember.el ends here
-
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 7f49b3236ee..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)
@@ -1302,7 +1302,7 @@ However, when FORCE is non-nil, create new columns if necessary."
 (defun org-table-line-to-dline (line &optional above)
   "Turn a buffer line number into a data line number.
 If there is no data line in this line, return nil.
-If there is no matchin dline (most likely te refrence was a hline), the
+If there is no matching dline (most likely te refrence was a hline), the
 first dline below it is used.  When ABOVE is non-nil, the one above is used."
   (catch 'exit
     (let ((ll (length org-table-dlines))
@@ -2204,7 +2204,7 @@ For all numbers larger than LIMIT, shift them by DELTA."
                      (string-match "^[a-zA-Z][a-zA-Z0-9]*$" field))
               (push (cons field v) org-table-local-parameters)
               (push (list field line col) org-table-named-field-locations))))
-      ;; Analyse the line types
+      ;; Analyze the line types
       (goto-char beg)
       (setq org-table-current-begin-line (org-current-line)
             org-table-current-begin-pos (point)
@@ -2432,7 +2432,7 @@ not overwrite the stored one."
                       duration-output-format nil
                       fmt (replace-match "" t t fmt)))
             (if (string-match "t" fmt)
-                (setq duration t 
+                (setq duration t
                       duration-output-format org-table-duration-custom-format
                       numbers t
                       fmt (replace-match "" t t fmt)))
@@ -2500,7 +2500,7 @@ not overwrite the stored one."
         ;; Insert complex ranges
         (while (and (string-match org-table-range-regexp form)
                     (> (length (match-string 0 form)) 1))
-          (setq formrg (save-match-data 
+          (setq formrg (save-match-data
                          (org-table-get-range (match-string 0 form) nil n0)))
           (setq formrpl
                 (save-match-data
@@ -2901,7 +2901,7 @@ known that the table will be realigned a little later anyway."
 
 (defun org-table-iterate (&optional arg)
   "Recalculate the table until it does not change anymore.
-The maximun number of iterations is 10, but you can chose a different value
+The maximum number of iterations is 10, but you can chose a different value
 with the prefix ARG."
   (interactive "P")
   (let ((imax (if arg (prefix-numeric-value arg) 10))
@@ -4723,4 +4723,3 @@ list of the fields in the rectangle ."
 
 
 ;;; org-table.el ends here
-
diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el
index 0d9516a389e..1fb3114bf3f 100644
--- a/lisp/org/org-taskjuggler.el
+++ b/lisp/org/org-taskjuggler.el
@@ -70,7 +70,7 @@
 ;; "taskjuggler_project" (or whatever you customized
 ;; `org-export-taskjuggler-project-tag' to). You are now ready to
 ;; export the project plan with `org-export-as-taskjuggler-and-open'
-;; which will export the project plan and open a gant chart in
+;; which will export the project plan and open a Gantt chart in
 ;; TaskJugglerUI.
 ;;
 ;; * Resources
@@ -354,8 +354,8 @@ information, all the properties, etc."
   (let* ((props (org-entry-properties))
          (components (org-heading-components))
          (level (nth 1 components))
-         (headline 
-          (replace-regexp-in-string 
+         (headline
+          (replace-regexp-in-string
            "\"" "\\\"" (nth 4 components) t t)) ; quote double quotes in headlines
          (parent-ordered (org-taskjuggler-parent-is-ordered-p)))
     (push (cons "level" level) props)
@@ -405,10 +405,10 @@ deeper), then it's not a leaf."
             (successor (car (cdr tasks))))
         (cond
          ;; if a task has no successors it is a leaf
-         ((null successor) 
+         ((null successor)
           (push (cons (cons "leaf-node" t) task) new-list))
          ;; if the successor has a lower level than task it is a leaf
-         ((<= (cdr (assoc "level" successor)) (cdr (assoc "level" task))) 
+         ((<= (cdr (assoc "level" successor)) (cdr (assoc "level" task)))
           (push (cons (cons "leaf-node" t) task) new-list))
          ;; otherwise examine the rest of the tasks
          (t (push task new-list))))
diff --git a/lisp/org/org.el b/lisp/org/org.el
index da39aa189ba..25bfb8a78e8 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -1480,9 +1480,9 @@ When nil, the link search tries to match a phrase with all words
 in the search text."
   :group 'org-link-follow
   :type '(choice
-          (const :tag "Use fuzy text search" nil)
+          (const :tag "Use fuzzy text search" nil)
           (const :tag "Match only exact headline" t)
-          (const :tag "Match extact headline or query to create it"
+          (const :tag "Match exact headline or query to create it"
                  query-to-create)))
 
 (defcustom org-link-frame-setup
@@ -2681,7 +2681,7 @@ When this variable is set to t, the date/time prompt will not let
 you specify dates outside the 1970-2037 range, so it is certain that
 these dates will work in whatever version of Emacs you are
 running, and also that you can move a file from one Emacs implementation
-to another.  WHenever Org is forcing the year for you, it will display
+to another.  Whenever Org is forcing the year for you, it will display
 a message and beep.
 
 When this variable is nil, Org will check if the date is
@@ -2924,7 +2924,7 @@ is better to limit inheritance to certain tags using the variables
           (const :tag "List them, indented with leading dots" indented)))
 
 (defcustom org-tags-sort-function nil
-  "When set, tags are sorted using this function as a comparator."
+  "When set, tags are sorted using this comparison function."
   :group 'org-tags
   :type '(choice
           (const :tag "No sorting" nil)
@@ -5052,7 +5052,7 @@ The time stamps may be either active or inactive.")
 (defvar org-emph-face nil)
 
 (defun org-do-emphasis-faces (limit)
-  "Run through the buffer and add overlays to emphasised strings."
+  "Run through the buffer and add overlays to emphasized strings."
   (let (rtn a)
     (while (and (not rtn) (re-search-forward org-emph-re limit t))
       (if (not (= (char-after (match-beginning 3))
@@ -5549,7 +5549,7 @@ Use `org-reduced-level' to remove the effect of `org-odd-levels'."
 
 (defvar org-font-lock-set-keywords-hook nil
   "Functions that can manipulate `org-font-lock-extra-keywords'.
-This is calles after `org-font-lock-extra-keywords' is defined, but before
+This is called after `org-font-lock-extra-keywords' is defined, but before
 it is installed to be used by font lock.  This can be useful if something
 needs to be inserted at a specific position in the font-lock sequence.")
 
@@ -11217,7 +11217,7 @@ changes.  Such blocking occurs when:
                      (forward-line 1)
                      (re-search-forward org-not-done-heading-regexp pos t))
             (throw 'dont-block nil))  ; block, there is an older sibling not done.
-          ;; Search further up the hierarchy, to see if an anchestor is blocked
+          ;; Search further up the hierarchy, to see if an ancestor is blocked
           (while t
             (goto-char parent-pos)
             (if (not (looking-at org-not-done-heading-regexp))
@@ -14835,7 +14835,7 @@ user."
       (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day)
                                t nil ans)))
 
-    ;; Help matching dottet european dates
+    ;; Help matching dotted european dates
     (when (string-match
            "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. ?\\([1-9][0-9][0-9][0-9]\\)?" ans)
       (setq year (if (match-end 3)
diff --git a/lisp/outline.el b/lisp/outline.el
index 34d30fc4591..b5bf8296455 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -144,10 +144,10 @@ in the file it applies to."
                   :help "Promote headings higher up the tree"))
     (define-key map [headings move-subtree-down]
       '(menu-item "Move Subtree Down" outline-move-subtree-down
-                  :help "Move the currrent subtree down past arg headlines of the same level"))
+                  :help "Move the current subtree down past arg headlines of the same level"))
     (define-key map [headings move-subtree-up]
       '(menu-item "Move Subtree Up" outline-move-subtree-up
-                  :help "Move the currrent subtree up past arg headlines of the same level"))
+                  :help "Move the current subtree up past arg headlines of the same level"))
     (define-key map [headings copy]
       '(menu-item "Copy to Kill Ring" outline-headers-as-kill
                   :enable mark-active
@@ -642,12 +642,12 @@ the match data is set appropriately."
 ;; Vertical tree motion
 
 (defun outline-move-subtree-up (&optional arg)
-  "Move the currrent subtree up past ARG headlines of the same level."
+  "Move the current subtree up past ARG headlines of the same level."
   (interactive "p")
   (outline-move-subtree-down (- arg)))
 
 (defun outline-move-subtree-down (&optional arg)
-  "Move the currrent subtree down past ARG headlines of the same level."
+  "Move the current subtree down past ARG headlines of the same level."
   (interactive "p")
   (let ((movfunc (if (> arg 0) 'outline-get-next-sibling
                    'outline-get-last-sibling))
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index 86e6b4abb6c..e111e743608 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -151,7 +151,7 @@
   "Local keymap for the 5x5 game.")
 
 (5x5-defvar-local 5x5-solver-output nil
-  "List that is is the output of artihmetic solver.
+  "List that is the output of an arithmetic solver.
 
 This list L is such that
 
@@ -162,8 +162,8 @@ M is the move count when the solve output was stored.
 S_1 ... S_N are all the solutions ordered from least to greatest
 number of strokes.  S_1 is the solution to be displayed.
 
-Each solution S_1, ..., S_N is a a list (STROKE-COUNT GRID) where
-STROKE-COUNT is to number of strokes to achieve the solution and
+Each solution S_1, ..., S_N is a list (STROKE-COUNT GRID) where
+STROKE-COUNT is the number of strokes to achieve the solution and
 GRID is the grid of positions to click.")
 
 
@@ -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
@@ -649,7 +649,7 @@ Solutions are sorted from least to greatest Hamming weight."
            ;; 23x25 is a diagonal of 1, and the two last columns are a
            ;; base of kernel of transferm.
            ;;
-           ;; base-change must be by construction inversible.
+           ;; base-change must be by construction invertible.
            (base-change
             (5x5-log
              "p"
@@ -816,9 +816,8 @@ solution that is presented is the one that needs least number of
 strokes --- other solutions can be viewed by rotating through the
 list. The list of solution is ordered by number of strokes, so
 rotating left just after calling `5x5-solve-suggest' will show
-the the solution with second least number of strokes, while
-rotating right will show the solution with greatest number of
-strokes."
+the solution with second least number of strokes, while rotating
+right will show the solution with greatest number of strokes."
   (interactive "P")
   (let ((len  (length 5x5-solver-output)))
     (when (>= len 3)
diff --git a/lisp/play/animate.el b/lisp/play/animate.el
index facdfa2f347..ec0cacc4a68 100644
--- a/lisp/play/animate.el
+++ b/lisp/play/animate.el
@@ -93,7 +93,7 @@
 
 (defvar animation-buffer-name nil
   "*String naming the default buffer for animations.
-When nil animations dipslayed in the buffer named *Animation*.")
+When nil animations displayed in the buffer named *Animation*.")
 
 ;;;###autoload
 (defun animate-string (string vpos &optional hpos)
diff --git a/lisp/play/bruce.el b/lisp/play/bruce.el
index 168d528ecb1..a41d5a3d3d1 100644
--- a/lisp/play/bruce.el
+++ b/lisp/play/bruce.el
@@ -110,7 +110,7 @@
   :group 'games)
 
 (defcustom bruce-phrases-file "~/bruce.lines"
-  "Keep your favourite phrases here."
+  "Keep your favorite phrases here."
   :type 'file
   :group 'bruce)
 
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index f2b7294e2d0..62d486ffca5 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -55,7 +55,7 @@
 
 ;; 0.3 (2007-03-11)
 ;;     - Renamed shift modes and thus names of score files. All
-;;       highscores are lost, unless you rename the score files from
+;;       high scores are lost, unless you rename the score files from
 ;;       bubbles-shift-... to bubbles-...!
 ;;     - Bugfixes: Check for successful image creation.
 ;;                 Disable menus and counter when game is over.
diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el
index b9ce669533a..4d4ea71cd7a 100644
--- a/lisp/play/decipher.el
+++ b/lisp/play/decipher.el
@@ -672,7 +672,7 @@ X: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z *  11   14   9%
      1 1                 1       2   1   1     2       5   7
 This says that X comes before D once, and after B once.  X begins 5
 words, and ends 3 words (`*' represents a space).  X comes before 8
-different letters, after 7 differerent letters, and is next to a total
+different letters, after 7 different letters, and is next to a total
 of 11 different letters.  It occurs 14 times, making up 9% of the
 ciphertext."
   (interactive (list (upcase (following-char))))
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 55b0a564fef..a46c2ba8171 100644
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -52,7 +52,7 @@
 ;;        (lambda ()
 ;;           (define-key gnus-article-mode-map "i" 'fortune-from-region)))
 ;; which allows marking a region and then pressing "i" so that the marked
-;; region will be automatically added to my favourite fortune-file.
+;; region will be automatically added to my favorite fortune-file.
 
 ;;; Code:
 
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index f0e6670fe58..8629baf35d3 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -1584,7 +1584,7 @@ If the game is finished, this command requests for another game."
 
 ;;;_  - something which doesn't work
 ; no-a-worka!!
-;(defum landmark-sum-list (list)
+;(defun landmark-sum-list (list)
 ;  (if (> (length list) 0)
 ;      (+ (car list) (landmark-sum-list (cdr list)))
 ;    0))
diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el
index 722c3b43033..b52ade6fdb7 100644
--- a/lisp/play/solitaire.el
+++ b/lisp/play/solitaire.el
@@ -190,7 +190,7 @@ That's all.  Here's the board after two moves:
 
                 o   o   o
 
-Pick your favourite shortcuts:
+Pick your favorite shortcuts:
 
 \\{solitaire-mode-map}"
 
diff --git a/lisp/printing.el b/lisp/printing.el
index 9f98c2b6e29..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
@@ -4667,7 +4667,7 @@ bottom."
   "Interactively select a PostScript utility."
   (interactive)
   (pr-menu-set-utility-title
-   (pr-complete-alist "Postscript utility"
+   (pr-complete-alist "PostScript utility"
                       pr-ps-utility-alist pr-ps-utility)))
 
 
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 89a37307506..b8bf62d90b4 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -105,8 +105,8 @@
 ;; should be loaded before the ada-mode, which will then setup some variables
 ;; to improve the support for Ada code.
 ;; Here is the list of these modes:
-;;   `which-function-mode': Display the name of the subprogram the cursor is
-;;      in in the mode line.
+;;   `which-function-mode': Display in the modeline the name of the subprogram
+;;      the cursor is in.
 ;;   `outline-mode': Provides the capability to collapse or expand the code
 ;;      for specific language constructs, for instance if you want to hide the
 ;;      code corresponding to a subprogram
@@ -826,7 +826,7 @@ the 4 file locations can be clicked on and jumped to."
 ;; to be considered as part of a word or not.
 ;; Some characters may have multiple meanings depending on the context:
 ;;  - ' is either the beginning of a constant character or an attribute
-;;  - # is either part of a based litteral or a gnatprep statement.
+;;  - # is either part of a based literal or a gnatprep statement.
 ;;  - " starts a string, but not if inside a constant character.
 ;;  - ( and ) should be ignored if inside a constant character.
 ;; Thus their syntax property is changed automatically, and we can still use
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 4a57a1eef67..0cfdab23702 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -1163,7 +1163,8 @@ If OTHER-FRAME is non-nil, display the cross-reference in another frame."
 
 (defun ada-goto-declaration-other-frame (pos)
   "Display the declaration of the identifier around POS.
-The declation is shown in another frame if `ada-xref-other-buffer' is non-nil."
+The declaration is shown in another frame if `ada-xref-other-buffer' is
+non-nil."
   (interactive "d")
   (ada-goto-declaration pos t))
 
@@ -1747,7 +1748,7 @@ Information is extracted from the ali file."
 
     (unless declaration-found
 
-      ;; Since we alread know the number of the file, search for a direct
+      ;; Since we already know the number of the file, search for a direct
       ;; reference to it
       (goto-char (point-min))
       (set 'declaration-found t)
diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el
index 3aa9a6cfb87..fce725c3b3c 100644
--- a/lisp/progmodes/autoconf.el
+++ b/lisp/progmodes/autoconf.el
@@ -83,7 +83,8 @@ searching backwards at another AC_... command."
   (set (make-local-variable 'defun-prompt-regexp)
        "^[ \t]*A[CM]_\\(\\sw\\|\\s_\\)+")
   (set (make-local-variable 'comment-start) "dnl ")
-  (set (make-local-variable 'comment-start-skip) "\\(?:\\<dnl\\|#\\) +")
+  (set (make-local-variable 'comment-start-skip)
+       "\\(?:\\(\\W\\|\\`\\)dnl\\|#\\) +")
   (set (make-local-variable 'syntax-propertize-function)
        (syntax-propertize-rules ("\\<dnl\\>" (0 "<"))))
   (set (make-local-variable 'font-lock-defaults)
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index d19ba47aa3f..8213a83461b 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -71,7 +71,7 @@
     ;; / can delimit regexes or be a division operator.  By default we assume
     ;; that it is a division sign, and fix the regexp operator cases with
     ;; `font-lock-syntactic-keywords'.
-    (modify-syntax-entry ?/ "." st)     ; ACM 2002/4/27.  
+    (modify-syntax-entry ?/ "." st)     ; ACM 2002/4/27.
     (modify-syntax-entry ?* "." st)
     (modify-syntax-entry ?+ "." st)
     (modify-syntax-entry ?- "." st)
@@ -128,7 +128,7 @@
 ;; REGEXPS FOR "HARMLESS" STRINGS/LINES.
 (defconst c-awk-harmless-char-re "[^_#/\"\\\\\n\r]")
 ;;   Matches any character but a _, #, /, ", \, or newline.  N.B. _" starts a
-;; localisation string in gawk 3.1
+;; localization string in gawk 3.1
 (defconst c-awk-harmless-_ "_\\([^\"]\\|\\'\\)")
 ;;   Matches an underline NOT followed by ".
 (defconst c-awk-harmless-string*-re
@@ -160,7 +160,7 @@
 (defconst c-awk-string-without-end-here-re
   (concat "\\=_?\"" c-awk-string-innards-re))
 ;;   Matches an AWK string at point up to, but not including, any terminator.
-;; A gawk 3.1+ string may look like _"localisable string".
+;; A gawk 3.1+ string may look like _"localizable string".
 (defconst c-awk-one-line-possibly-open-string-re
   (concat "\"\\(" c-awk-string-ch-re "\\|" c-awk-non-eol-esc-pair-re "\\)*"
           "\\(\"\\|\\\\?$\\|\\'\\)"))
@@ -195,7 +195,7 @@
 ;;   Matches the inside of an AWK regexp (i.e. without the enclosing /s)
 (defconst c-awk-regexp-without-end-re
   (concat "/" c-awk-regexp-innards-re))
-;; Matches an AWK regexp up to, but not including, any terminating /. 
+;; Matches an AWK regexp up to, but not including, any terminating /.
 (defconst c-awk-one-line-possibly-open-regexp-re
   (concat "/\\(" c-awk-non-eol-esc-pair-re
           "\\|" c-awk-regexp-one-line-possibly-open-char-list-re
@@ -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 "--".
@@ -256,7 +256,7 @@
 
 
 ;; ACM, 2002/5/29:
-;; 
+;;
 ;; The next section of code is about determining whether or not an AWK
 ;; statement is complete or not.  We use this to indent the following line.
 ;; The determination is pretty straightforward in C, where a statement ends
@@ -382,7 +382,7 @@
   ;;  Kludge: If c-backward-syntactic-ws gets stuck at a BOL, it is likely
   ;;  that the previous line contains an unterminated string (without \).  In
   ;;  this case, assume that the previous line's c-awk-NL-prop is a $.
-  ;; 
+  ;;
   ;;  POINT MUST BE AT THE START OF A LINE when calling this function.  This
   ;;  is to ensure that the various backward-comment functions will work
   ;;  properly.
@@ -425,13 +425,13 @@
   ;; Calculate and set the value of the c-awk-NL-prop on the immediately
   ;; preceding EOL.  This may also involve doing the same for several
   ;; preceding EOLs.
-  ;; 
+  ;;
   ;; NOTE that if the property was already set, we return it without
   ;; recalculation.  (This is by accident rather than design.)
-  ;; 
+  ;;
   ;; Return the property which got set (or was already set) on the previous
   ;; line.  Return nil if we hit BOB.
-  ;; 
+  ;;
   ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM.
   ;;
   ;; This function might do hidden buffer changes.
@@ -492,7 +492,7 @@
   ;; if necessary. (As a special case, the property doesn't get set on an
   ;; empty line at EOB (there's no position to set the property on), but the
   ;; function returns the property value an EOL would have got.)
-  ;; 
+  ;;
   ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM.
   ;;
   ;; This function might do hidden buffer changes.
@@ -566,7 +566,7 @@
   ;; this, a new newline inserted after an old newline (e.g. by C-j) would
   ;; inherit any c-awk-NL-prop from the old newline.  This would be a Bad
   ;; Thing.  This function's action is required by c-put-char-property.
-  (if (and (boundp 'text-property-default-nonsticky) ; doesn't exist in Xemacs
+  (if (and (boundp 'text-property-default-nonsticky) ; doesn't exist in XEmacs
            (not (assoc 'c-awk-NL-prop text-property-default-nonsticky)))
       (setq text-property-default-nonsticky
             (cons '(c-awk-NL-prop . t) text-property-default-nonsticky))))
@@ -611,7 +611,7 @@
 ;; Go back to the start of the (apparent) current line (or the start of the
 ;; line containing POS), returning the buffer position of that point.  I.e.,
 ;; go back to the last line which doesn't have an escaped EOL before it.
-;; 
+;;
 ;; This is guaranteed to be "safe" for syntactic analysis, i.e. outwith any
 ;; comment, string or regexp.  IT MAY WELL BE that this function should not be
 ;; executed on a narrowed buffer.
@@ -718,7 +718,7 @@
   ;; This function does hidden buffer changes.
   (let ((/point (point)))
     (goto-char anchor)
-    ;; Analyse the line to find out what the / is.
+    ;; Analyze the line to find out what the / is.
     (if (if anchor-state-/div
             (not (search-forward-regexp c-awk-regexp-sign-re (1+ /point) t))
           (search-forward-regexp c-awk-div-sign-re (1+ /point) t))
@@ -776,7 +776,7 @@
       (setq anchor (point))
       (search-forward-regexp c-awk-harmless-string*-here-re nil t)
       ;; We are now looking at either a " or a /.
-      ;; Do our thing on the string, regexp or divsion sign.
+      ;; Do our thing on the string, regexp or division sign.
       (setq anchor-state-/div
             (if (looking-at "_?\"")
                 (c-awk-syntax-tablify-string)
@@ -823,14 +823,14 @@
 ;; Don't overlook the possibility of the buffer change being the "recapturing"
 ;; of a previously escaped newline.
 
-;; ACM 2008-02-05: 
+;; ACM 2008-02-05:
 (defun c-awk-extend-and-syntax-tablify-region (beg end old-len)
   ;; Expand the region (BEG END) as needed to (c-new-BEG c-new-END) then put
   ;; `syntax-table' properties on this region.
   ;;
   ;; This function is called from an after-change function, BEG END and
   ;; OLD-LEN being the standard parameters.
-  ;; 
+  ;;
   ;; Point is undefined both before and after this function call, the buffer
   ;; has been widened, and match-data saved.  The return value is ignored.
   ;;
@@ -847,8 +847,8 @@
 
 ;; Awk regexps written with help from Peter Galbraith
 ;; <galbraith@mixing.qc.dfo.ca>.
-;; Take GNU Emacs's 'words out of the following regexp-opts.  They dont work
-;; in Xemacs 21.4.4.  acm 2002/9/19.
+;; Take GNU Emacs's 'words out of the following regexp-opts.  They don't work
+;; in XEmacs 21.4.4.  acm 2002/9/19.
 (defconst awk-font-lock-keywords
   (eval-when-compile
     (list
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index e59fdc16af7..1eaf8910d14 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1042,7 +1042,7 @@ reindented unless `c-syntactic-indentation' is nil.
                   (setcar (car elem) 'label))
               (setq elem (cdr elem)))
             ;; some language elements can only be determined by checking
-            ;; the following line.  Lets first look for ones that can be
+            ;; the following line.  Let's first look for ones that can be
             ;; found when looking on the line with the colon
             (setq newlines
                   (and c-auto-newline
@@ -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)
@@ -2969,7 +2969,7 @@ A prefix argument acts as a repeat count.  With a negative argument,
 move backward across a preprocessor conditional.
 
 If there aren't enough conditionals after \(or before) point, an
-error is signalled.
+error is signaled.
 
 \"#elif\" is treated like \"#else\" followed by \"#if\", except that
 the nesting level isn't changed when tracking subconditionals.
@@ -4094,7 +4094,7 @@ command to conveniently insert and align the necessary backslashes."
 ;                   (or (<= (- (cdr c-lit-limits) 2) (point))
 ; 2010-10-17  Construct removed.
 ;                   (or (< (- (cdr c-lit-limits) 2) (point))
-                    (and 
+                    (and
                      (search-forward-regexp
                       (concat "\\=[ \t]*\\(" c-current-comment-prefix "\\)")
                       (- (cdr c-lit-limits) 2) t)
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index 8632807f2b8..c91fe13543a 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -555,7 +555,7 @@ certain situations."
   `(c-forward-sexp ,(if (numberp count) (- count) `(- ,count))))
 
 (defmacro c-safe-scan-lists (from count depth &optional limit)
-  "Like `scan-lists' but returns nil instead of signalling errors
+  "Like `scan-lists' but returns nil instead of signaling errors
 for unbalanced parens.
 
 A limit for the search may be given.  FROM is assumed to be on the
@@ -760,7 +760,7 @@ be after it."
 ;; non-nil if point (or the optional parameter POS) is at a VS, nil otherwise.
 ;;
 ;; The language specific function might well do extensive analysis of the
-;; source text, and may use a cacheing scheme to speed up repeated calls.
+;; source text, and may use a caching scheme to speed up repeated calls.
 ;;
 ;; The "virtual semicolon" lies just after the last non-ws token on the line.
 ;; Like POINT, it is considered to lie between two characters.  For example,
@@ -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.
 ;;
@@ -784,7 +784,7 @@ be after it."
 ;; `c-beginning-of-statement-1'.  `c-vsemi-status-unknown-p' may not itself
 ;; call `c-beginning-of-statement-1'.
 ;;
-;; The macro `c-vsemi-status-unknown-p' will typically check the cacheing
+;; The macro `c-vsemi-status-unknown-p' will typically check the caching
 ;; scheme used by the `c-at-vsemi-p-fn', hence the name - the status is
 ;; "unknown" if there is no cache entry current for the line.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -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 ea0a8f2d3b3..5ec0ab04f7f 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -988,7 +988,7 @@ comment at the start of cc-engine.el for more info."
                          ;; Just gone back over an ordinary symbol of some sort?
                          (t (c-crosses-statement-barrier-p
                              (point) maybe-after-boundary-pos))))
-        
+
                   (when boundary-pos
                     (setq pptok ptok
                           ptok tok
@@ -1065,7 +1065,7 @@ comment at the start of cc-engine.el for more info."
                     pos tok) ; always non-nil
               )              ; end of (catch loop ....)
           )                  ; end of sexp-at-a-time (while ....)
-        
+
         ;; If the stack isn't empty there might be errors to report.
         (while stack
           (if (and (vectorp saved-pos) (eq (length saved-pos) 3))
@@ -1795,7 +1795,7 @@ comment at the start of cc-engine.el for more info."
         rung-is-marked simple-ws-beg cmt-skip-pos)
 
     ;; Skip simple horizontal ws and do a quick check on the preceding
-    ;; character to see if it's anying that can't end syntactic ws, so we can
+    ;; character to see if it's anything that can't end syntactic ws, so we can
     ;; bail out early in the majority of cases when there just are a few ws
     ;; chars.  Newlines are complicated in the backward direction, so we can't
     ;; skip over them.
@@ -2032,7 +2032,7 @@ comment at the start of cc-engine.el for more info."
 (defconst c-state-cache-too-far 5000)
 ;; A maximum comfortable scanning distance, e.g. between
 ;; `c-state-cache-good-pos' and "HERE" (where we call c-parse-state).  When
-;; this distance is exceeded, we take "emergency meausures", e.g. by clearing
+;; this distance is exceeded, we take "emergency measures", e.g. by clearing
 ;; the cache and starting again from point-min or a beginning of defun.  This
 ;; value can be tuned for efficiency or set to a lower value for testing.
 
@@ -2302,7 +2302,7 @@ comment at the start of cc-engine.el for more info."
 ;; `c-parse-state', or nil.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Defuns which analyse the buffer, yet don't change `c-state-cache'.
+;; Defuns which analyze the buffer, yet don't change `c-state-cache'.
 (defun c-get-fallback-scan-pos (here)
   ;; Return a start position for building `c-state-cache' from
   ;; scratch.  This will be at the top level, 2 defuns back.
@@ -2331,7 +2331,7 @@ comment at the start of cc-engine.el for more info."
   ;;
   ;; If there aren't enough opening paren/brace/brackets, return the position
   ;; of the outermost one found, or HERE- if there are none.  If there are no
-  ;; closeing p/b/bs between HERE+ and TOP, return HERE-.  HERE-/+ and TOP
+  ;; closing p/b/bs between HERE+ and TOP, return HERE-.  HERE-/+ and TOP
   ;; must not be inside literals.  Only the accessible portion of the buffer
   ;; will be scanned.
 
@@ -2364,7 +2364,7 @@ comment at the start of cc-engine.el for more info."
 
 (defun c-parse-state-get-strategy (here good-pos)
   ;; Determine the scanning strategy for adjusting `c-parse-state', attempting
-  ;; to minimise the amount of scanning.  HERE is the pertinent position in
+  ;; to minimize the amount of scanning.  HERE is the pertinent position in
   ;; the buffer, GOOD-POS is a position where `c-state-cache' (possibly with
   ;; its head trimmed) is known to be good, or nil if there is no such
   ;; position.
@@ -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 minimise) 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:
@@ -2820,7 +2820,7 @@ comment at the start of cc-engine.el for more info."
                                         ; or `here' itself.
         here- here+                  ; start/end of macro around HERE, or HERE
         (here-bol (c-point 'bol here))
-        (too-far-back (max (- here c-state-cache-too-far) 1)))
+        (too-far-back (max (- here c-state-cache-too-far) (point-min))))
 
     ;; Remove completely irrelevant entries from `c-state-cache'.
     (while (and c-state-cache
@@ -2964,9 +2964,9 @@ comment at the start of cc-engine.el for more info."
             c-state-cache-good-pos nil
             c-state-min-scan-pos nil)
 
-;;; Truncate `c-state-cache' and set `c-state-cache-good-pos' to a value below
-;;; `here'.  To maintain its consistency, we may need to insert a new brace
-;;; pair.
+    ;; Truncate `c-state-cache' and set `c-state-cache-good-pos' to a value
+    ;; below `here'.  To maintain its consistency, we may need to insert a new
+    ;; brace pair.
     (let ((here-bol (c-point 'bol here))
           too-high-pa             ; recorded {/(/[ next above here, or nil.
           dropped-cons            ; was the last removed element a brace pair?
@@ -4051,7 +4051,7 @@ comment at the start of cc-engine.el for more info."
                      ;; a relevant match.
                      (goto-char pos)
                      nil))))))
-             
+
           (> (point)
              (progn
                ;; Skip syntactic ws afterwards so that we don't stop at the
@@ -4219,9 +4219,9 @@ comment at the start of cc-engine.el for more info."
 ;; complicated anyway.  In this case, lim is only used to detect
 ;; cpp directives.
 ;;
-;; Note that there is a bug in Xemacs's buffer-syntactic-context when used in
+;; Note that there is a bug in XEmacs's buffer-syntactic-context when used in
 ;; conjunction with syntax-table-properties.  The bug is present in, e.g.,
-;; Xemacs 21.4.4.  It manifested itself thus:
+;; XEmacs 21.4.4.  It manifested itself thus:
 ;;
 ;; Starting with an empty AWK Mode buffer, type
 ;; /regexp/ {<C-j>
@@ -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)
@@ -5052,7 +5052,7 @@ comment at the start of cc-engine.el for more info."
 ;; The strategy now (2010-01) adopted is to mark and unmark < and
 ;; > IN MATCHING PAIRS ONLY.  [Previously, they were marked
 ;; individually when their context so indicated.  This gave rise to
-;; intractible problems when one of a matching pair was deleted, or
+;; intractable problems when one of a matching pair was deleted, or
 ;; pulled into a literal.]
 ;;
 ;; At each buffer change, the syntax-table properties are removed in a
@@ -5965,7 +5965,7 @@ comment at the start of cc-engine.el for more info."
   ;;     `*-font-lock-extra-types');
   ;;   o - 'prefix if it's a known prefix of a type;
   ;;   o - 'found if it's a type that matches one in `c-found-types';
-  ;;   o - 'maybe if it's an identfier that might be a type; or
+  ;;   o - 'maybe if it's an identifier that might be a type; or
   ;;   o -  nil if it can't be a type (the point isn't moved then).
   ;;
   ;; The point is assumed to be at the beginning of a token.
@@ -6277,7 +6277,7 @@ comment at the start of cc-engine.el for more info."
   ;;      car ^                                     ^ point
   ;;     Foo::Foo (int b) : Base (b) {}
   ;; car ^                ^ point
-  ;; 
+  ;;
   ;;   The cdr of the return value is non-nil when a
   ;;   `c-typedef-decl-kwds' specifier is found in the declaration.
   ;;   Specifically it is a dotted pair (A . B) where B is t when a
@@ -6285,7 +6285,7 @@ comment at the start of cc-engine.el for more info."
   ;;   other `c-typedef-decl-kwds' (e.g. class, struct, enum)
   ;;   specifier is present.  I.e., (some of) the declared
   ;;   identifier(s) are types.
-  ;; 
+  ;;
   ;; If a cast is parsed:
   ;;
   ;;   The point is left at the first token after the closing paren of
@@ -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
@@ -8461,7 +8461,7 @@ comment at the start of cc-engine.el for more info."
                 nil)
                (t nil))))
          (eolp))
-             
+
        (goto-char pos)
        (progn (c-backward-syntactic-ws)
               (eq (point) pos))
@@ -8832,7 +8832,7 @@ comment at the start of cc-engine.el for more info."
        ;; CASE B.4: Continued statement with block open.  The most
        ;; accurate analysis is perhaps `statement-cont' together with
        ;; `block-open' but we play DWIM and use `substatement-open'
-       ;; instead.  The rationaly is that this typically is a macro
+       ;; instead.  The rationale is that this typically is a macro
        ;; followed by a block which makes it very similar to a
        ;; statement with a substatement block.
        (t
@@ -8922,7 +8922,7 @@ comment at the start of cc-engine.el for more info."
       ;; FIXME: Should use c-add-stmt-syntax, but it's not yet
       ;; template aware.
       (c-add-syntax 'template-args-cont (point) placeholder))
-     
+
      ;; CASE D: continued statement.
      (t
       (c-beginning-of-statement-1 containing-sexp)
@@ -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 2028a7c4675..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
@@ -1103,7 +1103,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
               (<= (point) limit))
 
             ;; Search syntactically to the end of the declarator (";",
-            ;; ",", a closen paren, eob etc) or to the beginning of an
+            ;; ",", a closing paren, eob etc) or to the beginning of an
             ;; initializer or function prototype ("=" or "\\s\(").
             ;; Note that the open paren will match array specs in
             ;; square brackets, and we treat them as initializers too.
@@ -1122,7 +1122,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
                           (char-after (match-beginning 1))))
 
       (if types
-          ;; Register and fontify the identifer as a type.
+          ;; Register and fontify the identifier as a type.
           (let ((c-promote-possible-types t))
             (goto-char id-start)
             (c-forward-type))
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 a6bf241f0db..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)
@@ -484,7 +484,7 @@ that requires a literal mode spec at compile time."
   (make-local-variable 'comment-start)
   (make-local-variable 'comment-end)
   (make-local-variable 'comment-start-skip)
-  
+
   (make-local-variable 'paragraph-start)
   (make-local-variable 'paragraph-separate)
   (make-local-variable 'paragraph-ignore-fill-prefix)
@@ -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
@@ -587,7 +587,7 @@ that requires a literal mode spec at compile time."
   (add-hook 'after-change-functions 'c-after-change nil t)
   (set (make-local-variable 'font-lock-extend-after-change-region-function)
         'c-extend-after-change-region)) ; Currently (2009-05) used by all
-                        ; lanaguages with #define (C, C++,; ObjC), and by AWK.
+                        ; languages with #define (C, C++,; ObjC), and by AWK.
 
 (defun c-setup-doc-comment-style ()
   "Initialize the variables that depend on the value of `c-doc-comment-style'."
@@ -660,7 +660,7 @@ compatible with old code; callers should always specify it."
       (when (eq (car elt) 'c-file-style)
         (setq cownt (1+ cownt))))
     cownt))
-                                                          
+
 (defun c-before-hack-hook ()
   "Set the CC Mode style and \"offsets\" when in the buffer's local variables.
 They are set only when, respectively, the pseudo variables
@@ -860,7 +860,7 @@ Note that the style variables are always made local to the buffer."
   ;; (i) Extend the font lock region to cover all changed preprocessor
   ;; regions; it does this by setting the variables `c-new-BEG' and
   ;; `c-new-END' to the new boundaries.
-  ;; 
+  ;;
   ;; (ii) "Neutralize" every preprocessor line wholly or partially in the
   ;; extended changed region.  "Restore" lines which were CPP lines before the
   ;; change and are no longer so; these can be located from the Buffer local
@@ -1562,7 +1562,7 @@ Key bindings:
   (c-common-init 'awk-mode)
   (c-awk-unstick-NL-prop)
 
-  ;; Prevent Xemacs's buffer-syntactic-context being used.  See the comment
+  ;; Prevent XEmacs's buffer-syntactic-context being used.  See the comment
   ;; in cc-engine.el, just before (defun c-fast-in-literal ...
   (defalias 'c-in-literal 'c-slow-in-literal)
 
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 24361e3667a..549f94387d2 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -420,7 +420,7 @@ If a LINE-TYPE is missing, then \\[indent-for-comment] indents the comment
 according to `comment-column'.
 
 Note that a non-nil value on `c-indent-comments-syntactically-p'
-overrides this variable, so empty lines are indentented syntactically
+overrides this variable, so empty lines are indented syntactically
 in that case, i.e. as if \\[c-indent-command] was used instead."
   :type
   (let ((space '(cons :tag "space"
@@ -963,7 +963,7 @@ this is `c-lineup-ObjC-method-call', which would align it like:
         [foo blahBlahBlah: fred
              thisIsTooDamnLong: barney
 
-This behaviour can be overridden by customizing the indentation of
+This behavior can be overridden by customizing the indentation of
 `objc-method-call-cont' in the \"objc\" style."
   :type 'integer
   :group 'c)
@@ -1327,7 +1327,7 @@ Here is the current list of valid syntactic element symbols:
  statement-case-open    -- The first line in a case block starting with brace.
  substatement           -- The first line after an if/while/for/do/else.
  substatement-open      -- The brace that opens a substatement block.
- substatement-label     -- Labelled line after an if/while/for/do/else.
+ substatement-label     -- Labeled line after an if/while/for/do/else.
  case-label             -- A \"case\" or \"default\" label.
  access-label           -- C++ private/protected/public access label.
  label                  -- Any ordinary label.
@@ -1625,7 +1625,7 @@ names)."))
 (defvar c-macro-with-semi-re nil
   ;; Regular expression which matches a (#define'd) symbol whose expansion
   ;; ends with a semicolon.
-  ;; 
+  ;;
   ;; This variable should be set by `c-make-macros-with-semi-re' rather than
   ;; directly.
 )
@@ -1651,7 +1651,7 @@ names)."))
           (t (error "c-make-macro-with-semi-re: invalid \
 c-macro-names-with-semicolon: %s"
                     c-macro-names-with-semicolon))))))
-    
+
 (defvar c-macro-names-with-semicolon
   '("Q_OBJECT" "Q_PROPERTY" "Q_DECLARE" "Q_ENUMS")
   "List of #defined symbols whose expansion ends with a semicolon.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 3dba1af515a..73e990e2755 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1013,11 +1013,11 @@ POS and RES.")
             (setq col (funcall col))
           (and
            (setq col (match-string-no-properties col))
-           (setq col (- (string-to-number col) compilation-first-column)))))
+           (setq col (string-to-number col)))))
     (if (and end-col (functionp end-col))
         (setq end-col (funcall end-col))
       (if (and end-col (setq end-col (match-string-no-properties end-col)))
-          (setq end-col (- (string-to-number end-col) compilation-first-column -1))
+          (setq end-col (- (string-to-number end-col) -1))
         (if end-line (setq end-col -1))))
     (if (consp type)                    ; not a static type, check what it is.
         (setq type (or (and (car type) (match-end (car type)) 1)
@@ -1037,6 +1037,7 @@ POS and RES.")
   "Go to column COL on the current line.
 If SCREEN is non-nil, columns are screen columns, otherwise, they are
 just char-counts."
+  (setq col (- col compilation-first-column))
   (if screen
       (move-to-column (max col 0))
     (goto-char (min (+ (line-beginning-position) col) (line-end-position)))))
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index a79d1a2c064..88193d4d3fb 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -839,7 +839,7 @@ voice);
         b) Can lineup vertically \"middles\" of rows, like `=' in
                 a  = b;
                 cc = d;
-        c) Can insert spaces where this impoves readability (in one
+        c) Can insert spaces where this improves readability (in one
                 interactive sweep over the buffer);
         d) Has support for imenu, including:
                 1) Separate unordered list of \"interesting places\";
@@ -902,7 +902,7 @@ the settings present before the switch.
 9) When doing indentation of control constructs, may correct
 line-breaks/spacing between elements of the construct.
 
-10) Uses a linear-time algorith for indentation of regions (on Emaxen with
+10) Uses a linear-time algorithm for indentation of regions (on Emaxen with
 capable syntax engines).
 
 11) Syntax-highlight, indentation, sexp-recognition inside regular expressions.
@@ -927,7 +927,7 @@ syntax-parsing routines, and marks them up so that either
 
     A1) CPerl may work around these deficiencies (for big chunks, mostly
         PODs and HERE-documents), or
-    A2) On capable Emaxen CPerl will use improved syntax-handlings
+    A2) On capable Emaxen CPerl will use improved syntax-handling
         which reads mark-up hints directly.
 
     The scan in case A2 is much more comprehensive, thus may be slower.
@@ -1304,7 +1304,7 @@ versions of Emacs."
                    (get-text-property (point) 'syntax-type))
                  '(here-doc pod))]
           "----"
-          ["CPerl pretty print (exprmntl)" cperl-ps-print
+          ["CPerl pretty print (experimental)" cperl-ps-print
            (fboundp 'ps-extend-face-list)]
           "----"
           ["Syntaxify region" cperl-find-pods-heres-region
@@ -1512,7 +1512,7 @@ the last)."
 (defvar cperl-font-locking nil)
 
 ;; NB as it stands the code in cperl-mode assumes this only has one
-;; element. If Xemacs 19 support were dropped, this could all be simplified.
+;; element. If XEmacs 19 support were dropped, this could all be simplified.
 (defvar cperl-compilation-error-regexp-alist
   ;; This look like a paranoiac regexp: could anybody find a better one? (which WORKS).
   '(("^[^\n]* \\(file\\|at\\) \\([^ \t\n]+\\) [^\n]*line \\([0-9]+\\)[\\., \n]"
@@ -2801,7 +2801,7 @@ Will not look before LIM."
                                  (skip-chars-forward " \t")
                                  (if (memq (char-after (point))
                                            (append "#\n" nil))
-                                     nil ; Can't use intentation of this line...
+                                     nil ; Can't use indentation of this line...
                                    (point)))
                              (skip-chars-forward " \t")
                              (point)))
@@ -4540,7 +4540,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                        (forward-char 2))
                                 (and (eq (following-char) ?\] )
                                      (forward-char 1)))
-                              (setq REx-subgr-end qtag) ;EndOf smart-highlighed
+                              (setq REx-subgr-end qtag) ;End smart-highlighted
                               ;; Apparently, I can't put \] into a charclass
                               ;; in m]]: m][\\\]\]] produces [\\]]
 ;;; POSIX?  [:word:] [:^word:] only inside []
@@ -5793,7 +5793,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
             ;;                     "\\|")
             '("-[rwxoRWXOezsfdlpSbctugkTBMAC]\\>\\([ \t]+_\\>\\)?" 0
               font-lock-function-name-face keep) ; Not very good, triggers at "[a-z]"
-            ;; This highlights declarations and definitions differenty.
+            ;; This highlights declarations and definitions differently.
             ;; We do not try to highlight in the case of attributes:
             ;; it is already done by `cperl-find-pods-heres'
             (list (concat "\\<sub"
@@ -8946,7 +8946,7 @@ do extra unwind via `cperl-unwind-to-safe'."
 ;; Called when any modification is made to buffer text.
 (defun cperl-after-change-function (beg end old-len)
   ;; We should have been informed about changes by `font-lock'.  Since it
-  ;; does not inform as which calls are defered, do it ourselves
+  ;; does not inform as which calls are deferred, do it ourselves
   (if cperl-syntax-done-to
       (setq cperl-syntax-done-to (min cperl-syntax-done-to beg))))
 
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index b4094914d61..d855861d552 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -512,7 +512,7 @@ Variables controlling indentation style and extra features:
  dcl-block-begin-regexp
  dcl-block-end-regexp
     Regexps that match command lines that begin and end, respectively,
-    a block of commmand lines that will be given extra indentation.
+    a block of command lines that will be given extra indentation.
     Command lines between THEN-ELSE-ENDIF are always indented; these variables
     make it possible to define other places to indent.
     Set to nil to disable this feature.
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index c027b2b7454..d9adff6c8b8 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -2084,7 +2084,7 @@ special."
   "*Specify extra width for arrow shape drawing.
 
 The extra width is used to avoid that the arrowhead and the terminal border
-overlap.  It depens on `ebnf-arrow-shape' and `ebnf-line-width'."
+overlap.  It depends on `ebnf-arrow-shape' and `ebnf-line-width'."
   :type 'number
   :version "22"
   :group 'ebnf-shape)
@@ -5037,7 +5037,7 @@ killed after process termination."
                 (when gen-func
                   (setq error-msg "EMPTY RULES"
                         tree      (ebnf-eliminate-empty-rules tree))
-                  (setq error-msg "OPTMIZE"
+                  (setq error-msg "OPTIMIZE"
                         tree      (ebnf-optimize tree))
                   (setq error-msg "DIMENSIONS"
                         tree      (ebnf-dimensions tree))
@@ -6069,7 +6069,7 @@ killed after process termination."
 
 
 (defun ebnf-make-terminal1 (name gen-func dim-func)
-  (vector gen-func                      ; 0 generatore
+  (vector gen-func                      ; 0 generator
           'ignore                       ; 1 width fun
           dim-func                      ; 2 dimension fun
           0.0                           ; 3 entry
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index d321e9c1388..2d0b18f3dae 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1144,7 +1144,7 @@ error message."
           (setq order tag-order))
         ;; We throw out on match, so only get here if there were no matches.
         ;; Clear out the markers we use to avoid duplicate matches so they
-        ;; don't slow down editting and are immediately available for GC.
+        ;; don't slow down editing and are immediately available for GC.
         (while tag-lines-already-matched
           (set-marker (car tag-lines-already-matched) nil nil)
           (setq tag-lines-already-matched (cdr tag-lines-already-matched)))
@@ -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/f90.el b/lisp/progmodes/f90.el
index 007203a8b21..ce04d8b390e 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1837,7 +1837,7 @@ after indenting."
     (and (< (point) pos)
          (goto-char pos))
     (if auto-fill-function
-        ;; GM NO-UPDATE not honoured, since this calls f90-update-line.
+        ;; GM NO-UPDATE not honored, since this calls f90-update-line.
         (f90-do-auto-fill)
       (or no-update (f90-update-line)))
     (set-marker pos nil)))
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index fd3d42685f0..e98ca58f3e0 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -29,7 +29,7 @@
 ;; form.  For editing Fortran 90 free format source, use `f90-mode'
 ;; (f90.el).  It is meant to support the GNU Fortran language
 ;; implemented by g77 (its extensions to Fortran77 and
-;; interpretations, e.g. of blackslash in strings).
+;; interpretations, e.g. of backslash in strings).
 
 ;;; History:
 
@@ -571,7 +571,7 @@ in the Fortran entry in `hs-special-modes-alist'.")
    ;; An alternative is to match on THEN at a line end, eg:
    ;;   ".*)[ \t]*then[ \t]*\\($\\|!\\)"
    ;; This would also match ELSE branches, though. This does not seem
-   ;; right to me, because then one has neighbouring blocks that are
+   ;; right to me, because then one has neighboring blocks that are
    ;; not nested in each other.
    "\\(if[ \t]*(\\(.*\\|"
    ".*\n\\([^if]*\\([^i].\\|.[^f]\\|.\\>\\)\\)\\)\\<then\\|"
@@ -1462,7 +1462,7 @@ Return point or nil."
 
 (defun fortran-beginning-do ()
   "Search backwards for first unmatched DO [WHILE].
-Return point or nil.  Ignores labelled DO loops (ie DO 10 ... 10 CONTINUE)."
+Return point or nil.  Ignores labeled DO loops (ie DO 10 ... 10 CONTINUE)."
   (let ((case-fold-search t)
         (dostart-re "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+[^0-9]"))
     (if (save-excursion
@@ -1482,7 +1482,7 @@ Return point or nil.  Ignores labelled DO loops (ie DO 10 ... 10 CONTINUE)."
             (skip-chars-forward " \t0-9")
             (cond ((looking-at dostart-re)
                    (setq count (1- count)))
-                  ;; Note labelled loop ends not considered.
+                  ;; Note labeled loop ends not considered.
                   ((looking-at "end[ \t]*do\\b")
                    (setq count (1+ count)))))
           (and (zerop count)
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index e47ba3c92f3..a3ca87ec94a 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -25,7 +25,7 @@
 
 ;;; Credits:
 
-;; This file was written by by Nick Roberts following the general design
+;; This file was written by Nick Roberts following the general design
 ;; used in gdb-ui.el for Emacs 22.1 - 23.1.  It is currently being developed
 ;; by Dmitry Dzhus <dima@sphinx.net.ru> as part of the Google Summer
 ;; of Code 2009 Project "Emacs GDB/MI migration".
@@ -350,7 +350,7 @@ automatically.
 
 This setting is used in non-stop mode only. In all-stop mode,
 Emacs always switches to the thread which caused the stop."
-  ;; exited, exited-normally and exited-signalled are not
+  ;; exited, exited-normally and exited-signaled are not
   ;; thread-specific stop reasons and therefore are not included in
   ;; this list
   :type '(choice
@@ -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
@@ -2217,7 +2217,7 @@ Return position where LINE begins."
 (defun gdb-mapcar* (function &rest seqs)
   "Apply FUNCTION to each element of SEQS, and make a list of the results.
 If there are several SEQS, FUNCTION is called with that many
-arugments, and mapping stops as sson as the shortest list runs
+arguments, and mapping stops as soon as the shortest list runs
 out."
   (let ((shortest (apply #'min (mapcar #'length seqs))))
     (mapcar (lambda (i)
@@ -3428,7 +3428,7 @@ breakpoints buffer."
         (error "Not recognized as break/watchpoint line")))))
 
 
-;; Frames buffer.  This displays a perpetually correct bactrack trace.
+;; Frames buffer.  This displays a perpetually correct backtrack trace.
 ;;
 (def-gdb-trigger-and-handler
   gdb-invalidate-frames (gdb-current-context-command "-stack-list-frames")
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index ff192d5678e..dbffbc266e7 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -339,7 +339,7 @@ See `compilation-error-screen-columns'"
   "The most recent grep buffer.
 A grep buffer becomes most recent when you select Grep mode in it.
 Notice that using \\[next-error] or \\[compile-goto-error] modifies
-`complation-last-buffer' rather than `grep-last-buffer'.")
+`compilation-last-buffer' rather than `grep-last-buffer'.")
 
 ;;;###autoload
 (defconst grep-regexp-alist
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 543539421fe..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').
@@ -2094,7 +2094,7 @@ extension EXTN.  Normally EXTN is given as the regular expression
 
         ;; By this point the current directory is all screwed up.  Maybe we
         ;; could fix things and re-invoke gud-common-init, but for now I think
-        ;; issueing the error is good enough.
+        ;; issuing the error is good enough.
         (if user-error
             (progn
               (kill-buffer (current-buffer))
@@ -2102,7 +2102,7 @@ extension EXTN.  Normally EXTN is given as the regular expression
         massaged-args)))
 
 ;; Search for an association with P, a fully qualified class name, in
-;; gud-jdb-class-source-alist.  The asssociation gives the fully
+;; gud-jdb-class-source-alist.  The association gives the fully
 ;; qualified file name of the source file which produced the class.
 (defun gud-jdb-find-source-file (p)
   (cdr (assoc p gud-jdb-class-source-alist)))
@@ -3387,7 +3387,7 @@ This event can be examined by forms in `gud-tooltip-display'.")
 
 (defun gud-tooltip-dereference (&optional arg)
   "Toggle whether tooltips should show `* expr' or `expr'.
-With arg, dereference expr if ARG is positive, otherwise do not derereference."
+With arg, dereference expr if ARG is positive, otherwise do not dereference."
  (interactive "P")
   (setq gud-tooltip-dereference
         (if (null arg)
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index 8d8966ee159..0266fc17f9c 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -705,7 +705,8 @@ Those words in `idlwave-completion-help-links' have links.  The
              ;; we kill the help frame before the return-frame is selected.
              ;; To protect the workings, we wait for up to one second
              ;; and check if the return-frame *is* now selected.
-             ;; This is marked "eperimental" since we are not sure when its OK.
+             ;; This is marked "experimental" since we are not sure when
+             ;; it's OK.
              (let ((maxtime 1.0) (time 0.) (step 0.1))
                (select-frame idlwave-help-return-frame)
                (while (and (sit-for step)
@@ -985,12 +986,12 @@ 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 inconsisten this is through
+`KEYWORDS' section.  It is amazing how inconsistent this is through
 some IDL libraries I have seen.  We settle for a line containing an
-upper case \"KEYWORD\" string.  If this line is not fould we search
+upper case \"KEYWORD\" string.  If this line is not found we search
 for the keyword anyway to increase the hit-rate
 
 When one of these sections exists we check for a line starting with any of
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 453badfa46b..faccbb1f0ca 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -925,7 +925,7 @@ IDL has currently stepped.")
    \\[idlwave-shell-print] or \\[idlwave-shell-mouse-print] with the
    mouse, help, \\[idlwave-shell-help-expression] or
    \\[idlwave-shell-mouse-help] with the mouse, or with a
-   configureable set of custom examine commands using
+   configurable set of custom examine commands using
    \\[idlwave-shell-examine-select].  The mouse examine commands can
    also work by click and drag, to select an expression for
    examination.
@@ -939,7 +939,7 @@ IDL has currently stepped.")
    -------------------------------
    Info documentation for this package is available.  Use \\[idlwave-info]
    to display (complain to your sysadmin if that does not work).
-   For Postscript and HTML versions of the documentation, check IDLWAVE's
+   For PostScript and HTML versions of the documentation, check IDLWAVE's
    homepage at URL `http://idlwave.org'.
    IDLWAVE has customize support - see the group `idlwave'.
 
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 95f67a6bf66..1233ee19ff6 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -605,7 +605,7 @@ The value of this variable may be nil to inhibit display, or an integer to
 indicate the maximum number of classes to display.
 
 On XEmacs, a full list of classes will also be placed into a `help-echo'
-property on the competion items, so that the list of classes for the current
+property on the completion items, so that the list of classes for the current
 item is displayed in the echo area.  If the value of this variable is a
 negative integer, the `help-echo' property will be suppressed."
   :group 'idlwave-completion
@@ -7206,7 +7206,7 @@ If these don't exist, a letter in the string is automatically selected."
 ;;----------------------------------------------------------------------
 
 ;;; ------------------------------------------------------------------------
-;;; Stucture parsing code, and code to manage class info
+;;; Structure parsing code, and code to manage class info
 
 ;;
 ;; - Go again over the documentation how to write a completion
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/js.el b/lisp/progmodes/js.el
index 5505e8e94b2..94a9c250fee 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1295,7 +1295,7 @@ LIMIT defaults to point."
 ;; Like (up-list -1), but only considers lists that end nearby"
 (defun js--up-nearby-list ()
   (save-restriction
-    ;; Look at a very small region so our compuation time doesn't
+    ;; Look at a very small region so our computation time doesn't
     ;; explode in pathological cases.
     (narrow-to-region (max (point-min) (- (point) 500)) (point))
     (up-list -1)))
@@ -1599,7 +1599,7 @@ will be returned."
 
 (defun js-syntactic-context ()
   "Return the JavaScript syntactic context at point.
-When called interatively, also display a message with that
+When called interactively, also display a message with that
 context."
   (interactive)
   (let* ((syntactic-context (js--syntactic-context-from-pstate
@@ -3352,7 +3352,7 @@ If one hasn't been set, or if it's stale, prompt for a new one."
   ;; etc. and produce maddening "unbalanced parenthesis" errors.
   ;; When we attempt to find the error and scroll to the portion of
   ;; the buffer containing the problem, JIT-lock will apply the
-  ;; correct syntax to the regular expresion literal and the problem
+  ;; correct syntax to the regular expression literal and the problem
   ;; will mysteriously disappear.
   ;; FIXME: We should actually do this fontification lazily by adding
   ;; calls to syntax-propertize wherever it's really needed.
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 293ba49d4ae..c49519ed179 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -532,7 +532,7 @@ not be enclosed in { } or ( )."
 ;; should return an exit status of zero if the target `foo' is
 ;; up to date and a nonzero exit status otherwise.
 ;; Many makes can do this although the docs/manpages do not mention
-;; it. Try it with your favourite one.  GNU make, System V make, and
+;; it. Try it with your favorite one.  GNU make, System V make, and
 ;; Dennis Vadura's DMake have no problems.
 ;; Set the variable `makefile-brave-make' to the name of the
 ;; make utility that does this on your system.
diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el
index e15f765ea58..d0a34179cc8 100644
--- a/lisp/progmodes/meta-mode.el
+++ b/lisp/progmodes/meta-mode.el
@@ -161,7 +161,7 @@
                        "[ \t\f]+\\(\\sw+\\|\\s_+\\|\\s.+\\)")
                '((1 font-lock-keyword-face)
                  (2 font-lock-function-name-face)))
-         ;; binary macro defintions: <leveldef> x operator y
+         ;; binary macro definitions: <leveldef> x operator y
          (cons (concat "\\<" macro-keywords-2 "\\>"
                        "[ \t\f]+\\(\\sw+\\)"
                        "[ \t\f]*\\(\\sw+\\|\\s.+\\)"
@@ -700,7 +700,7 @@ If the list was changed, sort the list and remove duplicates first."
 
 
 (defun meta-beginning-of-defun (&optional arg)
-  "Move backward to beginnning of a defun in Metafont or MetaPost code.
+  "Move backward to beginning of a defun in Metafont or MetaPost code.
 With numeric argument, do it that many times.
 Negative arg -N means move forward to Nth following beginning of defun.
 Returns t unless search stops due to beginning or end of buffer."
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 103c7be7d3c..7d1f12595ab 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -1058,7 +1058,7 @@ EXECUTION-TIME holds info about the time it takes, number or string.")
    (list
     (let* ((completion-ignore-case t)
            ;; we already have a list, but it is not in the right format
-           ;; transform it to a valid table so completition can use it
+           ;; transform it to a valid table so completion can use it
            (table (mapcar (lambda (elm) (cons (symbol-name (car elm)) nil))
                           mixal-operation-codes-alist))
            ;; prompt is different depending on we are close to a valid op-code
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 67e3c4a18b4..91a2e946753 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -414,7 +414,7 @@ no args, if that value is non-nil."
       (electric-pascal-terminate-line)))
 
 (defun electric-pascal-colon ()
-  "Insert `:' and do all indentions except line indent on this line."
+  "Insert `:' and do all indentations except line indent on this line."
   (interactive)
   (insert last-command-event)
   ;; Do nothing if within string.
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 283919c131e..8b4798e1c14 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -116,7 +116,7 @@
 ;; Version 1.22:
 ;;  o  Allowed both 'swipl' and 'pl' as names for the SWI Prolog
 ;;     interpreter.
-;;  o  Atoms that start a line are not blindly coloured as
+;;  o  Atoms that start a line are not blindly colored as
 ;;     predicates.  Instead we check that they are followed by ( or
 ;;     :- first.  Patch suggested by Guy Wiener.
 ;; Version 1.21:
@@ -151,7 +151,7 @@
 ;;     (`prolog-electric-dot-full-predicate-template', defaults to t
 ;;     since it seems quicker to me to just type those commata).  A
 ;;     trivial adaptation of a patch by Markus Triska.
-;;  o  Improved the behaviour of electric if-then-else to only skip
+;;  o  Improved the behavior of electric if-then-else to only skip
 ;;     forward if the parenthesis/semicolon is preceded by
 ;;     whitespace.  Once more a trivial adaptation of a patch by
 ;;     Markus Triska.
@@ -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)
 
@@ -1023,7 +1023,7 @@ VERSION is of the format (Major . Minor)"
 
 
 (defvar prolog-mode-hook nil
-  "List of functions to call after the prolog mode has initialised.")
+  "List of functions to call after the prolog mode has initialized.")
 
 (unless (fboundp 'prog-mode)
   (defalias 'prog-mode 'fundamental-mode))
@@ -1090,7 +1090,7 @@ Actually this is just customized `prolog-mode'."
     map))
 
 (defvar prolog-inferior-mode-hook nil
-  "List of functions to call after the inferior prolog mode has initialised.")
+  "List of functions to call after the inferior prolog mode has initialized.")
 
 (defvar prolog-inferior-error-regexp-alist
   '(;; GNU Prolog used to not follow the GNU standard format.
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index 94d55ee3f61..c2adc3b801b 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -267,7 +267,7 @@ If nil, use `temporary-file-directory'."
       . (1 font-lock-function-name-face))
     '("/\\w+" . font-lock-variable-name-face)
     (cons ps-mode-operators 'font-lock-keyword-face)))
-  "High level highliting for PostScript mode.")
+  "High level highlighting for PostScript mode.")
 
 (defconst ps-mode-font-lock-keywords ps-mode-font-lock-keywords-1
   "Default expressions to highlight in PostScript mode.")
@@ -713,7 +713,7 @@ defines the beginning of a group. These tokens are:  {  [  <<"
   (ps-mode-r-balance ">>"))
 
 (defun ps-mode-r-balance (right)
-  "Adjust indentification if point after RIGHT."
+  "Adjust indenting if point after RIGHT."
   (if ps-mode-auto-indent
       (save-excursion
         (when (re-search-backward (concat "^[ \t]*" (regexp-quote right) "\\=") nil t)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 8615400bf6a..6bc4db60596 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -119,7 +119,7 @@
      (1 font-lock-type-face))
     ;; Built-ins.  (The next three blocks are from
     ;; `__builtin__.__dict__.keys()' in Python 2.7)  These patterns
-    ;; are debateable, but they at least help to spot possible
+    ;; are debatable, but they at least help to spot possible
     ;; shadowing of builtins.
     (,(rx symbol-start (or
           ;; exceptions
@@ -550,7 +550,7 @@ element matches `python-python-command'."
   "^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()"
   "Regular expression pdbtrack uses to find a stack trace entry.")
 
-(defconst python-pdbtrack-input-prompt "\n[(<]*[Pp]db[>)]+ "
+(defconst python-pdbtrack-input-prompt "\n[(<]*[Ii]?[Pp]db[>)]+ "
   "Regular expression pdbtrack uses to recognize a pdb prompt.")
 
 (defconst python-pdbtrack-track-range 10000
@@ -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
 ;; ====================================  ==========  =============  ============
@@ -2553,7 +2553,7 @@ If the traceback target file path is invalid, we look for the
 most recently visited python-mode buffer which either has the
 name of the current function or class, or which defines the
 function or class.  This is to provide for scripts not in the
-local filesytem (e.g., Zope's 'Script \(Python)', but it's not
+local file system (e.g., Zope's 'Script \(Python)', but it's not
 Zope specific).  If you put a copy of the script in a buffer
 named for the script and activate python-mode, then pdbtrack will
 find it."
@@ -2583,6 +2583,7 @@ find it."
         (if (not (string-match (concat python-pdbtrack-input-prompt "$") block))
             (python-pdbtrack-overlay-arrow nil)
 
+          (setq block (ansi-color-filter-apply block))
           (setq target (python-pdbtrack-get-source-buffer block))
 
           (if (stringp target)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 7b949134c6c..62ca2ce085f 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -567,6 +567,7 @@ This is buffer-local in every such buffer.")
   '((csh . "\\<\\([[:alnum:]_]+\\)\\(\\[.+\\]\\)?[ \t]*[-+*/%^]?=")
     ;; actually spaces are only supported in let/(( ... ))
     (ksh88 . "\\<\\([[:alnum:]_]+\\)\\(\\[.+\\]\\)?[ \t]*\\([-+*/%&|~^]\\|<<\\|>>\\)?=")
+    (bash . "\\<\\([[:alnum:]_]+\\)\\(\\[.+\\]\\)?\\+?=")
     (rc . "\\<\\([[:alnum:]_*]+\\)[ \t]*=")
     (sh . "\\<\\([[:alnum:]_]+\\)="))
   "Regexp for the variable name and what may follow in an assignment.
@@ -889,7 +890,7 @@ See `sh-feature'.")
          font-lock-variable-name-face))
 
     (rc sh-append es)
-    (bash sh-append shell ("\\$(\\(\\sw+\\)" (1 'sh-quoted-exec t) ))
+    (bash sh-append sh ("\\$(\\(\\sw+\\)" (1 'sh-quoted-exec t) ))
     (sh sh-append shell
         ;; Variable names.
         ("\\$\\({#?\\)?\\([[:alpha:]_][[:alnum:]_]*\\|[-#?@!]\\)" 2
@@ -985,7 +986,7 @@ Find all the unescaped \" characters within said subshell, remembering that
 subshells can nest."
   ;; FIXME: This can (and often does) match multiple lines, yet it makes no
   ;; effort to handle multiline cases correctly, so it ends up being
-  ;; rather flakey.
+  ;; rather flaky.
   (when (eq ?\" (nth 3 (syntax-ppss))) ; Check we matched an opening quote.
     ;; bingo we have a $( or a ` inside a ""
     (let (;; `state' can be: double-quote, backquote, code.
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 97a1c4605c2..af9ab537893 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -672,7 +672,7 @@ highlighted properly when you open them."
   :safe 'symbolp)
 (defvaralias 'sql-dialect 'sql-product)
 
-;; misc customization of sql.el behaviour
+;; misc customization of sql.el behavior
 
 (defcustom sql-electric-stuff nil
   "Treat some input as electric.
@@ -1595,7 +1595,7 @@ to add functions and PL/SQL keywords.")
 "cast" "ceil" "chartorowid" "chr" "cluster_id" "cluster_probability"
 "cluster_set" "coalesce" "collect" "compose" "concat" "convert" "corr"
 "corr_k" "corr_s" "cos" "cosh" "count" "covar_pop" "covar_samp"
-"cube_table" "cume_dist" "currrent_date" "currrent_timestamp" "cv"
+"cube_table" "cume_dist" "current_date" "current_timestamp" "cv"
 "dataobj_to_partition" "dbtimezone" "decode" "decompose" "deletexml"
 "dense_rank" "depth" "deref" "dump" "empty_blob" "empty_clob"
 "existsnode" "exp" "extract" "extractvalue" "feature_id" "feature_set"
@@ -3600,12 +3600,12 @@ The list is maintained in SQL interactive buffers.")
                 (setq has-schema (and
                                   (>= (length (car names)) schema-len)
                                   (string= schema-dot
-                                           (downcase (substring (car names) 
+                                           (downcase (substring (car names)
                                                                 0 schema-len))))
                       names (cdr names)))
               (unless has-schema
                 (sql-build-completions schema)))))
-        
+
         ;; Try to find the completion
         (cond
          ((not predicate)
@@ -3951,7 +3951,7 @@ is specified in the connection settings."
                        ;; interactive session
                        (eval `(let ((sql-connection ,connection)
                                      (,param-var ',rem-params))
-                                (sql-product-interactive sql-product 
+                                (sql-product-interactive sql-product
                                                          new-name)))))
 
             (message "SQL Connection <%s> does not exist" connection)
@@ -3981,16 +3981,16 @@ optionally is saved to the user's init file."
 
     (if connection
         (message "This session was started by a connection; it's already been saved.")
-      
+
       (let ((login (sql-get-product-feature product :sqli-login))
             (alist sql-connection-alist)
             connect)
-        
+
         ;; Remove the existing connection if the user says so
         (when (and (assoc name alist)
                    (yes-or-no-p (format "Replace connection definition <%s>? " name)))
           (setq alist (assq-delete-all name alist)))
-        
+
         ;; Add the new connection if it doesn't exist
         (if (assoc name alist)
             (message "Connection <%s> already exists" name)
@@ -4747,8 +4747,8 @@ Try to set `comint-output-filter-functions' like this:
     (sql-redirect sqlbuf "\\t off")
     (when (not (string= a "aligned"))
       (sql-redirect sqlbuf "\\a"))
-    
-    ;; Return the list of table names (public schema name can be omitted) 
+
+    ;; Return the list of table names (public schema name can be omitted)
     (mapcar (lambda (tbl)
               (if (string= (car tbl) "public")
                   (cadr tbl)
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index f18ec5abe81..d0e2c5abe7d 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -861,7 +861,7 @@ Returns nil if line starts inside a string, t if in a comment."
                        expr-p)
                    (progn
                      ;; Line is continuation line, or the sexp opener
-                     ;; is not a curly brace, or we are are looking at
+                     ;; is not a curly brace, or we are looking at
                      ;; an `expr' expression (which must be split
                      ;; specially).  So indentation is column of first
                      ;; good spot after sexp opener (with some added
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index f7cb1318dc0..4cc4a133c8e 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -292,7 +292,7 @@ STRING should be given if the last search was by `string-match' on STRING."
   "Filter `easy-menu-define' MENU to support new features."
   (cond ((not (featurep 'xemacs))
          menu) ;; GNU Emacs - passthru
-        ;; Xemacs doesn't support :help.  Strip it.
+        ;; XEmacs doesn't support :help.  Strip it.
         ;; Recursively filter the a submenu
         ((listp menu)
          (mapcar 'verilog-easy-menu-filter menu))
@@ -737,7 +737,7 @@ See `compilation-error-regexp-alist' for the formatting.  For Emacs 22+.")
 (defvar verilog-error-regexp-xemacs-alist
   ;; Emacs form is '((v-tool "re" 1 2) ...)
   ;; XEmacs form is '(verilog ("re" 1 2) ...)
-  ;; So we can just map from Emacs to Xemacs
+  ;; So we can just map from Emacs to XEmacs
   (cons 'verilog (mapcar 'cdr verilog-error-regexp-emacs-alist))
   "List of regexps for Verilog compilers.
 See `compilation-error-regexp-alist-alist' for the formatting.  For XEmacs.")
@@ -913,7 +913,7 @@ the MSB or LSB of a signal inside an AUTORESET."
 (put 'verilog-assignment-delay 'safe-local-variable 'stringp)
 
 (defcustom verilog-auto-arg-sort nil
-  "*If set, AUTOARG signal names will be sorted, not in delaration order.
+  "*If set, AUTOARG signal names will be sorted, not in declaration order.
 Declaration order is advantageous with order based instantiations
 and is the default for backward compatibility.  Sorted order
 reduces changes when declarations are moved around in a file, and
@@ -1847,7 +1847,7 @@ find the errors."
    ))
 
 (defconst verilog-auto-end-comment-lines-re
-  ;; Matches to names in this list cause auto-end-commentation
+  ;; Matches to names in this list cause auto-end-commenting
   (concat "\\("
           verilog-directive-re "\\)\\|\\("
           (eval-when-compile
@@ -2151,7 +2151,7 @@ find the errors."
        "interface" "endinterface"
        "module" "macromodule" "endmodule"
        "package" "endpackage"
-       "primitive" "endprimative"
+       "primitive" "endprimitive"
        "program" "endprogram"
        "property" "endproperty"
        "sequence" "randsequence" "endsequence"
@@ -2622,7 +2622,7 @@ user-visible changes to the buffer must not be within a
 
 (defmacro verilog-save-no-change-functions (&rest body)
   "Execute BODY forms, disabling all change hooks in BODY.
-For insigificant changes, see instead `verilog-save-buffer-state'."
+For insignificant changes, see instead `verilog-save-buffer-state'."
   `(let* ((inhibit-point-motion-hooks t)
           before-change-functions
           after-change-functions)
@@ -2709,7 +2709,7 @@ either is ok to parse as a non-comment, or `verilog-insert' was used."
         (remove-text-properties (point-min) (point-max) '(v-cmt nil))
         (verilog-scan-region (point-min) (point-max))
         (setq verilog-scan-cache-tick (buffer-chars-modified-tick))
-        (when verilog-debug (message "Scaning... done"))))))
+        (when verilog-debug (message "Scanning... done"))))))
 
 (defun verilog-inside-comment-p ()
   "Check if point inside a comment.
@@ -3579,7 +3579,7 @@ With ARG, first kill any existing labels."
   "Move backward to beginning of statement."
   (interactive)
   ;; Move back token by token until we see the end
-  ;; of some ealier line.
+  ;; of some earlier line.
   (let (h)
     (while
         ;; If the current point does not begin a new
@@ -3596,7 +3596,7 @@ With ARG, first kill any existing labels."
               (looking-at "\\w+\\W*:\\W*\\(coverpoint\\|cross\\|constraint\\)")
           ;; keep going if we are in the middle of a word
               (not (or (looking-at "\\<") (forward-word -1)))
-          ;; stop if we see an assertion (perhaps labled)
+          ;; stop if we see an assertion (perhaps labeled)
               (and
                (looking-at "\\(\\<\\(assert\\|assume\\|cover\\)\\>\\s-+\\<property\\>\\)\\|\\(\\<assert\\>\\)")
                (progn
@@ -5128,7 +5128,7 @@ Set point to where line starts."
     continued))
 
 (defun verilog-backward-token ()
-  "Step backward token, returing true if this is a continued line."
+  "Step backward token, returning true if this is a continued line."
   (interactive)
   (verilog-backward-syntactic-ws)
   (cond
@@ -6974,7 +6974,7 @@ Signals must be in standard (base vector) form."
 ;;(verilog-signals-not-in '(("A" "") ("B" "") ("DEL" "[2:3]")) '(("DEL" "") ("EXT" "")))
 
 (defun verilog-signals-memory (in-list)
-  "Return list of signals in IN-LIST that are memoried (multidimensional)."
+  "Return list of signals in IN-LIST that are memorized (multidimensional)."
   (let (out-list)
     (while in-list
       (if (nth 3 (car in-list))
@@ -11958,7 +11958,7 @@ Files are checked based on `verilog-library-flags'."
     (mouse-set-point event)
     (verilog-load-file-at-point t)))
 
-;; ffap isn't useable for Verilog mode. It uses library paths.
+;; ffap isn't usable for Verilog mode. It uses library paths.
 ;; so define this function to do more or less the same as ffap
 ;; but first resolve filename...
 (defun verilog-load-file-at-point (&optional warn)
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 2f06afaa5ef..3a94601768d 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -58,7 +58,7 @@
 ;;   - Word/keyword completion
 ;;   - Block commenting
 ;;   - Code fixing/alignment/beautification
-;;   - Postscript printing
+;;   - PostScript printing
 ;;   - VHDL'87/'93 and VHDL-AMS supported
 ;;   - Comprehensive menu
 ;;   - Fully customizable
@@ -1752,7 +1752,7 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry
 
 (defcustom vhdl-print-two-column t
   "*Non-nil means print code in two columns and landscape format.
-Adjusts settings in a way that postscript printing (\"File\" menu, `ps-print')
+Adjusts settings in a way that PostScript printing (\"File\" menu, `ps-print')
 prints VHDL files in a nice two-column landscape style.
 
 NOTE: Activate the new setting by restarting Emacs.
@@ -1761,7 +1761,7 @@ NOTE: Activate the new setting by restarting Emacs.
   :group 'vhdl-print)
 
 (defcustom vhdl-print-customize-faces t
-  "*Non-nil means use an optimized set of faces for postscript printing.
+  "*Non-nil means use an optimized set of faces for PostScript printing.
 
 NOTE: Activate the new setting by restarting Emacs.
       Overrides `ps-print' settings locally."
@@ -2131,7 +2131,7 @@ Ignore byte-compiler warnings you might see."
   (if (fboundp 'start-itimer)
       (start-itimer "vhdl-mode" function secs repeat t)
 ;    (run-with-idle-timer secs repeat function)))
-    ;; explicitely activate timer (necessary when Emacs is already idle)
+    ;; explicitly activate timer (necessary when Emacs is already idle)
     (aset (run-with-idle-timer secs repeat function) 0 nil)))
 
 (defun vhdl-warning-when-idle (&rest args)
@@ -3117,7 +3117,7 @@ STRING are replaced by `-' and substrings are converted to lower case."
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Menues
+;;; Menus
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -4567,10 +4567,10 @@ Usage:
 
 
   PRINTING:
-    Postscript printing with different faces (an optimized set of faces is
+    PostScript printing with different faces (an optimized set of faces is
     used if `vhdl-print-customize-faces' is non-nil) or colors \(if
     `ps-print-color-p' is non-nil) is possible using the standard Emacs
-    postscript printing commands.  Option `vhdl-print-two-column' defines
+    PostScript printing commands.  Option `vhdl-print-two-column' defines
     appropriate default settings for nice landscape two-column printing.
     The paper format can be set by option `ps-paper-type'.  Do not forget to
     switch `ps-print-color-p' to nil for printing on black-and-white
@@ -12913,10 +12913,10 @@ This does background highlighting of translate-off regions.")
   (font-lock-mode t))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Initialization for postscript printing
+;; Initialization for PostScript printing
 
 (defun vhdl-ps-print-settings ()
-  "Initialize custom face and page settings for postscript printing."
+  "Initialize custom face and page settings for PostScript printing."
   ;; define custom face settings
   (unless (or (not vhdl-print-customize-faces)
               ps-print-color-p)
@@ -12951,7 +12951,7 @@ This does background highlighting of translate-off regions.")
       (set (make-local-variable 'ps-right-margin) 40.0))))
 
 (defun vhdl-ps-print-init ()
-  "Initialize postscript printing."
+  "Initialize PostScript printing."
   (if (featurep 'xemacs)
       (when (boundp 'ps-print-color-p)
         (vhdl-ps-print-settings))
@@ -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/ps-samp.el b/lisp/ps-samp.el
index 8b652b26082..bfdcd91d26a 100644
--- a/lisp/ps-samp.el
+++ b/lisp/ps-samp.el
@@ -237,7 +237,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; If zeroconf is enabled, all CUPS printers can be detected.  The
-;; "Postscript printer" menu will be modified dynamically, as printers
+;; "PostScript printer" menu will be modified dynamically, as printers
 ;; are added or removed.
 
 ;; Preconditions:
@@ -257,7 +257,7 @@
 (require 'printing)
 (require 'zeroconf)
 
-;; Add a Postscript printer to the "Postscript printer" menu.
+;; Add a PostScript printer to the "PostScript printer" menu.
 (defun ps-add-printer (service)
   (let ((name (zeroconf-service-name service))
         (text (zeroconf-service-txt service))
@@ -267,7 +267,7 @@
     ;; `text' is an array of key=value strings like ("Duplex=T" "Copies=T").
     (dolist (string text)
       (let ((split (split-string string "=" t)))
-        ;; If it is a Postscript printer, there must be a string like
+        ;; If it is a PostScript printer, there must be a string like
         ;; "pdl=application/postscript,application/vnd.hp-PCL,...".
         (when (and (string-equal "pdl" (car split))
                    (string-match "application/postscript" (cadr split)))
@@ -288,7 +288,7 @@
                                     "-H" (format "%s:%s" addr port))))
       (pr-update-menus t))))
 
-;; Remove a printer from the "Postscript printer" menu.
+;; Remove a printer from the "PostScript printer" menu.
 (defun ps-remove-printer (service)
   (setq pr-ps-printer-alist
         (delete (assoc (intern (zeroconf-service-name service))
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 79f4eb437d9..2dac870afd5 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -567,7 +567,7 @@ menu-elements (no sub-menu)."
   (if (and l (functionp filter))
       (let ((case-fold-search recentf-case-fold-search)
             elts others)
-        ;; split L into two sub-listes, one of sub-menus elements and
+        ;; split L into two sub-lists, one of sub-menus elements and
         ;; another of single menu elements.
         (dolist (elt l)
           (if (recentf-sub-menu-element-p elt)
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 b1d7d7bfb9e..cdc58e12d00 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -980,7 +980,7 @@ if the cell's value is unchanged and FORCE is nil."
         (error "Circular references: %s" ses--deferred-recalc))
       (message " "))
     ;; Can't use save-excursion here: if the cell under point is updated,
-    ;; save-excusion's marker will move past the cell.
+    ;; save-excursion's marker will move past the cell.
     (goto-char pos)))
 
 
@@ -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
@@ -3204,7 +3204,7 @@ By passing in REST some flags one can configure the way the range
 is read and how it is formatted.
 
 In the sequel we assume that cells A1, B1, A2 B2 have respective values
-1 2 3 and 4 for examplication.
+1 2 3 and 4.
 
 Readout direction is specified by a `>v', '`>^', `<v', `<^',
 `v>', `v<', `^>', `^<' flag. For historical reasons, in absence
@@ -3230,7 +3230,7 @@ vector or a matrix depending on the number of rows, `*1' will
 flatten the result to a one row vector, and `*2' will make a
 matrix whatever the number of rows.
 
-Warning: interaction with Calc is expermimental and may produce
+Warning: interaction with Calc is experimental and may produce
 confusing results if you are not aware of Calc data format. Use
 `math-format-value' as a printer for Calc objects."
   (let (result-row
diff --git a/lisp/shell.el b/lisp/shell.el
index c75594ddbe4..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.
@@ -293,7 +293,7 @@ Value is a list of strings, which may be nil."
                    (getenv "ESHELL") shell-file-name))
          (name (file-name-nondirectory prog)))
     ;; Tell bash not to use readline, except for bash 1.x which
-    ;; doesn't grook --noediting.  Bash 1.x has -nolineediting, but
+    ;; doesn't grok --noediting.  Bash 1.x has -nolineediting, but
     ;; process-send-eof cannot terminate bash if we use it.
     (if (and (not purify-flag)
              (equal name "bash")
diff --git a/lisp/simple.el b/lisp/simple.el
index 90d22c817b0..1dc866cf64d 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -878,6 +878,7 @@ KILLFLAG is set if N was explicitly specified."
 
 (defun mark-whole-buffer ()
   "Put point at beginning and mark at end of buffer.
+If narrowing is in effect, only uses the accessible part of the buffer.
 You probably should not use this function in Lisp programs;
 it is usually a mistake for a Lisp function to use any subroutine
 that uses or sets the mark."
@@ -2408,7 +2409,7 @@ and only used if a buffer is displayed."
                                             1))
                                    1)))
                          ;; Don't use the echo area if the output buffer is
-                         ;; already dispayed in the selected frame.
+                         ;; already displayed in the selected frame.
                          (not (get-buffer-window (current-buffer))))
                     ;; Echo area
                     (goto-char (point-max))
@@ -2657,7 +2658,7 @@ value passed."
 Per default, this variable is always set to `t', meaning that a
 call of `process-file' could potentially change any file on a
 remote host.  When set to `nil', a file handler could optimize
-its behaviour with respect to remote file attributes caching.
+its behavior with respect to remote file attributes caching.
 
 This variable should never be changed by `setq'.  Instead of, it
 shall be set only by let-binding.")
@@ -4276,8 +4277,8 @@ into account variable-width characters and line continuation.
 If nil, `line-move' moves point by logical lines.
 A non-nil setting of `goal-column' overrides the value of this variable
 and forces movement by logical lines.
-Disabling `auto-hscroll-mode' also overrides forces movement by logical
-lines when the window is horizontally scrolled."
+A window that is  horizontally scrolled also forces movement by logical
+lines."
   :type 'boolean
   :group 'editing-basics
   :version "23.1")
@@ -4323,7 +4324,7 @@ lines when the window is horizontally scrolled."
           (when (> rbot 0)
             (set-window-vscroll nil (+ vs (min rbot (frame-char-height))) t)))
          ;; If cursor just entered the bottom scroll margin, move forward,
-         ;; but also vscroll one line so redisplay wont recenter.
+         ;; but also vscroll one line so redisplay won't recenter.
          ((and (> vpos 0)
                (= py (min (- (window-text-height) scroll-margin 1)
                           (1- vpos))))
@@ -4357,12 +4358,10 @@ lines when the window is horizontally scrolled."
     (if (and line-move-visual
              ;; Display-based column are incompatible with goal-column.
              (not goal-column)
-             ;; When auto-hscroll-mode is turned off and the text in
-             ;; the window is scrolled to the left, display-based
-             ;; motion doesn't make sense (because each logical line
-             ;; occupies exactly one screen line).
-             (not (and (null auto-hscroll-mode)
-                       (> (window-hscroll) 0))))
+             ;; When the text in the window is scrolled to the left,
+             ;; display-based motion doesn't make sense (because each
+             ;; logical line occupies exactly one screen line).
+             (not (> (window-hscroll) 0)))
         (line-move-visual arg noerror)
       (line-move-1 arg noerror to-end))))
 
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 3e707ff3832..30642e8f2f7 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -35,7 +35,7 @@ this version is not backward compatible to 0.14 or earlier.")
 ;;
 ;;; Customizing and Developing for speedbar
 ;;
-;; Please see the speedbar manual for informaion.
+;; Please see the speedbar manual for information.
 ;;
 ;;; Notes:
 ;;
@@ -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)
@@ -631,8 +631,8 @@ with `.' followed by extensions, followed by full-filenames."
                                (substring (car extlist) 1)))
         (setq regex2 (concat regex2 (if regex2 "\\|" "") (car extlist))))
       (setq extlist (cdr extlist)))
-    ;; concat all the sub-exressions together, making sure all types
-    ;; of parts exist during concatination.
+    ;; Concatenate all the subexpressions together, making sure all types
+    ;; of parts exist during concatenation.
     (concat "\\("
             (if regex1 (concat "\\(\\.\\(" regex1 "\\)\\)") "")
             (if (and regex1 regex2) "\\|" "")
@@ -1004,7 +1004,7 @@ supported at a time.
                      #'speedbar-frame-mode
                      (if (featurep 'xemacs)
                          (append speedbar-frame-plist
-                                 ;; This is a hack to get speedbar to iconfiy
+                                 ;; This is a hack to get speedbar to iconify
                                  ;; with the selected frame.
                                  (list 'parent (selected-frame)))
                        speedbar-frame-parameters)
@@ -2100,12 +2100,12 @@ cell of the form ( 'DIRLIST . 'FILELIST )."
   (if (= index 0)
       ;; If the shown files variable has extra directories, then
       ;; it is our responsibility to redraw them all
-      ;; Luckilly, the nature of inserting items into this list means
+      ;; Luckily, the nature of inserting items into this list means
       ;; that by reversing it, we can easilly go in the right order
       (let ((sf (cdr (reverse speedbar-shown-directories))))
         (setq speedbar-shown-directories
               (list (expand-file-name default-directory)))
-        ;; exand them all as we find them
+        ;; Expand them all as we find them.
         (while sf
           (if (speedbar-goto-this-file (car sf))
               (progn
@@ -2219,7 +2219,7 @@ passes some tests."
         ;; Go through all our bins  Stick singles into our
         ;; junk-list, everything else as sublsts in work-list.
         ;; If two neighboring lists are both small, make a grouped
-        ;; group combinding those two sub-lists.
+        ;; group combining those two sub-lists.
         (setq diff-idx 0)
         (while (> 256 diff-idx)
           ;; The bins contents are currently in forward order.
@@ -3292,7 +3292,7 @@ With universal argument ARG, flush cached data."
 Optional argument ARG indicates that any cache should be flushed."
   (interactive "P")
   (speedbar-expand-line arg)
-  ;; Now, inside the area expaded here, expand all subnodes of
+  ;; Now, inside the area expanded here, expand all subnodes of
   ;; the same descendant type.
   (save-excursion
     (speedbar-next 1) ;; Move into the list.
@@ -3327,7 +3327,7 @@ current indentation level."
     (speedbar-find-file-in-frame (concat cdd text))
     (speedbar-stealthy-updates)
     (run-hooks 'speedbar-visiting-file-hook)
-    ;; Reset the timer with a new timeout when cliking a file
+    ;; Reset the timer with a new timeout when clicking a file
     ;; in case the user was navigating directories, we can cancel
     ;; that other timer.
     (speedbar-set-timer dframe-update-speed))
@@ -3447,7 +3447,7 @@ INDENT is the current indentation level."
       (select-frame f))
     (speedbar-find-file-in-frame file)
     (save-excursion (speedbar-stealthy-updates))
-    ;; Reset the timer with a new timeout when cliking a file
+    ;; Reset the timer with a new timeout when clicking a file
     ;; in case the user was navigating directories, we can cancel
     ;; that other timer.
     (speedbar-set-timer dframe-update-speed)
diff --git a/lisp/startup.el b/lisp/startup.el
index 842548577c5..877ba1987f6 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1132,7 +1132,7 @@ the `--debug-init' option to view a complete error backtrace."
                   (eq orig-enable-multibyte (default-value
                                               'enable-multibyte-characters)))
         ;; Init file changed to unibyte.  Reset existing multibyte
-        ;; buffers (probably *scratch*, *Messages*, *Minibuff-0*).
+        ;; buffers (probably *scratch*, *Messages*, *Minibuf-0*).
         ;; Arguably this should only be done if they're free of
         ;; multibyte characters.
         (mapc (lambda (buffer)
diff --git a/lisp/subr.el b/lisp/subr.el
index 1cd6598eeb5..6d652f55b29 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1,4 +1,4 @@
-;;; subr.el --- basic lisp subroutines for Emacs
+;;; subr.el --- basic lisp subroutines for Emacs  -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2011
 ;;   Free Software Foundation, Inc.
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index cfa406c2b48..ff528fcc9df 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -142,7 +142,7 @@ This information is useful, but it takes screen space away from file names."
 
 ;; The Tar data is made up of bytes and better manipulated as bytes
 ;; and can be very large, so insert/delete can be costly.  The summary we
-;; want to display may contain non-ascci chars, of course, so we'd like it
+;; want to display may contain non-ascii chars, of course, so we'd like it
 ;; to be multibyte.  We used to keep both in the same buffer and switch
 ;; from/to uni/multibyte.  But this had several downsides:
 ;; - set-buffer-multibyte has an O(N^2) worst case that tends to be triggered
diff --git a/lisp/term.el b/lisp/term.el
index 87e5a734701..dc5ae29ffd2 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -294,7 +294,7 @@
 ;;   # Notice that the ^[ character is an ESC, not two chars.  You can
 ;;   # get it in various ways, for example by typing
 ;;   # echo -e '\033' > escape.file
-;;   # or by using your favourite editor
+;;   # or by using your favorite editor
 ;;
 ;;              foreach temp (cd pushd)
 ;;                      alias $temp "$temp \!* ; echo 'AnSiTc' $cwd_hack"
@@ -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/term/internal.el b/lisp/term/internal.el
index 43b799df1c9..a43864e36d6 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -68,7 +68,7 @@
 ;;   MULE charset, Emacs can display a single MULE charset with the
 ;;   glyphs of the current codepage.  When Emacs starts on DOS, it
 ;;   automatically sets its default coding systems for file I/O and
-;;   terminal output according to the currend DOS codepage, given by
+;;   terminal output according to the current DOS codepage, given by
 ;;   the `dos-codepage' variable.
 ;;
 ;;   This leaves us with the problem of displaying character sets
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el
index 490c06148a9..574b8389818 100644
--- a/lisp/term/iris-ansi.el
+++ b/lisp/term/iris-ansi.el
@@ -136,7 +136,7 @@
 
     (define-key map "\e[Z" [?\S-\t])
     (define-key map "\e[072q" [?\C-\t])
-    ;; This only works if you remove the M-TAB keybing from the system.4Dwmrc
+    ;; This only works if you remove the M-TAB keyring from the system.4Dwmrc
     ;; our your ~/.4Dwmrc, if you use the 4Dwm window manager.
     (define-key map "\e[073q" [?\M-\t])
 
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 646b65abc60..db826f1db8a 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -513,9 +513,6 @@ unless the current buffer is a scratch buffer."
 
 ;;;; Frame-related functions.
 
-;; Don't show the frame name; that's redundant with Nextstep.
-(setq-default mode-line-frame-identification '("  "))
-
 ;; nsterm.m
 (defvar ns-alternate-modifier)
 (defvar ns-right-alternate-modifier)
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 4cb88f6bd23..284c164150d 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -134,7 +134,7 @@
 ;; terminal-initialization function.  Also, our handling of reverse
 ;; video is slightly different.
 (defun msdos-create-frame-with-faces (&optional parameters)
-  "Create an frame on MS-DOS display.
+  "Create a frame on MS-DOS display.
 Optional frame parameters PARAMETERS specify the frame parameters.
 Parameters not specified by PARAMETERS are taken from
 `default-frame-alist'.  If either PARAMETERS or `default-frame-alist'
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index 0e9de519c8c..14c4ce1c8b7 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -114,11 +114,11 @@
 
 (defvar rxvt-alternatives-map
   (let ((map (make-sparse-keymap)))
-    ;; The terminal intialization C code file might have initialized
+    ;; The terminal initialization C code file might have initialized
     ;; function keys F11->F42 from the termcap/terminfo information.  On
     ;; a PC-style keyboard these keys correspond to
     ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-.  The
-    ;; code here subsitutes the corresponding defintions in
+    ;; code here subsitutes the corresponding definitions in
     ;; function-key-map.  This substitution is needed because if a key
     ;; definition if found in function-key-map, there are no further
     ;; lookups in other keymaps.
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index 9a900916830..d62db664d21 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -76,7 +76,7 @@
 ;; defined for the MS-DOS and MS-Windows consoles, because the users
 ;; on those systems expect these colors to be available.
 ;;
-;; For these reasons, package maintaners are advised NOT to use color
+;; For these reasons, package maintainers are advised NOT to use color
 ;; names such as "lightred" or "lightblue", because they will have
 ;; different effect on different displays.  Instead, use "red1" and
 ;; "blue1", respectively.
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index e3c42626a3f..05e18ed24a0 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1226,7 +1226,7 @@ The value nil is the same as the list (UTF8_STRING COMPOUND_TEXT STRING)."
         (if (string= clip-text "") (setq clip-text nil))
 
         ;; Check the CLIPBOARD selection for 'newness', is it different
-        ;; from what we remebered them to be last time we did a
+        ;; from what we remembered them to be last time we did a
         ;; cut/paste operation.
         (setq clip-text
               (cond ;; check clipboard
@@ -1243,7 +1243,7 @@ The value nil is the same as the list (UTF8_STRING COMPOUND_TEXT STRING)."
       (when x-select-enable-primary
         (setq primary-text (x-selection-value-internal 'PRIMARY))
         ;; Check the PRIMARY selection for 'newness', is it different
-        ;; from what we remebered them to be last time we did a
+        ;; from what we remembered them to be last time we did a
         ;; cut/paste operation.
         (setq primary-text
               (cond ;; check primary selection
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 47da0bf4de5..c2856660ea8 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -460,7 +460,7 @@ features.  Set to nil to skip the checks."
   "Terminal initialization function for xterm."
   ;; rxvt terminals sometimes set the TERM variable to "xterm", but
   ;; rxvt's keybindings are incompatible with xterm's. It is
-  ;; better in that case to use rxvt's initializion function.
+  ;; better in that case to use rxvt's initialization function.
   (if (and (getenv "COLORTERM" (selected-frame))
            (string-match "\\`rxvt" (getenv "COLORTERM" (selected-frame))))
       (tty-run-terminal-initialization (selected-frame) "rxvt")
diff --git a/lisp/terminal.el b/lisp/terminal.el
index 6fdaecf9c9c..99f652f7df4 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -1285,7 +1285,7 @@ in the directory specified by `te-terminfo-directory'."
         ;; Rename it to the desired name.
         ;; We use this roundabout approach
         ;; to avoid any risk of writing a name that
-        ;; was michievouslyt set up as a symlink.
+        ;; was mischievously set up as a symlink.
         (rename-file temp-file file-name))
       ;; Now compile that source to make the binary that the
       ;; programs actually use.
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index 2325d7b26ff..d13437f4c7c 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -2263,7 +2263,7 @@ Returns a DIRECTION, a number 0--7, coded as follows:
 
 
 ;; Things for drawing lines in all directions.
-;; The line drawing engine is the eight-point alrogithm.
+;; The line drawing engine is the eight-point algorithm.
 ;;
 ;; A line is here a list of (x y saved-char new-char)s.
 ;;
@@ -2437,7 +2437,7 @@ in the coord."
     point-list))
 
 ;; artist-save-chars-under-point-list
-;; Remebers the chars that were there before we did draw the line.
+;; Remembers the chars that were there before we did draw the line.
 ;; Returns point-list.
 ;;
 (defun artist-save-chars-under-point-list (point-list)
@@ -2514,7 +2514,7 @@ This function returns a point-list."
 
 
 ;;
-;; functions for accessing endoints and elements in object requiring
+;; functions for accessing endpoints and elements in object requiring
 ;; 2 endpoints
 ;;
 
@@ -3582,7 +3582,7 @@ FILL-INFO is a list of vectors on the form [X Y ELLIPSE-WIDTH-ON-THIS-LINE]."
          (width (abs (- x2 x1)))
          (height (abs (- y2 y1)))
          ;; When drawing our circle, we want it to through the cursor
-         ;; just as when drawing the ellispe, but we have to take
+         ;; just as when drawing the ellipse, but we have to take
          ;; care for the aspect-ratio.
          ;; The equation for the ellipse  (where a is the x-radius and
          ;; b is the y-radius):
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 741b6cd904c..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
@@ -3941,7 +3941,7 @@ If `bibtex-files' is non-nil, search all these files.
 Otherwise the search is limited to the current buffer.
 Return position of entry if CROSSREF-KEY is found or nil otherwise.
 If CROSSREF-KEY is in the same buffer like current entry but before it
-an error is signaled.  If NOERRER is non-nil this error is suppressed.
+an error is signaled.  If NOERROR is non-nil this error is suppressed.
 Optional arg PNT is the position of the referencing entry.  It defaults
 to position of point.  If optional arg SPLIT is non-nil, split window
 so that both the referencing and the crossrefed entry are displayed.
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/flyspell.el b/lisp/textmodes/flyspell.el
index a5099311307..d54debcec4c 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -715,7 +715,7 @@ not the very same deplacement command."
   (remove-hook 'after-change-functions 'flyspell-after-change-function t)
   (remove-hook 'hack-local-variables-hook
                (function flyspell-hack-local-variables-hook) t)
-  ;; we remove all the flyspell hilightings
+  ;; we remove all the flyspell highlightings
   (flyspell-delete-all-overlays)
   ;; we have to erase pre cache variables
   (setq flyspell-pre-buffer nil)
@@ -1446,7 +1446,7 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
                              ;; is used, string is a TeX command
                              ;; (char before beginning of word is
                              ;; backslash) and none of the previous
-                             ;; contitions match
+                             ;; conditions match.
                              (and (not ispell-really-aspell)
                                   (save-excursion
                                     (goto-char (- (nth 1 found-list) 1))
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index d22346b518b..704fad4fb3b 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2284,7 +2284,7 @@ Otherwise the variable `ispell-grep-command' contains the command used to
 search for the words (usually egrep).
 
 Optional second argument contains the dictionary to use; the default is
-`ispell-alternate-dictionary', overriden by `ispell-complete-word-dict'
+`ispell-alternate-dictionary', overridden by `ispell-complete-word-dict'
 if defined."
   ;; We don't use the filter for this function, rather the result is written
   ;; into a buffer.  Hence there is no need to save the filter values.
@@ -3503,7 +3503,7 @@ Don't read buffer-local settings or word lists."
              '(
                ;; Don't spell check signatures
                "^-- $"
-               ;; Matches postscript files.
+               ;; Matches PostScript files.
                ;;"^%!PS-Adobe-[123].0"
                ;; Matches uuencoded text
                ;;"^begin [0-9][0-9][0-9] .*\nM.*\nM.*\nM"
diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index 6e73fda662b..91f6624e7a3 100644
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -435,7 +435,7 @@ REVERSE (non-nil means reverse order), BEG and END (region to sort)."
                            (skip-chars-forward " \t\n")
                            ))
 
-               ;; ENDRECFUN is is called with point within the record.
+               ;; ENDRECFUN is called with point within the record.
                ;; It should move point to the end of the record.
                (function (lambda ()
                            (if (re-search-forward
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index 78d80da41ac..eb0e734080e 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -69,7 +69,7 @@
   (unless (eq (get 'reftex-default-bibliography :reftex-raw)
               reftex-default-bibliography)
     (put 'reftex-default-bibliography :reftex-expanded
-         (reftex-locate-bibliography-files 
+         (reftex-locate-bibliography-files
           default-directory reftex-default-bibliography))
     (put 'reftex-default-bibliography :reftex-raw
          reftex-default-bibliography))
@@ -128,7 +128,7 @@
   ;; If RETURN is non-nil, just return the entry and restore point.
 
   (let* ((re
-          (if item 
+          (if item
               (concat "\\\\bibitem\\(\\[[^]]*\\]\\)?{" (regexp-quote key) "}")
             (concat "@[a-zA-Z]+[ \t\n\r]*[{(][ \t\n\r]*" (regexp-quote key)
                     "[, \t\r\n}]")))
@@ -152,7 +152,7 @@
           (when return
             ;; Just return the relevant entry
             (if item (goto-char (match-end 0)))
-            (setq return (buffer-substring 
+            (setq return (buffer-substring
                           (point) (reftex-end-of-bib-entry item)))
             (goto-char oldpos) ;; restore point.
             (set-buffer buffer-conf)
@@ -169,9 +169,9 @@
         (error "No BibTeX entry with citation key %s" key)))))
 
 (defun reftex-end-of-bib-entry (item)
-  (save-excursion 
+  (save-excursion
     (condition-case nil
-        (if item 
+        (if item
             (progn (end-of-line)
                    (re-search-forward
                     "\\\\bibitem\\|\\end{thebibliography}")
@@ -192,16 +192,16 @@
 
     ;; Read a regexp, completing on known citation keys.
     (setq default (regexp-quote (reftex-get-bibkey-default)))
-    (setq re-list 
-          (split-string 
-           (completing-read 
+    (setq re-list
+          (split-string
+           (completing-read
             (concat
              "Regex { && Regex...}: "
              "[" default "]: ")
             (if reftex-mode
                 (if (fboundp 'LaTeX-bibitem-list)
                     (LaTeX-bibitem-list)
-                  (cdr (assoc 'bibview-cache 
+                  (cdr (assoc 'bibview-cache
                               (symbol-value reftex-docstruct-symbol))))
               nil)
             nil nil nil 'reftex-cite-regexp-hist)
@@ -248,7 +248,7 @@
                    (error (goto-char key-point)
                           (throw 'search-again nil)))
                  (setq end-point (point))
-                 
+
                  ;; Ignore @string, @comment and @c entries or things
                  ;; outside entries
                  (when (or (string= (downcase (match-string 2)) "string")
@@ -257,12 +257,12 @@
                            (< (point) key-point)) ; this means match not in {}
                    (goto-char key-point)
                    (throw 'search-again nil))
-                 
+
                  ;; Well, we have got a match
                  ;;(setq entry (concat
                  ;;             (buffer-substring start-point (point)) "\n"))
                  (setq entry (buffer-substring start-point (point)))
-                 
+
                  ;; Check if other regexp match as well
                  (setq re-list rest-re)
                  (while re-list
@@ -270,24 +270,24 @@
                      ;; nope - move on
                      (throw 'search-again nil))
                    (pop re-list))
-                 
+
                  (setq alist (reftex-parse-bibtex-entry
                               nil start-point end-point))
                  (push (cons "&entry" entry) alist)
-                 
+
                  ;; check for crossref entries
                  (if (assoc "crossref" alist)
                      (setq alist
                            (append
                             alist (reftex-get-crossref-alist alist))))
-                 
+
                  ;; format the entry
                  (push (cons "&formatted" (reftex-format-bib-entry alist))
                        alist)
-                 
+
                  ;; make key the first element
                  (push (reftex-get-bib-field "&key" alist) alist)
-                 
+
                  ;; add it to the list
                  (push alist found-list)))))
           (reftex-kill-temporary-buffers))))
@@ -350,7 +350,7 @@
     (unless files
       (error "Need file name to find thebibliography environment"))
     (while (setq file (pop files))
-      (setq buf (reftex-get-file-buffer-force 
+      (setq buf (reftex-get-file-buffer-force
                  file (not reftex-keep-temporary-buffers)))
       (unless buf
         (error "No such file %s" file))
@@ -386,16 +386,16 @@
 
     ;; Read a regexp, completing on known citation keys.
     (setq default (regexp-quote (reftex-get-bibkey-default)))
-    (setq re-list 
-          (split-string 
-           (completing-read 
+    (setq re-list
+          (split-string
+           (completing-read
             (concat
              "Regex { && Regex...}: "
              "[" default "]: ")
             (if reftex-mode
                 (if (fboundp 'LaTeX-bibitem-list)
                     (LaTeX-bibitem-list)
-                  (cdr (assoc 'bibview-cache 
+                  (cdr (assoc 'bibview-cache
                               (symbol-value reftex-docstruct-symbol))))
               nil)
             nil nil nil 'reftex-cite-regexp-hist)
@@ -408,14 +408,14 @@
         (error "Empty regular expression"))
 
     (while (and (setq re (pop re-list)) entries)
-      (setq entries 
+      (setq entries
             (delq nil (mapcar
                        (lambda (x)
                          (if (string-match re (cdr (assoc "&entry" x)))
                              x nil))
                        entries))))
-    (setq entries 
-          (mapcar 
+    (setq entries
+          (mapcar
             (lambda (x)
               (push (cons "&formatted" (reftex-format-bibitem x)) x)
               (push (reftex-get-bib-field "&key" x) x)
@@ -655,12 +655,12 @@ While entering the regexp, completion on knows citation keys is possible.
 
     (when (eq (car selected-entries) 'concat)
       ;; All keys go into a single command - we need to trick a little
-      ;; FIXME: Unfortunately, this meens that commenting does not work right.
+      ;; FIXME: Unfortunately, this means that commenting does not work right.
       (pop selected-entries)
       (let ((concat-keys (mapconcat 'car selected-entries ",")))
-        (setq insert-entries 
+        (setq insert-entries
               (list (list concat-keys (cons "&key" concat-keys))))))
-    
+
     (unless no-insert
 
       ;; We shall insert this into the buffer...
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index 9b924ba7ad9..7de15c66cec 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -59,7 +59,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'."
             (error "Not on a crossref macro argument"))
 
       (setq reftex-call-back-to-this-buffer (current-buffer))
-      
+
       (cond
        ((string-match "\\`\\\\cite\\|cite\\*?\\'\\|bibentry" macro)
         ;; A citation macro: search for bibitems or BibTeX entries
@@ -87,7 +87,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'."
                   (format reftex-find-index-entry-regexp-format
                           (regexp-quote key))
                   3 nil nil)))
-       (t 
+       (t
         (reftex-access-scan-info arg)
         (catch 'exit
           (let ((list reftex-view-crossref-extra)
@@ -97,14 +97,14 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'."
                     action (nth 1 entry)
                     group (nth 2 entry))
               (when (string-match mre macro)
-                (setq dw (reftex-view-regexp-match 
+                (setq dw (reftex-view-regexp-match
                           (format action key) group nil nil))
                 (throw 'exit t))))
           (error "Not on a crossref macro argument"))))
       (if (and (eq arg 2) (windowp dw)) (select-window dw)))))
-     
+
 (defun reftex-view-cr-cite (arg key how)
-  ;; View crossreference of a ref cite.  HOW can have the values 
+  ;; View crossreference of a ref cite.  HOW can have the values
   ;; nil:         Show in another window.
   ;; echo:        Show one-line info in echo area.
   ;; tmp-window:  Show in small window and arrange for window to disappear.
@@ -114,7 +114,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'."
 
   (if (eq how 'tmp-window)
       ;; Remember the window configuration
-      (put 'reftex-auto-view-crossref 'last-window-conf 
+      (put 'reftex-auto-view-crossref 'last-window-conf
            (current-window-configuration)))
 
   (let (files size item (pos (point)) (win (selected-window)) pop-win
@@ -130,7 +130,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'."
       (setq item t
             files (reftex-uniquify
                    (mapcar 'cdr
-                           (reftex-all-assq 
+                           (reftex-all-assq
                             'thebib (symbol-value reftex-docstruct-symbol))))))
      (reftex-default-bibliography
       (setq item nil
@@ -169,17 +169,17 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'."
         (select-window pop-win)))))
 
 (defun reftex-view-cr-ref (arg label how)
-  ;; View crossreference of a ref macro.  HOW can have the values 
+  ;; View crossreference of a ref macro.  HOW can have the values
   ;; nil:         Show in another window.
   ;; echo:        Show one-line info in echo area.
   ;; tmp-window:  Show in small window and arrange for window to disappear.
 
   ;; Ensure access to scanning info
   (reftex-access-scan-info (or arg current-prefix-arg))
-  
+
   (if (eq how 'tmp-window)
       ;; Remember the window configuration
-      (put 'reftex-auto-view-crossref 'last-window-conf 
+      (put 'reftex-auto-view-crossref 'last-window-conf
            (current-window-configuration)))
 
   (let* ((xr-data (assoc 'xr (symbol-value reftex-docstruct-symbol)))
@@ -191,14 +191,14 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'."
         ;; Label is defined in external document
         (save-excursion
           (save-match-data
-            (set-buffer 
+            (set-buffer
              (or (reftex-get-file-buffer-force
                   (cdr (assoc (match-string 1 label) (nth 1
                                                           xr-data))))
                  (error "Problem with external label %s" label))))
           (setq label (substring label (match-end 1)))
           (reftex-access-scan-info)
-          (setq entry 
+          (setq entry
                 (assoc label (symbol-value reftex-docstruct-symbol)))))
     (if (eq how 'echo)
         ;; Display in echo area
@@ -234,7 +234,7 @@ With argument, actually select the window showing the cross reference."
 
 (defun reftex-view-crossref-when-idle ()
   ;; Display info about crossref at point in echo area or a window.
-  ;; This function was desigend to work with an idle timer.
+  ;; This function was designed to work with an idle timer.
   ;; We try to get out of here as quickly as possible if the call is useless.
   (and reftex-mode
        ;; Make sure message area is free if we need it.
@@ -244,7 +244,7 @@ With argument, actually select the window showing the cross reference."
                                  reftex-mouse-view-crossref)))
        ;; Quick precheck if this might be a relevant spot
        ;; `reftex-view-crossref' will do a more thorough check.
-       (save-excursion  
+       (save-excursion
          (search-backward "\\" nil t)
          (looking-at "\\\\[a-zA-Z]*\\(cite\\|ref\\|bibentry\\)"))
 
@@ -262,12 +262,12 @@ With argument, actually select the window showing the cross reference."
   (set-window-configuration (get 'reftex-auto-view-crossref 'last-window-conf))
   (put 'reftex-auto-view-crossref 'last-window-conf nil)
   (remove-hook 'pre-command-hook 'reftex-restore-window-conf))
-                  
+
 (defun reftex-echo-ref (label entry docstruct)
   ;; Display crossref info in echo area.
   (cond
    ((null docstruct)
-    (message "%s" 
+    (message "%s"
              (substitute-command-keys (format reftex-no-info-message "ref"))))
    ((null entry)
     (message "ref: unknown label: %s" label))
@@ -293,14 +293,14 @@ With argument, actually select the window showing the cross reference."
       (unless reftex-revisit-to-echo
         (setq files (reftex-visited-files files)))
 
-      (setq entry 
+      (setq entry
             (condition-case nil
                 (save-excursion
                   (reftex-pop-to-bibtex-entry key files nil nil item t))
               (error
                (if (and files (= (length all-files) (length files)))
                    (message "cite: no such database entry: %s" key)
-                 (message "%s" (substitute-command-keys 
+                 (message "%s" (substitute-command-keys
                                 (format reftex-no-info-message "cite"))))
                nil)))
       (when entry
@@ -337,7 +337,7 @@ will display info in the echo area."
           (if (featurep 'xemacs)
               (if reftex-use-itimer-in-xemacs
                   (start-itimer "RefTeX Idle Timer"
-                                'reftex-view-crossref-when-idle 
+                                'reftex-view-crossref-when-idle
                                 reftex-idle-time reftex-idle-time t)
                 (add-hook 'post-command-hook 'reftex-start-itimer-once)
                 t)
@@ -352,7 +352,7 @@ will display info in the echo area."
         (not (itimer-live-p reftex-auto-view-crossref-timer))
         (setq reftex-auto-view-crossref-timer
               (start-itimer "RefTeX Idle Timer"
-                            'reftex-view-crossref-when-idle 
+                            'reftex-view-crossref-when-idle
                             reftex-idle-time nil t))))
 
 (declare-function bibtex-beginning-of-entry "bibtex" ())
@@ -364,7 +364,7 @@ prompts upon first use for a buffer in RefTeX mode.  To reset this
 link to a document, call the function with with a prefix arg.
 Calling this function several times find successive citation locations."
   (interactive "P")
-  (when arg 
+  (when arg
     ;; Break connection to reference buffer
     (put 'reftex-bibtex-view-cite-locations :ref-buffer nil))
   (let ((ref-buffer (get 'reftex-bibtex-view-cite-locations :ref-buffer)))
@@ -372,10 +372,10 @@ Calling this function several times find successive citation locations."
     (unless ref-buffer
       (setq ref-buffer
             (save-current-buffer
-              (completing-read 
+              (completing-read
                "Reference buffer: "
                (delq nil
-                     (mapcar 
+                     (mapcar
                       (lambda (b)
                         (set-buffer b)
                         (if reftex-mode (list (buffer-name b)) nil))
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index ccdab49750b..bf46635c479 100644
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -139,7 +139,7 @@ No active TAGS table is required."
     (set (make-local-variable 'TeX-master) master)
     (erase-buffer)
     (insert "                MULTIPLE LABELS IN CURRENT DOCUMENT:\n")
-    (insert 
+    (insert
      " Move point to label and type `r' to run a query-replace on the label\n"
      " and its references.  Type `q' to exit this buffer.\n\n")
     (insert " LABEL               FILE\n")
@@ -190,15 +190,15 @@ This command should be used with care, in particular in multifile
 documents.  You should not use it if another document refers to this
 one with the `xr' package."
   (interactive)
-  ;; Resan the entire document
+  ;; Rescan the entire document
   (reftex-access-scan-info 1)
   ;; Get some insurance
   (if (and (reftex-is-multi)
            (not (yes-or-no-p "Replacing all simple labels in multiple files is risky.  Continue? ")))
       (error "Abort"))
   ;; Make the translation list
-  (let* ((re-core (concat "\\(" 
-                          (mapconcat 'cdr reftex-typekey-to-prefix-alist "\\|") 
+  (let* ((re-core (concat "\\("
+                          (mapconcat 'cdr reftex-typekey-to-prefix-alist "\\|")
                           "\\)"))
          (label-re (concat "\\`" re-core "\\([0-9]+\\)\\'"))
          (search-re (concat "[{,]\\(" re-core "\\([0-9]+\\)\\)[,}]"))
@@ -230,12 +230,12 @@ one with the `xr' package."
     ;; Save all document buffers before this operation
     (reftex-save-all-document-buffers)
 
-    ;; First test to check for erros
-    (setq n (reftex-translate 
+    ;; First test to check for errors.
+    (setq n (reftex-translate
              files search-re translate-alist error-fmt 'test))
 
     ;; Now the real thing.
-    (if (yes-or-no-p 
+    (if (yes-or-no-p
          (format "Replace %d items at %d places in %d files? "
                  (length translate-alist) n (length files)))
         (progn
@@ -253,9 +253,9 @@ one with the `xr' package."
 
 (defun reftex-translate (files search-re translate-alist error-fmt test)
   ;; In FILES, look for SEARCH-RE and replace match 1 of it with
-  ;; its association in TRANSLATE-ALSIT.  
+  ;; its association in TRANSLATE-ALIST.
   ;; If we do not find an association and TEST is non-nil, query
-  ;; to ignore the problematic string.  
+  ;; to ignore the problematic string.
   ;; If TEST is nil, it is ignored without query.
   ;; Return the number of replacements.
   (let ((n 0) file label match-data buf macro pos cell)
@@ -281,7 +281,7 @@ one with the `xr' package."
                          (or (looking-at "\\\\ref")
                              (looking-at "\\\\[a-zA-Z]*ref\\(range\\)?[^a-zA-Z]")
                              (looking-at "\\\\ref[a-zA-Z]*[^a-zA-Z]")
-                             (looking-at (format 
+                             (looking-at (format
                                           reftex-find-label-regexp-format
                                           (regexp-quote label)))))
                 ;; OK, we should replace it.
@@ -351,7 +351,7 @@ Also checks if buffers visiting the files are in read-only mode."
 
 (defun reftex-isearch-wrap-function ()
   (if (not isearch-word)
-      (switch-to-buffer 
+      (switch-to-buffer
        (funcall isearch-next-buffer-function (current-buffer) t)))
   (goto-char (if isearch-forward (point-min) (point-max))))
 
@@ -435,7 +435,7 @@ With no argument, this command toggles
 `reftex-isearch-minor-mode' on if ARG is positive, otherwise turn it off."
   (interactive "P")
   (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode))
-    (setq reftex-isearch-minor-mode 
+    (setq reftex-isearch-minor-mode
           (not (or (and (null arg) reftex-isearch-minor-mode)
                    (<= (prefix-numeric-value arg) 0))))
     (unless (eq reftex-isearch-minor-mode old-reftex-isearch-minor-mode)
@@ -471,7 +471,7 @@ With no argument, this command toggles
     ;; Force modeline redisplay.
     (set-buffer-modified-p (buffer-modified-p))))
 
-(add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil 
+(add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil
                 'reftex-isearch-minor-mode)
 
 ;;; reftex-global.el ends here
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 79df6135806..f0ceaa74d26 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -663,7 +663,7 @@ SPC=view TAB=goto RET=goto+hide [e]dit [q]uit [r]escan [f]ollow [?]Help
     (insert "\n")))
 
 (defun reftex-get-restriction (arg docstruct)
-  ;; Interprete the prefix ARG and derive index restriction specs.
+  ;; Interpret the prefix ARG and derive index restriction specs.
   (let* ((beg (min (point) (or (condition-case nil (mark) (error nil))
                                (point-max))))
          (end (max (point) (or (condition-case nil (mark) (error nil))
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index 4d6b5e5fb83..1a0f7ec5836 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -711,7 +711,7 @@ of master file."
                                    context)
                  (when (and (not appendix)
                             (>= (string-to-char (match-string 2)) ?A))
-                   ;; Just entered the appendex.  Get out.
+                   ;; Just entered the appendix.  Get out.
                    (throw 'exit nil))
 
                  ;; Change the section number.
diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el
index b47f2f6c2e9..d622603236e 100644
--- a/lisp/textmodes/reftex-ref.el
+++ b/lisp/textmodes/reftex-ref.el
@@ -206,7 +206,7 @@ This function is controlled by the settings of reftex-insert-label-flags."
                          (if naked "Naked Label: " "Label: ")
                          default))
 
-            ;; Lets make sure that this is a valid label
+            ;; Let's make sure that this is a valid label
             (cond
 
              ((string-match (concat "\\`\\(" (regexp-quote prefix)
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index 37983d17931..25be64a3af2 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -33,7 +33,7 @@
 
 (defvar reftex-toc-mode-map
   (let ((map (make-sparse-keymap)))
-    
+
     (define-key map (if (featurep 'xemacs) [(button2)] [(mouse-2)])
       'reftex-toc-mouse-goto-line-and-hide)
     (define-key map [follow-link] 'mouse-face)
@@ -170,15 +170,15 @@ Here are all local bindings.
 
 
 (defvar reftex-toc-return-marker (make-marker)
-  "Marker which makes it possible to return from toc to old position.")
+  "Marker which makes it possible to return from TOC to old position.")
 
 (defconst reftex-toc-help
 "                      AVAILABLE KEYS IN TOC BUFFER
                       ============================
 n / p      next-line / previous-line
 SPC        Show the corresponding location of the LaTeX document.
-TAB        Goto the location and keep the *toc* window.
-RET        Goto the location and hide the *toc* window (also on mouse-2).
+TAB        Goto the location and keep the TOC window.
+RET        Goto the location and hide the TOC window (also on mouse-2).
 < / >      Promote / Demote section, or all sections in region.
 C-c >      Display Index. With prefix arg, restrict index to current section.
 q / k      Hide/Kill *toc* buffer, return to position of reftex-toc command.
@@ -287,7 +287,7 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help
       (setq offset
             (reftex-insert-docstruct
              this-buf
-             t ; include toc
+             t ; include TOC
              reftex-toc-include-labels
              reftex-toc-include-index-entries
              reftex-toc-include-file-boundaries
@@ -296,7 +296,7 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help
              nil ; commented
              here-I-am
              ""     ; xr-prefix
-             t      ; a toc buffer
+             t      ; a TOC buffer
              ))
 
       (run-hooks 'reftex-display-copied-context-hook)
@@ -391,7 +391,7 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help
                 (frame-parameter  frame 'name))
               "RefTeX TOC Frame")))
     (if (and res error)
-        (error "This frame is view-only.  Use `C-c =' to create toc window for commands"))
+        (error "This frame is view-only.  Use `C-c =' to create TOC window for commands"))
     res))
 
 (defun reftex-toc-show-help ()
@@ -421,14 +421,14 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help
   (goto-char (or (previous-single-property-change (point) :data)
                  (point))))
 (defun reftex-toc-next-heading (&optional arg)
-  "Move to next table of contentes line."
+  "Move to next table of contents line."
   (interactive "p")
   (when (featurep 'xemacs) (setq zmacs-region-stays t))
   (end-of-line)
   (re-search-forward "^ " nil t arg)
   (beginning-of-line))
 (defun reftex-toc-previous-heading (&optional arg)
-  "Move to previous table of contentes line."
+  "Move to previous table of contents line."
   (interactive "p")
   (when (featurep 'xemacs) (setq zmacs-region-stays t))
   (re-search-backward "^ " nil t arg))
@@ -468,9 +468,9 @@ Label context is only displayed when the labels are there as well."
   (setq reftex-toc-include-context (not reftex-toc-include-context))
   (reftex-toc-revert))
 (defun reftex-toc-max-level (arg)
-  "Set the maximum level of toc lines in this buffer to value of prefix ARG.
+  "Set the maximum level of TOC lines in this buffer to value of prefix ARG.
 When no prefix is given, set the max level to a large number, so that all
-levels are shown.  For eaxample, to set the level to 3, type `3 m'."
+levels are shown.  For example, to set the level to 3, type `3 m'."
   (interactive "P")
   (setq reftex-toc-max-level (if arg
                                  (prefix-numeric-value arg)
@@ -484,23 +484,23 @@ levels are shown.  For eaxample, to set the level to 3, type `3 m'."
   (reftex-toc-dframe-p nil 'error)
   (reftex-toc-visit-location))
 (defun reftex-toc-goto-line-and-hide ()
-  "Go to document location in other window.  Hide the *toc* window."
+  "Go to document location in other window.  Hide the TOC window."
   (interactive)
   (reftex-toc-dframe-p nil 'error)
   (reftex-toc-visit-location 'hide))
 (defun reftex-toc-goto-line ()
-  "Go to document location in other window. *toc* window stays."
+  "Go to document location in other window.  TOC window stays."
   (interactive)
   (reftex-toc-dframe-p nil 'error)
   (reftex-toc-visit-location t))
 (defun reftex-toc-mouse-goto-line-and-hide (ev)
-  "Go to document location in other window.  Hide the *toc* window."
+  "Go to document location in other window.  Hide the TOC window."
   (interactive "e")
   (mouse-set-point ev)
   (reftex-toc-dframe-p nil 'error)
   (reftex-toc-visit-location 'hide))
 (defun reftex-toc-show-calling-point ()
-  "Show point where reftex-toc was called from."
+  "Show point where `reftex-toc' was called from."
   (interactive)
   (reftex-toc-dframe-p nil 'error)
   (let ((this-window (selected-window)))
@@ -512,8 +512,8 @@ levels are shown.  For eaxample, to set the level to 3, type `3 m'."
           (recenter '(4)))
       (select-window this-window))))
 (defun reftex-toc-quit ()
-  "Hide the *toc* window and do not move point.
-If the toc window is the only window on the dedicated TOC frame, the frame
+  "Hide the TOC window and do not move point.
+If the TOC window is the only window on the dedicated TOC frame, the frame
 is destroyed."
   (interactive)
   (if (and (one-window-p)
@@ -584,7 +584,7 @@ With prefix arg 1, restrict index to the section at point."
     (reftex-toc)))
 
 (defun reftex-toc-revert (&rest ignore)
-  "Regenerate the *toc* from the internal lists."
+  "Regenerate the TOC from the internal lists."
   (interactive)
   (let ((unsplittable
          (if (fboundp 'frame-property)
@@ -618,7 +618,7 @@ With prefix arg 1, restrict index to the section at point."
 
 (defun reftex-toc-jump (arg)
   "Jump to a specific section.  E.g. '3 z' jumps to section 3.
-Useful for large TOC's."
+Useful for large TOCs."
   (interactive "P")
   (goto-char (point-min))
   (re-search-forward
@@ -642,7 +642,7 @@ Useful for large TOC's."
   (interactive "p")
   (reftex-toc-do-promote -1))
 (defun reftex-toc-do-promote (delta)
-  "Workhorse for reftex-toc-promote and reftex-to-demote.
+  "Workhorse for `reftex-toc-promote' and `reftex-toc-demote'.
 Changes the level of sections in the current region, or just the section at
 point."
   ;; We should not do anything unless we are sure this is going to work for
@@ -660,7 +660,7 @@ point."
     (setq msg
           (catch 'exit
             (if (reftex-region-active-p)
-                ;; A region is dangerous, check if we have a brandnew scan,
+                ;; A region is dangerous, check if we have a brand new scan,
                 ;; to make sure we are not missing any section statements.
                 (if (not (reftex-toc-check-docstruct))
                     (reftex-toc-load-all-files-for-promotion)   ;; exits
@@ -728,8 +728,8 @@ point."
               deactivate-mark nil)))))
 
 (defun reftex-toc-promote-prepare (x delta)
-  "Look at a toc entry and see if we could pro/demote it.
-This function prepares everything for the changes, but does not do it.
+  "Look at a TOC entry and see if we could pro/demote it.
+This function prepares everything for the change, but does not do it.
 The return value is a list with information needed when doing the
 promotion/demotion later.  DELTA is the level change."
   (let* ((data (car x))
@@ -779,7 +779,7 @@ promotion/demotion later.  DELTA is the level change."
       (error "Cannot %smote \\%s" pro-or-de name))))
 
 (defun reftex-toc-promote-action (x)
-  "Change the level of a toc entry.
+  "Change the level of a TOC entry.
 PRO-OR-DE is assumed to be dynamically scoped into this function."
   (let* ((data (car x))
          (name (nth 1 x))
@@ -792,7 +792,7 @@ PRO-OR-DE is assumed to be dynamically scoped into this function."
         (error "Fatal error during %smotion" pro-or-de)))))
 
 (defun reftex-toc-extract-section-number (entry)
-  "Get the numbering of a toc entry, for message purposes."
+  "Get the numbering of a TOC entry, for message purposes."
   (if (string-match "\\s-*\\(\\S-+\\)" (nth 2 (car entry)))
       (match-string 1 (nth 2 (car entry)))
     "?"))
@@ -838,7 +838,7 @@ if these sets are sorted blocks in the alist."
 (defun reftex-toc-load-all-files-for-promotion ()
   "Make sure all files of the document are being visited by buffers,
 and that the scanning info is absolutely up to date.
-We do this by rescanning with reftex-keep-temporary-buffers bound to t.
+We do this by rescanning with `reftex-keep-temporary-buffers' bound to t.
 The variable PRO-OR-DE is assumed to be dynamically scoped into this function.
 When finished, we exit with an error message."
   (let ((reftex-keep-temporary-buffers t))
@@ -848,9 +848,9 @@ When finished, we exit with an error message."
            "TOC had to be updated first.  Please check selection and repeat the command.")))
 
 (defun reftex-toc-rename-label ()
-  "Rename the currently selected label in the *TOC* buffer.
+  "Rename the currently selected label in the *toc* buffer.
 This launches a global search and replace in order to rename a label.
-Renaming a label is hardly ever necessary - the only exeption is after
+Renaming a label is hardly ever necessary - the only exception is after
 promotion/demotion in connection with a package like fancyref, where the
 label prefix determines the wording of a reference."
   (interactive)
@@ -861,7 +861,7 @@ label prefix determines the wording of a reference."
     (setq newlabel (read-string (format "Rename label \"%s\" to:" label)))
     (if (assoc newlabel (symbol-value reftex-docstruct-symbol))
         (if (not (y-or-n-p
-                  (format "Label '%s' exists. Use anyway? " label)))
+                  (format "Label '%s' exists.  Use anyway? " label)))
             (error "Abort")))
     (save-excursion
       (save-window-excursion
@@ -875,10 +875,10 @@ label prefix determines the wording of a reference."
 
 
 (defun reftex-toc-visit-location (&optional final no-revisit)
-  ;; Visit the tex file corresponding to the toc entry on the current line.
+  ;; Visit the tex file corresponding to the TOC entry on the current line.
   ;; If FINAL is t, stay there
-  ;; If FINAL is 'hide, hide the *toc* window.
-  ;; Otherwise, move cursor back into *toc* window.
+  ;; If FINAL is 'hide, hide the TOC window.
+  ;; Otherwise, move cursor back into TOC window.
   ;; NO-REVISIT means don't visit files, just use live buffers.
   ;; This function is pretty clever about finding back a section heading,
   ;; even if the buffer is not live, or things like outline, x-symbol etc.
@@ -888,7 +888,7 @@ label prefix determines the wording of a reference."
          (toc-window (selected-window))
          show-window show-buffer match)
 
-    (unless toc (error "Don't know which toc line to visit"))
+    (unless toc (error "Don't know which TOC line to visit"))
 
     (cond
 
@@ -1012,8 +1012,8 @@ label prefix determines the wording of a reference."
          (reftex-toc-recenter))))
 
 (defun reftex-toggle-auto-toc-recenter ()
-  "Toggle the automatic recentering of the toc window.
-When active, leaving point idle will make the toc window jump to the correct
+  "Toggle the automatic recentering of the TOC window.
+When active, leaving point idle will make the TOC window jump to the correct
 section."
   (interactive)
   (if reftex-toc-auto-recenter-timer
@@ -1022,7 +1022,7 @@ section."
             (delete-itimer reftex-toc-auto-recenter-timer)
           (cancel-timer reftex-toc-auto-recenter-timer))
         (setq reftex-toc-auto-recenter-timer nil)
-        (message "Automatic recentering of toc windwo was turned off"))
+        (message "Automatic recentering of TOC window was turned off"))
     (setq reftex-toc-auto-recenter-timer
           (if (featurep 'xemacs)
               (start-itimer "RefTeX Idle Timer for recenter"
@@ -1030,7 +1030,7 @@ section."
                             reftex-idle-time reftex-idle-time t)
             (run-with-idle-timer
              reftex-idle-time t 'reftex-recenter-toc-when-idle)))
-    (message "Automatic recentering of toc window was turned on")))
+    (message "Automatic recentering of TOC window was turned on")))
 
 (defun reftex-toc-toggle-dedicated-frame ()
   "Toggle the display of a separate frame for the TOC.
@@ -1052,7 +1052,7 @@ always show the current section in connection with the option
       (reftex-make-separate-toc-frame))))
 
 (defun reftex-make-separate-toc-frame ()
-  ;; Create a new fame showing only the toc buffer.
+  ;; Create a new fame showing only the TOC buffer.
   (let ((current-frame (selected-frame))
         (current-window (selected-window))
         (current-toc-window (get-buffer-window "*toc*" 'visible))
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index cef8a3d1548..b73056a803b 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -42,7 +42,7 @@
 ;; - For XEmacs 21.x, you need to install the RefTeX plug-in package
 ;;   available from the XEmacs distribution sites.
 ;; - If you have downloaded this file from the maintainers webpage, follow
-;;   the instructions in the INSTALL file of the distrubution.
+;;   the instructions in the INSTALL file of the distribution.
 ;;
 ;; To turn RefTeX Mode on and off in a buffer, use `M-x reftex-mode'.
 ;;
@@ -688,7 +688,7 @@ on the menu bar.
               (TeX-master-file t)
             (error (buffer-file-name))))
          ((fboundp 'tex-main-file) (tex-main-file)) ; Emacs LaTeX mode
-         ((boundp 'TeX-master)       ; The variable is defined - lets use it.
+         ((boundp 'TeX-master)       ; The variable is defined - let's use it.
           (cond
            ((eq TeX-master t)
             (buffer-file-name))
@@ -1568,7 +1568,7 @@ Valid actions are: readable, restore, read, kill, write."
 ;;; Finding files
 
 (defun reftex-locate-file (file type master-dir &optional die)
-  "Find FILE of type TYPE in MASTER-DIR or on the path associcted with TYPE.
+  "Find FILE of type TYPE in MASTER-DIR or on the path associated with TYPE.
 If the file does not have any of the valid extensions for TYPE,
 try first the default extension and only then the naked file name.
 When DIE is non-nil, throw an error if file not found."
@@ -1612,7 +1612,7 @@ When DIE is non-nil, throw an error if file not found."
 (defun reftex-find-file-externally (file type &optional master-dir)
   ;; Use external program to find FILE.
   ;; The program is taken from `reftex-external-file-finders'.
-  ;; Interprete relative path definitions starting from MASTER-DIR.
+  ;; Interpret relative path definitions starting from MASTER-DIR.
   (let ((default-directory (or master-dir default-directory))
         (prg (cdr (assoc type reftex-external-file-finders)))
         out)
@@ -2058,7 +2058,7 @@ When DIE is non-nil, throw an error if file not found."
                (with-current-buffer buf
                  (run-hooks 'reftex-initialize-temporary-buffers))))
 
-           ;; Lets see if we got a license to kill :-|
+           ;; Let's see if we got a license to kill :-|
            (and mark-to-kill
                 (add-to-list 'reftex-buffers-to-kill buf))
 
@@ -2254,7 +2254,7 @@ IGNORE-WORDS List of words which should be removed from the string."
 (defvar font-lock-defaults-computed)
 (defun reftex-fontify-select-label-buffer (parent-buffer)
   ;; Fontify the `*RefTeX Select*' buffer.  Buffer is temporarily renamed to
-  ;; start with none-SPC char, beacuse Font-Lock otherwise refuses operation.
+  ;; start with none-SPC char, because Font-Lock otherwise refuses operation.
   (run-hook-with-args 'reftex-pre-refontification-functions
                       parent-buffer 'reftex-ref)
   (let* ((oldname (buffer-name))
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 1923ab692d8..07a4fae9c30 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -113,7 +113,7 @@
 ;;  - Allowing particular views of the initially amorphous data pool
 ;;    (ala the Xanadu concept).
 ;;
-;;  - Storage of the data in a manner most appopriate to that data,
+;;  - Storage of the data in a manner most appropriate to that data,
 ;;    such as keeping address-book type information in BBDB, etc.
 ;;
 ;; * Using "remember"
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 0ce71c25ad7..81e92487eb0 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -1534,7 +1534,7 @@ is a regular expression for matching the lines with items."
 
 (defvar rst-preferred-bullets
   '(?- ?* ?+)
-  "List of favourite bullets to set for straightening bullets.")
+  "List of favorite bullets to set for straightening bullets.")
 
 (defun rst-straighten-bullets-region (beg end)
   "Make all the bulleted list items in the region consistent.
@@ -2323,7 +2323,7 @@ of (COLUMN-NUMBER . LINE) pairs."
     (indent-rigidly
      mbeg mend
 
-     ;; Find the next tab after the leftmost columnt.
+     ;; Find the next tab after the leftmost column.
      (let ((tab (funcall find-next-fun tabs leftmostcol)))
 
        (if tab
@@ -2475,7 +2475,7 @@ first of a paragraph."
 ;;------------------------------------------------------------------------------
 
 ;; FIXME: these next functions should become part of a larger effort to redo the
-;; bullets in bulletted lists.  The enumerate would just be one of the possible
+;; bullets in bulleted lists.  The enumerate would just be one of the possible
 ;; outputs.
 ;;
 ;; FIXME: TODO we need to do the enumeration removal as well.
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 871701b7303..f9e3283b783 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -847,7 +847,7 @@ and disable it otherwise.  If called from Lisp, enable the mode
 if ARG is omitted or nil.
 
 SGML Electric Tag Pair mode is a buffer-local minor mode for use
-with `sgml-mode' and related maor modes.  When enabled, editing
+with `sgml-mode' and related major modes.  When enabled, editing
 an opening markup tag automatically updates the closing tag."
   :lighter "/e"
   (if sgml-electric-tag-pair-mode
@@ -1558,7 +1558,7 @@ LCON is the lexical context, if any."
 
 (defun sgml-guess-indent ()
   "Guess an appropriate value for `sgml-basic-offset'.
-Base the guessed identation level on the first indented tag in the buffer.
+Base the guessed indentation level on the first indented tag in the buffer.
 Add this to `sgml-mode-hook' for convenience."
   (interactive)
   (save-excursion
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 2dc4e4a88b1..08a45b6b302 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -1482,7 +1482,7 @@ the last cache point coordinate."
            (cons (cons command func-symbol)
                  table-command-remap-alist))))
  '(center-line
-   conter-region
+   center-region
    center-paragraph
    fill-paragraph))
 
@@ -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/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index deb92fc0243..c4892ce572c 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1871,7 +1871,7 @@ Mark is left at original location."
      tex-old-error-file-name 2 nil 1 1
      (2 compilation-warning-face))
     ;; Included files get output as (<file> ...).
-    ;; FIXME: there tend to be a crapload of them at the beginning of the
+    ;; FIXME: there tend to be a boatload of them at the beginning of the
     ;; output which aren't that interesting.  Maybe we should filter out
     ;; all the file name that start with /usr/share?
     ;; ("(\\.?/\\([^() \n]+\\)" 1 nil nil 0)
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index d33cbb97dd8..094885bb0d0 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -620,7 +620,7 @@ if large.  You can use `Info-split' to do this manually."
    "var{\\|"
    "w{\\|"
    "xref{\\|"
-   "@-\\|"    ; @- is a descretionary hyphen (not an accent) (a noop).
+   "@-\\|"    ; @- is a discretionary hyphen (not an accent) (a noop).
    texinfo-accent-commands
    "\\)"
    )
@@ -2194,7 +2194,7 @@ This command is executed when texinfmt sees @item inside @multitable."
 
 (put 'image 'texinfo-format 'texinfo-format-image)
 (defun texinfo-format-image ()
-  "Insert an image from an an file ending in .txt.
+  "Insert an image from a file ending in .txt.
 Use only the FILENAME arg; for Info, ignore the other arguments to @image."
   (let ((args (texinfo-format-parse-args))
         filename)
@@ -3909,11 +3909,11 @@ Default is to leave paragraph indentation as is."
 ;;; @set, @clear, @ifset, @ifclear
 
 ;; If a flag is set with @set FLAG, then text between @ifset and @end
-;; ifset is formatted normally, but if the flag is is cleared with
+;; ifset is formatted normally, but if the flag is cleared with
 ;; @clear FLAG, then the text is not formatted; it is ignored.
 
 ;; If a flag is cleared with @clear FLAG, then text between @ifclear
-;; and @end ifclear is formatted normally, but if the flag is is set with
+;; and @end ifclear is formatted normally, but if the flag is set with
 ;; @set FLAG, then the text is not formatted; it is ignored.  @ifclear
 ;; is the opposite of @ifset.
 
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 7a505758408..dad4731122e 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -26,7 +26,7 @@
 ;; This package create two new modes: thumbs-mode and thumbs-view-image-mode.
 ;; It is used for basic browsing and viewing of images from within Emacs.
 ;; Minimal image manipulation functions are also available via external
-;; programs.  If you want to do more complex tasks like categorise and tag
+;; programs.  If you want to do more complex tasks like categorize and tag
 ;; your images, use image-dired.el
 ;;
 ;; The 'convert' program from 'ImageMagick'
@@ -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/tmm.el b/lisp/tmm.el
index 52704e70a55..5722c2c8f79 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -37,7 +37,6 @@
 ;;; The following will be localized, added only to pacify the compiler.
 (defvar tmm-short-cuts)
 (defvar tmm-old-mb-map nil)
-(defvar tmm-old-comp-map)
 (defvar tmm-c-prompt nil)
 (defvar tmm-km-list)
 (defvar tmm-next-shortcut-digit)
@@ -98,7 +97,7 @@ See the documentation for `tmm-prompt'."
 
 (defcustom tmm-mid-prompt "==>"
   "String to insert between shortcut and menu item.
-If nil, there will be no shortcuts. It should not consist only of spaces,
+If nil, there will be no shortcuts.  It should not consist only of spaces,
 or else the correct item might not be found in the `*Completions*' buffer."
   :type 'string
   :group 'tmm)
@@ -158,7 +157,7 @@ Its value should be an event that has a binding in MENU."
   (let ((gl-str "Menu bar")  ;; The menu bar itself is not a menu keymap
                                         ; so it doesn't have a name.
         tmm-km-list out history history-len tmm-table-undef tmm-c-prompt
-        tmm-old-mb-map tmm-old-comp-map tmm-short-cuts
+        tmm-old-mb-map tmm-short-cuts
         chosen-string choice
         (not-menu (not (keymapp menu))))
     (run-hooks 'activate-menubar-hook)
@@ -219,23 +218,16 @@ Its value should be an event that has a binding in MENU."
              (setq history-len (length history))
              (setq history (append history history history history))
              (setq tmm-c-prompt (nth (- history-len 1 index-of-default) history))
-             (add-hook 'minibuffer-setup-hook 'tmm-add-prompt)
-             (if default-item
-                 (setq out (car (nth index-of-default tmm-km-list)))
-               (save-excursion
-                 (unwind-protect
-                     (setq out
-                           (completing-read
-                            (concat gl-str
-                                    " (up/down to change, PgUp to menu): ")
-                            tmm-km-list nil t nil
-                            (cons 'history
-                                  (- (* 2 history-len) index-of-default))))
-                   (remove-hook 'minibuffer-setup-hook 'tmm-add-prompt)
-                   (if (get-buffer "*Completions*")
-                       (with-current-buffer "*Completions*"
-                         (use-local-map tmm-old-comp-map)
-                         (bury-buffer (current-buffer)))))))))
+             (setq out
+                   (if default-item
+                       (car (nth index-of-default tmm-km-list))
+                     (minibuffer-with-setup-hook #'tmm-add-prompt
+                       (completing-read
+                        (concat gl-str
+                                " (up/down to change, PgUp to menu): ")
+                        tmm-km-list nil t nil
+                        (cons 'history
+                              (- (* 2 history-len) index-of-default))))))))
       (setq choice (cdr (assoc out tmm-km-list)))
       (and (null choice)
            (> (length out) (length tmm-c-prompt))
@@ -270,7 +262,7 @@ Its value should be an event that has a binding in MENU."
              choice)))))
 
 (defun tmm-add-shortcuts (list)
-  "Adds shortcuts to cars of elements of the list.
+  "Add shortcuts to cars of elements of the list.
 Takes a list of lists with a string as car, returns list with
 shortcuts added to these cars.
 Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
@@ -362,7 +354,6 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
     (set-buffer-modified-p nil)))
 
 (defun tmm-add-prompt ()
-  (remove-hook 'minibuffer-setup-hook 'tmm-add-prompt)
   (add-hook 'minibuffer-exit-hook 'tmm-delete-map nil t)
   (unless tmm-c-prompt
     (error "No active menu entries"))
@@ -387,9 +378,7 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
   (save-selected-window
     (other-window 1)                    ; Electric-pop-up-window does
                                         ; not work in minibuffer
-    (Electric-pop-up-window "*Completions*")
-    (with-current-buffer "*Completions*"
-      (setq tmm-old-comp-map (tmm-define-keys nil))))
+    (Electric-pop-up-window "*Completions*"))
   (insert tmm-c-prompt))
 
 (defun tmm-delete-map ()
@@ -424,16 +413,18 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
           (exit-minibuffer)))))
 
 (defun tmm-goto-completions ()
+  "Jump to the completions buffer."
   (interactive)
   (let ((prompt-end (minibuffer-prompt-end)))
     (setq tmm-c-prompt (buffer-substring prompt-end (point-max)))
+    ;; FIXME: Why?
     (delete-region prompt-end (point-max)))
   (switch-to-buffer-other-window "*Completions*")
   (search-forward tmm-c-prompt)
   (search-backward tmm-c-prompt))
 
 (defun tmm-get-keymap (elt &optional in-x-menu)
-  "Prepends (DOCSTRING EVENT BINDING) to free variable `tmm-km-list'.
+  "Prepend (DOCSTRING EVENT BINDING) to free variable `tmm-km-list'.
 The values are deduced from the argument ELT, that should be an
 element of keymap, an `x-popup-menu' argument, or an element of
 `x-popup-menu' argument (when IN-X-MENU is not-nil).
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index a2a1b451258..47f006eebda 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,13 @@
+2011-11-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * url-dav.el (url-dav-delete-file): Fix typo.
+
+2011-11-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url-http.el (url-http-async-sentinel): If the server hangs up
+        while we're talking to it, just `message' the error instead of
+        throwing an error.
+
 2011-11-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * url-cookie.el (url-cookie-expired-p): Protect against
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 3d1f6afcb0e..0e3713c9fcc 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -117,7 +117,7 @@
     ;; We need to populate 'time' with
     ;; (SEC MIN HOUR DAY MON YEAR DOW DST TZ)
 
-    ;; Nobody else handles iso8601 correctly, lets do it ourselves.
+    ;; Nobody else handles iso8601 correctly, let's do it ourselves.
     (when (string-match date-re date-string re-start)
       (setq year (string-to-number (match-string 1 date-string))
             month (string-to-number (match-string 2 date-string))
@@ -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.
@@ -430,7 +430,7 @@ added to this list, so most requests can just pass in nil."
   ;; Take care of the default value for depth...
   (setq depth (or depth 0))
 
-  ;; Now lets translate it into something webdav can understand.
+  ;; Now let's translate it into something webdav can understand.
   (if (< depth 0)
       (setq depth "Infinity")
     (setq depth (int-to-string depth)))
@@ -762,7 +762,7 @@ files in the collection as well."
             (setq status (plist-get (cdr result) 'DAV:status))
             (if (not (url-dav-http-success-p status))
                 (signal 'file-error (list "Removing old name"
-                                          "Errror removing"
+                                          "Error removing"
                                           (car result) status))))
           props))
   nil)
@@ -909,7 +909,7 @@ Returns nil if URL contains no name starting with FILE."
       ;; Only one file and FILE matches it exactly...
       t)
      (t
-      ;; Need to figure out the longest string that they have in commmon
+      ;; Need to figure out the longest string that they have in common
       (setq matches (sort matches (lambda (a b) (> (length a) (length b)))))
       (let ((n (length file))
             (searching t)
diff --git a/lisp/url/url-future.el b/lisp/url/url-future.el
index ac85a3cec47..8a2c112715c 100644
--- a/lisp/url/url-future.el
+++ b/lisp/url/url-future.el
@@ -36,7 +36,7 @@
 ;; So, to get the value:
 ;; (when (url-future-completed-p future) (url-future-value future))
 
-;; See the ERT tests and the code for futher details.
+;; See the ERT tests and the code for further details.
 
 ;;; Code:
 
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 6e192cd5aae..a9ff042d681 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -702,7 +702,7 @@ should be shown to the user."
          (not-acceptable                ; 406
           ;; The resource identified by the request is only capable of
           ;; generating response entities which have content
-          ;; characteristics nota cceptable according to the accept
+          ;; characteristics not acceptable according to the accept
           ;; headers sent in the request.
           (setq success t))
          (proxy-authentication-required ; 407
@@ -721,7 +721,7 @@ should be shown to the user."
           ;; The request could not be completed due to a conflict with
           ;; the current state of the resource.  This code is only
           ;; allowed in situations where it is expected that the user
-          ;; mioght be able to resolve the conflict and resubmit the
+          ;; might be able to resolve the conflict and resubmit the
           ;; request.  The response body SHOULD include enough
           ;; information for the user to recognize the source of the
           ;; conflict.
@@ -1092,7 +1092,7 @@ the end of the document."
             (url-http-activate-callback)))
          ((string= "CONNECT" url-http-method)
           ;; A CONNECT request is finished, but we cannot stick this
-          ;; back on the free connectin list
+          ;; back on the free connection list
           (url-http-debug "CONNECT request must have headers only.")
           (when (url-http-parse-headers)
             (url-http-activate-callback)))
@@ -1255,7 +1255,11 @@ CBARGS as the arguments."
         (url-http-end-of-document-sentinel proc why))
        ((string= (substring why 0 4) "open")
         (setq url-http-connection-opened t)
-        (process-send-string proc (url-http-create-request)))
+        (condition-case error
+            (process-send-string proc (url-http-create-request))
+          (file-error
+           (setq url-http-connection-opened nil)
+           (message "HTTP error: %s" error))))
        (t
         (setf (car url-callback-arguments)
               (nconc (list :error (list 'error 'connection-failed why
diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index bb937a44423..8a7bb76160b 100644
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -173,7 +173,7 @@ URL can be a URL string, or a URL vector of the type returned by
         (if attributes
             (setq attributes (mapcar 'url-unhex-string (split-string attributes ","))))
 
-        ;; Parse out the exentions
+        ;; Parse out the extensions.
         (if extensions
             (setq extensions (mapcar (lambda (ext)
                                        (if (string-match "\\([^=]*\\)=\\(.*\\)" ext)
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 42d33553e14..cfb98c6937e 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -335,7 +335,7 @@ Currently supported methods:
 `socks': Connect through a socks server;
 `tls': Connect with TLS;
 `ssl': Connect with SSL (deprecated, use `tls' instead);
-`native': Connect directy."
+`native': Connect directly."
   :type '(radio (const :tag "Telnet to gateway host" :value telnet)
                 (const :tag "Rlogin to gateway host" :value rlogin)
                 (const :tag "Use SOCKS proxy" :value socks)
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 7136b6023ce..c95b61c43fb 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -252,7 +252,7 @@ no further processing).  URL is either a string or a parsed URL."
             ;; interrupt it before it got a chance to handle process input.
             ;; `sleep-for' was tried but it lead to other forms of
             ;; hanging.  --Stef
-            (unless (or (with-local-quit 
+            (unless (or (with-local-quit
                           (accept-process-output proc))
                         (null proc))
               ;; accept-process-output returned nil, maybe because the process
@@ -290,7 +290,7 @@ no further processing).  URL is either a string or a parsed URL."
   ;; These requires could advantageously be moved to url-mm-callback or
   ;; turned into autoloads, but I suspect that it would introduce some bugs
   ;; because loading those files from a process sentinel or filter may
-  ;; result in some undesirable carner cases.
+  ;; result in some undesirable corner cases.
   (require 'mm-decode)
   (require 'mm-view)
   (url-retrieve url 'url-mm-callback nil))
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index eeaa2cfa927..787a8b7c0f1 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -81,7 +81,7 @@ that Ediff doesn't know about.")
 ;; so that `kill-all-local-variables' (called by major-mode setting
 ;; commands) won't destroy Ediff control variables.
 ;;
-;; Plagiarised from `emerge-defvar-local' for XEmacs.
+;; Plagiarized from `emerge-defvar-local' for XEmacs.
 (defmacro ediff-defvar-local (var value doc)
   "Defines VAR as a local variable."
   (declare (indent defun))
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index d930a1bec69..ef273c610fe 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -635,7 +635,7 @@ optional argument, then use it."
 ;; Traditional patch has weird return codes.
 ;; GNU and Posix return 1 if some hanks failed and 2 in case of trouble.
 ;; 0 is a good code in all cases.
-;; We'll do the concervative thing.
+;; We'll do the conservative thing.
 (defun ediff-patch-return-code-ok (code)
   (eq code 0))
 ;;;  (if (eq (ediff-test-patch-utility) 'traditional)
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index 5a7fa0bf950..9bf75fa7f55 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -1127,7 +1127,7 @@ It assumes that it is called from within the control buffer."
 
 ;; Revise the mode line to display which difference we have selected
 ;; Also resets modelines of buffers A/B, since they may be clobbered by
-;; anothe invocations of Ediff.
+;; other invocations of Ediff.
 (defun ediff-refresh-mode-lines ()
   (let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge)
 
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el
index 46b95130ca0..f6340392dc2 100644
--- a/lisp/vc/pcvs-defs.el
+++ b/lisp/vc/pcvs-defs.el
@@ -502,7 +502,7 @@ It is expected to call the function.")
   (if (or (null cvs-version)
           (or (>= (cdr cvs-version) 10) (> (car cvs-version) 1)))
       ;; Supposedly some recent versions of CVS output some directory info
-      ;; as they recurse downthe tree, but it's not good enough in the case
+      ;; as they recurse down the tree, but it's not good enough in the case
       ;; where we run "cvs status foo bar/foo".
       '("status")
     t)
diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el
index c514026b1f1..43292ed14e4 100644
--- a/lisp/vc/pcvs-parse.el
+++ b/lisp/vc/pcvs-parse.el
@@ -430,7 +430,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
         ;; Conflict
         (and
          (cvs-match (concat "C \\(.*" qfile "\\)$") (path 1) (type 'CONFLICT))
-         ;; C might be followed by a "suprious" U for non-mergeable files
+         ;; C might be followed by a "spurious" U for non-mergable files
          (cvs-or (cvs-match (concat "U \\(.*" qfile "\\)$")) t))
         ;; Successful merge
         (cvs-match (concat "M \\(.*" qfile "\\)$") (path 1))
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index 311841d37a0..4915cb9bf7f 100644
--- a/lisp/vc/pcvs-util.el
+++ b/lisp/vc/pcvs-util.el
@@ -307,7 +307,7 @@ If it is \\[universal-argument] \\[universal-argument], behave just
 See `cvs-prefix-set' for further description of the behavior."))
        (defvar ,cps
          (let ((defaults ,defaults))
-           ;; sanity ensurance
+           ;; sanity insurance
            (unless (>= (length defaults) cvs-prefix-number)
              (setq defaults (append defaults
                                     (make-list (1- cvs-prefix-number)
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index 5595dc0b03f..256719d4c84 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -620,7 +620,7 @@ If non-nil, NEW means to create a new buffer no matter what."
          (str (car hf))
          (done "")
          (tin (ewoc-nth cvs-cookies 0)))
-    ;; look for the first *real* fileinfo (to determine emptyness)
+    ;; look for the first *real* fileinfo (to determine emptiness)
     (while
         (and tin
              (memq (cvs-fileinfo->type (ewoc-data tin))
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/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 35fa11c2e5e..148f6cde930 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -72,7 +72,7 @@ An empty list disables VC altogether."
   :group 'vc)
 
 ;; Note: we don't actually have a darcs back end yet.
-;; Also, Meta-CVS (corresponsding to MCVS) is unsupported.
+;; Also, Meta-CVS (corresponding to MCVS) is unsupported.
 (defcustom vc-directory-exclusion-list (purecopy '("SCCS" "RCS" "CVS" "MCVS"
                                          ".svn" ".git" ".hg" ".bzr"
                                          "_MTN" "_darcs" "{arch}"))
@@ -456,8 +456,8 @@ For registered files, the value returned is one of:
   'edited            The working file has been edited by the user.  If
                      locking is used for the file, this state means that
                      the current version is locked by the calling user.
-                     This status should *not* be reported for files 
-                     which have a changed mtime but the same content 
+                     This status should *not* be reported for files
+                     which have a changed mtime but the same content
                      as the repo copy.
 
   USER               The current version of the working file is locked by
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 8051009a983..39c583b8a0d 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -1399,7 +1399,7 @@ The `:insn' key is a keyword to distinguish it as a vc-rcs.el extension."
               ;; `incg' or `buffer-substring-no-properties'.  (This is
               ;; for speed; strictly speaking, it is sufficient to use
               ;; only the former since it behaves identically to the
-              ;; latter in the absense of "@@".)
+              ;; latter in the absence of "@@".)
               sub)
           (flet ((incg (beg end) (let ((b beg) (e end) @-holes)
                                    (while (and asc (< (car asc) e))
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index dc4e179e060..d014c4da135 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -706,7 +706,7 @@ information about FILENAME and return its status."
   (vc-svn-command buf 'async file "annotate" (if rev (concat "-r" rev))))
 
 (defun vc-svn-annotate-time-of-rev (rev)
-  ;; Arbitrarily assume 10 commmits per day.
+  ;; Arbitrarily assume 10 commits per day.
   (/ (string-to-number rev) 10.0))
 
 (defvar vc-annotate-parent-rev)
diff --git a/lisp/view.el b/lisp/view.el
index ef865007332..6955fbdfad8 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -925,7 +925,7 @@ for highlighting the match that is found."
 
 (defun view-search (times regexp)
   ;; This function does the job for all the View-search- commands.
-  ;; Search for the TIMESt match for REGEXP.  If TIMES is negative
+  ;; Search for the TIMESth match for REGEXP.  If TIMES is negative
   ;; search backwards.  If REGEXP is nil use `view-last-regexp'.
   ;; Characters "!" and "@" have a special meaning at the beginning of
   ;; REGEXP and are removed from REGEXP before the search "!" means
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index f50386b1827..53a35b4f0b3 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -525,7 +525,7 @@ evaluated instead of indentation::space value.
 
 One reason for not visualize spaces via faces (if `face' is not
 included in `whitespace-style') is to use exclusively for
-cleanning up a buffer.  See `whitespace-cleanup' and
+cleaning up a buffer.  See `whitespace-cleanup' and
 `whitespace-cleanup-region' for documentation.
 
 See also `whitespace-display-mappings' for documentation."
@@ -2573,7 +2573,7 @@ Also refontify when necessary."
         (setq whitespace-display-table-was-local t
               whitespace-display-table
               (copy-sequence buffer-display-table))
-        ;; asure `buffer-display-table' is unique
+        ;; Assure `buffer-display-table' is unique
         ;; when two or more windows are visible.
         (setq buffer-display-table
               (copy-sequence buffer-display-table)))
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index b0d00242f2a..8c4df9fc9cf 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -2363,7 +2363,7 @@ Return an alist of (TYPE MATCH)."
     result))
 
 (defun widget-checklist-validate (widget)
-  ;; Ticked chilren must be valid.
+  ;; Ticked children must be valid.
   (let ((children (widget-get widget :children))
         child button found)
     (while (and children (not found))
diff --git a/lisp/windmove.el b/lisp/windmove.el
index 2aef37dd4c8..1deaa44c7dd 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -245,7 +245,7 @@ placement bugs in old versions of Emacs."
 ;; Actually, the whole subject of the minibuffer edge of the frame is
 ;; rather messy.  It turns out that with a sufficiently large delta,
 ;; we can fly off the bottom edge of the frame and miss the minibuffer
-;; altogther.  This, I think, is never right: if there's a minibuffer
+;; altogether.  This, I think, is never right: if there's a minibuffer
 ;; and you're not in it, and you move down, the minibuffer should be
 ;; in your way.
 ;;
diff --git a/lisp/window.el b/lisp/window.el
index 7b16d6b886f..477211672cf 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -246,51 +246,51 @@ windows horizontally arranged within WINDOW."
         (setq child (window-right child)))
       count))))
 
-(defun walk-window-tree-1 (proc walk-window-tree-window any &optional sub-only)
+(defun walk-window-tree-1 (fun walk-window-tree-window any &optional sub-only)
   "Helper function for `walk-window-tree' and `walk-window-subtree'."
   (let (walk-window-tree-buffer)
     (while walk-window-tree-window
       (setq walk-window-tree-buffer
             (window-buffer walk-window-tree-window))
       (when (or walk-window-tree-buffer any)
-        (funcall proc walk-window-tree-window))
+        (funcall fun walk-window-tree-window))
       (unless walk-window-tree-buffer
         (walk-window-tree-1
-         proc (window-left-child walk-window-tree-window) any)
+         fun (window-left-child walk-window-tree-window) any)
         (walk-window-tree-1
-         proc (window-top-child walk-window-tree-window) any))
+         fun (window-top-child walk-window-tree-window) any))
       (if sub-only
           (setq walk-window-tree-window nil)
         (setq walk-window-tree-window
               (window-right walk-window-tree-window))))))
 
-(defun walk-window-tree (proc &optional frame any)
-  "Run function PROC on each live window of FRAME.
-PROC must be a function with one argument - a window.  FRAME must
+(defun walk-window-tree (fun &optional frame any)
+  "Run function FUN on each live window of FRAME.
+FUN must be a function with one argument - a window.  FRAME must
 be a live frame and defaults to the selected one.  ANY, if
-non-nil means to run PROC on all live and internal windows of
+non-nil means to run FUN on all live and internal windows of
 FRAME.
 
 This function performs a pre-order, depth-first traversal of the
-window tree.  If PROC changes the window tree, the result is
+window tree.  If FUN changes the window tree, the result is
 unpredictable."
   (let ((walk-window-tree-frame (window-normalize-frame frame)))
     (walk-window-tree-1
-     proc (frame-root-window walk-window-tree-frame) any)))
+     fun (frame-root-window walk-window-tree-frame) any)))
 
-(defun walk-window-subtree (proc &optional window any)
-  "Run function PROC on the subtree of windows rooted at WINDOW.
-WINDOW defaults to the selected window.  PROC must be a function
-with one argument - a window.  By default, run PROC only on live
+(defun walk-window-subtree (fun &optional window any)
+  "Run function FUN on the subtree of windows rooted at WINDOW.
+WINDOW defaults to the selected window.  FUN must be a function
+with one argument - a window.  By default, run FUN only on live
 windows of the subtree.  If the optional argument ANY is non-nil,
-run PROC on all live and internal windows of the subtree.  If
-WINDOW is live, run PROC on WINDOW only.
+run FUN on all live and internal windows of the subtree.  If
+WINDOW is live, run FUN on WINDOW only.
 
 This function performs a pre-order, depth-first traversal of the
-subtree rooted at WINDOW.  If PROC changes that tree, the result
+subtree rooted at WINDOW.  If FUN changes that tree, the result
 is unpredictable."
   (setq window (window-normalize-window window))
-  (walk-window-tree-1 proc window any t))
+  (walk-window-tree-1 fun window any t))
 
 (defun window-with-parameter (parameter &optional value frame any)
   "Return first window on FRAME with PARAMETER non-nil.
@@ -524,10 +524,10 @@ imposed by fixed size windows, `window-min-height' or
 windows may get as small as `window-safe-min-height' lines and
 `window-safe-min-width' columns.  IGNORE a window means ignore
 restrictions for that window only."
-  (window-min-size-1
+  (window--min-size-1
    (window-normalize-window window) horizontal ignore))
 
-(defun window-min-size-1 (window horizontal ignore)
+(defun window--min-size-1 (window horizontal ignore)
   "Internal function of `window-min-size'."
   (let ((sub (window-child window)))
     (if sub
@@ -538,13 +538,13 @@ restrictions for that window only."
               ;; the minimum sizes of its child windows.
               (while sub
                 (setq value (+ value
-                               (window-min-size-1 sub horizontal ignore)))
+                               (window--min-size-1 sub horizontal ignore)))
                 (setq sub (window-right sub)))
             ;; The minimum size of an ortho-combination is the maximum of
             ;; the minimum sizes of its child windows.
             (while sub
               (setq value (max value
-                               (window-min-size-1 sub horizontal ignore)))
+                               (window--min-size-1 sub horizontal ignore)))
               (setq sub (window-right sub))))
           value)
       (with-current-buffer (window-buffer window)
@@ -687,7 +687,7 @@ WINDOW can be resized in the desired direction.  The function
   (window--size-fixed-1
    (window-normalize-window window) horizontal))
 
-(defun window-min-delta-1 (window delta &optional horizontal ignore trail noup)
+(defun window--min-delta-1 (window delta &optional horizontal ignore trail noup)
   "Internal function for `window-min-delta'."
   (if (not (window-parent window))
       ;; If we can't go up, return zero.
@@ -723,7 +723,7 @@ WINDOW can be resized in the desired direction.  The function
             (setq sub (window-right sub))))
         (if noup
             delta
-          (window-min-delta-1 parent delta horizontal ignore trail))))))
+          (window--min-delta-1 parent delta horizontal ignore trail))))))
 
 (defun window-min-delta (&optional window horizontal ignore trail noup nodown)
   "Return number of lines by which WINDOW can be shrunk.
@@ -757,7 +757,7 @@ at least one other window can be enlarged appropriately."
     (cond
      (nodown
       ;; If NODOWN is t, try to recover the entire size of WINDOW.
-      (window-min-delta-1 window size horizontal ignore trail noup))
+      (window--min-delta-1 window size horizontal ignore trail noup))
      ((= size minimum)
       ;; If NODOWN is nil and WINDOW's size is already at its minimum,
       ;; there's nothing to recover.
@@ -765,10 +765,10 @@ at least one other window can be enlarged appropriately."
      (t
       ;; Otherwise, try to recover whatever WINDOW is larger than its
       ;; minimum size.
-      (window-min-delta-1
+      (window--min-delta-1
        window (- size minimum) horizontal ignore trail noup)))))
 
-(defun window-max-delta-1 (window delta &optional horizontal ignore trail noup)
+(defun window--max-delta-1 (window delta &optional horizontal ignore trail noup)
   "Internal function of `window-max-delta'."
   (if (not (window-parent window))
       ;; Can't go up.  Return DELTA.
@@ -804,7 +804,7 @@ at least one other window can be enlarged appropriately."
             delta
           ;; Else try with parent of WINDOW, passing the DELTA we
           ;; recovered so far.
-          (window-max-delta-1 parent delta horizontal ignore trail))))))
+          (window--max-delta-1 parent delta horizontal ignore trail))))))
 
 (defun window-max-delta (&optional window horizontal ignore trail noup nodown)
   "Return maximum number of lines WINDOW by which WINDOW can be enlarged.
@@ -840,7 +840,7 @@ only whether other windows can be shrunk appropriately."
       ;; size.
       0
     ;; WINDOW has no fixed size.
-    (window-max-delta-1 window 0 horizontal ignore trail noup)))
+    (window--max-delta-1 window 0 horizontal ignore trail noup)))
 
 ;; Make NOUP also inhibit the min-size check.
 (defun window--resizable (window delta &optional horizontal ignore trail noup nodown)
@@ -997,9 +997,9 @@ taken into account."
             (setq hor (cdr fcsb)))))
     (cons vert hor)))
 
-(defun walk-windows (proc &optional minibuf all-frames)
-  "Cycle through all live windows, calling PROC for each one.
-PROC must specify a function with a window as its sole argument.
+(defun walk-windows (fun &optional minibuf all-frames)
+  "Cycle through all live windows, calling FUN for each one.
+FUN must specify a function with a window as its sole argument.
 The optional arguments MINIBUF and ALL-FRAMES specify the set of
 windows to include in the walk.
 
@@ -1041,7 +1041,7 @@ windows nor the buffer list."
     (when (framep all-frames)
       (select-window (frame-first-window all-frames) 'norecord))
     (dolist (walk-windows-window (window-list-1 nil minibuf all-frames))
-      (funcall proc walk-windows-window))))
+      (funcall fun walk-windows-window))))
 
 (defun window-point-1 (&optional window)
   "Return value of WINDOW's point.
@@ -1482,11 +1482,11 @@ instead."
      ((window--resizable-p window delta horizontal ignore)
       (window--resize-reset frame horizontal)
       (window--resize-this-window window delta horizontal ignore t)
-      (if (and (not window-splits)
+      (if (and (not window-combination-resize)
                (window-combined-p window horizontal)
                (setq sibling (or (window-right window) (window-left window)))
                (window-sizable-p sibling (- delta) horizontal ignore))
-          ;; If window-splits is nil, WINDOW is part of an
+          ;; If window-combination-resize is nil, WINDOW is part of an
           ;; iso-combination, and WINDOW's neighboring right or left
           ;; sibling can be resized as requested, resize that sibling.
           (let ((normal-delta
@@ -2039,8 +2039,8 @@ move it as far as possible in the desired direction."
       ;; two windows we want to resize.
       (cond
        ((> delta 0)
-        (setq max-delta (window-max-delta-1 left 0 horizontal nil 'after))
-        (setq min-delta (window-min-delta-1 right (- delta) horizontal nil 'before))
+        (setq max-delta (window--max-delta-1 left 0 horizontal nil 'after))
+        (setq min-delta (window--min-delta-1 right (- delta) horizontal nil 'before))
         (when (or (< max-delta delta) (> min-delta (- delta)))
           ;; We can't get the whole DELTA - move as far as possible.
           (setq delta (min max-delta (- min-delta))))
@@ -2062,8 +2062,8 @@ move it as far as possible in the desired direction."
                (window-left-column right)
              (window-top-line right)))))
        ((< delta 0)
-        (setq max-delta (window-max-delta-1 right 0 horizontal nil 'before))
-        (setq min-delta (window-min-delta-1 left delta horizontal nil 'after))
+        (setq max-delta (window--max-delta-1 right 0 horizontal nil 'before))
+        (setq min-delta (window--min-delta-1 left delta horizontal nil 'after))
         (when (or (< max-delta (- delta)) (> min-delta delta))
           ;; We can't get the whole DELTA - move as far as possible.
           (setq delta (max (- max-delta) min-delta)))
@@ -2389,7 +2389,8 @@ non-side window, signal an error."
              (sibling (or (window-left window) (window-right window))))
         (window--resize-reset frame horizontal)
         (cond
-         ((and (not window-splits) sibling (window-sizable-p sibling size))
+         ((and (not window-combination-resize)
+               sibling (window-sizable-p sibling size))
           ;; Resize WINDOW's sibling.
           (window--resize-this-window sibling size horizontal nil t)
           (set-window-new-normal
@@ -3083,9 +3084,9 @@ frame.  The selected window is not changed by this function."
          (parent (window-parent window))
          (function (window-parameter window 'split-window))
          (window-side (window-parameter window 'window-side))
-         ;; Rebind `window-nest' since in some cases we may have to
-         ;; override its value.
-         (window-nest window-nest)
+         ;; Rebind `window-combination-limit' since in some cases we may
+         ;; have to override its value.
+         (window-combination-limit window-combination-limit)
          atom-root)
 
     (window--check frame)
@@ -3109,15 +3110,15 @@ frame.  The selected window is not changed by this function."
                  (or (not parent)
                      (not (window-parameter parent 'window-side))))
         ;; WINDOW is a side root window.  To make sure that a new parent
-        ;; window gets created set `window-nest' to t.
-        (setq window-nest t))
+        ;; window gets created set `window-combination-limit' to t.
+        (setq window-combination-limit t))
 
-      (when (and window-splits size (> size 0))
-        ;; If `window-splits' is non-nil and SIZE is a non-negative
-        ;; integer, we cannot reasonably resize other windows.  Rather
-        ;; bind `window-nest' to t to make sure that subsequent window
-        ;; deletions are handled correctly.
-        (setq window-nest t))
+      (when (and window-combination-resize size (> size 0))
+        ;; If `window-combination-resize' is non-nil and SIZE is a
+        ;; non-negative integer, we cannot reasonably resize other
+        ;; windows.  Rather bind `window-combination-limit' to t to make
+        ;; sure that subsequent window deletions are handled correctly.
+        (setq window-combination-limit t))
 
       (let* ((parent-size
               ;; `parent-size' is the size of WINDOW's parent, provided
@@ -3126,7 +3127,7 @@ frame.  The selected window is not changed by this function."
              ;; `resize' non-nil means we are supposed to resize other
              ;; windows in WINDOW's combination.
              (resize
-              (and window-splits (not window-nest)
+              (and window-combination-resize (not window-combination-limit)
                    ;; Resize makes sense in iso-combinations only.
                    (window-combined-p window horizontal)))
              ;; `old-size' is the current size of WINDOW.
@@ -3206,7 +3207,8 @@ frame.  The selected window is not changed by this function."
               ;; Make new-parent non-nil if we need a new parent window;
               ;; either because we want to nest or because WINDOW is not
               ;; iso-combined.
-              (or window-nest (not (window-combined-p window horizontal))))
+              (or window-combination-limit
+                  (not (window-combined-p window horizontal))))
         (setq new-normal
               ;; Make new-normal the normal size of the new window.
               (cond
@@ -3431,7 +3433,7 @@ is non-nil."
   "Balance the sizes of windows of WINDOW-OR-FRAME.
 WINDOW-OR-FRAME is optional and defaults to the selected frame.
 If WINDOW-OR-FRAME denotes a frame, balance the sizes of all
-windows of that frame.  If WINDOW-OR-FRAME denots a window,
+windows of that frame.  If WINDOW-OR-FRAME denotes a window,
 recursively balance the sizes of all child windows of that
 window."
   (interactive)
@@ -3568,7 +3570,7 @@ specific buffers."
 (defvar window-state-ignored-parameters '(quit-restore)
   "List of window parameters ignored by `window-state-get'.")
 
-(defun window-state-get-1 (window &optional markers)
+(defun window--state-get-1 (window &optional markers)
   "Helper function for `window-state-get'."
   (let* ((type
           (cond
@@ -3584,7 +3586,7 @@ specific buffers."
             (total-width . ,(window-total-size window t))
             (normal-height . ,(window-normal-size window))
             (normal-width . ,(window-normal-size window t))
-            (nest . ,(window-nest window))
+            (combination-limit . ,(window-combination-limit window))
             ,@(let (list)
                 (dolist (parameter (window-parameters window))
                   (unless (memq (car parameter)
@@ -3623,7 +3625,7 @@ specific buffers."
             (let (list)
               (setq window (window-child window))
               (while window
-                (setq list (cons (window-state-get-1 window markers) list))
+                (setq list (cons (window--state-get-1 window markers) list))
                 (setq window (window-right window)))
               (nreverse list)))))
     (append head tail)))
@@ -3662,12 +3664,12 @@ value can be also stored on disk and read back in a new session."
      ;; These are probably not needed.
      ,@(when (window-size-fixed-p window) `((fixed-height . t)))
      ,@(when (window-size-fixed-p window t) `((fixed-width . t))))
-   (window-state-get-1 window markers)))
+   (window--state-get-1 window markers)))
 
 (defvar window-state-put-list nil
   "Helper variable for `window-state-put'.")
 
-(defun window-state-put-1 (state &optional window ignore totals)
+(defun window--state-put-1 (state &optional window ignore totals)
   "Helper function for `window-state-put'."
   (let ((type (car state)))
     (setq state (cdr state))
@@ -3675,8 +3677,7 @@ value can be also stored on disk and read back in a new session."
      ((eq type 'leaf)
       ;; For a leaf window just add unprocessed entries to
       ;; `window-state-put-list'.
-      (setq window-state-put-list
-            (cons (cons window state) window-state-put-list)))
+      (push (cons window state) window-state-put-list))
      ((memq type '(vc hc))
       (let* ((horizontal (eq type 'hc))
              (total (window-total-size window horizontal))
@@ -3687,7 +3688,7 @@ value can be also stored on disk and read back in a new session."
           ;; real window that we want to fill with what we find here.
           (when (memq (car item) '(leaf vc hc))
             (if (assq 'last item)
-                ;; The last child window.  Below `window-state-put-1'
+                ;; The last child window.  Below `window--state-put-1'
                 ;; will put into it whatever ITEM has in store.
                 (setq new nil)
               ;; Not the last child window, prepare for splitting
@@ -3709,9 +3710,11 @@ value can be also stored on disk and read back in a new session."
                                      window-safe-min-width)))
 
               (if (window-sizable-p window (- size) horizontal 'safe)
-                  (let* ((window-nest (assq 'nest item)))
-                    ;; We must inherit the nesting, otherwise we might mess
-                    ;; up handling of atomic and side window.
+                  (let* ((window-combination-limit
+                          (assq 'combination-limit item)))
+                    ;; We must inherit the combiantion limit, otherwise
+                    ;; we might mess up handling of atomic and side
+                    ;; window.
                     (setq new (split-window window size horizontal)))
                 ;; Give up if we can't resize window down to safe sizes.
                 (error "Cannot resize window %s" window))
@@ -3726,19 +3729,20 @@ value can be also stored on disk and read back in a new session."
 
             ;; Now process the current window (either the one we've just
             ;; split or the last child of its parent).
-            (window-state-put-1 item window ignore totals)
+            (window--state-put-1 item window ignore totals)
             ;; Continue with the last window split off.
             (setq window new))))))))
 
-(defun window-state-put-2 (ignore)
+(defun window--state-put-2 (ignore)
   "Helper function for `window-state-put'."
   (dolist (item window-state-put-list)
     (let ((window (car item))
           (splits (cdr (assq 'splits item)))
-          (nest (cdr (assq 'nest item)))
+          (combination-limit (cdr (assq 'combination-limit item)))
           (parameters (cdr (assq 'parameters item)))
           (state (cdr (assq 'buffer item))))
-      (when nest (set-window-nest window nest))
+      (when combination-limit
+        (set-window-combination-limit window combination-limit))
       ;; Process parameters.
       (when parameters
         (dolist (parameter parameters)
@@ -3855,11 +3859,11 @@ windows can get as small as `window-safe-min-height' and
       ;; Work on the windows of a temporary buffer to make sure that
       ;; splitting proceeds regardless of any buffer local values of
       ;; `window-size-fixed'.  Release that buffer after the buffers of
-      ;; all live windows have been set by `window-state-put-2'.
+      ;; all live windows have been set by `window--state-put-2'.
       (with-temp-buffer
         (set-window-buffer window (current-buffer))
-        (window-state-put-1 state window nil totals)
-        (window-state-put-2 ignore))
+        (window--state-put-1 state window nil totals)
+        (window--state-put-2 ignore))
       (window--check frame))))
 
 (defun display-buffer-record-window (type window buffer)
@@ -4946,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
@@ -5409,7 +5413,7 @@ by `recenter-positions'."
 ;;; of buffer).
 
 (defcustom scroll-error-top-bottom nil
-  "Move point to top/bottom of buffer before signalling a scrolling error.
+  "Move point to top/bottom of buffer before signaling a scrolling error.
 A value of nil means just signal an error if no more scrolling possible.
 A value of t means point moves to the beginning or the end of the buffer
 \(depending on scrolling direction) when no more scrolling possible.
diff --git a/lisp/woman.el b/lisp/woman.el
index 078acfc0362..243196a5302 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1439,7 +1439,7 @@ The cdr of each alist element is the path-index / filename."
           (push (woman-topic-all-completions-1 dir path-index)
                 files))
       (setq path-index (1+ path-index)))
-    ;; Uniquefy topics:
+    ;; Uniquify topics:
     ;; Concatenate all lists with a single nconc call to
     ;; avoid retraversing the first lists repeatedly  -- dak
     (woman-topic-all-completions-merge
@@ -2023,7 +2023,7 @@ Optional argument REDRAW, if non-nil, forces mode line to be updated."
 ;; Both advices are disabled because "a file in Emacs should not put
 ;; advice on a function in Emacs" (see Info node "(elisp)Advising
 ;; Functions").  Counting the formatting time is useful for
-;; developping, but less applicable for daily use.  The advice for
+;; developing, but less applicable for daily use.  The advice for
 ;; `Man-getpage-in-background' can be discarded, because the
 ;; key-binding in `woman-mode-map' has been remapped to call `woman'
 ;; but `man'.  Michael Albinus <michael.albinus@gmx.de>
@@ -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/lisp/x-dnd.el b/lisp/x-dnd.el
index 04b759a8116..fbb76da1b91 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -410,7 +410,7 @@ otherwise return the frame width/height."
   "Return the x/y coordinates to be sent in a XDndStatus message.
 Coordinates are required to be absolute.
 FRAME is the frame and W is the window where the drop happened.
-If W is a window, return its absolute corrdinates,
+If W is a window, return its absolute coordinates,
 otherwise return the frame coordinates."
   (let* ((frame-left (frame-parameter frame 'left))
          ;; If the frame is outside the display, frame-left looks like
@@ -444,7 +444,7 @@ otherwise return the frame coordinates."
   (if (consp flags)
       (logand (cdr flags) 1)
     (logand flags 1)))
-      
+
 (defun x-dnd-handle-xdnd (event frame window message _format data)
   "Receive one XDND event (client message) and send the appropriate reply.
 EVENT is the client message.  FRAME is where the mouse is now.
diff --git a/lisp/xml.el b/lisp/xml.el
index 52bb0de7ea0..68aa5f4db6f 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -540,7 +540,7 @@ Leave point at the first non-blank character after the tag."
         (replace-regexp-in-string "\\s-\\{2,\\}" " " string)
         (let ((expansion (xml-substitute-special string)))
           (unless (stringp expansion)
-                                        ; We say this is the constraint.  It is acctually that
+                                        ; We say this is the constraint.  It is actually that neither
                                         ; external entities nor "<" can be in an attribute value.
             (error "XML: (Not Well-Formed) Entities in attributes cannot expand into elements"))
           (push (cons name expansion) attlist)))