upstream

238 files changed, 2240 insertions, 1503 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c77ace6d483..78cc1862c2f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,383 @@
+2011-12-28  Chong Yidong  <cyd@gnu.org>
+
+        * progmodes/gdb-mi.el (gdb-get-source-file-list)
+        (gdb-get-source-file): Move mode line update to
+        gdb-get-source-file (Bug#10087).
+
+2011-12-25  Chong Yidong  <cyd@gnu.org>
+
+        * progmodes/gud.el (gud-gdb-fetch-lines-filter): Just use
+        gud-gdb-marker-filter without taking it as an argument.
+        (gud-gdb-run-command-fetch-lines): Caller changed.
+        (gud-gdb-completion-function): New variable.
+        (gud-gdb-completion-at-point): Use it.
+        (gud-gdb-completions-1): Split from gud-gdb-completions.
+
+        * progmodes/gdb-mi.el (gdb-input): Accept command and handler
+        function as separate arguments.
+        (gdb-init-1, gdb-non-stop-handler, gdb-check-target-async)
+        (gdb-tooltip-print-1, gud-watch, gdb-speedbar-update)
+        (gdb-var-list-children, gdb-var-set-format, gdb-var-delete-1)
+        (gdb-var-delete-children, gdb-edit-value, gdb-var-update)
+        (gdb-stopped, def-gdb-auto-update-trigger)
+        (gdb-place-breakpoints, gdb-select-thread, gdb-select-frame)
+        (gdb-get-changed-registers, gdb-get-main-selected-frame): Callers
+        changed.
+        (gud-gdbmi-completions): New function.
+        (gdb): Use it for generating the completion table.
+
+2011-12-24  Alan Mackenzie  <acm@muc.de>
+
+        Introduce a mechanism to widen the region used in context font
+        locking.  Use this to protect declarations from losing their
+        contexts.
+
+        * progmodes/cc-langs.el (c-before-font-lock-functions): replace
+        c-set-fl-decl-start with c-change-set-fl-decl-start (Renaming).
+        (c-before-context-fontification-functions): new defvar, a list of
+        functions to be run just before context (etc.) font locking.
+
+        * progmodes/cc-mode.el (c-extend-font-lock-region-for-macros):
+        new, functionality extracted from
+        c-neutralize-syntax-in-and-mark-CPP.
+        (c-in-after-change-fontification): new variable.
+        (c-after-change): Set c-in-after-change-fontification.
+        (c-set-fl-decl-start): Rejig its interface, so it can be called
+        from both after-change and context fontifying.
+        (c-change-set-fl-decl-start, c-context-set-fl-decl-start): new
+        functions.
+        (c-standard-font-lock-fontify-region-function): new variable.
+        (c-font-lock-fontify-region): new function.
+
+2011-12-24  Juri Linkov  <juri@jurta.org>
+
+        * window.el (window--state-get-1): Set `FORCE' arg of `mark' to t.
+        (Bug#10348)
+
+2011-12-23  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/ange-ftp.el (ange-ftp-copy-file-internal): Check for
+        existence of source file.  (Bug#10325)
+
+2011-12-23  Alan Mackenzie  <acm@muc.de>
+
+        Fix unstable fontification inside templates.
+
+        * progmodes/cc-langs.el (c-before-font-lock-functions): newly
+        created from the singular version.  The (c c++ objc) entry now
+        additionally has c-set-fl-decl-start.  The other languages (apart
+        from AWK) have that as a single entry.
+
+        * progmodes/cc-fonts.el (c-font-lock-enclosing-decls): The
+        functionality for "local" declarations has been extracted to
+        c-set-fl-decl-start.
+
+        * progmodes/cc-mode.el: (c-common-init, c-after-change): Changes
+        due to pluralisation of c-before-font-lock-functions.
+        (c-set-fl-decl-start): New function, extracted from
+        c-font-lock-enclosing-decls and enhanced.
+
+2011-12-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop-internal-v2s): Fix typos in docstring (bug#10353).
+
+2011-12-22  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/grep.el (rgrep): Fix docstring.  (Bug#10185)
+
+2011-12-22  Chong Yidong  <cyd@gnu.org>
+
+        * vc/vc-hooks.el (vc-keep-workfiles): Doc fix.
+
+2011-12-21  Drew Adams  <drew.adams@oracle.com>
+
+        * files.el (file-remote-p): Fix docstring.  (Bug#10319)
+
+2011-12-21  Jérémy Compostella  <jeremy.compostella@gmail.com>
+
+        * battery.el (battery-linux-sysfs): Add missing parameters from acpi.
+
+2011-12-21  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * progmodes/cfengine.el: Add Version.
+
+        Add CFEngine 3.x syntax highlighting and support with
+        `cfengine3-mode', and rename the old `cfengine-mode' to
+        `cfengine2-mode'.  Make `cfengine-mode' an automatic content-based
+        switcher between `cfengine3-mode' and `cfengine2-mode' by aliasing
+        it to `cfengine-auto-mode'.  Rename variables specific to
+        `cfengine2-mode' from cfengine-* to cfengine2-*.  Change the
+        modeline indicator to "CFE2" and "CFE3" depending on the mode, to
+        save space. Mark `cfengine-mode-abbrevs' as obsolete.
+
+2011-12-21  Chong Yidong  <cyd@gnu.org>
+
+        * vc/vc-bzr.el (vc-bzr-rename-file): Don't pass ~ to Bzr in
+        filename argument.
+
+2011-12-20  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-normalize-buffer-to-display): Remove.
+        (display-buffer): Handle buffer-or-name argument as in Emacs 23.
+
+2011-12-19  Chong Yidong  <cyd@gnu.org>
+
+        * vc/vc-dir.el (vc-dir-parent-marked-p, vc-dir-children-marked-p):
+        Don't signal an error in a predicate function; return non-nil.
+        (vc-dir-mark-file): Move the error here.
+        (vc-dir-mark-unmark): If acting on the region, keep going if one
+        of the entries cannot be marked/unmarked.
+        (vc-dir-mark-all-files): If current entry is a directory, mark
+        only child files, as documented.
+
+2011-12-19  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+        * ses.el: Ooops... undo changes of 2011-12-11T14:49:48Z!vincentb1@users.sourceforge.net, as trunk
+        branch is feature frozen, and 2011-12-11T14:49:48Z!vincentb1@users.sourceforge.net was a feature
+        addition.
+
+2011-12-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * term/ns-win.el (ns-get-selection-internal)
+        (ns-store-selection-internal): Declare.
+        (ns-store-cut-buffer-internal, ns-get-cut-buffer-internal):
+        Declare as obsolete.
+        (ns-get-pasteboard, ns-paste-secondary):
+        Use ns-get-selection-internal.
+        (ns-set-pasteboard,  ns-copy-including-secondary):
+        Use ns-store-selection-internal.
+
+2011-12-17  Chong Yidong  <cyd@gnu.org>
+
+        * vc/vc.el (vc-next-action): Doc fix; remove CVS-isms.
+        (vc-deduce-fileset): Doc fix.
+
+2011-12-16  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * calc/calc-misc.el (calc-help): Avoid wrapping help message.
+
+2011-12-13  Sam Steingold  <sds@gnu.org>
+
+        * man.el (Man-getpage-in-background): When running under a
+        window-system, ignore $MANWIDTH and $COLUMNS.
+
+2011-12-15  Kenichi Handa  <handa@m17n.org>
+
+        * language/ethio-util.el: Change coding tag to utf-8-emacs.
+        (setup-ethiopic-environment-internal): Comment out key-binding for
+        ethio-toggle-punctuation.
+
+2011-12-13  Alan Mackenzie  <acm@muc.de>
+
+        Add the switch statement to AWK Mode.
+
+        * progmodes/cc-awk (awk-font-lock-keywords): Add "switch", "case",
+        "default" to the keywords regexp.
+
+        * progmodes/cc-langs (c-label-kwds): Let AWK take the same
+        expression as the rest.
+        (c-nonlabel-token-key): Allow string literals for AWK.  Refactor
+        for the other modes.
+
+        Large brace-block initialisation makes CC Mode slow: Fix.
+        Tidy up and accelerate c-in-literal, etc. by using the
+        c-parse-state
+        routines.  Limit backward searching in c-font-lock-enclosing.decl.
+
+        * progmodes/cc-engine.el (c-state-pp-to-literal): Return the
+        pp-state and literal type in addition to the limits.
+        (c-state-safe-place): New defun, extracted from
+        c-state-literal-at.
+        (c-state-literal-at): Use the above new defun.
+        (c-slow-in-literal, c-fast-in-literal): Removed.
+        (c-in-literal, c-literal-limits): Amended to use
+        c-state-pp-to-literal.
+
+        * progmodes/cc-fonts.el (c-font-lock-enclosing-decls): Check for
+        being in a literal.  Add a limit for backward searching.
+
+        * progmodes/cc-mode.el (awk-mode): Don't alias c-in-literal to
+        c-slow-in-literal.
+
+2011-12-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/pascal.el: Declare `ind' as dyn-bound (bug#10264).
+
+2011-12-13  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (delete-other-windows): Use correct frame in call to
+        window-with-parameter.
+
+2011-12-12  Daniel Pfeiffer  <occitan@t-online.de>
+
+        * progmodes/make-mode.el: Bring it up to date with makepp V2.0.
+        (makefile-make-font-lock-keywords): Extend meaning of `keywords'.
+        (makefile-gmake-statements, makefile-makepp-statements):
+        Use it and add new makepp keywords.
+        (makefile-makepp-font-lock-keywords): Add new patterns.
+        (makefile-match-function-end): Match new [...] and [[...]].
+
+2011-12-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ses.el (ses-call-printer-return, ses-cell-property-get)
+        (ses-sym-rowcol, ses-printer-validate, ses-formula-record)
+        (ses-create-cell-variable, ses-reset-header-string)
+        (ses-cell-set-formula, ses-repair-cell-reference-all)
+        (ses-self-reference-early-detection, ses-in-print-area, ses-set-curcell)
+        (ses-check-curcell, ses-call-printer, ses-adjust-print-width)
+        (ses-print-cell-new-width, ses-formula-references, ses-relocate-formula)
+        (ses-aset-with-undo, ses-load, ses-truncate-cell)
+        (ses-read-column-printer, ses-read-default-printer, ses-insert-row)
+        (ses-delete-row, ses-delete-column, ses-append-row-jump-first-column)
+        (ses-kill-override, ses-yank-pop, ses-yank-cells, ses-yank-tsf)
+        (ses-yank-resize, ses-export-tab, ses-mark-row, ses-mark-column)
+        (ses-renarrow-buffer, ses-insert-range, ses-insert-ses-range)
+        (ses-safe-printer, ses-safe-formula, ses-warn-unsafe, ses--clean-!)
+        (ses--clean-_, ses-range, ses-select, ses-center, ses-center-span)
+        (ses-dashfill, ses-unsafe): Fix typos and reflow docstrings.
+
+2011-12-11  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+        * ses.el: The overall change is to add cell renaming, that is
+        setting fancy names for cell symbols other than name matching
+        "\\`[A-Z]+[0-9]+\\'" regexp .
+        (ses-create-cell-variable): New defun.
+        (ses-relocate-formula): Relocate formulas only for cells the
+        symbols of which are not renamed, i.e. symbols whose names do not
+        match regexp "\\`[A-Z]+[0-9]+\\'".
+        (ses-relocate-all): Relocate values only for cells the symbols of
+        which are not renamed.
+        (ses-load): Create cells variables as the (ses-cell ...) are read,
+        in order to check row col consistency with cell symbol name only
+        for cells that are not renamed.
+        (ses-replace-name-in-formula): New defun.
+        (ses-rename-cell): New defun.
+
+2011-12-11  Chong Yidong  <cyd@gnu.org>
+
+        * progmodes/gdb-mi.el (gdb): Set comint-prompt-regexp, required
+        for completion via gud-gdb-fetch-lines-filter (Bug#10274).
+
+2011-12-11  Eric Hanchrow  <eric.hanchrow@gmail.com>
+
+        * window.el (other-window): Fix docstring.
+
+2011-12-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/rmailsum.el (rmail-header-summary): RFC2047 decode the
+        `from' or `to' address before taking its substring.  Fixes
+        incorrect display in Rmail summary buffer whereby an RFC2047
+        encoded name is chopped in the middle of the encoded string, and
+        thus displayed encoded.
+
+2011-12-10  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (update-subdirs-CMD): Use a Local Variables section.
+
+2011-12-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * textmodes/texnfo-upd.el: Update commentary.  Add a warning not
+        to use texinfo-update-node and commands that call it if the
+        Texinfo file uses @node lines without next/prev/up pointers.
+        Correct outdated description about texinfo-master-menu.
+        (texinfo-all-menus-update, texinfo-master-menu)
+        (texinfo-update-node, texinfo-every-node-update)
+        (texinfo-multiple-files-update): Doc fix.  Warn against updating
+        all the @node lines.
+        (texinfo-master-menu): Only call texinfo-update-node if the prefix
+        argument is numeric.  Explain better in the doc string what the
+        function really does.
+        (texinfo-insert-master-menu-list): Improve the error message
+        displayed if there's no menu in the Top node.
+        (Bug#2975)  See also this thread:
+        http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00156.html.
+
+2011-12-09  Manuel Gómez  <mgrojo@gmail.com>  (tiny change)
+
+        * speedbar.el (speedbar-supported-extension-expressions):
+        Add .adb and .ads, commonly used for Ada source code (bug#10256).
+
+2011-12-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * printing.el (pr-mode-alist):
+        * simple.el (filter-buffer-substring-functions)
+        (completion-list-insert-choice-function):
+        * window.el (window-with-parameter, window-atom-root)
+        (window-sides-slots, window-size-fixed, window-min-delta)
+        (window-max-delta, window--resize-mini-window)
+        (window--resize-child-windows-normal, window-tree)
+        (delete-other-windows, quit-window, split-window)
+        (display-buffer-record-window, special-display-buffer-names)
+        (special-display-regexps, special-display-popup-frame)
+        (same-window-p, split-window-sensibly)
+        (display-buffer-overriding-action, display-buffer-alist)
+        (display-buffer-base-action, display-buffer, switch-to-buffer)
+        (switch-to-buffer-other-window, switch-to-buffer-other-frame)
+        (fit-window-to-buffer, recenter-positions)
+        (mouse-autoselect-window-state, mouse-autoselect-window-select):
+        * emacs-lisp/syntax.el (syntax-propertize-function): Fix typos
+        and remove unneeded backslashes in docstrings.
+
+2011-12-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/lisp-mode.el (defmethod): Add doc-string-elt (bug#10244).
+
+        * pcmpl-gnu.el: Don't fail when there is no Makefile nor -f arg.
+        (pcmpl-gnu-makefile-regexps): Accept "makefile" as well as files that
+        end in ".mk".
+        (pcmpl-gnu-make-rule-names): Check "makefile" and ignore errors
+        when reading the makefile (bug#10116).
+
+2011-12-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcmpl-gnu.el (pcomplete/make): Also allow filename arguments
+        (bug#10116).
+
+2011-12-06  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/package.el (package-archives): Doc fix re riskiness.
+
+2011-12-06  Chong Yidong  <cyd@gnu.org>
+
+        * progmodes/cc-fonts.el (c-annotation-face): Use defface.
+
+2011-12-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * textmodes/table.el (table-shorten-cell): Fix typo.
+
+2011-12-05  Christopher Genovese  <genovese.cr@gmail.com>  (tiny change)
+
+        * emacs-lisp/assoc.el (aput): Fix return value (bug#10146)
+
+2011-12-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * descr-text.el (describe-char): Fix display of strong
+        right-to-left characters and directional embeddings and overrides.
+
+        * simple.el (what-cursor-position): Fix display of codepoints of
+        strong right-to-left characters.
+
+2011-12-05  Chong Yidong  <cyd@gnu.org>
+
+        * faces.el (read-color): Doc fix.
+
+2011-12-05  Glenn Morris  <rgm@gnu.org>
+
+        * align.el (align--set-marker): Add doc-string.
+        Don't try to move something that is not a marker.  (Bug#10216)
+
+2011-12-04  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/appt.el (appt-add): Rewrite the interactive-spec to avoid
+        overly zealous deletion of trailing whitespace.
+
+2011-12-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * server.el (server-delete-client): On Windows, do not try to delete
+        the only terminal.
+        (server-process-filter): On Windows, treat requests for a tty frame as
+        if they were for a GUI frame if the running server is in GUI mode.
+
 2011-12-03  Glenn Morris  <rgm@gnu.org>
 
         * textmodes/texinfmt.el (batch-texinfo-format): Doc fix.  (Bug#10207)
@@ -112,11 +492,11 @@
         (verilog-inject-sense, verilog-read-inst-pins)
         (verilog-read-sub-decls, verilog-read-sub-decls-line):
         Fix mismatching parenthesis inside commented out code when deleting
-        AUTOINST, bug383. Reported by Jonathan Greenlaw.
+        AUTOINST, bug383.  Reported by Jonathan Greenlaw.
         (verilog-auto-ascii-enum): Fix AUTOASCIIENUM one-hot with
         non-numeric vector width.  Reported by Alex Reed.
         (verilog-auto-ascii-enum): Add "onehot" option to work around not
-        detecting signals with parameter widths. Reported by Alex Reed.
+        detecting signals with parameter widths.  Reported by Alex Reed.
         (verilog-auto-delete-trailing-whitespace):
         With `verilog-auto-delete-trailing-whitespace' remove trailing
         whitespace in auto expansion, bug371.  Reported by Brad Dobbie.
@@ -384,8 +764,8 @@
 
 2011-11-21  Juri Linkov  <juri@jurta.org>
 
-        * calc/calc.el (calc-read-key-sequence): Let-bind `input-method-function'
-        to nil.  (Bug#10018)
+        * calc/calc.el (calc-read-key-sequence):
+        Let-bind `input-method-function' to nil.  (Bug#10018)
 
 2011-11-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -1915,11 +2295,10 @@
 2011-09-24  Ulf Jasper  <ulf.jasper@web.de>
 
         * net/newst-reader.el (newsticker-html-renderer)
-        (newsticker-show-news): Automatically
-        load html rendering package if newsticker-html-renderer is set.
-        Fixes "Warning: defvar ignored because w3m-fill-column is
-        let-bound" and the error "Symbol's value as variable is void:
-        w3m-fill-column".
+        (newsticker-show-news): Automatically load html rendering package
+        if newsticker-html-renderer is set.  Fixes "Warning: defvar ignored
+        because w3m-fill-column is let-bound" and the error "Symbol's value
+        as variable is void: w3m-fill-column".
 
 2011-09-24  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -2033,8 +2412,8 @@
 2011-09-21  Martin Rudalics  <rudalics@gmx.at>
 
         * window.el (set-window-buffer-start-and-point):
-        Call set-window-start with NOFORCE argument t.  Suggested by Thierry
-        Volpiatto <thierry.volpiatto@gmail.com>.
+        Call set-window-start with NOFORCE argument t.
+        Suggested by Thierry Volpiatto <thierry.volpiatto@gmail.com>.
         (quit-window): Reword doc-string.  Handle new format of
         quit-restore parameter.  Don't delete window if it has a
         previous buffer we can show instead of the present one.
@@ -2152,13 +2531,13 @@
 2011-09-18  Juri Linkov  <juri@jurta.org>
 
         * info.el (Info-mode-syntax-table): New variable.
-        (Info-mode): Set `:syntax-table' to `Info-mode-syntax-table'.  (Bug#3312)
+        (Info-mode): Set `:syntax-table' to `Info-mode-syntax-table' (bug#3312).
 
 2011-09-18  Juri Linkov  <juri@jurta.org>
 
-        * info.el (Info-file-supports-index-cookies): Increment
-        line-beginning-position's arg from 3 to 4 because makeinfo outputs
-        one more line for long file names (bug#4142).
+        * info.el (Info-file-supports-index-cookies):
+        Increment line-beginning-position's arg from 3 to 4 because makeinfo
+        outputs one more line for long file names (bug#4142).
 
 2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -4450,8 +4829,8 @@
         pending encryption.
 
         (allout-inhibit-auto-save-info-for-decryption):
-        Adjust buffer-saved-size and some allout state to inhibit auto-saves if
-        there are plain-text topics pending encryption.
+        Adjust buffer-saved-size and some allout state to inhibit auto-saves
+        if there are plain-text topics pending encryption.
 
         (allout-maybe-resume-auto-save-info-after-encryption): Adjust
         buffer-saved-size and some allout state to not inhibit auto-saves
@@ -5064,7 +5443,7 @@
         (ses-calculate-cell, ses-update-cells): Use Dijkstra algorithm for
         cycle detection.
         (ses-self-reference-early-detection): New defcustom.
-        (ses-formula-references): Robustify against self-refering cells.
+        (ses-formula-references): Robustify against self-referring cells.
         (ses-mode): Use ses-set-localvars.
         (ses-command-hook): Add call to ses-initialize-Dijkstra-attempt
         before lauching the update processing.
@@ -5353,7 +5732,7 @@
 
         * net/network-stream.el (network-stream-open-starttls): Support
         upgrading to STARTTLS always, even if we don't have built-in support.
-        (open-network-stream): Add the :always-query-capabilies keyword.
+        (open-network-stream): Add the :always-query-capabilities keyword.
 
         * mail/smtpmail.el: Rewritten to do opportunistic STARTTLS
         upgrades with `open-network-stream', and rely solely on
@@ -5881,11 +6260,11 @@
         (split-window-keep-point): Mention split-window-above-each-other
         instead of split-window-vertically.
         (split-window-above-each-other, split-window-vertically):
-        Rename split-window-vertically to split-window-above-each-other and
-        provide defalias for old definition.
-        (split-window-side-by-side, split-window-horizontally): Rename
-        split-window-horizontally to split-window-side-by-side and provide
-        defalias for the old definition.
+        Rename split-window-vertically to split-window-above-each-other
+        and provide defalias for old definition.
+        (split-window-side-by-side, split-window-horizontally):
+        Rename split-window-horizontally to split-window-side-by-side
+        and provide defalias for the old definition.
         (ctl-x-map): Move bindings for delete-window,
         delete-other-windows and enlarge-window here from window.c.
         Replace bindings for split-window-vertically and
@@ -9308,10 +9687,10 @@
         preserves the existing header prefix, rebulleting it if necessary,
         rather than replacing it.  This is necessary for proper operation
         of cooperative addons like allout-widgets.
-        (allout-make-topic-prefix, allout-rebullet-heading): Change
-        SOLICIT arg to INSTEAD, and interpret additionally a string value
-        as alternate bullet to be used, instead of prompting the user for
-        a bullet character.
+        (allout-make-topic-prefix, allout-rebullet-heading):
+        Change SOLICIT arg to INSTEAD, and interpret additionally a string
+        value as alternate bullet to be used, instead of prompting the user
+        for a bullet character.
 
 2011-03-09  Michael Albinus  <michael.albinus@gmx.de>
 
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index a1cfaee6eaf..d6ac498c877 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -8278,7 +8278,7 @@
 2002-11-17  Markus Rost  <rost@math.ohio-state.edu>
 
         * speedbar.el (defgroup speedbar): Use group 'etags instead of
-        nonexisting group 'tags.
+        nonexistent group 'tags.
 
         * emacs-lisp/re-builder.el: Add provide call.
 
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index 38a5530fbfc..dd1d113d665 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -1744,7 +1744,7 @@
         substitute-env-vars -- not quite shell compatible but better than
         nothing.
         (compilation-error-regexp-alist-alist): Simplify ftnchek to only
-        handle the newer versions messages, which are more parseable.
+        handle the newer versions messages, which are more parsable.
 
 2004-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 8721130ec50..55335533b7a 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -6278,7 +6278,7 @@
         Register changes using allout-exposure-change-hook.
         Disregard aberrant topics.
         (allout-shift-in): With universal-argument, make topic a peer of
-        it's former offspring.  Simplify the code by separating out
+        its former offspring.  Simplify the code by separating out
         allout-shift-out functionality.
         (allout-shift-out): With universal-argument, make offspring peers
         of their former container, and its siblings.  Implement the
@@ -7177,7 +7177,7 @@
 2006-08-20  Chong Yidong  <cyd@stupidchicken.com>
 
         * frame.el (blink-cursor-start): Set timer first.
-        (blink-cursor-end): Ignore timer cancelling errors.
+        (blink-cursor-end): Ignore timer canceling errors.
         Suggested by Ken Manheimer.
 
 2006-08-20  Juanma Barranquero  <lekktu@gmail.com>
@@ -15842,7 +15842,7 @@
         interactive spec from "p" to "P".
 
         * progmodes/cc-styles.el: Amend the doc-string of c-set-style, in
-        reponse to a report from Joseph Kiniry <kiniry@acm.org> that it
+        response to a report from Joseph Kiniry <kiniry@acm.org> that it
         was difficult to understand.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
@@ -18459,7 +18459,7 @@
         reveal-open-spots, so as to be more reliable.  There were several
         tricky corner cases where an open spot might be lost, or where
         a closed spot might end up on the list of open spots.
-        Only reveal text that's ellipsised.
+        Only reveal text that's ellipsized.
 
 2005-11-07  Carsten Dominik  <dominik@science.uva.nl>
 
@@ -27413,7 +27413,7 @@
         which has been added in Emacs 21.1.
         (c-mode, c++-mode, objc-mode, java-mode, idl-mode, pike-mode)
         (awk-mode): Use it.
-        (make-local-hook): Suppress warning about obsoleteness.
+        (make-local-hook): Suppress warning about obsolescence.
 
         * progmodes/cc-engine.el, cc-align.el, cc-cmds.el
         (c-append-backslashes-forward, c-delete-backslashes-forward)
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index 12eadc6aadf..558718a5a5f 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -7261,7 +7261,7 @@
         * progmodes/gdb-ui.el (gdb-parent-bptno-enabled): New variable.
         (gdb-breakpoint-regexp, gdb-mouse-toggle-breakpoint-margin)
         (gdb-mouse-toggle-breakpoint-fringe, gdb-delete-breakpoint)
-        (gdb-goto-breakpoint): Generalise for breakpoints with multiple
+        (gdb-goto-breakpoint): Generalize for breakpoints with multiple
         locations.
         (gdb-info-breakpoints-custom, gdb-assembler-custom)
         (gdb-toggle-breakpoint): Update for new gdb-breakpoint-regexp.
@@ -8010,7 +8010,7 @@
 2007-10-31  Juanma Barranquero  <lekktu@gmail.com>
 
         * help-at-pt.el (help-at-pt-unload-hook): Remove.
-        Timers are automatically cancelled by `unload-feature'.
+        Timers are automatically canceled by `unload-feature'.
 
         * delsel.el (delsel-unload-hook): Remove function and variable.
         (delsel-unload-function): New-style unload function, adapted
@@ -10869,7 +10869,7 @@
 
 2007-09-23  Glenn Morris  <rgm@gnu.org>
 
-        * ses.el (ses-calculate-cell): Don't evaluate unsafe formulae.
+        * ses.el (ses-calculate-cell): Don't evaluate unsafe formulas.
 
 2007-09-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index 0348a0141a2..5620b90a3f4 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -866,7 +866,7 @@
 
         * calc/calc-embed.el (calc-embedded-restore-original-modes):
         Add argument for Calculator buffer.
-        (calc-do-embedded): Use specific Calculator buffer when cancelling
+        (calc-do-embedded): Use specific Calculator buffer when canceling
         embedded mode.
 
         * calc/calc.el (calc-buffer-list): New variable.
@@ -3473,7 +3473,7 @@
 2009-01-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * diff-mode.el (diff-show-trailing-whitespaces): Remove function.
-        Move setting up whitepace-mode ...
+        Move setting up whitespace-mode ...
         (diff-mode): ... here.
         (diff-mode-menu): Add a menu entry for showing trailing whitespace.
 
@@ -19176,7 +19176,7 @@
         toggle-read-only.
 
         * textmodes/bibtex.el (bibtex-format-entry): Handle error message
-        refering to a missing required field with the OPT prefix.
+        referring to a missing required field with the OPT prefix.
         Make unwindform more robust.
 
         * textmodes/bibtex.el: Remove support for hideshow minor mode as
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index e0c244d5725..6e13c1156ce 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -7086,7 +7086,7 @@
         (sql-mode-oracle-font-lock-keywords): Improve SQL*Plus REMARK
         syntax pattern.
         (sql-mode-postgres-font-lock-keywords): Support Postgres V9.
-        (sql-mode-sqlite-font-lock-keywords): Hilight sqlite commands.
+        (sql-mode-sqlite-font-lock-keywords): Highlight sqlite commands.
 
 2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -8618,7 +8618,7 @@
         (menu-bar-showhide-tool-bar-menu-customize-enable-right)
         (menu-bar-showhide-tool-bar-menu-customize-enable-bottom)
         (menu-bar-showhide-tool-bar-menu-customize-enable-top): New functions
-        (menu-bar-showhide-tool-bar-menu): If tool bar is moveable,
+        (menu-bar-showhide-tool-bar-menu): If tool bar is movable,
         make a menu for Options => toolbar that can move it.
 
 2010-07-29  Chong Yidong  <cyd@stupidchicken.com>
@@ -11908,7 +11908,7 @@
         Add new VC methods: vc-log-incoming and vc-log-outgoing.
         * vc.el (vc-print-log-setup-buttons): New function split out from
         vc-print-log-internal.
-        (vc-log-internal-common): New function, a parametrized version of
+        (vc-log-internal-common): New function, a parameterized version of
         vc-print-log-internal.
         (vc-print-log-internal): Just call vc-log-internal-common with the
         right arguments.
diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index 65005a4ba47..957c9c7deff 100644
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -60,7 +60,7 @@
 
 1988-08-03  Robert J. Chassell  (bob@frosted-flakes.ai.mit.edu)
 
-        * texinfo.el: Changed fill-colum from 75 to 72.  The larger
+        * texinfo.el: Changed fill-column from 75 to 72.  The larger
         fill-column causes numerous overfull hboxes in TeX when you are
         writing Emacs Lisp code that will be formatted as a Texinfo example.
 
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index cb39ca5997f..e0f9bc9ade2 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -6305,7 +6305,7 @@
         to "Non-echoed text: ".  This conforms with the convention
         used by existing prompts, and gives more room to type stuff.
 
-        * comint.el (comint-last-input-start): New varible.  In
+        * comint.el (comint-last-input-start): New variable.  In
         particular, this helps support subprocesses that insist on echoing
         their input.  Added comments to porting guide indicating that
         this should probably not be used for implementing history stuff.
@@ -8647,7 +8647,7 @@
         * comint.el, inf-lisp.el, shell.el: Updated to meet Olin's
         version 2.0 comint offerings.
         * ring.el: The underlying history mechanism for comint.
-        Generalised handling of a ring data type based on vectors.
+        Generalized handling of a ring data type based on vectors.
         * history.el: For now, a symlink to ring.el.
         * loaddefs.el: Updated shell-prompt-pattern doc string.
 
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 934258ade67..b05707abe5c 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -884,7 +884,7 @@
 1998-07-21  Kenichi Handa  <handa@etl.go.jp>
 
         * international/kkc.el (kkc-region): Handled the case that
-        conversion is cancelled.
+        conversion is canceled.
         (kkc-terminate): Update kkc-overlay-head correctly.
         (kkc-cancel): Don't call kkc-terminate, but set kkc-converting to nil.
 
@@ -12129,7 +12129,7 @@
 
         * cc-mode.el (c-buffer-is-cc-mode):
         Definition moved here from cc-vars.el.  Also,
-        put permanent-local property on variable so it's value won't get
+        put permanent-local property on variable so its value won't get
         killed by kill-all-local-variables.
 
         * cc-mode.el (c++-mode, java-mode, objc-mode, idl-mode):
@@ -13088,7 +13088,7 @@
 
 1997-07-25  Simon Marshall  <simon@frobnitz.gnu.ai.mit.edu>
 
-        * complete.el: Customise; as subgroup of minibuffer.
+        * complete.el: Customize; as subgroup of minibuffer.
         (partial-completion-mode): New option to toggle mode.
         (partial-completion-mode): New command to toggle mode.
         Add and remove hooks here, i.e., not at the top-level.
@@ -13617,7 +13617,7 @@
 
 1997-07-15  Simon Marshall  <simon@albert.gnu.ai.mit.edu>
 
-        * mouse-sel.el: Customise; create mouse-sel as subgroup of mouse.
+        * mouse-sel.el: Customize; create mouse-sel as subgroup of mouse.
         (mouse-sel-mode): New option to toggle mode.
         (mouse-sel-mode): New command to toggle mode.
         (mouse-sel-set-selection-function): If mouse-sel-default-bindings is
@@ -13625,7 +13625,7 @@
         (mouse-sel-bindings): New function to install/restore mouse bindings.
         This is called by mouse-sel-mode, i.e., not at the top-level.
 
-        * delsel.el: Customise; as part of editing-basics group.
+        * delsel.el: Customize; as part of editing-basics group.
         (delete-selection-mode): Convert to autoloaded option.  Default to nil.
         (delete-selection-mode): Define before option.
         Modify pre-command-hook here, i.e., not at the top-level.
@@ -14943,7 +14943,7 @@
         paren-matching) and put all blink-matching-paren variables in the
         former (as opposed to the latter) group.
 
-        * paren.el: Customise; paren-showing as a subgroup of paren-matching.
+        * paren.el: Customize; paren-showing as a subgroup of paren-matching.
         (show-paren-style): New variable.
         (show-paren-match-face)
         (show-paren-mismatch-face): New faces.
@@ -18871,7 +18871,7 @@
 
 1997-04-16  Simon Marshall  <simon@wombat.gnu.ai.mit.edu>
 
-        * font-lock.el: Customise.
+        * font-lock.el: Customize.
         (font-lock-defaults-alist): Leave ~ syntax alone in C++.
         (font-lock-match-c++-style-declaration-item-and-skip-to-next): Match ~
         characters here.
@@ -18883,10 +18883,10 @@
         (font-lock-compile-keywords): Don't set font-lock-keywords.
         (font-lock-fontify-keywords-region): Set it here.
 
-        * fast-lock.el: Customise.
+        * fast-lock.el: Customize.
         (fast-lock-cache-data): Simplify calls of font-lock-compile-keywords.
 
-        * lazy-lock.el: Customise.
+        * lazy-lock.el: Customize.
         (lazy-lock-fontify-conservatively): Fontify around WINDOW's point.
 
         * shell.el (shell-font-lock-keywords): Use EVAL form for prompt.
@@ -19534,7 +19534,7 @@
         the innermost test.  This catches GNU-style comments.
 
         * cc-mode.el (c-add-syntax):
-        Move macro definition to before it's first use.
+        Move macro definition to before its first use.
 
         * cc-mode.el (c-submit-bug-report):
         Capture buffer local variable values which are
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 1c38b4d9ac6..252b3854f7a 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -6620,7 +6620,7 @@
         (ansi-color-process-output): New function.  It is automatically
         added to comint-output-filter-functions if this is XEmacs.
         (ansi-color-unfontify-region): New optional parameter for XEmacs
-        compatibility.  Check wether font-lock-syntactic-keywords is
+        compatibility.  Check whether font-lock-syntactic-keywords is
         boundp before removing the syntax table text property, as XEmacs
         doesn't have it.
         (ansi-color-filter-region): Doc change.
diff --git a/lisp/align.el b/lisp/align.el
index 0d9f351b9da..214c3add93f 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -109,7 +109,7 @@
 ;; simple algorithm that understand only basic regular expressions.
 ;; Parts of the code were broken up and included in vhdl-mode.el
 ;; around this time.  After several comments from users, and a need to
-;; find a more robust, performant algorithm, 2.0 was born in late
+;; find a more robust, higher performing algorithm, 2.0 was born in late
 ;; 1998.  Many different approaches were taken (mostly due to the
 ;; complexity of TeX tables), but finally a scheme was discovered
 ;; which worked fairly well for most common usage cases.  Development
@@ -1247,7 +1247,9 @@ have been aligned.  No changes will be made to the buffer."
         (setq areas (cdr areas))))))
 
 (defmacro align--set-marker (marker-var pos &optional type)
-  `(if ,marker-var
+  "If MARKER-VAR is a marker, move it to position POS.
+Otherwise, create a new marker at position POS, with type TYPE."
+  `(if (markerp ,marker-var)
        (move-marker ,marker-var ,pos)
      (setq ,marker-var (copy-marker ,pos ,type))))
 
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index dfd9adad2a7..715879534b0 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -108,7 +108,7 @@ inhibition of allout-widgets-mode."
 ;;;_  > allout-widgets-setup (varname value)
 ;;;###autoload
 (defun allout-widgets-setup (varname value)
-  "Commission or decommision allout-widgets-mode along with allout-mode.
+  "Commission or decommission allout-widgets-mode along with allout-mode.
 
 Meant to be used by customization of `allout-widgets-auto-activation'."
   (set-default varname value)
diff --git a/lisp/allout.el b/lisp/allout.el
index 68330aa538b..480c22d31e0 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1872,7 +1872,7 @@ at the beginning of the current entry.
 
                              Extending Allout
 
-Allout exposure and authoring activites all have associated
+Allout exposure and authoring activities all have associated
 hooks, by which independent code can cooperate with allout
 without changes to the allout core.  Here are key ones:
 
@@ -3334,7 +3334,7 @@ coordinating with allout activity.")
       (run-hooks 'allout-post-undo-hook)
       (cond ((and (= buffer-saved-size -1)
                   allout-auto-save-temporarily-disabled)
-             ;; user possibly undid a decryption, deinhibit auto-save:
+             ;; user possibly undid a decryption, disinhibit auto-save:
              (allout-maybe-resume-auto-save-info-after-encryption))
             ((save-excursion
                (save-restriction
@@ -5871,7 +5871,7 @@ encryption.
 Further, encrypting with a KEYMODE-CUE universal argument greater
 than 4 - eg, preceded by a doubled Ctrl-U - causes association of
 the specified recipients with the file, replacing those currently
-associated with it.  This can be used to deassociate any
+associated with it.  This can be used to dissociate any
 recipients with the file, by selecting no recipients in the
 dialog.
 
@@ -5912,7 +5912,7 @@ encryption.
 Further, encrypting with a KEYMODE-CUE universal argument greater
 than 4 - eg, preceded by a doubled Ctrl-U - causes association of
 the specified recipients with the file, replacing those currently
-associated with it.  This can be used to deassociate any
+associated with it.  This can be used to dissociate any
 recipients with the file, by selecting no recipients in the
 dialog.
 
@@ -6045,7 +6045,7 @@ encryption.
 Further, encrypting with a KEYMODE-CUE universal argument greater
 than 4 - eg, preceded by a doubled Ctrl-U - causes association of
 the specified recipients with the file, replacing those currently
-associated with it.  This can be used to deassociate any
+associated with it.  This can be used to dissociate any
 recipients with the file, by selecting no recipients in the
 dialog.
 
@@ -6661,7 +6661,7 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
       (if (/= arg 1)
           (condition-case nil (line-move (1- arg)) (error nil)))
 
-      ;; Move to beginning-of-line, ignoring fields and invisibles.
+      ;; Move to beginning-of-line, ignoring fields and invisible text.
       (skip-chars-backward "^\n")
       (while (and (not (bobp))
                   (let ((prop
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 4d6f02a40b7..abb6a961018 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -413,7 +413,7 @@ start of the region and set the face with which to start.  Set
           (setq ansi-color-context-region nil))))))
 
 ;; This function helps you look for overlapping overlays.  This is
-;; usefull in comint-buffers.  Overlapping overlays should not happen!
+;; useful in comint-buffers.  Overlapping overlays should not happen!
 ;; A possible cause for bugs are the markers.  If you create an overlay
 ;; up to the end of the region, then that end might coincide with the
 ;; process-mark.  As text is added BEFORE the process-mark, the overlay
@@ -585,7 +585,7 @@ ANSI-CODE is used as an index into the vector."
   "Create a new face by applying all the parameters in ESCAPE-SEQ.
 
 Should any of the parameters result in the default face (usually this is
-the parameter 0), then the effect of all previous parameters is cancelled.
+the parameter 0), then the effect of all previous parameters is canceled.
 
 ESCAPE-SEQ is a SGR control sequences such as \\033[34m.  The parameter
 34 is used by `ansi-color-get-face-1' to return a face definition."
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 48b4c5be164..816291166fa 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -860,13 +860,13 @@ using `make-temp-file', and the generated name is returned."
           dir)))
     (if (or alien (file-exists-p fullname))
         (progn
-          ;; Maked sure all the leading directories in
+          ;; Make sure all the leading directories in
           ;; archive-local-name exist under archive-tmpdir, so that
           ;; the directory structure recorded in the archive is
           ;; reconstructed in the temporary directory.
           (make-directory (file-name-directory tmpfile) t)
           (make-temp-file tmpfile))
-      ;; Maked sure all the leading directories in `fullname' exist
+      ;; Make sure all the leading directories in `fullname' exist
       ;; under archive-tmpdir.  This is necessary for nested archives
       ;; (`archive-extract' sets `archive-remote' to t in case
       ;; an archive occurs inside another archive).
diff --git a/lisp/battery.el b/lisp/battery.el
index 3b245ed644d..bb899f2beae 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -421,10 +421,15 @@ format introduced in Linux version 2.4.25.
 
 The following %-sequences are provided:
 %c Current capacity (mAh or mWh)
+%r Current rate
 %B Battery status (verbose)
+%d Temperature (in degrees Celsius)
 %p Battery load percentage
-%L AC line status (verbose)"
-  (let (charging-state
+%L AC line status (verbose)
+%m Remaining time (to charge or discharge) in minutes
+%h Remaining time (to charge or discharge) in hours
+%t Remaining time (to charge or discharge) in the form `h:min'"
+  (let (charging-state rate temperature hours
         (charge-full 0.0)
         (charge-now 0.0)
         (energy-full 0.0)
@@ -444,6 +449,12 @@ The following %-sequences are provided:
           (and (re-search-forward "POWER_SUPPLY_STATUS=\\(.*\\)$" nil t)
                (member charging-state '("Unknown" "Full" nil))
                (setq charging-state (match-string 1)))
+          (when (re-search-forward
+                 "POWER_SUPPLY_\\(CURRENT\\|POWER\\)_NOW=\\([0-9]*\\)$"
+                 nil t)
+            (setq rate (float (string-to-number (match-string 2)))))
+          (when (re-search-forward "POWER_SUPPLY_TEMP=\\([0-9]*\\)$" nil t)
+            (setq temperature (match-string 1)))
           (let (full-string now-string)
             ;; Sysfs may list either charge (mAh) or energy (mWh).
             ;; Keep track of both, and choose which to report later.
@@ -466,12 +477,30 @@ The following %-sequences are provided:
                    (setq energy-full (+ energy-full
                                         (string-to-number full-string))
                          energy-now  (+ energy-now
-                                        (string-to-number now-string)))))))))
+                                        (string-to-number now-string))))))
+          (goto-char (point-min))
+          (when (and energy-now rate (not (zerop rate))
+                     (re-search-forward
+                      "POWER_SUPPLY_VOLTAGE_NOW=\\([0-9]*\\)$" nil t))
+            (let ((remaining (if (string= charging-state "Discharging")
+                                 energy-now
+                               (- energy-full energy-now))))
+              (setq hours (/ (/ (* remaining (string-to-number
+                                              (match-string 1)))
+                                rate)
+                             10000000.0)))))))
     (list (cons ?c (cond ((or (> charge-full 0) (> charge-now 0))
                           (number-to-string charge-now))
                          ((or (> energy-full 0) (> energy-now 0))
                           (number-to-string energy-now))
                          (t "N/A")))
+          (cons ?r (if rate (format "%.1f" (/ rate 1000000.0)) "N/A"))
+          (cons ?m (if hours (format "%d" (* hours 60)) "N/A"))
+          (cons ?h (if hours (format "%d" hours) "N/A"))
+          (cons ?t (if hours
+                       (format "%d:%02d" hours (* (- hours (floor hours)) 60))
+                     "N/A"))
+          (cons ?d (or temperature "N/A"))
           (cons ?B (or charging-state "N/A"))
           (cons ?p (cond ((> charge-full 0)
                           (format "%.1f"
diff --git a/lisp/calc/calc-alg.el b/lisp/calc/calc-alg.el
index 274f399fe6a..5ad1e58b45c 100644
--- a/lisp/calc/calc-alg.el
+++ b/lisp/calc/calc-alg.el
@@ -1841,7 +1841,7 @@
              expr))))
 
 ;;; Simplify a polynomial in list form by stripping off high-end zeros.
-;;; This always leaves the constant part, i.e., nil->nil and nonnil->nonnil.
+;;; This always leaves the constant part, i.e., nil->nil and non-nil->non-nil.
 (defun math-poly-simplify (p)
   (and p
        (if (Math-zerop (nth (1- (length p)) p))
diff --git a/lisp/calc/calc-menu.el b/lisp/calc/calc-menu.el
index d8099b0aadc..d8c01656784 100644
--- a/lisp/calc/calc-menu.el
+++ b/lisp/calc/calc-menu.el
@@ -24,19 +24,19 @@
 (defvar calc-arithmetic-menu
   (list "Arithmetic"
         (list "Basic"
-              ["-(1:)"         calc-change-sign 
+              ["-(1:)"         calc-change-sign
                :keys "n" :active (>= (calc-stack-size) 1)]
-              ["(2:) + (1:)"   calc-plus   
+              ["(2:) + (1:)"   calc-plus
                :keys "+" :active (>= (calc-stack-size) 2)]
-              ["(2:) - (1:)"   calc-minus  
+              ["(2:) - (1:)"   calc-minus
                :keys "-" :active (>= (calc-stack-size) 2)]
-              ["(2:) * (1:)"   calc-times  
+              ["(2:) * (1:)"   calc-times
                :keys "*" :active (>= (calc-stack-size) 2)]
-              ["(2:) / (1:)"   calc-divide 
+              ["(2:) / (1:)"   calc-divide
                :keys "/" :active (>= (calc-stack-size) 2)]
-              ["(2:) ^ (1:)"   calc-power  
+              ["(2:) ^ (1:)"   calc-power
                :keys "^" :active (>= (calc-stack-size) 2)]
-              ["(2:) ^ (1/(1:))" 
+              ["(2:) ^ (1/(1:))"
                (progn
                  (require 'calc-ext)
                  (let ((calc-inverse-flag t))
@@ -44,8 +44,8 @@
                :keys "I ^"
                :active (>= (calc-stack-size) 2)
                :help "The (1:)th root of (2:)"]
-              ["abs(1:)"   
-               (progn 
+              ["abs(1:)"
+               (progn
                  (require 'calc-arith)
                  (call-interactively 'calc-abs))
                :keys "A"
@@ -57,7 +57,7 @@
                  (call-interactively 'calc-inv))
                :keys "&"
                :active (>= (calc-stack-size) 1)]
-              ["sqrt(1:)" 
+              ["sqrt(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-sqrt))
@@ -70,7 +70,7 @@
                :keys "\\"
                :active (>= (calc-stack-size) 2)
                :help "The integer quotient of (2:) over (1:)"]
-              ["(2:) mod (1:)"  
+              ["(2:) mod (1:)"
                (progn
                  (require 'calc-misc)
                  (call-interactively 'calc-mod))
@@ -78,28 +78,28 @@
                :active (>= (calc-stack-size) 2)
                :help "The remainder when (2:) is divided by (1:)"])
         (list "Rounding"
-              ["floor(1:)" 
+              ["floor(1:)"
                (progn
                  (require 'calc-arith)
                  (call-interactively 'calc-floor))
                :keys "F"
                :active (>= (calc-stack-size) 1)
                :help "The greatest integer less than or equal to (1:)"]
-              ["ceiling(1:)"  
+              ["ceiling(1:)"
                (progn
                  (require 'calc-arith)
                  (call-interactively 'calc-ceiling))
                :keys "I F"
                :active (>= (calc-stack-size) 1)
                :help "The smallest integer greater than or equal to (1:)"]
-              ["round(1:)"    
+              ["round(1:)"
                (progn
                  (require 'calc-arith)
                  (call-interactively 'calc-round))
                :keys "R"
                :active (>= (calc-stack-size) 1)
                :help "The nearest integer to (1:)"]
-              ["truncate(1:)" 
+              ["truncate(1:)"
                (progn
                  (require 'calc-arith)
                  (call-interactively 'calc-trunc))
@@ -140,32 +140,32 @@
                :active (>= (calc-stack-size) 1)
                :help "The argument (polar angle) of (1:)"])
         (list "Conversion"
-              ["Convert (1:) to a float"    
+              ["Convert (1:) to a float"
                (progn
                  (require 'calc-ext)
                  (call-interactively 'calc-float))
                :keys "c f"
                :active (>= (calc-stack-size) 1)]
-              ["Convert (1:) to a fraction" 
+              ["Convert (1:) to a fraction"
                (progn
                  (require 'calc-ext)
                  (call-interactively 'calc-fraction))
                :keys "c F"
                :active (>= (calc-stack-size) 1)])
         (list "Binary"
-              ["Set word size" 
+              ["Set word size"
                (progn
                  (require 'calc-bin)
                  (call-interactively 'calc-word-size))
                :keys "b w"]
-              ["Clip (1:) to word size" 
+              ["Clip (1:) to word size"
                (progn
                  (require 'calc-bin)
                  (call-interactively 'calc-clip))
                :keys "b c"
                :active (>= (calc-stack-size) 1)
                :help "Reduce (1:) modulo 2^wordsize"]
-              ["(2:) and (1:)"    
+              ["(2:) and (1:)"
                (progn
                  (require 'calc-bin)
                  (call-interactively 'calc-and))
@@ -180,13 +180,13 @@
                :active (>= (calc-stack-size) 2)
                :help "Bitwise inclusive OR [modulo 2^wordsize]"]
               ["(2:) xor (1:)"
-               (progn 
+               (progn
                  (require 'calc-bin)
                  (call-interactively 'calc-xor))
                :keys "b x"
                :active (>= (calc-stack-size) 2)
                :help "Bitwise exclusive OR [modulo 2^wordsize]"]
-              ["diff(2:,1:)" 
+              ["diff(2:,1:)"
                (progn
                  (require 'calc-bin)
                  (call-interactively 'calc-diff))
@@ -263,82 +263,82 @@
                :keys "I P"
                :help "Euler's constant"])
         (list "Logs and Exps"
-              ["ln(1:)" 
-               (progn 
-                 (require 'calc-math) 
-                 (call-interactively 'calc-ln)) 
+              ["ln(1:)"
+               (progn
+                 (require 'calc-math)
+                 (call-interactively 'calc-ln))
                :keys "L"
                :active (>= (calc-stack-size) 1)
                :help "The natural logarithm"]
-              ["e^(1:)"   
+              ["e^(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-exp))
                :keys "E"
                :active (>= (calc-stack-size) 1)]
-              ["log(1:) [base 10]" 
+              ["log(1:) [base 10]"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-log10))
                :keys "H L"
                :active (>= (calc-stack-size) 1)
                :help "The common logarithm"]
-              ["10^(1:)" 
+              ["10^(1:)"
                (progn
                  (require 'calc-math)
                  (let ((calc-inverse-flag t))
                    (call-interactively 'calc-log10)))
                :keys "I H L"
                :active (>= (calc-stack-size) 1)]
-              ["log(2:) [base(1:)]" 
+              ["log(2:) [base(1:)]"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-log))
                :keys "B"
                :active (>= (calc-stack-size) 2)
                :help "The logarithm with an arbitrary base"]
-              ["(2:) ^ (1:)"  
-               calc-power 
+              ["(2:) ^ (1:)"
+               calc-power
                :keys "^"
                :active (>= (calc-stack-size) 2)])
         (list "Trigonometric Functions"
-              ["sin(1:)"  
+              ["sin(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-sin))
                :keys "S"
                :active (>= (calc-stack-size) 1)]
-              ["cos(1:)"  
+              ["cos(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-cos))
                :keys "C"
                :active (>= (calc-stack-size) 1)]
-              ["tan(1:)"  
+              ["tan(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-tan))
                :keys "T"
                :active (>= (calc-stack-size) 1)]
-              ["arcsin(1:)" 
+              ["arcsin(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arcsin))
                :keys "I S"
                :active (>= (calc-stack-size) 1)]
-              ["arccos(1:)" 
+              ["arccos(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arccos))
                :keys "I C"
                :active (>= (calc-stack-size) 1)]
-              ["arctan(1:)" 
+              ["arctan(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arctan))
                :keys "I T"
                :active (>= (calc-stack-size) 1)]
-              ["arctan2(2:,1:)" 
+              ["arctan2(2:,1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arctan2))
@@ -367,65 +367,65 @@
                :style radio
                :selected (eq calc-angle-mode 'hms)])
         (list "Hyperbolic Functions"
-              ["sinh(1:)" 
+              ["sinh(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-sinh))
                :keys "H S"
                :active (>= (calc-stack-size) 1)]
-              ["cosh(1:)" 
+              ["cosh(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-cosh))
                :keys "H C"
                :active (>= (calc-stack-size) 1)]
-              ["tanh(1:)" 
+              ["tanh(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-tanh))
                :keys "H T"
                :active (>= (calc-stack-size) 1)]
-              ["arcsinh(1:)" 
+              ["arcsinh(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arcsinh))
                :keys "I H S"
                :active (>= (calc-stack-size) 1)]
-              ["arccosh(1:)" 
+              ["arccosh(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arccosh))
                :keys "I H C"
                :active (>= (calc-stack-size) 1)]
-              ["arctanh(1:)" 
+              ["arctanh(1:)"
                (progn
                  (require 'calc-math)
                  (call-interactively 'calc-arctanh))
                :keys "I H T"
                :active (>= (calc-stack-size) 1)])
         (list "Advanced Math Functions"
-              ["Gamma(1:)" 
+              ["Gamma(1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-gamma))
                :keys "f g"
                :active (>= (calc-stack-size) 1)
                :help "The Euler Gamma function"]
-              ["GammaP(2:,1:)" 
+              ["GammaP(2:,1:)"
                (progn
                  (require 'calc-funcs)
                  (call-interactively 'calc-inc-gamma))
                :keys "f G"
                :active (>= (calc-stack-size) 2)
                :help "The lower incomplete Gamma function"]
-              ["Beta(2:,1:)" 
+              ["Beta(2:,1:)"
                (progn
                  (require 'calc-funcs)
                  (call-interactively 'calc-beta))
                :keys "f b"
                :active (>= (calc-stack-size) 2)
                :help "The Euler Beta function"]
-              ["BetaI(3:,2:,1:)" 
+              ["BetaI(3:,2:,1:)"
                (progn
                  (require 'calc-funcs)
                  (call-interactively 'calc-inc-beta))
@@ -439,14 +439,14 @@
                :keys "f e"
                :active (>= (calc-stack-size) 1)
                :help "The error function"]
-              ["BesselJ(2:,1:)" 
+              ["BesselJ(2:,1:)"
                (progn
                  (require 'calc-funcs)
                  (call-interactively 'calc-bessel-J))
                :keys "f j"
                :active (>= (calc-stack-size) 2)
                :help "The Bessel function of the first kind (of order (2:))"]
-              ["BesselY(2:,1:)" 
+              ["BesselY(2:,1:)"
                (progn
                  (require 'calc-funcs)
                  (call-interactively 'calc-bessel-Y))
@@ -454,44 +454,44 @@
                :active (>= (calc-stack-size) 2)
                :help "The Bessel function of the second kind (of order (2:))"])
         (list "Combinatorial Functions"
-              ["gcd(2:,1:)" 
+              ["gcd(2:,1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-gcd))
                  :keys "k g"
                  :active (>= (calc-stack-size) 2)]
-              ["lcm(2:,1:)" 
+              ["lcm(2:,1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-lcm))
                :keys "k l"
                :active (>= (calc-stack-size) 2)]
-              ["factorial(1:)" 
+              ["factorial(1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-factorial))
                :keys "!"
                :active (>= (calc-stack-size) 1)]
-              ["(2:) choose (1:)" 
+              ["(2:) choose (1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-choose))
                :keys "k c"
                :active (>= (calc-stack-size) 2)]
-              ["permutations(2:,1:)" 
+              ["permutations(2:,1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-perm))
                :keys "H k c"
                :active (>= (calc-stack-size) 2)]
-              ["Primality test for (1:)" 
+              ["Primality test for (1:)"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-prime-test))
                :keys "k p"
                :active (>= (calc-stack-size) 1)
                :help "For large (1:), a probabilistic test"]
-              ["Factor (1:) into primes" 
+              ["Factor (1:) into primes"
                (progn
                  (require 'calc-comb)
                  (call-interactively 'calc-prime-factors))
@@ -527,17 +527,17 @@
         ["Help on Scientific Functions"
          (calc-info-goto-node "Scientific Functions")])
   "Menu for Calc's scientific functions.")
-              
+
 (defvar calc-algebra-menu
   (list "Algebra"
         (list "Simplification"
-              ["Simplify (1:)" 
+              ["Simplify (1:)"
                (progn
                  (require 'calc-alg)
                  (call-interactively 'calc-simplify))
                :keys "a s"
                :active (>= (calc-stack-size) 1)]
-              ["Simplify (1:) with extended rules" 
+              ["Simplify (1:) with extended rules"
                (progn
                  (require 'calc-alg)
                  (call-interactively 'calc-simplify-extended))
@@ -545,72 +545,72 @@
                :active (>= (calc-stack-size) 1)
                :help "Apply possibly unsafe simplifications"])
         (list "Manipulation"
-              ["Expand formula (1:)" 
+              ["Expand formula (1:)"
                (progn
                  (require 'calc-alg)
                  (call-interactively 'calc-expand-formula))
                :keys "a \""
                :active (>= (calc-stack-size) 1)
                :help "Expand (1:) into its defining formula, if possible"]
-              ["Evaluate variables in (1:)" 
+              ["Evaluate variables in (1:)"
                (progn
                  (require 'calc-ext)
                  (call-interactively 'calc-evaluate))
                :keys "="
                :active (>= (calc-stack-size) 1)]
-              ["Make substitution in (1:)" 
+              ["Make substitution in (1:)"
                (progn
                  (require 'calc-alg)
                  (call-interactively 'calc-substitute))
                :keys "a b"
                :active (>= (calc-stack-size) 1)
-               :help 
+               :help
                "Substitute all occurrences of a sub-expression with a new sub-expression"])
         (list "Polynomials"
-              ["Factor (1:)" 
+              ["Factor (1:)"
                (progn
                  (require 'calc-alg)
                  (call-interactively 'calc-factor))
                :keys "a f"
                :active (>= (calc-stack-size) 1)]
-              ["Collect terms in (1:)" 
+              ["Collect terms in (1:)"
                (progn
                  (require 'calc-alg)
-                 (call-interactively 'calc-collect)) 
+                 (call-interactively 'calc-collect))
                :keys "a c"
                :active (>= (calc-stack-size) 1)
                :help "Arrange as a polynomial in a given variable"]
-              ["Expand (1:)" 
+              ["Expand (1:)"
                (progn
                  (require 'calc-alg)
                  (call-interactively 'calc-expand))
                :keys "a x"
                :active (>= (calc-stack-size) 1)
                :help "Apply distributive law everywhere"]
-              ["Find roots of (1:)" 
+              ["Find roots of (1:)"
                (progn
                  (require 'calcalg2)
                  (call-interactively 'calc-poly-roots))
                :keys "a P"
                :active (>= (calc-stack-size) 1)])
         (list "Calculus"
-              ["Differentiate (1:)" 
+              ["Differentiate (1:)"
                (progn
                  (require 'calcalg2)
                  (call-interactively 'calc-derivative))
                :keys "a d"
                :active (>= (calc-stack-size) 1)]
-              ["Integrate (1:) [indefinite]" 
+              ["Integrate (1:) [indefinite]"
                (progn
                  (require 'calcalg2)
                  (call-interactively 'calc-integral))
                :keys "a i"
                :active (>= (calc-stack-size) 1)]
-              ["Integrate (1:) [definite]" 
+              ["Integrate (1:) [definite]"
                (progn
                  (require 'calcalg2)
                  (let ((var (read-string "Integration variable: ")))
-                   (calc-tabular-command 'calcFunc-integ "Integration" 
+                   (calc-tabular-command 'calcFunc-integ "Integration"
                                          "intg" nil var nil nil)))
                :keys "C-u a i"
                :active (>= (calc-stack-size) 1)]
@@ -621,20 +621,20 @@
                :keys "a I"
                :active (>= (calc-stack-size) 1)
                :help "Integrate using the open Romberg method"]
-              ["Taylor expand (1:)" 
+              ["Taylor expand (1:)"
                (progn
                  (require 'calcalg2)
                  (call-interactively 'calc-taylor))
                :keys "a t"
                :active (>= (calc-stack-size) 1)]
-              ["Minimize (2:) [initial guess = (1:)]" 
+              ["Minimize (2:) [initial guess = (1:)]"
                (progn
                  (require 'calcalg3)
                  (call-interactively 'calc-find-minimum))
                :keys "a N"
                :active (>= (calc-stack-size) 2)
                :help "Find a local minimum"]
-              ["Maximize (2:) [initial guess = (1:)]" 
+              ["Maximize (2:) [initial guess = (1:)]"
                (progn
                  (require 'calcalg3)
                  (call-interactively 'calc-find-maximum))
@@ -642,26 +642,26 @@
                :active (>= (calc-stack-size) 2)
                :help "Find a local maximum"])
         (list "Solving"
-              ["Solve equation (1:)" 
+              ["Solve equation (1:)"
                (progn
                  (require 'calcalg2)
                  (call-interactively 'calc-solve-for))
                :keys "a S"
                :active (>= (calc-stack-size) 1)]
-              ["Solve equation (2:) numerically [initial guess = (1:)]" 
+              ["Solve equation (2:) numerically [initial guess = (1:)]"
                (progn
                  (require 'calcalg3)
                  (call-interactively 'calc-find-root))
                :keys "a R"
                :active (>= (calc-stack-size) 2)]
-              ["Find roots of polynomial (1:)" 
+              ["Find roots of polynomial (1:)"
                (progn
                  (require 'calcalg2)
                  (call-interactively 'calc-poly-roots))
                :keys "a P"
                :active (>= (calc-stack-size) 1)])
         (list "Curve Fitting"
-              ["Fit (1:)=[x values, y values] to a curve" 
+              ["Fit (1:)=[x values, y values] to a curve"
                (progn
                  (require 'calcalg3)
                  (call-interactively 'calc-curve-fit))
@@ -675,13 +675,13 @@
 
 (defvar calc-graphics-menu
   (list "Graphics"
-        ["Graph 2D [(1:)= y values, (2:)= x values]" 
+        ["Graph 2D [(1:)= y values, (2:)= x values]"
          (progn
            (require 'calc-graph)
            (call-interactively 'calc-graph-fast))
          :keys "g f"
          :active (>= (calc-stack-size) 2)]
-        ["Graph 3D [(1:)= z values, (2:)= y values, (3:)= x values]" 
+        ["Graph 3D [(1:)= z values, (2:)= y values, (3:)= x values]"
          (progn
            (require 'calc-graph)
            (call-interactively 'calc-graph-fast-3d))
@@ -696,11 +696,11 @@
 (defvar calc-vectors-menu
   (list "Matrices/Vectors"
         (list "Matrices"
-              ["(2:) + (1:)"   calc-plus   
+              ["(2:) + (1:)"   calc-plus
                :keys "+" :active (>= (calc-stack-size) 2)]
-              ["(2:) - (1:)"   calc-minus  
+              ["(2:) - (1:)"   calc-minus
                :keys "-" :active (>= (calc-stack-size) 2)]
-              ["(2:) * (1:)"   calc-times  
+              ["(2:) * (1:)"   calc-times
                :keys "*" :active (>= (calc-stack-size) 2)]
               ["(1:)^(-1)"
                (progn
@@ -709,17 +709,17 @@
                :keys "&"
                :active (>= (calc-stack-size) 1)]
               ["Create an identity matrix"
-               (progn 
+               (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-ident))
                :keys "v i"]
-              ["transpose(1:)" 
+              ["transpose(1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-transpose))
                :keys "v t"
                :active (>= (calc-stack-size) 1)]
-              ["det(1:)" 
+              ["det(1:)"
                (progn
                  (require 'calc-mtx)
                  (call-interactively 'calc-mdet))
@@ -731,19 +731,19 @@
                  (call-interactively 'calc-mtrace))
                :keys "V T"
                :active (>= (calc-stack-size) 1)]
-              ["LUD decompose (1:)" 
+              ["LUD decompose (1:)"
                (progn
                  (require 'calc-mtx)
                  (call-interactively 'calc-mlud))
                :keys "V L"
                :active (>= (calc-stack-size) 1)]
-              ["Extract a row from (1:)" 
+              ["Extract a row from (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-mrow))
                :keys "v r"
                :active (>= (calc-stack-size) 1)]
-              ["Extract a column from (1:)" 
+              ["Extract a column from (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-mcol))
@@ -756,13 +756,13 @@
                  (call-interactively 'calc-head))
                :keys "v h"
                :active (>= (calc-stack-size) 1)]
-              ["Extract an element from (1:)" 
+              ["Extract an element from (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-mrow))
                :keys "v r"
                :active (>= (calc-stack-size) 1)]
-              ["Reverse (1:)" 
+              ["Reverse (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-reverse-vector))
@@ -775,19 +775,19 @@
                :keys "v u"
                :active (>= (calc-stack-size) 1)
                :help "Separate the elements of (1:)"]
-              ["(2:) cross (1:)" 
+              ["(2:) cross (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-cross))
                :keys "V C"
                :active (>= (calc-stack-size) 2)
                :help "The cross product in R^3"]
-              ["(2:) dot (1:)" 
-               calc-mult 
+              ["(2:) dot (1:)"
+               calc-mult
                :keys "*"
                :active (>= (calc-stack-size) 2)
                :help "The dot product"]
-              ["Map a function across (1:)" 
+              ["Map a function across (1:)"
                (progn
                  (require 'calc-map)
                  (call-interactively 'calc-map))
@@ -795,25 +795,25 @@
                :active (>= (calc-stack-size) 1)
                :help "Apply a function to each element"])
         (list "Vectors As Sets"
-              ["Remove duplicates from (1:)" 
+              ["Remove duplicates from (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-remove-duplicates))
                :keys "V +"
                :active (>= (calc-stack-size) 1)]
-              ["(2:) union (1:)" 
+              ["(2:) union (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-set-union))
                :keys "V V"
                :active (>= (calc-stack-size) 2)]
-              ["(2:) intersect (1:)" 
+              ["(2:) intersect (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-set-intersect))
                :keys "V ^"
                :active (>= (calc-stack-size) 2)]
-              ["(2:) \\ (1:)" 
+              ["(2:) \\ (1:)"
                (progn
                  (require 'calc-vec)
                  (call-interactively 'calc-set-difference))
@@ -821,35 +821,35 @@
                :help "Set difference"
                :active (>= (calc-stack-size) 2)])
         (list "Statistics On Vectors"
-              ["length(1:)" 
+              ["length(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-count))
                :keys "u #"
                :active (>= (calc-stack-size) 1)
                :help "The number of data values"]
-              ["sum(1:)"    
+              ["sum(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-sum))
                :keys "u +"
                :active (>= (calc-stack-size) 1)
                :help "The sum of the data values"]
-              ["max(1:)"    
+              ["max(1:)"
                (progn
                  (require 'calc-stat)
-                 (call-interactively 'calc-vector-max))  
+                 (call-interactively 'calc-vector-max))
                :keys "u x"
                :active (>= (calc-stack-size) 1)
                :help "The maximum of the data values"]
-              ["min(1:)"    
+              ["min(1:)"
                (progn
                  (require 'calc-stat)
-                 (call-interactively 'calc-vector-min))  
+                 (call-interactively 'calc-vector-min))
                :keys "u N"
                :active (>= (calc-stack-size) 1)
-               :help "The minumum of the data values"]
-              ["mean(1:)"   
+               :help "The minimum of the data values"]
+              ["mean(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-mean))
@@ -863,28 +863,28 @@
               :keys "I u M"
               :active (>= (calc-stack-size) 1)
               :help "The average (arithmetic mean) of the data values as an error form"]
-              ["sdev(1:)"   
+              ["sdev(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-sdev))
                :keys "u S"
                :active (>= (calc-stack-size) 1)
                :help "The sample sdev, sqrt[sum((values - mean)^2)/(N-1)]"]
-              ["variance(1:)" 
+              ["variance(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-variance))
                :keys "H u S"
                :active (>= (calc-stack-size) 1)
                :help "The sample variance, sum((values - mean)^2)/(N-1)"]
-              ["population sdev(1:)" 
+              ["population sdev(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-pop-sdev))
                :keys "I u S"
                :active (>= (calc-stack-size) 1)
                :help "The population sdev, sqrt[sum((values - mean)^2)/N]"]
-              ["population variance(1:)" 
+              ["population variance(1:)"
                (progn
                  (require 'calc-stat)
                  (call-interactively 'calc-vector-pop-variance))
@@ -937,25 +937,25 @@
 
 (defvar calc-units-menu
   (list "Units"
-        ["Convert units in (1:)" 
+        ["Convert units in (1:)"
          (progn
            (require 'calc-units)
            (call-interactively 'calc-convert-units ))
          :keys "u c"
          :active (>= (calc-stack-size) 1)]
-        ["Convert temperature in (1:)" 
+        ["Convert temperature in (1:)"
          (progn
            (require 'calc-units)
            (call-interactively 'calc-convert-temperature))
          :keys "u t"
          :active (>= (calc-stack-size) 1)]
-        ["Simplify units in (1:)" 
+        ["Simplify units in (1:)"
          (progn
            (require 'calc-units)
            (call-interactively 'calc-simplify-units))
          :keys "u s"
          :active (>= (calc-stack-size) 1)]
-        ["View units table" 
+        ["View units table"
          (progn
            (require 'calc-units)
            (call-interactively 'calc-view-units-table))
@@ -1072,40 +1072,40 @@
 
 (defvar calc-variables-menu
   (list "Variables"
-        ["Store (1:) into a variable" 
+        ["Store (1:) into a variable"
          (progn
            (require 'calc-store)
            (call-interactively 'calc-store))
          :keys "s s"
          :active (>= (calc-stack-size) 1)]
-        ["Recall a variable value" 
+        ["Recall a variable value"
           (progn
             (require 'calc-store)
             (call-interactively 'calc-recall ))
          :keys "s r"]
-        ["Edit the value of a variable" 
+        ["Edit the value of a variable"
          (progn
            (require 'calc-store)
            (call-interactively 'calc-edit-variable))
          :keys "s e"]
-        ["Exchange (1:) with a variable value" 
+        ["Exchange (1:) with a variable value"
          (progn
            (require 'calc-store)
            (call-interactively 'calc-store-exchange))
          :keys "s x"
          :active (>= (calc-stack-size) 1)]
-        ["Clear variable value" 
+        ["Clear variable value"
          (progn
            (require 'calc-store)
            (call-interactively 'calc-unstore))
          :keys "s u"]
-        ["Evaluate variables in (1:)" 
+        ["Evaluate variables in (1:)"
          (progn
            (require 'calc-ext)
            (call-interactively 'calc-evaluate))
          :keys "="
          :active (>= (calc-stack-size) 1)]
-        ["Evaluate (1:), assigning a value to a variable" 
+        ["Evaluate (1:), assigning a value to a variable"
          (progn
            (require 'calc-store)
            (call-interactively 'calc-let))
@@ -1119,19 +1119,19 @@
 
 (defvar calc-stack-menu
   (list "Stack"
-        ["Remove (1:)" 
-         calc-pop 
+        ["Remove (1:)"
+         calc-pop
          :keys "DEL"
          :active (>= (calc-stack-size) 1)]
-        ["Switch (1:) and (2:)" 
-         calc-roll-down 
+        ["Switch (1:) and (2:)"
+         calc-roll-down
          :keys "TAB"
          :active (>= (calc-stack-size) 2)]
-        ["Duplicate (1:)" 
-         calc-enter 
+        ["Duplicate (1:)"
+         calc-enter
          :keys "RET"
          :active (>= (calc-stack-size) 1)]
-        ["Edit (1:)" 
+        ["Edit (1:)"
          (progn
            (require 'calc-yank)
            (call-interactively calc-edit))
@@ -1144,12 +1144,12 @@
 
 (defvar calc-errors-menu
   (list "Undo"
-        ["Undo" 
+        ["Undo"
          (progn
            (require 'calc-undo)
            (call-interactively 'calc-undo))
          :keys "U"]
-        ["Redo" 
+        ["Redo"
          (progn
            (require 'calc-undo)
            (call-interactively 'calc-redo))
@@ -1162,7 +1162,7 @@
 
 (defvar calc-modes-menu
   (list "Modes"
-        ["Precision" 
+        ["Precision"
          (progn
            (require 'calc-ext)
            (call-interactively 'calc-precision))
@@ -1277,7 +1277,7 @@
               ["Binary"
                (progn
                  (require 'calc-bin)
-                 (call-interactively 
+                 (call-interactively
                   (lambda () (interactive) (calc-binary-radix t))))
                :keys "C-u d 2"
                :style radio
@@ -1330,7 +1330,7 @@
                :keys "d e"
                :style radio
                :selected (eq (car-safe calc-float-format) 'eng)])
-        (list "Complex Format"             
+        (list "Complex Format"
               ["Default"
                (progn
                  (require 'calc-cplx)
@@ -1522,17 +1522,17 @@
 
 (defvar  calc-help-menu
   (list "Help"
-        ["Manual"   
+        ["Manual"
          calc-info
          :keys "h i"]
-        ["Tutorial" 
-         calc-tutorial 
+        ["Tutorial"
+         calc-tutorial
          :keys "h t"]
-        ["Summary"  
-         calc-info-summary 
+        ["Summary"
+         calc-info-summary
          :keys "h s"]
         "----"
-        ["Help on Help" 
+        ["Help on Help"
          (progn
            (calc-info-goto-node "Introduction")
            (Info-goto-node "Help Commands"))])
@@ -1557,7 +1557,7 @@
         calc-errors-menu
         calc-modes-menu
         calc-help-menu
-        ["Reset"  
+        ["Reset"
          (progn
            (require 'calc-ext)
            (call-interactively 'calc-reset))
@@ -1565,4 +1565,3 @@
         ["Quit" calc-quit]))
 
 (provide 'calc-menu)
-
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index 6d034927ae0..d8bdc614e67 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -219,10 +219,10 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C).
   (let ((msgs
          '("Press `h' for complete help; press `?' repeatedly for a summary"
            "Letter keys: Negate; Precision; Yank; Why; Xtended cmd; Quit"
-           "Letter keys: SHIFT + Undo, reDo; Keep-args; Inverse, Hyperbolic, Option"
+           "Letter keys: SHIFT + Undo, reDo; Inverse, Hyperbolic, Option"
            "Letter keys: SHIFT + sQrt; Sin, Cos, Tan; Exp, Ln, logB"
            "Letter keys: SHIFT + Floor, Round; Abs, conJ, arG; Pi"
-           "Letter keys: SHIFT + Num-eval; More-recn; eXec-kbd-macro"
+           "Letter keys: SHIFT + Num-eval; More-recn; eXec-kbd-macro; Keep-args"
            "Other keys: +, -, *, /, ^, \\ (int div), : (frac div)"
            "Other keys: & (1/x), | (concat), % (modulo), ! (factorial)"
            "Other keys: ' (alg-entry), = (eval), ` (edit); M-RET (last-args)"
diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el
index 97d955eb07d..e21a095c821 100644
--- a/lisp/calc/calc-poly.el
+++ b/lisp/calc/calc-poly.el
@@ -147,7 +147,7 @@
 
 ;;; Return only quotient to top of stack (nil if zero)
 
-;; calc-poly-div-remainder is a local variable for 
+;; calc-poly-div-remainder is a local variable for
 ;; calc-poly-div (in calc-alg.el), but is used by
 ;; calcFunc-pdiv, which is called by calc-poly-div.
 (defvar calc-poly-div-remainder)
@@ -512,7 +512,7 @@
 ;;; Given an expression find all variables that are polynomial bases.
 ;;; Return list in the form '( (var1 degree1) (var2 degree2) ... ).
 
-;; The variable math-poly-base-total-base is local to 
+;; The variable math-poly-base-total-base is local to
 ;; math-total-polynomial-base, but is used by math-polynomial-p1,
 ;; which is called by math-total-polynomial-base.
 (defvar math-poly-base-total-base)
@@ -539,19 +539,19 @@
   nil)
 
 ;; The variable math-factored-vars is local to calcFunc-factors and
-;; calcFunc-factor, but is used by math-factor-expr and 
+;; calcFunc-factor, but is used by math-factor-expr and
 ;; math-factor-expr-part, which are called (directly and indirectly) by
 ;; calcFunc-factor and calcFunc-factors.
 (defvar math-factored-vars)
 
 ;; The variable math-fact-expr is local to calcFunc-factors,
-;; calcFunc-factor and math-factor-expr, but is used by math-factor-expr-try 
+;; calcFunc-factor and math-factor-expr, but is used by math-factor-expr-try
 ;; and math-factor-expr-part, which are called (directly and indirectly) by
 ;; calcFunc-factor, calcFunc-factors and math-factor-expr.
 (defvar math-fact-expr)
 
-;; The variable math-to-list is local to calcFunc-factors and 
-;; calcFunc-factor, but is used by math-accum-factors, which is 
+;; The variable math-to-list is local to calcFunc-factors and
+;; calcFunc-factor, but is used by math-accum-factors, which is
 ;; called (indirectly) by calcFunc-factors and calcFunc-factor.
 (defvar math-to-list)
 
@@ -729,7 +729,7 @@
                           '(1)))
 
                ;; We now have a square-free polynomial with integer coefs.
-               ;; For now, we use a kludgey method that finds linear and
+               ;; For now, we use a kludgy method that finds linear and
                ;; quadratic terms using floating-point root-finding.
                (if (setq t1 (let ((calc-symbolic-mode nil))
                               (math-poly-all-roots nil p t)))
@@ -749,7 +749,7 @@
                                            (math-add
                                             (math-add
                                              (math-mul den (math-pow math-fet-x 2))
-                                             (math-mul (math-mul coef1 den) 
+                                             (math-mul (math-mul coef1 den)
                                                        math-fet-x))
                                             (math-mul coef0 den)))
                                        (let ((den (math-lcm-denoms coef0)))
@@ -1077,7 +1077,7 @@ If no partial fraction representation can be found, return nil."
         ((and (eq (car-safe expr) '^)
               (memq (car-safe (nth 1 expr)) '(+ -))
               (integerp (nth 2 expr))
-              (if (and 
+              (if (and
                    (or (math-known-matrixp (nth 1 (nth 1 expr)))
                        (math-known-matrixp (nth 2 (nth 1 expr)))
                        (and
@@ -1090,11 +1090,11 @@ If no partial fraction representation can be found, return nil."
                       (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr))
                                        (list '* (nth 2 (nth 1 expr)) (nth 1 expr))
                                        nil (eq (car (nth 1 expr)) '-))
-                    (math-add-or-sub (list '* (nth 1 (nth 1 expr)) 
-                                           (list '^ (nth 1 expr) 
+                    (math-add-or-sub (list '* (nth 1 (nth 1 expr))
+                                           (list '^ (nth 1 expr)
                                                  (1- (nth 2 expr))))
-                                     (list '* (nth 2 (nth 1 expr)) 
-                                           (list '^ (nth 1 expr) 
+                                     (list '* (nth 2 (nth 1 expr))
+                                           (list '^ (nth 1 expr)
                                                  (1- (nth 2 expr))))
                                      nil (eq (car (nth 1 expr)) '-)))
                 (if (> (nth 2 expr) 0)
diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el
index 2360cf00ddc..135ea0bae40 100644
--- a/lisp/calc/calc-yank.el
+++ b/lisp/calc/calc-yank.el
@@ -131,7 +131,7 @@
                       val))
                 val))))))))
 
-;;; The Calc set- and get-register commands are modified versions of functions 
+;;; The Calc set- and get-register commands are modified versions of functions
 ;;; in register.el
 
 (defvar calc-register-alist nil
@@ -206,7 +206,7 @@ With prefix arg, delete as well."
 
 (defun calc-add-to-register (register start end prepend delete-flag)
   "Add the lines in the region to register REGISTER.
-If PREPEND is non-nil, add them to the beginning of the register, 
+If PREPEND is non-nil, add them to the beginning of the register,
 otherwise the end.  If DELETE-FLAG is non-nil, also delete the region."
   (let* ((top-num (calc-locate-cursor-element start))
          (top-pos (save-excursion
@@ -242,7 +242,7 @@ With prefix arg, also delete the region."
   (if (eq major-mode 'calc-mode)
       (calc-add-to-register register start end nil delete-flag)
     (append-to-register register start end delete-flag)))
-  
+
 (defun calc-prepend-to-register (register start end &optional delete-flag)
   "Copy the lines in the region to the beginning of register REGISTER.
 With prefix arg, also delete the region."
@@ -250,7 +250,7 @@ With prefix arg, also delete the region."
   (if (eq major-mode 'calc-mode)
       (calc-add-to-register register start end t delete-flag)
     (prepend-to-register register start end delete-flag)))
-  
+
 
 
 (defun calc-clean-newlines (s)
@@ -585,12 +585,12 @@ To cancel the edit, simply kill the *Calc Edit* buffer."
     (setq calc-allow-ret allow-ret)
     (let ((inhibit-read-only t))
       (erase-buffer))
-    (add-hook 'kill-buffer-hook (lambda () 
+    (add-hook 'kill-buffer-hook (lambda ()
                                   (let ((calc-edit-handler nil))
                                     (calc-edit-finish t))
                                   (message "(Cancelled)")) t t)
     (insert (propertize
-             (concat 
+             (concat
               (or title title "Calc Edit Mode. ")
               "Press `C-c C-c'"
               (if allow-ret "" " or RET")
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 4a79316d736..faf62424729 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -81,7 +81,7 @@ This determines the default behavior of unary operators."
 
 (defcustom calculator-prompt "Calc=%s> "
   "The prompt used by the Emacs calculator.
-It should contain a \"%s\" somewhere that will indicate the i/o radixes;
+It should contain a \"%s\" somewhere that will indicate the i/o radices;
 this will be a two-character string as described in the documentation
 for `calculator-mode'."
   :type  'string
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index c44eb6e1b5d..230366da2b0 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -508,7 +508,7 @@ The time should be in either 24 hour format or am/pm format.
 Optional argument WARNTIME is an integer (or string) giving the number
 of minutes before the appointment at which to start warning.
 The default is `appt-message-warning-time'."
-  (interactive "sTime (hh:mm[am/pm]): \nsMessage: 
+  (interactive "sTime (hh:mm[am/pm]): \nsMessage: \n\
 sMinutes before the appointment to start warning: ")
   (unless (string-match appt-time-regexp time)
     (error "Unacceptable time-string"))
@@ -521,7 +521,7 @@ sMinutes before the appointment to start warning: ")
   (or appt-timer (appt-activate))
   (let ((time-msg (list (list (appt-convert-time time))
                         (concat time " " msg) t)))
-    ;; It is presently non-sensical to have multiple warnings about
+    ;; It is presently nonsensical to have multiple warnings about
     ;; the same appointment with just different delays, but it might
     ;; not always be so.  TODO
     (if warntime (setq time-msg (append time-msg (list warntime))))
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 3ba1078f62d..42c95f39faa 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -723,7 +723,7 @@ STRING)).  Returns nil if it is not visible in the current calendar window."
   (let ((m displayed-month)
         (y displayed-year))
     (calendar-increment-month m y (- 11 month))
-    (if (> m 9)                         ; is november visible?
+    (if (> m 9)                         ; Is November visible?
         (list (list (list month day y) string)))))
 
 (defun holiday-float (month dayname n string &optional day)
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 84a1544d709..b841ed4ab73 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -962,7 +962,7 @@ Accurate to within a minute between 1951 and 2050."
 (defun solar-mean-equinoxes/solstices (k year)
   "Julian day of mean equinox/solstice K for YEAR.
 K=0, spring equinox; K=1, summer solstice; K=2, fall equinox; K=3, winter
-solstice.  These formulae are only to be used between 1000 BC and 3000 AD."
+solstice.  These formulas are only to be used between 1000 BC and 3000 AD."
   (let ((y (/ year 1000.0))
         (z (/ (- year 2000) 1000.0)))
     (if (< year 1000)                ; actually between -1000 and 1000
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index f3ff89ddd7f..0e46ba73e6e 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-19  Sam Steingold  <sds@gnu.org>
+
+        * semantic/edit.el (semantic-edits-incremental-parser): Add the
+        autoload cookie, necessary for JDEE.
+
+2011-12-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * semantic/bovine/c.el (semantic-tag-abstract-p): Fix typo.
+
 2011-11-26  Chong Yidong  <cyd@gnu.org>
 
         * semantic/wisent/python-wy.el:
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index 329d1c608c2..d553c433fc4 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -1060,11 +1060,11 @@ If the result is a list or vector, then use the data debugger to display it."
       (setq values (cons (eval expr) values))
     (let ((old-value (make-symbol "t")) new-value)
       ;; Bind debug-on-error to something unique so that we can
-      ;; detect when evaled code changes it.
+      ;; detect when evalled code changes it.
       (let ((debug-on-error old-value))
         (setq values (cons (eval expr) values))
         (setq new-value debug-on-error))
-      ;; If evaled code has changed the value of debug-on-error,
+      ;; If evalled code has changed the value of debug-on-error,
       ;; propagate that change to the global binding.
       (unless (eq old-value new-value)
         (setq debug-on-error new-value))))
diff --git a/lisp/cedet/ede/pmake.el b/lisp/cedet/ede/pmake.el
index d78e95af27f..4065b848f54 100644
--- a/lisp/cedet/ede/pmake.el
+++ b/lisp/cedet/ede/pmake.el
@@ -335,7 +335,7 @@ NOTE: Not yet in use!  This is part of an SRecode conversion of
 ;
 ;          (oref this variables))
 ;
-;     ;; Add in all variables from the configuration not allready covered.
+;     ;; Add in all variables from the configuration not already covered.
 ;     (mapc (lambda (c)
 ;
 ;            (if (member (car c) conf-done)
@@ -372,7 +372,7 @@ NOTE: Not yet in use!  This is part of an SRecode conversion of
                   (setq conf-done (cons (car c) conf-done))))
             (insert (cdr c) "\n"))
           (oref this variables))
-    ;; Add in all variables from the configuration not allready covered.
+    ;; Add in all variables from the configuration not already covered.
     (mapc (lambda (c)
             (if (member (car c) conf-done)
                 nil
@@ -430,7 +430,7 @@ sources variable."
                       this (oref proj configuration-default)))
          (conf-done nil)
          )
-    ;; Add in all variables from the configuration not allready covered.
+    ;; Add in all variables from the configuration not already covered.
     (mapc (lambda (c)
             (if (member (car c) conf-done)
                 nil
diff --git a/lisp/cedet/ede/proj-archive.el b/lisp/cedet/ede/proj-archive.el
index 23d3aa05000..23ef4850b6a 100644
--- a/lisp/cedet/ede/proj-archive.el
+++ b/lisp/cedet/ede/proj-archive.el
@@ -46,7 +46,7 @@
 (defmethod ede-proj-makefile-insert-source-variables :BEFORE
   ((this ede-proj-target-makefile-archive) &optional moresource)
   "Insert bin_PROGRAMS variables needed by target THIS.
-We aren't acutally inserting SOURCE details, but this is used by the
+We aren't actually inserting SOURCE details, but this is used by the
 Makefile.am generator, so use it to add this important bin program."
   (ede-pmake-insert-variable-shared
       (concat "lib" (ede-name this) "_a_LIBRARIES")
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el
index 4e233f56a12..7268fb95646 100644
--- a/lisp/cedet/ede/proj-shared.el
+++ b/lisp/cedet/ede/proj-shared.el
@@ -181,7 +181,7 @@ Results in --add-missing being passed to automake."
 (defmethod ede-proj-makefile-insert-automake-pre-variables
   ((this ede-proj-target-makefile-shared-object))
   "Insert bin_PROGRAMS variables needed by target THIS.
-We aren't acutally inserting SOURCE details, but this is used by the
+We aren't actually inserting SOURCE details, but this is used by the
 Makefile.am generator, so use it to add this important bin program."
   (ede-pmake-insert-variable-shared "lib_LTLIBRARIES"
      (insert (concat "lib" (ede-name this) ".la"))))
diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el
index 53639b19a96..35841d2a6b2 100644
--- a/lisp/cedet/inversion.el
+++ b/lisp/cedet/inversion.el
@@ -199,12 +199,12 @@ not an indication of new features or bug fixes."
              (= v1-1 v2-1)
              (= v1-2 v2-2)
              (= v1-3 v2-3)
-             v1-4 v2-4          ; all or nothin if elt - is =
+             v1-4 v2-4          ; all or nothing if elt - is =
              (< v1-4 v2-4))
         (and (= v1-0 v2-0)
              (= v1-1 v2-1)
              (= v1-2 v2-2)
-             v1-3 v2-3          ; all or nothin if elt - is =
+             v1-3 v2-3          ; all or nothing if elt - is =
              (< v1-3 v2-3))
         (and (= v1-1 v2-1)
              (< v1-2 v2-2))
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 3355ed83a91..337413caf75 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -680,7 +680,7 @@ Does nothing if the current buffer doesn't need reparsing."
                     (save-excursion (semantic-fetch-tags))
                     nil)
               ;; If we are here, it is because the lexical step failed,
-              ;; proably due to unterminated lists or something like that.
+              ;; probably due to unterminated lists or something like that.
 
               ;; We do nothing, and just wait for the next idle timer
               ;; to go off.  In the meantime, remember this, and make sure
diff --git a/lisp/cedet/semantic/analyze/debug.el b/lisp/cedet/semantic/analyze/debug.el
index b02358b7243..ce8e79b19dc 100644
--- a/lisp/cedet/semantic/analyze/debug.el
+++ b/lisp/cedet/semantic/analyze/debug.el
@@ -70,7 +70,7 @@
       (let ((pentry (nth idx pf))
             (ptentry (nth idx pft)))
         (if (or (stringp pentry) (not ptentry))
-            ;; Found someting ok.  stop
+            ;; Found something ok.  Stop.
             (setq stop t)
           (setq idx (1+ idx)))))
     ;; We found the first non-tag entry.  What is the situation?
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index fe659d118e1..4da23498cfc 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -816,7 +816,7 @@ now.
     ;;
     ;; will create 2 toplevel tags, one is type A, and the other variable B
     ;; where the :type of B is just a type tag A that is a prototype, and
-    ;; the actual struct info of A is it's own toplevel tag.
+    ;; the actual struct info of A is its own toplevel tag.
     (when (or (semantic-tag-of-class-p tag 'function)
               (semantic-tag-of-class-p tag 'variable))
       (let* ((basetype (semantic-tag-type tag))
@@ -1311,7 +1311,7 @@ Optional PARENT and COLOR as specified with
   "Return non-nil if TAG is considered abstract.
 PARENT is tag's parent.
 In C, a method is abstract if it is `virtual', which is already
-handled.  A class is abstract iff it's destructor is virtual."
+handled.  A class is abstract iff its destructor is virtual."
   (cond
    ((eq (semantic-tag-class tag) 'type)
     (require 'semantic/find)
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index 98f744dca6e..1a2061d01e7 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -497,15 +497,15 @@ used to perform the override."
 Unfortunately, this requires that the tag in question has been loaded
 into Emacs Lisp's memory."
   (let ((obsoletethis (intern-soft (semantic-tag-name tag)))
-        (obsoletor nil))
+        (obsoleter nil))
     ;; This asks if our tag is available in the Emacs name space for querying.
     (when obsoletethis
       (mapatoms (lambda (a)
                   (let ((oi (get a 'byte-obsolete-info)))
                     (if (and oi (eq (car oi) obsoletethis))
-                        (setq obsoletor a)))))
-      (if obsoletor
-          (format "\n@obsolete{%s,%s}" obsoletor (semantic-tag-name tag))
+                        (setq obsoleter a)))))
+      (if obsoleter
+          (format "\n@obsolete{%s,%s}" obsoleter (semantic-tag-name tag))
         ""))))
 
 (define-mode-local-override semantic-documentation-for-tag
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index 943ccf23031..9df240a3681 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -193,16 +193,16 @@ If DIRECTORY doesn't exist, create a new one."
   (eieio-instance-tracker-find filename 'file 'semanticdb-database-list))
 
 (defmethod semanticdb-file-directory-exists-p ((DB semanticdb-project-database-file)
-                                               &optional supress-questions)
+                                               &optional suppress-questions)
   "Does the directory the database DB needs to write to exist?
-If SUPRESS-QUESTIONS, then do not ask to create the directory."
+If SUPPRESS-QUESTIONS, then do not ask to create the directory."
   (let ((dest (file-name-directory (oref DB file)))
         )
     (cond ((null dest)
            ;; @TODO - If it was never set up... what should we do ?
            nil)
           ((file-exists-p dest) t)
-          ((or supress-questions
+          ((or suppress-questions
                (and (boundp 'semanticdb--inhibit-make-directory)
                     semanticdb--inhibit-make-directory))
            nil)
@@ -216,13 +216,13 @@ If SUPRESS-QUESTIONS, then do not ask to create the directory."
 
 (defmethod semanticdb-save-db ((DB semanticdb-project-database-file)
                                &optional
-                               supress-questions)
+                               suppress-questions)
   "Write out the database DB to its file.
 If DB is not specified, then use the current database."
   (let ((objname (oref DB file)))
     (when (and (semanticdb-dirty-p DB)
                (semanticdb-live-p DB)
-               (semanticdb-file-directory-exists-p DB supress-questions)
+               (semanticdb-file-directory-exists-p DB suppress-questions)
                (semanticdb-write-directory-p DB)
                )
       ;;(message "Saving tag summary for %s..." objname)
@@ -243,7 +243,7 @@ If DB is not specified, then use the current database."
           (t
            ;; @todo - It should ask if we are not called from a hook.
            ;;         How?
-           (if (or supress-questions
+           (if (or suppress-questions
                    (y-or-n-p (format "Skip Error: %s ?" (car (cdr foo)))))
                (message "Save Error: %S: %s" (car (cdr foo))
                         objname)
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 4d5d8f35f51..a651e08d53c 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -210,7 +210,7 @@ This class will cache data derived during various searches.")
   "Synchronize the search index IDX with some NEW-TAGS."
   ;; Reset our parts.
   (semantic-reset idx)
-  ;; Notify dependants by clearning their indicies.
+  ;; Notify dependants by clearing their indices.
   (semanticdb-notify-references
    (oref idx table)
    (lambda (tab me)
@@ -224,7 +224,7 @@ This class will cache data derived during various searches.")
   (if (semantic-find-tags-by-class 'include new-tags)
       (progn
         (semantic-reset idx)
-        ;; Notify dependants by clearning their indicies.
+        ;; Notify dependants by clearing their indices.
         (semanticdb-notify-references
          (oref idx table)
          (lambda (tab me)
@@ -234,7 +234,7 @@ This class will cache data derived during various searches.")
     (when (oref idx type-cache)
       (when (semanticdb-partial-synchronize (oref idx type-cache) new-tags)
         ;; If the synchronize returns true, we need to notify.
-        ;; Notify dependants by clearning their indicies.
+        ;; Notify dependants by clearing their indices.
         (semanticdb-notify-references
          (oref idx table)
          (lambda (tab me)
@@ -405,10 +405,10 @@ Default action as described in `semanticdb-find-translate-path'."
         ;; do a caching lookup.
         (let ((index (semanticdb-get-table-index table)))
           (if (semanticdb-find-need-cache-update-p table)
-              ;; Lets go look up our indicies
+              ;; Let's go look up our indices.
               (let ((ans (semanticdb-find-translate-path-includes--internal path)))
                 (oset index include-path ans)
-                ;; Once we have our new indicies set up, notify those
+                ;; Once we have our new indices set up, notify those
                 ;; who depend on us if we found something for them to
                 ;; depend on.
                 (when ans (semanticdb-refresh-references table))
@@ -575,7 +575,7 @@ a new path from the provided PATH."
           (setq ans (semanticdb-file-table
                      (car systemdb)
                      ;; I would expect most omniscient to return the same
-                     ;; thing reguardless of filename, but we may have
+                     ;; thing regardless of filename, but we may have
                      ;; one that can return a table of all things the
                      ;; current file needs.
                      (buffer-file-name (current-buffer))))
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index 3d2128db29a..c159a26dc1e 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -227,7 +227,7 @@ it is in Emacs.")
           "Non nil if this table needs to be `Saved'.")
    (db-refs :initform nil
             :documentation
-            "List of `semanticdb-table' objects refering to this one.
+            "List of `semanticdb-table' objects referring to this one.
 These aren't saved, but are instead recalculated after load.
 See the file semantic/db-ref.el for how this slot is used.")
    (pointmax :initarg :pointmax
@@ -657,7 +657,7 @@ The file associated with OBJ does not need to be in a buffer."
 ;;; SAVE/LOAD
 ;;
 (defmethod semanticdb-save-db ((DB semanticdb-project-database)
-                               &optional supress-questions)
+                               &optional suppress-questions)
   "Cause a database to save itself.
 The database base class does not save itself persistently.
 Subclasses could save themselves to a file, or to a database, or other
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index 45b807df12b..6db47f8b0be 100644
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -175,7 +175,7 @@ TOKEN is a lexical token."
   "For IFACE, highlight NONTERM in the parser buffer.
 NONTERM is the name of the rule currently being processed that shows up
 as a nonterminal (or tag) in the source buffer.
-If RULE and MATCH indicies are specified, highlight those also."
+If RULE and MATCH indices are specified, highlight those also."
   (set-buffer (oref iface :parser-buffer))
 
   (let* ((rules (semantic-find-tags-by-class 'nonterminal (current-buffer)))
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index a2c8c5efd40..d33454eb56b 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -470,6 +470,7 @@ a 'semantic-parse-changes-failed exception with value t."
              (buffer-name (current-buffer))))
   (run-hooks 'semantic-edits-incremental-reparse-failed-hook))
 
+;;;###autoload
 (defun semantic-edits-incremental-parser ()
   "Incrementally reparse the current buffer.
 Incremental parser allows semantic to only reparse those sections of
@@ -859,7 +860,7 @@ pre-positioned to a convenient location."
           (setq cacheend chil)
           (while (and cacheend (not (eq last (car cacheend))))
             (setq cacheend (cdr cacheend)))
-          ;; The splicable part is after cacheend.. so move cacheend
+          ;; The spliceable part is after cacheend.. so move cacheend
           ;; one more tag.
           (setq cacheend (cdr cacheend))
           ;; Splice the found end tag into the cons cell
diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el
index b4d94321bc1..a6d86691206 100644
--- a/lisp/cedet/semantic/find.el
+++ b/lisp/cedet/semantic/find.el
@@ -427,7 +427,7 @@ TABLE is a tag table.  See `semantic-something-to-tag-table'."
 
 ;;; Old Style Brute Force Search Routines
 ;;
-;; These functions will search through tags lists explicity for
+;; These functions will search through tags lists explicitly for
 ;; desired information.
 
 ;; The -by-name nonterminal search can use the built in fcn
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 98b1ab55c32..1a79adc650d 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -1290,7 +1290,7 @@ the change bounds to encompass the whole nonterminal tag."
           semantic-grammar-mode-keywords-3)
          nil  ;; perform string/comment fontification
          nil  ;; keywords are case sensitive.
-         ;; This puts _ & - as a word constituant,
+         ;; This puts _ & - as a word constituent,
          ;; simplifying our keywords significantly
          ((?_ . "w") (?- . "w"))))
   ;; Setup Semantic to parse grammar
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 6761a7f532b..c60ca4b4b6a 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -246,8 +246,8 @@ And also manages services that depend on tag values."
 
         ;; NOTE ON COMMENTED SAFE HERE
         ;; We used to not execute the services if the buffer was
-        ;; unparseable.  We now assume that they are lexically
-        ;; safe to do, because we have marked the buffer unparseable
+        ;; unparsable.  We now assume that they are lexically
+        ;; safe to do, because we have marked the buffer unparsable
         ;; if there was a problem.
         ;;(when safe
         (dolist (service semantic-idle-scheduler-queue)
@@ -476,7 +476,7 @@ Does nothing if the current buffer doesn't need reparsing."
       ;; do them here, then all the bovination hooks are not run, and
       ;; we save lots of time.
       (cond
-       ;; If the buffer was previously marked unparseable,
+       ;; If the buffer was previously marked unparsable,
        ;; then don't waste our time.
        ((semantic-parse-tree-unparseable-p)
         nil)
@@ -515,7 +515,7 @@ Does nothing if the current buffer doesn't need reparsing."
                         (save-excursion (semantic-fetch-tags))
                         nil)
                   ;; If we are here, it is because the lexical step failed,
-                  ;; proably due to unterminated lists or something like that.
+                  ;; probably due to unterminated lists or something like that.
 
                   ;; We do nothing, and just wait for the next idle timer
                   ;; to go off.  In the meantime, remember this, and make sure
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index ba43ba657a1..f8e72c1027c 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -1248,7 +1248,7 @@ they are comment end characters) AND when you want whitespace tokens."
   (if (eq (semantic-lex-token-class (car semantic-lex-token-stream))
           'whitespace)
       ;; Merge whitespace tokens together if they are adjacent.  Two
-      ;; whitespace tokens may be sperated by a comment which is not in
+      ;; whitespace tokens may be separated by a comment which is not in
       ;; the token stream.
       (setcdr (semantic-lex-token-bounds (car semantic-lex-token-stream))
               (match-end 0))
@@ -1271,7 +1271,7 @@ they are comment end characters)."
   (if (eq (semantic-lex-token-class (car semantic-lex-token-stream))
           'whitespace)
       ;; Merge whitespace tokens together if they are adjacent.  Two
-      ;; whitespace tokens may be sperated by a comment which is not in
+      ;; whitespace tokens may be separated by a comment which is not in
       ;; the token stream.
       (progn
         (setq semantic-lex-end-point (match-end 0))
@@ -1704,7 +1704,7 @@ If there is no error, then the last value of FORMS is returned."
                       nil))))
        ;; Great Sadness.  Assume that FORMS execute within the
        ;; confines of the current buffer only!  Mark this thing
-       ;; unparseable iff the special symbol was thrown.  This
+       ;; unparsable iff the special symbol was thrown.  This
        ;; will prevent future calls from parsing, but will allow
        ;; then to still return the cache.
        (when ,ret
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index ea4903c70ea..937936032d2 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -725,7 +725,7 @@ The class returned from the scope calculation is variable
               (oset scopecache localargs localargs)
               (oset scopecache localvar localvar)
               )))
-        ;; Make sure we become dependant on the typecache.
+        ;; Make sure we become dependent on the typecache.
         (semanticdb-typecache-add-dependant scopecache)
         ;; Handy debug output.
         (when (called-interactively-p 'any)
diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el
index 4d001322108..2f585cbdf45 100644
--- a/lisp/cedet/semantic/tag-ls.el
+++ b/lisp/cedet/semantic/tag-ls.el
@@ -195,7 +195,7 @@ See `semantic-tag-static-p'."
 ;;;###autoload
 (define-overloadable-function semantic-tag-prototype-p (tag)
   "Return non nil if TAG is a prototype.
-For some laguages, such as C, a prototype is a declaration of
+For some languages, such as C, a prototype is a declaration of
 something without an implementation."
   )
 
diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el
index a08f4a31b30..13836f64b85 100644
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -109,7 +109,7 @@ Only minor modes that are locally enabled are shown in the mode line."
                  (tail (or (memq elem minor-mode-alist)
                            (setq minor-mode-alist
                                  (cons elem minor-mode-alist)))))
-            (setcdr tail (nconc locals (cdr tail)))))))))      
+            (setcdr tail (nconc locals (cdr tail)))))))))
 
 (defun semantic-desktop-ignore-this-minor-mode (buffer)
   "Installed as a minor-mode initializer for Desktop mode.
@@ -438,7 +438,7 @@ The state is indicated in the modeline with the following characters:
  `-'  ->  The cache is up to date.
  `!'  ->  The cache requires a full update.
  `~'  ->  The cache needs to be incrementally parsed.
- `%'  ->  The cache is not currently parseable.
+ `%'  ->  The cache is not currently parsable.
  `@'  ->  Auto-parse in progress (not set here.)
 With prefix argument ARG, turn on if positive, otherwise off.  The
 minor mode can be turned on only if semantic feature is available and
@@ -524,7 +524,7 @@ This marker is one of the following:
  `-'  ->  The cache is up to date.
  `!'  ->  The cache requires a full update.
  `~'  ->  The cache needs to be incrementally parsed.
- `%'  ->  The cache is not currently parseable.
+ `%'  ->  The cache is not currently parsable.
  `@'  ->  Auto-parse in progress (not set here.)
 Arguments IGNORE are ignored, and accepted so this can be used as a hook
 in many situations."
diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el
index f92ae88c14e..0aff8325252 100644
--- a/lisp/cedet/semantic/wisent/comp.el
+++ b/lisp/cedet/semantic/wisent/comp.el
@@ -51,7 +51,7 @@
 ;; name space.  Elisp dynamic binding allows that ;-)
 
 ;; Here are simple macros to easily define and use set of variables
-;; binded locally, without all these "reference to free variable"
+;; bound locally, without all these "reference to free variable"
 ;; compiler warnings!
 
 (defmacro wisent-context-name (name)
@@ -2640,7 +2640,7 @@ there are any reduce/reduce conflicts.")
 
 (defun wisent-print-results ()
   "Print information on generated parser.
-Report detailed informations if `wisent-verbose-flag' or
+Report detailed information if `wisent-verbose-flag' or
 `wisent-debug-flag' are non-nil."
   (when (or wisent-verbose-flag wisent-debug-flag)
     (wisent-print-useless))
diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index d8e02f978b2..73445fbf13d 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -32,7 +32,7 @@
 ;;; :blank
 ;;
 ;; Using :blank means that the template should force blank lines
-;; before and after the template, reguardless of where the insertion
+;; before and after the template, regardless of where the insertion
 ;; is occurring.
 (defun srecode-semantic-handle-:blank (dict)
   "Add macros into the dictionary DICT specifying blank line spacing.
@@ -185,4 +185,3 @@ do not contain any text from preceding or following text."
 (provide 'srecode/args)
 
 ;;; srecode/args.el ends here
-
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el
index f13fb17ca8f..f4d34a0f2ab 100644
--- a/lisp/cedet/srecode/fields.el
+++ b/lisp/cedet/srecode/fields.el
@@ -324,7 +324,7 @@ Try to use this to provide useful completion when available.")
   )
 
 (defvar srecode-field-replication-max-size 100
-  "Maximum size of a field before cancelling replication.")
+  "Maximum size of a field before canceling replication.")
 
 (defun srecode-field-mod-hook (ol after start end &optional pre-len)
   "Modification hook for the field overlay.
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 60f277b2c9f..bbf8b881c4d 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -312,7 +312,7 @@ occur in your template.")
           (setq doit nil)))
       (goto-char pm)
       )
-    ;; Do indentation reguardless of the newline.
+    ;; Do indentation regardless of the newline.
     (when (and (eq i t) inbuff)
       (indent-according-to-mode)
       (goto-char pm))
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 0a99b7869e8..ed2b0e2cfdb 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -194,7 +194,7 @@ we can tell font lock about them.")
        '(srecode-font-lock-keywords
          nil  ;; perform string/comment fontification
          nil  ;; keywords are case sensitive.
-         ;; This puts _ & - as a word constituant,
+         ;; This puts _ & - as a word constituent,
          ;; simplifying our keywords significantly
          ((?_ . "w") (?- . "w")))))
 
diff --git a/lisp/comint.el b/lisp/comint.el
index c0b02e5a230..77734b69af6 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -45,7 +45,7 @@
 ;; It is pretty easy to make new derived modes for other processes.
 
 ;; For documentation on the functionality provided by Comint mode, and
-;; the hooks available for customising it, see the comments below.
+;; the hooks available for customizing it, see the comments below.
 ;; For further information on the standard derived modes (shell,
 ;; inferior-lisp, inferior-scheme, ...), see the relevant source files.
 
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index ed6ab96107a..a0a8af80389 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -97,7 +97,7 @@
 ;; operates over the text rectangle selected which rectangle diagonal is
 ;; given by the region start and end.
 ;;
-;; See `delimit-columns-format' variable documentation for column formating.
+;; See `delimit-columns-format' variable documentation for column formatting.
 ;;
 ;; `delimit-columns-region' is useful when you have columns of text that
 ;; are not well aligned, like:
@@ -171,7 +171,7 @@ For examples below, consider:
 
 Valid values are:
 
-   nil          no formating.  That is, `delimit-columns-after' is followed by
+   nil          no formatting.  That is, `delimit-columns-after' is followed by
                 `delimit-columns-separator'.
                 For example, the result is: \"<ccc>:<dddd>:\"
 
@@ -190,9 +190,9 @@ Valid values are:
                 For example, the result is: \"<ccc   >:<dddd  >:\"
 
 Any other value is treated as t."
-  :type '(choice :menu-tag "Column Formating"
-                 :tag "Column Formating"
-                 (const :tag "No Formating" nil)
+  :type '(choice :menu-tag "Column Formatting"
+                 :tag "Column Formatting"
+                 (const :tag "No Formatting" nil)
                  (const :tag "Column Alignment" t)
                  (const :tag "Separator Alignment" separator)
                  (const :tag "Column Padding" padding))
@@ -206,7 +206,7 @@ This has effect only when there are lines with different number of columns."
   :group 'columns)
 
 (defcustom delimit-columns-start 0
-  "Specify column number to start prettifing.
+  "Specify column number to start prettifying.
 
 See also `delimit-columns-end' for documentation.
 
@@ -221,7 +221,7 @@ column (column 0) is located at left corner."
   :group 'columns)
 
 (defcustom delimit-columns-end 1000000
-  "Specify column number to end prettifing.
+  "Specify column number to end prettifying.
 
 See also `delimit-columns-start' for documentation.
 
@@ -404,7 +404,7 @@ START and END delimits the corners of text rectangle."
                 (re-search-forward delimit-columns-separator
                                    delimit-columns-limit 'move))
       (setq ncol (1+ ncol)))
-    ;; insert first formating
+    ;; insert first formatting
     (insert delimit-columns-str-before delimit-columns-before)
     ;; Adjust all columns but last one
     (while (progn
@@ -436,7 +436,7 @@ START and END delimits the corners of text rectangle."
              (setq spaces (and delimit-columns-format
                                (make-string (aref delimit-columns-max ncol)
                                             ?\s)))))
-      ;; insert last formating
+      ;; insert last formatting
       (cond ((null delimit-columns-format)
              (insert delimit-columns-after delimit-columns-str-after))
             ((eq delimit-columns-format 'padding)
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 6d2c47f3957..fcd45f1a148 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -144,7 +144,7 @@ any selection."
 (put 'newline 'delete-selection t)
 (put 'open-line 'delete-selection 'kill)
 
-;; This is very useful for cancelling a selection in the minibuffer without
+;; This is very useful for canceling a selection in the minibuffer without
 ;; aborting the minibuffer.
 (defun minibuffer-keyboard-quit ()
   "Abort recursive edit.
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 8b7fa89a19b..47f96e8d68f 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -358,7 +358,7 @@ This function is semi-obsolete.  Use `get-char-code-property'."
       (compose-string (string ch) 0 1 (format "\t%c\t" ch))
     (string ch)))
 
-;; Return a nicely formated list of categories; extended category
+;; Return a nicely formatted list of categories; extended category
 ;; description is added to the category name as a tooltip
 (defsubst describe-char-categories (category-set)
   (let ((mnemonics (category-set-mnemonics category-set)))
@@ -422,6 +422,20 @@ as well as widgets, buttons, overlays, and text properties."
               (setq charset (char-charset char)
                     code (encode-char char charset)))
         (setq code char))
+      (cond
+       ;; Append a PDF character to directional embeddings and
+       ;; overrides, to prevent potential messup of the following
+       ;; text.
+       ((memq char '(?\x202a ?\x202b ?\x202d ?\x202e))
+        (setq char-description
+              (concat char-description
+                      (propertize (string ?\x202c) 'invisible t))))
+       ;; Append a LRM character to any strong character to avoid
+       ;; messing up the numerical codepoint.
+       ((memq (get-char-code-property char 'bidi-class) '(R AL))
+        (setq char-description
+              (concat char-description
+                      (propertize (string ?\x200e) 'invisible t)))))
       (when composition
         ;; When the composition is trivial (i.e. composed only with the
         ;; current character itself without any alternate characters),
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 8a61bec0eea..34a51eb51dc 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -702,9 +702,9 @@ is nil, ask the user where to save the desktop."
 ;; ----------------------------------------------------------------------------
 (defun desktop-internal-v2s (value)
   "Convert VALUE to a pair (QUOTE . TXT); (eval (read TXT)) gives VALUE.
-TXT is a string that when read and evaluated yields value.
+TXT is a string that when read and evaluated yields VALUE.
 QUOTE may be `may' (value may be quoted),
-`must' (values must be quoted), or nil (value may not be quoted)."
+`must' (value must be quoted), or nil (value must not be quoted)."
   (cond
     ((or (numberp value) (null value) (eq t value) (keywordp value))
      (cons 'may (prin1-to-string value)))
diff --git a/lisp/dframe.el b/lisp/dframe.el
index b4f44e1a308..728f08d135d 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -221,7 +221,7 @@ Local to those buffers, as a function called that created it.")
     (define-key map [mouse-2] 'dframe-click)
     ;; This is the power click for new frames, or refreshing a cache
     (define-key map [S-mouse-2] 'dframe-power-click)
-    ;; This adds a small unecessary visual effect
+    ;; This adds a small unnecessary visual effect
     ;;(define-key map [down-mouse-2] 'dframe-quick-mouse)
 
     (define-key map [down-mouse-3] 'dframe-popup-kludge)
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 4daf313445c..0863cc1abac 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1392,7 +1392,7 @@ Considers buffers closer to the car of `buffer-list' to be more recent."
 ;; Apparently people do use it. - lrd 12/22/97.
 
 (with-no-warnings
-  ;; Warnings are suppresed to avoid "global/dynamic var `X' lacks a prefix".
+  ;; Warnings are suppressed to avoid "global/dynamic var `X' lacks a prefix".
   ;; This is unbearably ugly, but not more than having global variables
   ;; named size, time, name or s, however practical it can be while writing
   ;; `dired-mark-sexp' predicates.
diff --git a/lisp/dired.el b/lisp/dired.el
index 1d503a14810..3a82ebcf504 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2678,7 +2678,7 @@ Anything else means ask for each directory."
 (defvar dired-re-no-dot "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")
 
 ;; Delete file, possibly delete a directory and all its files.
-;; This function is usefull outside of dired.  One could change it's name
+;; This function is useful outside of dired.  One could change its name
 ;; to e.g. recursive-delete-file and put it somewhere else.
 (defun dired-delete-file (file &optional recursive trash) "\
 Delete FILE or directory (possibly recursively if optional RECURSIVE is true.)
@@ -4128,7 +4128,7 @@ instead.
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
-;;;;;;  "dired-x" "dired-x.el" "ea7c74fbb7dddf43bb85875018cb59ad")
+;;;;;;  "dired-x" "dired-x.el" "a542cdbf155ff79f36331bae217f3b28")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
diff --git a/lisp/electric.el b/lisp/electric.el
index 1a8bf9f89ed..cec1b5d2000 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -85,7 +85,7 @@
               (eq last-input-event ?\C-g))
           (progn (setq unread-command-events nil
                        prefix-arg nil)
-                 ;; If it wasn't cancelling a prefix character, then quit.
+                 ;; If it wasn't canceling a prefix character, then quit.
                  (if (or (= (length (this-command-keys)) 1)
                          (not inhibit-quit)) ; safety
                      (progn (ding)
diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el
index 31be851f2dd..e650995d3fe 100644
--- a/lisp/emacs-lisp/assoc.el
+++ b/lisp/emacs-lisp/assoc.el
@@ -61,10 +61,9 @@ pair is not at the head of alist.  ALIST is not altered."
 
 
 (defun aput (alist-symbol key &optional value)
-  "Inserts a key-value pair into an alist.
+  "Insert a key-value pair into an alist.
 The alist is referenced by ALIST-SYMBOL.  The key-value pair is made
-from KEY and optionally, VALUE.  Returns the altered alist or nil if
-ALIST is nil.
+from KEY and optionally, VALUE.  Returns the altered alist.
 
 If the key-value pair referenced by KEY can be found in the alist, and
 VALUE is supplied non-nil, then the value of KEY will be set to VALUE.
@@ -78,7 +77,7 @@ of the alist (with value nil if VALUE is nil or not supplied)."
     (setq alist (symbol-value alist-symbol))
     (cond ((null alist) (set alist-symbol elem))
           ((anot-head-p alist key) (set alist-symbol (nconc elem alist)))
-          (value (setcar alist (car elem)))
+          (value (setcar alist (car elem)) alist)
           (t alist))))
 
 
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 9aa230cfe9b..29c5f3f092b 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2637,7 +2637,7 @@ If FORM is a lambda or a macro, byte-compile it as a function."
                    (setq form (cdr form)))
                  (setq form (car form)))
                (if (and (eq (car-safe form) 'list)
-                        ;; The spec is evaled in callint.c in dynamic-scoping
+                        ;; The spec is evalled in callint.c in dynamic-scoping
                         ;; mode, so just leaving the form unchanged would mean
                         ;; it won't be eval'd in the right mode.
                         (not lexical-binding))
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 86c7e59fd07..d7cfcfb870a 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -3448,7 +3448,7 @@ instrumented.  Then it does `edebug-on-entry' and switches to `go' mode."
 (defun edebug-on-entry (function &optional flag)
   "Cause Edebug to stop when FUNCTION is called.
 With prefix argument, make this temporary so it is automatically
-cancelled the first time the function is entered."
+canceled the first time the function is entered."
   (interactive "aEdebug on entry to: \nP")
   ;; Could store this in the edebug data instead.
   (put function 'edebug-on-entry (if flag 'temp t)))
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index db3236afc1a..170d3fb0bf8 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -57,7 +57,7 @@
 
 (eval-and-compile
 ;; About the above.  EIEIO must process its own code when it compiles
-;; itself, thus, by eval-and-compiling outselves, we solve the problem.
+;; itself, thus, by eval-and-compiling ourselves, we solve the problem.
 
 ;; Compatibility
 (if (fboundp 'compiled-function-arglist)
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index f9e7fe44824..44e87e171d1 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -131,6 +131,7 @@
 (put 'autoload 'doc-string-elt 3)
 (put 'defun    'doc-string-elt 3)
 (put 'defun*    'doc-string-elt 3)
+(put 'defmethod 'doc-string-elt 3)
 (put 'defvar   'doc-string-elt 3)
 (put 'defcustom 'doc-string-elt 3)
 (put 'deftheme 'doc-string-elt 2)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 8417aa8d380..a1513039a98 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -113,6 +113,8 @@
 
 ;;; ToDo:
 
+;; - a trust mechanism, since compiling a package can run arbitrary code.
+;;   For example, download package signatures and check that they match.
 ;; - putting info dirs at the start of the info path means
 ;;   users see a weird ordering of categories.  OTOH we want to
 ;;   override later entries.  maybe emacs needs to enforce
@@ -224,7 +226,10 @@ Each element has the form (ID . LOCATION).
  LOCATION specifies the base location for the archive.
   If it starts with \"http:\", it is treated as a HTTP URL;
   otherwise it should be an absolute directory name.
-  (Other types of URL are currently not supported.)"
+  (Other types of URL are currently not supported.)
+
+Only add locations that you trust, since fetching and installing
+a package can run arbitrary code."
   :type '(alist :key-type (string :tag "Archive name")
                 :value-type (string :tag "URL or directory name"))
   :risky t
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index e6c4ccbbc50..6931ce75cb5 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -363,12 +363,12 @@ MATCH is the pattern that needs to be matched, of the form:
     (dolist (branch rest)
       (let* ((match (car branch))
              (code&vars (cdr branch))
-             (splitted
+             (split
               (pcase--split-match sym splitter match)))
-        (unless (eq (car splitted) :pcase--fail)
-          (push (cons (car splitted) code&vars) then-rest))
-        (unless (eq (cdr splitted) :pcase--fail)
-          (push (cons (cdr splitted) code&vars) else-rest))))
+        (unless (eq (car split) :pcase--fail)
+          (push (cons (car split) code&vars) then-rest))
+        (unless (eq (cdr split) :pcase--fail)
+          (push (cons (cdr split) code&vars) else-rest))))
     (cons (nreverse then-rest) (nreverse else-rest))))
 
 (defun pcase--split-consp (syma symd pat)
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index c65cbc39eab..85fa4772eb6 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -56,7 +56,7 @@
   ;; syntax-ppss-flush-cache since that would not only flush the cache but also
   ;; reset syntax-propertize--done which should not be done in this case).
   "Mode-specific function to apply the syntax-table properties.
-Called with 2 arguments: START and END.
+Called with two arguments: START and END.
 This function can call `syntax-ppss' on any position before END, but it
 should not call `syntax-ppss-flush-cache', which means that it should not
 call `syntax-ppss' on some position and later modify the buffer on some
@@ -248,7 +248,7 @@ Note: back-references in REGEXPs do not work."
                                  (if syntax
                                      (put-text-property
                                       mb me 'syntax-table syntax))))))))
-                               
+
                      (if (or (not (cddr rule)) (zerop gn))
                          (setq code (nconc (nreverse thiscode) code))
                        (push `(if (match-beginning ,gn)
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 9a50352d507..b17fa6b1471 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -368,7 +368,7 @@ interpreted as a register number."
 
 (defcustom cua-check-pending-input t
   "If non-nil, don't override prefix key if input pending.
-It is rumoured that `input-pending-p' is unreliable under some window
+It is rumored that `input-pending-p' is unreliable under some window
 managers, so try setting this to nil, if prefix override doesn't work."
   :type 'boolean
   :group 'cua)
@@ -1242,7 +1242,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
 
    ;; Handle shifted cursor keys and other movement commands.
    ;; If region is not active, region is activated if key is shifted.
-   ;; If region is active, region is cancelled if key is unshifted
+   ;; If region is active, region is canceled if key is unshifted
    ;;   (and region not started with C-SPC).
    ;; If rectangle is active, expand rectangle in specified direction and
    ;;   ignore the movement.
diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el
index 690555e81dc..b6a3a977909 100644
--- a/lisp/emulation/cua-gmrk.el
+++ b/lisp/emulation/cua-gmrk.el
@@ -94,7 +94,7 @@ insert the deleted or copied text before the global marker, even when the
 global marker is in another buffer.
 If the global marker isn't set, set the global marker at point in the current
 buffer.  Otherwise jump to the global marker position and cancel it.
-With prefix argument, don't jump to global mark when cancelling it."
+With prefix argument, don't jump to global mark when canceling it."
   (interactive "P")
   (unless cua--global-mark-initialized
     (cua--init-global-mark))
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 76cab39f5b2..00aec2d0bf9 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -1258,7 +1258,7 @@ The numbers are formatted according to the FORMAT string."
   (untabify (point-min) (point-max)))
 
 (defun cua-text-fill-rectangle (width text)
-  "Replace rectagle with filled TEXT read from minibuffer.
+  "Replace rectangle with filled TEXT read from minibuffer.
 A numeric prefix argument is used a new width for the filled rectangle."
   (interactive (list
                 (prefix-numeric-value current-prefix-arg)
@@ -1269,7 +1269,7 @@ A numeric prefix argument is used a new width for the filled rectangle."
     (lambda () (insert text))))
 
 (defun cua-refill-rectangle (width)
-  "Fill contents of current rectagle.
+  "Fill contents of current rectangle.
 A numeric prefix argument is used as new width for the filled rectangle."
   (interactive "P")
   (cua--rectangle-aux-replace
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index a0c6062fb29..1298e5424ac 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -420,7 +420,7 @@ Type `n' to quit this window for now.\n")
         (goto-char (point-min))
         (if (y-or-n-p "Inhibit VIP startup message? ")
             (progn
-              (with-current-buffer 
+              (with-current-buffer
                   (find-file-noselect
                    (substitute-in-file-name vip-startup-file))
                 (goto-char (point-max))
@@ -877,7 +877,7 @@ is the name of the register for COM."
   (if (> beg end) (exchange-point-and-mark)))
 
 (defun vip-global-execute ()
-  "Call last keyboad macro for each line in the region."
+  "Call last keyboard macro for each line in the region."
   (if (> (point) (mark)) (exchange-point-and-mark))
   (beginning-of-line)
   (call-last-kbd-macro)
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index ce3cc3c9a22..b6d487704f4 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -716,7 +716,7 @@
     (error
      (viper-message-conditions conds))))
 
-;; escape to emacs mode termporarily
+;; escape to emacs mode temporarily
 (defun viper-escape-to-emacs (arg &optional events)
   "Escape to Emacs state from Vi state for one Emacs command.
 ARG is used as the prefix value for the executed command.  If
@@ -726,7 +726,7 @@ EVENTS is a list of events, which become the beginning of the command."
       (message "Switched to EMACS state for the next command..."))
   (viper-escape-to-state arg events 'emacs-state))
 
-;; escape to Vi mode termporarily
+;; escape to Vi mode temporarily
 (defun viper-escape-to-vi (arg)
   "Escape from Emacs state to Vi state for one Vi 1-character command.
 If the Vi command that the user types has a prefix argument, e.g., `d2w', then
@@ -1979,7 +1979,7 @@ Undo previous insertion and inserts new."
 ;; Quote region by each line with a user supplied string.
 (defun viper-quote-region ()
   (let ((quote-str viper-quote-string)
-        (donot-change-dafault t))
+        (donot-change-default t))
     (setq quote-str
           (viper-read-string-with-history
            "Quote string: "
@@ -1991,9 +1991,9 @@ Undo previous insertion and inserts new."
                  ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;")
                  ((memq major-mode '(c-mode cc-mode c++-mode)) "//")
                  ((memq major-mode '(sh-mode shell-mode)) "#")
-                 (t (setq donot-change-dafault nil)
+                 (t (setq donot-change-default nil)
                     quote-str))))
-    (or donot-change-dafault
+    (or donot-change-default
         (setq viper-quote-string quote-str))
     (viper-enlarge-region (point) (mark t))
     (if (> (point) (mark t)) (exchange-point-and-mark))
@@ -2407,7 +2407,7 @@ problems."
    t 'local)
   (add-hook
    'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local)
-  ;; guard against a smartie who switched from R-replace to normal replace
+  ;; guard against a smarty who switched from R-replace to normal replace
   (remove-hook
    'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local)
   (if overwrite-mode (overwrite-mode -1))
@@ -2531,7 +2531,7 @@ problems."
    'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local)
   (add-hook
    'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local)
-  ;; guard against a smartie who switched from R-replace to normal replace
+  ;; guard against a smarty who switched from R-replace to normal replace
   (remove-hook
    'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local)
   )
@@ -3767,7 +3767,7 @@ If MAJOR-MODE is set, set the macros only in that major mode."
                "//" 'vi-state
                [1 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return]
                scope)
-              ;; toggle regexp/vanila search
+              ;; toggle regexp/vanilla search
               (viper-record-kbd-macro
                "///" 'vi-state
                [2 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return]
@@ -3824,7 +3824,7 @@ the macros are set in the current major mode.
              "//" 'emacs-state
              [1 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return]
              (or arg-majormode major-mode))
-            ;; toggle regexp/vanila search
+            ;; toggle regexp/vanilla search
             (viper-record-kbd-macro
              "///" 'emacs-state
              [2 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return]
@@ -4017,7 +4017,7 @@ Null string will repeat previous search."
   (setq viper-prefix-commands
         (cons viper-buffer-search-char viper-prefix-commands)))
 
-;; This is a Viper wraper for isearch-forward.
+;; This is a Viper wrapper for isearch-forward.
 (defun viper-isearch-forward (arg)
   "Do incremental search forward."
   (interactive "P")
@@ -4025,7 +4025,7 @@ Null string will repeat previous search."
   (if (listp arg) (setq arg (car arg)))
   (viper-exec-form-in-emacs (list 'isearch-forward arg)))
 
-;; This is a Viper wraper for isearch-backward."
+;; This is a Viper wrapper for isearch-backward."
 (defun viper-isearch-backward (arg)
   "Do incremental search backward."
   (interactive "P")
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 2d221d5fa05..2fc8dc599cb 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -818,7 +818,7 @@ Related buffers can be cycled through via :R and :P commands."
 ;;; Face-saving tricks
 
 (defgroup viper-highlighting nil
-  "Hilighting of replace region, search pattern, minibuffer, etc."
+  "Highlighting of replace region, search pattern, minibuffer, etc."
   :prefix "viper-"
   :group 'viper)
 
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index e978823a49c..2704bdc5b40 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -921,7 +921,7 @@ name from there."
 
 
 (defun viper-global-execute ()
-  "Call last keyboad macro for each line in the region."
+  "Call last keyboard macro for each line in the region."
   (if (> (point) (mark t)) (exchange-point-and-mark))
   (beginning-of-line)
   (call-last-kbd-macro)
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index b2035e8ede6..3704725b8dd 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -491,7 +491,7 @@ unless it is coming up in a wrong Viper state."
     )
   "List specifying how to modify the various major modes to enable some Viperisms.
 The list has the structure: ((mode viper-state keymap) (mode viper-state
-keymap) ...).  If `mode' is on the list, the `kemap' will be made active (on
+keymap) ...).  If `mode' is on the list, the `keymap' will be made active (on
 the minor-mode-map-alist) in the specified viper state.
 If you change this list, have to restart Emacs for the change to take effect.
 However, if you did the change through the customization widget, then Emacs
diff --git a/lisp/epa-dired.el b/lisp/epa-dired.el
index 0834a8df23a..d51045a5e37 100644
--- a/lisp/epa-dired.el
+++ b/lisp/epa-dired.el
@@ -67,7 +67,7 @@ If no one is selected, default secret key is used.  "
     (while file-list
       (epa-encrypt-file
        (expand-file-name (car file-list))
-       (epa-select-keys (epg-make-context) "Select recipents for encryption.
+       (epa-select-keys (epg-make-context) "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "))
       (setq file-list (cdr file-list)))
     (revert-buffer)))
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index bef67ba4f69..4d05563719d 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -235,7 +235,7 @@ encryption is used."
                                                    (current-buffer)))))
                    (epa-select-keys
                     context
-                    "Select recipents for encryption.
+                    "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "
                     recipients)
                  (if epa-file-encrypt-to
@@ -273,7 +273,7 @@ If no one is selected, symmetric encryption will be performed.  "
            (epg-sub-key-id (car (epg-key-sub-key-list key))))
         (epa-select-keys
          (epg-make-context)
-         "Select recipents for encryption.
+         "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "))))
 
 ;;;###autoload
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index 3364af531f5..d20b6ca35a7 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -75,7 +75,7 @@
         everything but the last character.
 
         * erc.el(erc-send-current-line):
-        Check wether point is in the input line. If
+        Check whether point is in the input line. If
         not, just beep and do nothing.
 
 2002-12-28  Alex Schroeder  <alex@gnu.org>
@@ -98,7 +98,7 @@
 2002-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 
         * erc.el(erc-log-irc-protocol):
-        Removed check wether get-buffer-create
+        Removed check whether get-buffer-create
             returned nil. "The value is never nil", says the docstring.
 
         * erc.el: Day Of The Small Changes
@@ -245,7 +245,7 @@
         (erc-process-alive): Check erc-process for boundp and processp.
 
         * erc.el(erc-kill-buffer-function):
-        Do not check wether the process is
+        Do not check whether the process is
         alive before running the hook, because there might be functions on
         the hook that need to run even when the process is dead.  And
         function that wants to check this, should use (erc-process-alive).
@@ -1037,7 +1037,7 @@
         * (erc-away-p): new function
 
         erc-fill.el:
-        * (erc-fill-variable): Check wether erc-timestamp-format is bound before
+        * (erc-fill-variable): Check whether erc-timestamp-format is bound before
                                using it (erc-fill.el does not require erc-stamp).
 
 2002-11-10  Alex Schroeder  <alex@gnu.org>
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index fc7fd09e76c..3e687202d38 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -416,7 +416,7 @@
         * erc-button.el: New variable erc-button-wrap-long-urls.
         Modified erc-button-add-buttons:
           New optional argument REGEXP.
-          If we're buttonising a URL and erc-button-wrap-long-urls is
+          If we're buttonizing a URL and erc-button-wrap-long-urls is
           non-nil, try and wrap them
 
         Modified erc-button-add-buttons-1:
@@ -693,10 +693,10 @@
 2003-04-29  Jorgen Schaefer  <forcer@users.sourceforge.net>
 
         * erc.el(erc):
-        Check wether erc-save-buffer-in-logs is bound, too
+        Check whether erc-save-buffer-in-logs is bound, too
 
         * erc.el(erc):
-        Check wether erc-logging-enabled is bound before using it - not
+        Check whether erc-logging-enabled is bound before using it - not
         everyone is using erc-log.el!
 
 2003-04-28  Andreas Fuchs  <asf@void.at>
@@ -822,7 +822,7 @@
         (define-erc-module): the enable and disable routines now update erc-modules
             accordingly
         erc-modules: new variable controlling the modules which erc has loaded/will
-            load. when customising, it will automatically enable modules. it won't
+            load. when customizing, it will automatically enable modules. it won't
             automatically disable modules which are removed, yet.
         (erc-update-modules): enable all modules in `erc-modules'
 
@@ -1058,7 +1058,7 @@
         * erc.el(erc-process-input-line):
         when displaying the help for a function, if no
             documentation exists, don't fall over
-        (erc-cmd-SAY): new function for quoting lines begining with /
+        (erc-cmd-SAY): new function for quoting lines beginning with /
         (erc-server-NICK):
             - fix a bug where the "is now known as" message doesn't appear on newly
               created /query buffers
@@ -1166,7 +1166,7 @@
 
         (erc-person): Call erc-downcase before getting
         something from the hash.
-        (erc-nick-in-channel): Checking wether erc-process must be used is
+        (erc-nick-in-channel): Checking whether erc-process must be used is
         unnecessary -- this will be done in erc-person.
         (erc-nick-channels): New.
         (erc-add-nick-to-channel, erc-update-member): Call erc-downcase
@@ -1491,7 +1491,7 @@
         * erc.el:
         * removed duplicate do-no-parse-args properties for the defaliased defuns
         (erc-process-input-line): show function signature when incorrect args
-        (erc-extract-command-from-line): canonicalise defaliases before extracting
+        (erc-extract-command-from-line): canonicalize defaliases before extracting
             plist
         (erc-cmd-CLEAR): fixed
         (erc-cmd-UNIGNORE): fixed again
@@ -1678,7 +1678,7 @@
 2003-01-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
 
         * erc-stamp.el(erc-insert-timestamp-right):
-        Check wether erc-fill-column is
+        Check whether erc-fill-column is
         available before using it. Else default to fill-column or if
         everything else fails, the window width of the current window. For the
         fill-columns, use them directly as the starting position for the
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 5baa676ab39..112091af219 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -991,7 +991,7 @@ Hands off to helper functions via `erc-call-hooks'."
   (if (member (erc-response.command parsed-response)
               erc-server-prevent-duplicates)
       (let ((m (erc-response.unparsed parsed-response)))
-        ;; duplicate supression
+        ;; duplicate suppression
         (if (< (or (gethash m erc-server-duplicates) 0)
                (- (erc-current-time) erc-server-duplicate-timeout))
             (erc-call-hooks process parsed-response))
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index 1aa2c34c395..cab84951143 100644
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -160,7 +160,7 @@ it's far more automatic.  `pushd' allows the user to decide which
 directories gets pushed, and its size is unlimited.
 
 `eshell-last-dir-ring' is meant for users who don't use `pushd'
-explicity very much, but every once in a while would like to return to
+explicitly very much, but every once in a while would like to return to
 a previously visited directory without having to type in the whole
 thing again."
   :type 'integer
diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index 2c346dfcd3d..b6f12e1ff2e 100644
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -144,7 +144,7 @@ This is default behavior of shells like bash."
 ;;; Functions:
 
 (defun eshell-rebind-initialize ()
-  "Initialize the inputing code."
+  "Initialize the inputting code."
   (unless eshell-non-interactive-p
     (add-hook 'eshell-mode-hook 'eshell-setup-input-keymap nil t)
     (make-local-variable 'eshell-previous-point)
diff --git a/lisp/faces.el b/lisp/faces.el
index f10c9f87f25..21193589deb 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1704,13 +1704,14 @@ If omitted or nil, that stands for the selected frame's display."
       (> (tty-color-gray-shades display) 2)))))
 
 (defun read-color (&optional prompt convert-to-RGB allow-empty-name msg)
-  "Read a color name or RGB triplet of the form \"#RRRRGGGGBBBB\".
+  "Read a color name or RGB triplet.
 Completion is available for color names, but not for RGB triplets.
 
-RGB triplets have the form #XXXXXXXXXXXX, where each X is a hex
-digit.  The number of Xs must be a multiple of 3, with the same
-number of Xs for each of red, green, and blue.  The order is red,
-green, blue.
+RGB triplets have the form \"#RRGGBB\".  Each of the R, G, and B
+components can have one to four digits, but all three components
+must have the same number of digits.  Each digit is a hex value
+between 0 and F; either upper case or lower case for A through F
+are acceptable.
 
 In addition to standard color names and RGB hex values, the
 following are available as color candidates.  In each case, the
diff --git a/lisp/files.el b/lisp/files.el
index f903d2919a6..0f7386511f6 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -917,24 +917,41 @@ See `load-file' for a different interface to `load'."
 
 (defun file-remote-p (file &optional identification connected)
   "Test whether FILE specifies a location on a remote system.
-Returns nil or a string identifying the remote connection (ideally
-a prefix of FILE).  For example, the remote identification for filename
-\"/user@host:/foo\" could be \"/user@host:\".
-A file is considered \"remote\" if accessing it is likely to be slower or
-less reliable than accessing local files.
-Furthermore, relative file names do not work across remote connections.
-
-IDENTIFICATION specifies which part of the identification shall
-be returned as string.  IDENTIFICATION can be the symbol
-`method', `user', `host' or `localname'; any other value is
-handled like nil and means to return the complete identification
-string.
-
-If CONNECTED is non-nil, the function returns an identification only
-if FILE is located on a remote system, and a connection is established
-to that remote system.
-
-`file-remote-p' will never open a connection on its own."
+A file is considered remote if accessing it is likely to
+be slower or less reliable than accessing local files.
+
+`file-remote-p' never opens a new remote connection.  It can
+only reuse a connection that is already open.
+
+Return nil or a string identifying the remote connection
+\(ideally a prefix of FILE).  Return nil if FILE is a relative
+file name.
+
+When IDENTIFICATION is nil, the returned string is a complete
+remote identifier: with components method, user, and host.  The
+components are those present in FILE, with defaults filled in for
+any that are missing.
+
+IDENTIFICATION can specify which part of the identification to
+return.  IDENTIFICATION can be the symbol `method', `user',
+`host', or `localname'.  Any other value is handled like nil and
+means to return the complete identification.  The string returned
+for IDENTIFICATION `localname' can differ depending on whether
+there is an existing connection.
+
+If CONNECTED is non-nil, return an identification only if FILE is
+located on a remote system and a connection is established to
+that remote system.
+
+Tip: You can use this expansion of remote identifier components
+     to derive a new remote file name from an existing one.  For
+     example, if FILE is \"/sudo::/path/to/file\" then
+
+       \(concat \(file-remote-p FILE) \"/bin/sh\")
+
+     returns a remote file name for file \"/bin/sh\" that has the
+     same remote identifier as FILE but expanded; a name such as
+     \"/sudo:root@myhost:/bin/sh\"."
   (let ((handler (find-file-name-handler file 'file-remote-p)))
     (if handler
         (funcall handler 'file-remote-p file identification connected)
@@ -4866,7 +4883,7 @@ given.  With a prefix argument, TRASH is nil."
                 directory 'full directory-files-no-dot-files-regexp))
           (error "Directory is not empty, not moving to trash")
         (move-file-to-trash directory)))
-     ;; Otherwise, call outselves recursively if needed.
+     ;; Otherwise, call ourselves recursively if needed.
      (t
       (if (and recursive (not (file-symlink-p directory)))
           (mapc (lambda (file)
@@ -6110,7 +6127,7 @@ message to that effect instead of signaling an error."
 
 (defvar kill-emacs-query-functions nil
   "Functions to call with no arguments to query about killing Emacs.
-If any of these functions returns nil, killing Emacs is cancelled.
+If any of these functions returns nil, killing Emacs is canceled.
 `save-buffers-kill-emacs' calls these functions, but `kill-emacs',
 the low level primitive, does not.  See also `kill-emacs-hook'.")
 
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 680a107adfe..0f6c6e8dd78 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -453,7 +453,7 @@ will not be rewrapped if their length exceeds this value."
   :group 'filesets)
 
 (defcustom filesets-max-entry-length 50
-  "Truncate names of splitted submenus to this length."
+  "Truncate names of split submenus to this length."
   :set (function filesets-set-default)
   :type 'integer
   :group 'filesets)
diff --git a/lisp/follow.el b/lisp/follow.el
index 2273e8920fd..ee8be14c6dc 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -1129,7 +1129,7 @@ Otherwise, return nil."
 ;;{{{ Redisplay
 
 ;; Redraw all the windows on the screen, starting with the top window.
-;; The window used as as marker is WIN, or the selcted window if WIN
+;; The window used as as marker is WIN, or the selected window if WIN
 ;; is nil.  Start every window directly after the end of the previous
 ;; window, to make sure long lines are displayed correctly.
 
@@ -1993,7 +1993,7 @@ report this using the `report-emacs-bug' function."
 ;; going to be recentered at the next redisplay, unless we do a
 ;; read-and-write cycle to update the `force' flag inside the windows.
 ;;
-;; In 19.30, a new varible `window-scroll-functions' is called every
+;; In 19.30, a new variable `window-scroll-functions' is called every
 ;; time a window is recentered.  It is not perfect for our situation,
 ;; since when it is called for a tail window, it is to late.  However,
 ;; if it is called for another window, we can try to update our
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index c319974fb41..2db0d809275 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -294,7 +294,7 @@ If a number, only buffers greater than this size have fontification messages."
 ;; and they give users another mechanism for changing face appearance.
 ;; We now allow a FACENAME in `font-lock-keywords' to be any expression that
 ;; returns a face.  So the easiest thing is to continue using these variables,
-;; rather than sometimes evaling FACENAME and sometimes not.  sm.
+;; rather than sometimes evalling FACENAME and sometimes not.  sm.
 
 ;; Note that in new code, in the vast majority of cases there is no
 ;; need to create variables that specify face names.  Simply using
diff --git a/lisp/forms.el b/lisp/forms.el
index 215f3ce88f7..0d92dc3ffd9 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -709,7 +709,7 @@ Commands:                        Equivalent keys in read-only mode:
       (forms-first-record))
     )
 
-  ;; user customising
+  ;; user customizing
   ;;(message "forms: proceeding setup (user hooks)...")
   (run-mode-hooks 'forms-mode-hook 'forms-mode-hooks)
   ;;(message "forms: setting up... done.")
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index fbfcda57b53..1fff67074e7 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,32 @@
+2011-12-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-view.el (mm-display-inline-fontify): Add comment.
+
+2011-12-15  Juri Linkov  <juri@jurta.org>
+
+        * mm-decode.el (mm-inline-media-tests): Add missing
+        `mm-handle-media-subtype'.
+
+2011-12-09  Tassilo Horn  <tassilo@member.fsf.org>
+
+        * message.el (message-valid-fqdn-regexp): Update with newly approved
+        top-level domain names ".tel" and ".asia".
+
+2011-12-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-sum.el (gnus-summary-show-article): Don't load shr
+        unconditionally.
+
+2011-12-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * message.el (message-pop-to-buffer): Use pop-to-buffer instead of
+        pop-to-buffer-same-window for old Emacsen.
+
+2011-12-04  Chong Yidong  <cyd@gnu.org>
+
+        * message.el (message-pop-to-buffer): Partially revert 2011-11-30
+        change (Bug#10200).
+
 2011-12-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * compface.el (uncompface):
@@ -145,7 +174,7 @@
 
 2011-10-17  Dave Abrahams  <dave@boostpro.com>  (tiny change)
 
-        * gnus-registry.el (gnus-registry-enabled): Add new variable. (Bug#9691)
+        * gnus-registry.el (gnus-registry-enabled): Add new variable (bug#9691).
         (gnus-registry-install-shortcuts): Set `gnus-registry-install' to 'ask
         only while we need to find out if it should be t or nil.
         (gnus-registry-initialize): Don't set `gnus-registry-install' to t.
@@ -304,7 +333,7 @@
 2011-09-20  Julien Danjou  <julien@danjou.info>
 
         * auth-source.el (auth-source-netrc-create): Use default value for
-        password if specified. Evaluate default.
+        password if specified.  Evaluate default.
         (auth-source-plstore-create): Ditto.
         (auth-source-plstore-create, auth-source-netrc-create): Fix default
         value evaluation.
@@ -360,7 +389,7 @@
         (message-mail-other-window, message-mail-other-frame)
         (message-news-other-window, message-news-other-frame):
         Use switch-to-buffer-other-frame and switch-to-buffer-other-window
-        instead of setting buffer display varibles.
+        instead of setting buffer display variables.
 
 2011-09-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -621,8 +650,8 @@
 
 2011-08-05  Andrew Cohen  <cohen@andy.bu.edu>
 
-        * gnus-sum.el (gnus-summary-refer-article): Warp to article. This
-        allows article-referral to work from an nnir group.
+        * gnus-sum.el (gnus-summary-refer-article): Warp to article.
+        This allows article-referral to work from an nnir group.
 
 2011-08-04  Andrew Cohen  <cohen@andy.bu.edu>
 
@@ -638,7 +667,7 @@
 2011-08-03  Andrew Cohen  <cohen@andy.bu.edu>
 
         * nnir.el (nnir-read-server-parm): Add an argument to restrict to
-        server-variables only. This should fix a bug introduced with commit
+        server-variables only.  This should fix a bug introduced with commit
         e1889675b7f4adf057833c5513c9374134c4e053.
         (nnir-run-query): 'nnir-search-engine should not be set from the global
         environment.
@@ -1838,7 +1867,7 @@
 2011-03-21  Julien Danjou  <julien@danjou.info>
 
         * mm-view.el (mm-display-inline-fontify): Make mode optional, and call
-        normal-mode if not set. Set temp buffer unmodified to avoid kill-buffer
+        normal-mode if not set.  Set temp buffer unmodified to avoid kill-buffer
         query.
         (mm-inline-text): Render normal text with fontification whenever
         possible.
@@ -2682,9 +2711,9 @@
         * gnus.el (gnus-summary-line-format): Mention &user-date format in
         docstring.
 
-        * gnus.el (gnus-user-date-format-alist): Change default value. Use
-        defcustom, with type and group. Move from gnus-util.el. Rename to
-        gnus-summary-user-date-format-alist.
+        * gnus.el (gnus-user-date-format-alist): Change default value.
+        Use defcustom, with type and group.  Move from gnus-util.el.
+        Rename to gnus-summary-user-date-format-alist.
 
 2011-02-03  Glenn Morris  <rgm@gnu.org>
 
@@ -3211,12 +3240,12 @@
 2010-12-17  Julien Danjou  <julien@danjou.info>
 
         * gnus-util.el (gnus-rescale-image): Allow to resize images even if
-        they are from file. Can also scale up.
+        they are from file.  Can also scale up.
 
 2010-12-17  Andrew Cohen  <cohen@andy.bu.edu>
 
-        * gnus-sum.el (gnus-summary-refer-thread): Simplify code. Restore
-        gnus-use-agent.
+        * gnus-sum.el (gnus-summary-refer-thread): Simplify code.
+        Restore gnus-use-agent.
         (gnus-get-newsgroup-headers): Avoid unwanted spaces at eol.
 
         * nnir.el (nnir-get-active): Ignore nnir-ignored-newsgroups if null.
@@ -3574,8 +3603,8 @@
         * nnir.el: Update to handle the registry better.
         (autoload): Silence byte-compiler.
         (nnir-open-server): Add a hook for nnir groups.
-        (nnir-request-move-article): Don't mangle the header. Better to use
-        formating variables (which will be added in the future).
+        (nnir-request-move-article): Don't mangle the header.  Better to use
+        formatting variables (which will be added in the future).
         (nnir-registry-action): Update the registry using the original article
         group name.
         (nnir-mode): Install nnir-specific hooks for updating the registry.
@@ -4010,7 +4039,7 @@
 2010-11-21  Andrew Cohen  <cohen@andy.bu.edu>
 
         * nnir.el: Fix typo in comments.
-        (nnir-run-imap): Simplify code. No need to reverse artlist.
+        (nnir-run-imap): Simplify code.  No need to reverse artlist.
         (nnir-run-gmane): Use nnir-tmp-buffer for web results.
 
 2010-11-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
@@ -4042,8 +4071,8 @@
 
 2010-11-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-        * gnus-art.el (gnus-mime-display-single)
-        * gnus-html.el (gnus-html-wash-images, gnus-html-prefetch-images)
+        * gnus-art.el (gnus-mime-display-single):
+        * gnus-html.el (gnus-html-wash-images, gnus-html-prefetch-images):
         * mm-decode.el (mm-shr): Assume that gnus-inhibit-images may be a group
         parameter.
 
@@ -4398,7 +4427,7 @@
         * gnus-util.el (gnus-string-match-p): New function, that is an alias to
         string-match-p in Emacs >=23.
 
-        * gnus-msg.el (gnus-configure-posting-styles)
+        * gnus-msg.el (gnus-configure-posting-styles):
         * nnir.el (nnir-run-gmane): Use gnus-string-match-p.
 
 2010-11-01  Glenn Morris  <rgm@gnu.org>
@@ -5346,8 +5375,8 @@
         * gnus-util.el (gnus-remove-if): Allow hash table.
         (gnus-remove-if-not): New function.
 
-        * gnus-art.el (gnus-mime-view-part-as-type)
-        * gnus-score.el (gnus-summary-score-effect)
+        * gnus-art.el (gnus-mime-view-part-as-type):
+        * gnus-score.el (gnus-summary-score-effect):
         * gnus-sum.el (gnus-read-move-group-name):
         Replace remove-if-not with gnus-remove-if-not.
 
@@ -5836,8 +5865,8 @@
 2010-09-29  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * mm-util.el (mm-codepage-iso-8859-list, mm-charset-eval-alist)
-        (mm-mime-charset)
-        * rfc2047.el (rfc2047-syntax-table)
+        (mm-mime-charset):
+        * rfc2047.el (rfc2047-syntax-table):
         * utf7.el (utf7-utf-16-coding-system): Comment fix.
 
         * nnrss.el (nnrss-read-server-data, nnrss-read-group-data): Use `load'
@@ -5852,8 +5881,8 @@
 
 2010-09-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-        * mail-source.el (mail-source-report-new-mail)
-        * message.el (message-default-mail-headers)
+        * mail-source.el (mail-source-report-new-mail):
+        * message.el (message-default-mail-headers):
         * mm-decode.el (mm-valid-image-format-p): Comment fix.
 
         * mml2015.el (mml2015-use): Don't bind recursive-load-depth-limit.
@@ -6349,8 +6378,8 @@
         (gnus-article-next-page-1): No need to adjust the number of lines.
         (gnus-article-describe-bindings): Always use help-buffer.
 
-        * gnus-audio.el (gnus-audio-inline-sound)
-        * gnus-cus.el (gnus-custom-mode)
+        * gnus-audio.el (gnus-audio-inline-sound):
+        * gnus-cus.el (gnus-custom-mode):
         * gnus-group.el (gnus-group-update-tool-bar): Comment fix.
 
         * gnus-sum.el (gnus-remove-overlays): Doc fix.
@@ -6546,9 +6575,9 @@
 
 2010-09-22  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-        * mailcap.el (mailcap-parse-mailcap, mailcap-parse-mimetypes)
-        * mm-util.el (mm-decompress-buffer)
-        * nnir.el (nnir-run-find-grep)
+        * mailcap.el (mailcap-parse-mailcap, mailcap-parse-mimetypes):
+        * mm-util.el (mm-decompress-buffer):
+        * nnir.el (nnir-run-find-grep):
         * pop3.el (pop3-list): Use 3rd arg of split-string.
 
 2010-09-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
@@ -7123,7 +7152,7 @@
 
         * gnus-start.el (gnus-activate-group): Take an optional parameter to
         say that you don't want to call gnus-request-group with don-check, but
-        do check the reponse.  This is for virtual groups only.
+        do check the response.  This is for virtual groups only.
         (gnus-get-unread-articles): Count the archive groups as secondary, so
         that they're activated the same way as before.
 
@@ -7414,7 +7443,7 @@
 2010-09-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-html.el (gnus-html-cache-directory, gnus-html-cache-size)
-        (gnus-html-frame-width, gnus-blocked-images)
+        (gnus-html-frame-width, gnus-blocked-images):
         * message.el (message-prune-recipient-rules): Add custom version.
         * gnus-sum.el (gnus-auto-expirable-marks): Bump custom version.
 
@@ -7464,11 +7493,11 @@
         * gnus-ems.el: Provide compatibility functions for
         gnus-set-process-plist.
 
-        * gnus-sum.el (gnus-summary-stop-at-end-of-message)
-        * gnus.el (gnus-valid-select-methods)
-        * message.el (message-send-mail-partially-limit)
-        * mm-decode.el (mm-text-html-renderer)
-        * mml.el (mml-insert-mime-headers-always)
+        * gnus-sum.el (gnus-summary-stop-at-end-of-message):
+        * gnus.el (gnus-valid-select-methods):
+        * message.el (message-send-mail-partially-limit):
+        * mm-decode.el (mm-text-html-renderer):
+        * mml.el (mml-insert-mime-headers-always):
         * smiley.el (smiley-regexp-alist): Bump custom version.
 
 2010-08-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
@@ -7800,7 +7829,7 @@
 
 2010-05-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-        * mml1991.el (mml1991-mailcrypt-encrypt, mml1991-gpg-encrypt)
+        * mml1991.el (mml1991-mailcrypt-encrypt, mml1991-gpg-encrypt):
         * mml2015.el (mml2015-gpg-encrypt): Disable multibyte in buffers
         generated within the mm-with-unibyte-current-buffer macro.
 
@@ -7875,11 +7904,11 @@
 
 2010-05-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-        * nnweb.el (nnweb-gmane-search)
+        * nnweb.el (nnweb-gmane-search):
         * yenc.el (yenc-decode-region): Don't run set-buffer-multibyte for
         XEmacs.
 
-        * gnus-art.el (gnus-article-browse-html-parts)
+        * gnus-art.el (gnus-article-browse-html-parts):
         * gnus-group.el (gnus-read-ephemeral-gmane-group)
         (gnus-read-ephemeral-bug-grou): Use mm-make-temp-file instead of
         make-temp-file.
@@ -10587,10 +10616,10 @@
 
 2007-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-        * gnus-art.el (gnus-use-idna)
-        * gnus-start.el (gnus-site-init-file)
-        * message.el (message-use-idna)
-        * mm-uu.el (mm-uu-hide-markers)
+        * gnus-art.el (gnus-use-idna):
+        * gnus-start.el (gnus-site-init-file):
+        * message.el (message-use-idna):
+        * mm-uu.el (mm-uu-hide-markers):
         * smiley.el (smiley-style): Revert changes that suppress warnings.
 
 2007-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>
@@ -11892,13 +11921,13 @@
 2007-05-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (gnus-header-from, gnus-header-subject, gnus-header-name)
-        (gnus-header-content)
-        * gnus-cite.el (gnus-cite-10)
-        * gnus-srvr.el (gnus-server-closed)
+        (gnus-header-content):
+        * gnus-cite.el (gnus-cite-10):
+        * gnus-srvr.el (gnus-server-closed):
         * gnus.el (gnus-group-mail-1, gnus-group-mail-1-empty)
         (gnus-group-mail-2, gnus-group-mail-2-empty, gnus-group-mail-3)
         (gnus-group-mail-3-empty, gnus-group-mail-low)
-        (gnus-group-mail-low-empty, gnus-splash)
+        (gnus-group-mail-low-empty, gnus-splash):
         * message.el (message-header-to, message-header-cc)
         (message-header-subject, message-header-other, message-header-name)
         (message-header-xheader, message-separator, message-cited-text)
@@ -21315,7 +21344,7 @@
         (gnus-agent-cat-groups): Use eval-and-compile, not
         eval-when-compile, to define gnus-agent-set-cat-groups as the setf
         method of gnus-agent-cat-groups even when the buffer has been
-        evaled.
+        evalled.
         (gnus-agent-save-active, gnus-agent-save-active-1): Merge to
         delete gnus-agent-save-active-1.
         (gnus-agent-save-groups): Delete.  Identical to
@@ -21831,7 +21860,7 @@
 
 2004-01-06  Steve Youngs  <sryoungs@bigpond.net.au>
 
-        * gnus-ems.el (gnus-mode-line-modified): Don't conditionalise on
+        * gnus-ems.el (gnus-mode-line-modified): Don't conditionalize on
         XEmacs version.
 
         * dns.el (dns-make-network-process): Use `open-network-stream'
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 6b11a956a99..64b15ce31b3 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -5094,7 +5094,7 @@
 2003-02-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * nnheader.el (nnheader-directory-separator-character): Change the
-        way to compute the dafault value.
+        way to compute the default value.
 
 2003-02-02  Jesper Harder  <harder@ifa.au.dk>
 
@@ -8442,7 +8442,7 @@
 
 2002-07-21  Nevin Kapur  <nevin@jhu.edu>
 
-        * nnmail.el (nnmail-fancy-expiry-target): Treat nonexisting
+        * nnmail.el (nnmail-fancy-expiry-target): Treat nonexistent
         headers as empty headers.
 
 2002-07-21  Jochen Hein  <jochen@jochen.org>
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 555c715bc2f..ea0710bf026 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -669,7 +669,7 @@ non-nil.
 If the match is a string, it is used as a regexp match on the
 article.  If the match is a symbol, that symbol will be funcalled
 from the buffer of the article to be saved with the newsgroup as the
-parameter.  If it is a list, it will be evaled in the same buffer.
+parameter.  If it is a list, it will be evalled in the same buffer.
 
 If this form or function returns a string, this string will be used as a
 possible file name; and if it returns a non-nil list, that list will be
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index 08ec3c4ffb0..44cb1583ec9 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -274,10 +274,10 @@ colors of the displayed X-Faces."
     result))
 
 (defun gnus-fun-ppm-change-string ()
-  (let* ((possibilites '("%02x0000" "00%02x00" "0000%02x"
-                        "%02x%02x00" "00%02x%02x" "%02x00%02x"))
+  (let* ((possibilities '("%02x0000" "00%02x00" "0000%02x"
+                          "%02x%02x00" "00%02x%02x" "%02x00%02x"))
          (format (concat "'#%02x%02x%02x' '#"
-                         (nth (random 6) possibilites)
+                         (nth (random 6) possibilities)
                          "'"))
          (values nil))
   (dotimes (i 255)
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 694b4d7e8b4..9730b69164e 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -992,7 +992,7 @@ Setter function for custom variables."
                                  'gnus-group-tool-bar-retro)
   "Specifies the Gnus group tool bar.
 
-It can be either a list or a symbol refering to a list.  See
+It can be either a list or a symbol referring to a list.  See
 `gmm-tool-bar-from-list' for the format of the list.  The
 default key map is `gnus-group-mode-map'.
 
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index e06d475ed6c..6ff1023383b 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1588,7 +1588,7 @@ this is a reply."
                        ;; BUG: We really need to get the charset for
                        ;; each name in the Newsgroups and Followup-To
                        ;; lines to allow crossposting between group
-                       ;; namess with incompatible character sets.
+                       ;; names with incompatible character sets.
                        ;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2001-10-08.
                        (group-field-charset
                         (gnus-group-name-charset
@@ -1784,7 +1784,7 @@ this is a reply."
                              (and header
                                   (string-match (nth 2 match) header)))))))
                  (t
-                  ;; This is a form to be evaled.
+                  ;; This is a form to be evalled.
                   (eval match)))))
           ;; We have a match, so we set the variables.
           (dolist (attribute style)
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 2345c4fc141..4c5715c67f9 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -52,7 +52,7 @@ text properties. This is only needed on XEmacs, as Emacs does this anyway."
 (defvar gnus-group-indentation "")
 
 ;; Format specs.  The chunks below are the machine-generated forms
-;; that are to be evaled as the result of the default format strings.
+;; that are to be evalled as the result of the default format strings.
 ;; We write them in here to get them byte-compiled.  That way the
 ;; default actions will be quite fast, while still retaining the full
 ;; flexibility of the user-defined format specs.
@@ -690,7 +690,7 @@ are supported for %s."
                      (not (and (featurep 'xemacs)
                                gnus-use-correct-string-widths)))
             (insert (number-to-string pad-width)))
-          ;; Create the form to be evaled.
+          ;; Create the form to be evalled.
           (if (or max-width cut-width ignore-value
                   (and (featurep 'xemacs)
                        gnus-use-correct-string-widths))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index b3f85cf9366..d8db300efbd 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -2835,7 +2835,7 @@ Setter function for custom variables."
                                    'gnus-summary-tool-bar-retro)
   "Specifies the Gnus summary tool bar.
 
-It can be either a list or a symbol refering to a list.  See
+It can be either a list or a symbol referring to a list.  See
 `gmm-tool-bar-from-list' for the format of the list.  The
 default key map is `gnus-summary-mode-map'.
 
@@ -2969,7 +2969,7 @@ When FORCE, rebuild the tool bar."
                                         'gnus-summary-mode-map)))
       (when map
         ;; Need to set `gnus-summary-tool-bar-map' because `gnus-article-mode'
-        ;; uses it's value.
+        ;; uses its value.
         (setq gnus-summary-tool-bar-map map))))
   (set (make-local-variable 'tool-bar-map) gnus-summary-tool-bar-map))
 
@@ -7087,7 +7087,7 @@ With ARG, turn line truncation on if ARG is positive."
 (defun gnus-summary-find-for-reselect ()
   "Return the number of an article to stay on across a reselect.
 The current article is considered, then following articles, then previous
-articles.  An article is sought which is not cancelled and isn't a temporary
+articles.  An article is sought which is not canceled and isn't a temporary
 insertion from another group.  If there's no such then return a dummy 0."
   (let (found)
     (dolist (rev '(nil t))
@@ -9611,9 +9611,12 @@ C-u g', show the raw article."
         (when (gnus-summary-goto-subject (cdr gnus-article-current) nil t)
           (gnus-summary-update-secondary-mark (cdr gnus-article-current))))))
    ((not arg)
-    (require 'shr)
-    (let ((shr-ignore-cache t))
-      ;; Select the article the normal way.
+    ;; Select the article the normal way.
+    (if (eq mm-text-html-renderer 'shr)
+        (progn
+          (require 'shr)
+          (let ((shr-ignore-cache t))
+            (gnus-summary-select-article nil 'force)))
       (gnus-summary-select-article nil 'force)))
    ((equal arg '(16))
     ;; C-u C-u g
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index ecd5b3b525b..f0009830b44 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -242,7 +242,7 @@ See the Gnus manual for an explanation of the syntax used.")
   (let* ((current-window (or (get-buffer-window (current-buffer)) (selected-window)))
          (window (or window current-window)))
     (select-window window)
-    ;; The SPLIT might be something that is to be evaled to
+    ;; The SPLIT might be something that is to be evalled to
     ;; return a new SPLIT.
     (while (and (not (assq (car split) gnus-window-to-buffer))
                 (symbolp (car split)) (fboundp (car split)))
@@ -447,7 +447,7 @@ should have point."
       (when (consp (car split))
         (push 1.0 split)
         (push 'vertical split))
-      ;; The SPLIT might be something that is to be evaled to
+      ;; The SPLIT might be something that is to be evalled to
       ;; return a new SPLIT.
       (while (and (not (assq (car split) gnus-window-to-buffer))
                   (symbolp (car split)) (fboundp (car split)))
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 5f385ec1054..b1f0f60668e 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -700,7 +700,7 @@ be set in `.emacs' instead."
 (defface gnus-summary-cancelled
   '((((class color))
      (:foreground "yellow" :background "black")))
-  "Face used for cancelled articles."
+  "Face used for canceled articles."
   :group 'gnus-summary)
 ;; backward-compatibility alias
 (put 'gnus-summary-cancelled-face 'face-alias 'gnus-summary-cancelled)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index ee9d4992158..5198618c2c3 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -906,7 +906,7 @@ The function `message-setup' runs this hook."
   :type 'hook)
 
 (defcustom message-cancel-hook nil
-  "Hook run when cancelling articles."
+  "Hook run when canceling articles."
   :group 'message-various
   :link '(custom-manual "(message)Various Message Variables")
   :type 'hook)
@@ -1893,14 +1893,14 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
   (concat "[a-z0-9][-.a-z0-9]+\\." ;; [hostname.subdomain.]domain.
           ;; valid TLDs:
           "\\([a-z][a-z]\\|" ;; two letter country TDLs
-          "aero\\|arpa\\|bitnet\\|biz\\|bofh\\|"
+          "aero\\|arpa\\|asia\\|bitnet\\|biz\\|bofh\\|"
           "cat\\|com\\|coop\\|edu\\|gov\\|"
           "info\\|int\\|jobs\\|"
           "mil\\|mobi\\|museum\\|name\\|net\\|"
-          "org\\|pro\\|travel\\|uucp\\)")
+          "org\\|pro\\|tel\\|travel\\|uucp\\)")
   ;; http://en.wikipedia.org/wiki/List_of_Internet_top-level_domains
   ;; http://en.wikipedia.org/wiki/GTLD
-  ;; `in the process of being approved': .asia .post .tel .sex
+  ;; `approved, but not yet in operation': .xxx
   ;; "dead" nato bitnet uucp
   "Regular expression that matches a valid FQDN."
   ;; see also: gnus-button-valid-fqdn-regexp
@@ -4409,7 +4409,7 @@ This function could be useful in `message-setup-hook'."
        ;; A simple function.
        ((functionp action)
         (funcall action))
-       ;; Something to be evaled.
+       ;; Something to be evalled.
        (t
         (eval action))))))
 
@@ -4840,7 +4840,7 @@ Otherwise, generate and save a value for `canlock-password' first."
                            (message-fetch-field "Followup-To")))
          ;; BUG: We really need to get the charset for each name in the
          ;; Newsgroups and Followup-To lines to allow crossposting
-         ;; between group namess with incompatible character sets.
+         ;; between group names with incompatible character sets.
          ;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2001-10-08.
          (group-field-charset
           (gnus-group-name-charset method newsgroups-field))
@@ -6327,7 +6327,6 @@ between beginning of field and beginning of line."
 
 (defun message-pop-to-buffer (name &optional switch-function)
   "Pop to buffer NAME, and warn if it already exists and is modified."
-  (unless switch-function (setq switch-function #'pop-to-buffer))
   (let ((buffer (get-buffer name)))
     (if (and buffer
              (buffer-name buffer))
@@ -6337,7 +6336,7 @@ between beginning of field and beginning of line."
               (progn
                 (gnus-select-frame-set-input-focus (window-frame window))
                 (select-window window))
-            (funcall switch-function buffer)
+            (funcall (or switch-function #'pop-to-buffer) buffer)
             (set-buffer buffer))
           (when (and (buffer-modified-p)
                      (not (prog1
@@ -6345,7 +6344,11 @@ between beginning of field and beginning of line."
                                "Message already being composed; erase? ")
                             (message nil))))
             (error "Message being composed")))
-      (funcall switch-function name)
+      (funcall (or switch-function
+                   (if (fboundp #'pop-to-buffer-same-window)
+                       #'pop-to-buffer-same-window
+                     #'pop-to-buffer))
+               name)
       (set-buffer name))
     (erase-buffer)
     (message-mode)))
@@ -7735,7 +7738,7 @@ Setter function for custom variables."
                               'message-tool-bar-retro)
   "Specifies the message mode tool bar.
 
-It can be either a list or a symbol refering to a list.  See
+It can be either a list or a symbol referring to a list.  See
 `gmm-tool-bar-from-list' for the format of the list.  The
 default key map is `message-mode-map'.
 
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 44e2af5b904..7ea0902bdb5 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -275,7 +275,7 @@ before the external MIME handler is invoked."
                      (ignore-errors
                        (if (fboundp 'create-image)
                            (create-image (buffer-string) 'imagemagick 'data-p)
-                         (mm-create-image-xemacs type)))))
+                         (mm-create-image-xemacs (mm-handle-media-subtype handle))))))
                 (when image
                   (setcar (cdr handle) (list "image/imagemagick"))
                   (mm-image-fit-p handle)))))))
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 854ca3497da..f14b47e86e4 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -602,6 +602,7 @@ If MODE is not set, try to find mode automatically."
       ;; I find font-lock a bit too verbose.
       (let ((font-lock-verbose nil))
         ;; Disable support modes, e.g., jit-lock, lazy-lock, etc.
+        ;; Note: XEmacs people use `font-lock-mode-hook' to run those modes.
         (set (make-local-variable 'font-lock-mode-hook) nil)
         (set (make-local-variable 'font-lock-support-mode) nil)
         (setq buffer-file-name (mm-handle-filename handle))
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index 043356ca841..29f0695c74e 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -353,7 +353,7 @@ all.  This may very well take some time.")
   ;; List of NNDiary headers that specify the time spec. Each header name is
   ;; followed by either two integers (specifying a range of possible values
   ;; for this header) or one list (specifying all the possible values for this
-  ;; header). In the latter case, the list does NOT include the unspecifyed
+  ;; header). In the latter case, the list does NOT include the unspecified
   ;; spec (*).
   ;; For time zone values, we have symbolic time zone names associated with
   ;; the (relative) number of seconds ahead GMT.
@@ -1161,11 +1161,11 @@ all.  This may very well take some time.")
 
 (defun nndiary-parse-schedule-value (str min-or-values max)
   ;; Parse the schedule string STR, or signal an error.
-  ;; Signals are caught by `nndary-schedule'.
+  ;; Signals are caught by `nndiary-schedule'.
   (if (string-match "[ \t]*\\*[ \t]*" str)
-      ;; unspecifyed
+      ;; unspecified
       nil
-    ;; specifyed
+    ;; specified
     (if (listp min-or-values)
         ;; min-or-values is values
         ;; #### NOTE: this is actually only a hack for time zones.
@@ -1204,7 +1204,7 @@ all.  This may very well take some time.")
   ;; - Returns nil if `*'
   ;; - Otherwise returns a list of integers and/or ranges (BEG . END)
   ;; The exception is the Timze-Zone value which is always of the form (STR).
-  ;; Signals are caught by `nndary-schedule'.
+  ;; Signals are caught by `nndiary-schedule'.
   (let ((header (format "^X-Diary-%s: \\(.*\\)$" head)))
     (goto-char (point-min))
     (if (not (re-search-forward header nil t))
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 78d2478b4fb..3d0fc78dca7 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -1273,8 +1273,8 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
       (message "Doing hyrex-search query \"%s\"...done" qstring)
       (sit-for 0)
       ;; nnir-search returns:
-      ;;   for nnml/nnfolder: "filename mailid weigth"
-      ;;   for nnimap:        "group mailid weigth"
+      ;;   for nnml/nnfolder: "filename mailid weight"
+      ;;   for nnimap:        "group mailid weight"
       (goto-char (point-min))
       (delete-non-matching-lines "^\\S + [0-9]+ [0-9]+$")
       ;; HyREX doesn't search directly in groups -- so filter out here.
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 9816c208fab..f4b8ce66d16 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -665,7 +665,7 @@ command whose response triggered the error."
                                                   (process-buffer -process))))
                               ;; When I an able to identify the
                               ;; connection to the server AND I've
-                              ;; received NO reponse for
+                              ;; received NO response for
                               ;; nntp-connection-timeout seconds.
                               (when (and -buffer (eq 0 (buffer-size -buffer)))
                                 ;; Close the connection.  Take no
diff --git a/lisp/gnus/plstore.el b/lisp/gnus/plstore.el
index 340c7255958..50208cc5b0b 100644
--- a/lisp/gnus/plstore.el
+++ b/lisp/gnus/plstore.el
@@ -420,7 +420,7 @@ SECRET-KEYS is a plist containing secret data."
                                                           (current-buffer)))))
                           (epa-select-keys
                            context
-                           "Select recipents for encryption.
+                           "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "
                            recipients)
                         (if plstore-encrypt-to
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el
index 306b67cd7c1..9c30379ef6e 100644
--- a/lisp/gnus/rfc2231.el
+++ b/lisp/gnus/rfc2231.el
@@ -58,7 +58,7 @@ must never cause a Lisp error."
          ;; The most likely cause of an error is unbalanced parentheses
          ;; or double-quotes.  If all parentheses and double-quotes are
          ;; quoted meaninglessly with backslashes, removing them might
-         ;; make it parseable.  Let's try...
+         ;; make it parsable.  Let's try...
          (error
           (let (mod)
             (when (and (string-match "\\\\\"" string)
diff --git a/lisp/gs.el b/lisp/gs.el
index 2eba7af71ae..b86632f7637 100644
--- a/lisp/gs.el
+++ b/lisp/gs.el
@@ -96,7 +96,7 @@ FILE is the value to substitute for the place-holder `<file>'."
 (declare-function x-display-pixel-width "xfns.c" (&optional terminal))
 
 (defun gs-width-in-pt (frame pixel-width)
-  "Return, on FRAME, pixel width PIXEL-WIDTH tranlated to pt."
+  "Return, on FRAME, pixel width PIXEL-WIDTH translated to pt."
   (let ((mm (* (float pixel-width)
                (/ (float (x-display-mm-width frame))
                   (float (x-display-pixel-width frame))))))
@@ -106,7 +106,7 @@ FILE is the value to substitute for the place-holder `<file>'."
 (declare-function x-display-pixel-height "xfns.c" (&optional terminal))
 
 (defun gs-height-in-pt (frame pixel-height)
-  "Return, on FRAME, pixel height PIXEL-HEIGHT tranlated to pt."
+  "Return, on FRAME, pixel height PIXEL-HEIGHT translated to pt."
   (let ((mm (* (float pixel-height)
                (/ (float (x-display-mm-height frame))
                   (float (x-display-pixel-height frame))))))
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index 0dee4157d78..50e631a95c5 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -367,7 +367,7 @@ buffer with the contents of a file
 
 ;;;###autoload
 (define-minor-mode highlight-changes-visible-mode
-  "Toggle visiblility of highlighting due to Highlight Changes mode.
+  "Toggle visibility of highlighting due to Highlight Changes mode.
 With a prefix argument ARG, enable Highlight Changes Visible mode
 if ARG is positive, and disable it otherwise.  If called from
 Lisp, enable the mode if ARG is omitted or nil.
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 126b616a644..b0fd37abd36 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -580,7 +580,7 @@ If a window system is unavailable, calls `hfy-fallback-colour-values'."
             (color-values colour)
           ;;(message "[%S]" window-system)
           (x-color-values colour))
-      ;; blarg - tty colours are no good - go fetch some X colours:
+      ;; blarg - tty colors are no good - go fetch some X colors:
       (hfy-fallback-colour-values colour))))
 
 (defvar hfy-cperl-mode-kludged-p nil)
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 6c8db872c0b..a0fae8d8671 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -26,7 +26,7 @@
 ;;; Commentary:
 
 ;; These functions should be automatically loaded when called, but you
-;; can explicity (require 'ibuf-ext) in your ~/.emacs to have them
+;; can explicitly (require 'ibuf-ext) in your ~/.emacs to have them
 ;; preloaded.
 
 ;;; Code:
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 3f3b0b7a843..cb511c4695e 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -426,7 +426,7 @@ directory, like `default-directory'."
       '(menu-item "Save current filter groups permanently..."
         ibuffer-save-filter-groups
         :enable (and (featurep 'ibuf-ext) ibuffer-filter-groups)
-        :help "Use a mnemnonic name to store current filter groups"))
+        :help "Use a mnemonic name to store current filter groups"))
     (define-key-after groups-map [switch-to-saved-filter-groups]
       '(menu-item "Restore permanently saved filters..."
         ibuffer-switch-to-saved-filter-groups
@@ -676,7 +676,7 @@ directory, like `default-directory'."
     (define-key-after map [menu-bar view filter save-filters]
       '(menu-item "Save current filters permanently..." ibuffer-save-filters
         :enable (and (featurep 'ibuf-ext) ibuffer-filtering-qualifiers)
-        :help "Use a mnemnonic name to store current filter stack"))
+        :help "Use a mnemonic name to store current filter stack"))
     (define-key-after map [menu-bar view filter switch-to-saved-filters]
       '(menu-item "Restore permanently saved filters..."
         ibuffer-switch-to-saved-filters
@@ -2648,7 +2648,7 @@ will be inserted before the group at point."
 ;;;;;;  ibuffer-backward-filter-group ibuffer-forward-filter-group
 ;;;;;;  ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group
 ;;;;;;  ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode
-;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "25e69a1e030791b3a3e7d91d4377173a")
+;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "897e64e4465af94b89e21fa84ae61290")
 ;;; Generated autoloads from ibuf-ext.el
 
 (autoload 'ibuffer-auto-mode "ibuf-ext" "\
diff --git a/lisp/ido.el b/lisp/ido.el
index f2dcba614a9..345438d3cc6 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -308,7 +308,7 @@
 ;; ifindf package back into iswitchb.
 ;;
 ;; This is basically what ido (interactively do) is all about; but I
-;; found it ackward to merge my changes into the "iswitchb-" namespace,
+;; found it awkward to merge my changes into the "iswitchb-" namespace,
 ;; so I invented a common "ido-" namespace for the merged packages.
 ;;
 ;; This version is based on ido.el version 1.57 released on
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index 9614479072a..d16a272c9dc 100644
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -1433,7 +1433,7 @@ REG := r0 | r1 | r2 | r3 | r4 | r5 | r6 | r7
 ARG := REG | integer
 
 OPERATOR :=
-        ;; Normal arithmethic operators (same meaning as C code).
+        ;; Normal arithmetic operators (same meaning as C code).
         + | - | * | / | %
 
         ;; Bitwise operators (same meaning as C code)
@@ -1469,7 +1469,7 @@ OPERATOR :=
         | de-sjis
 
         ;; If ARG_0 and ARG_1 are the first and second code point of
-        ;; JISX0208 character CHAR, and SJIS is the correponding
+        ;; JISX0208 character CHAR, and SJIS is the corresponding
         ;; Shift-JIS code,
         ;; (REG = ARG_0 en-sjis ARG_1) means:
         ;;      ((REG = HIGH)
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 0a5d6ed954c..0d3f079866e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1031,7 +1031,7 @@ It is highly recommended to fix it before writing to a file."
 and try again)? " coding-system auto-cs))
               (error "Save aborted"))))
       (when (and tick (/= tick (buffer-chars-modified-tick)))
-        (error "Cancelled because the buffer was modified"))
+        (error "Canceled because the buffer was modified"))
       coding-system)))
 
 (setq select-safe-coding-system-function 'select-safe-coding-system)
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index ef09cdda2de..f0a5ebbee40 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -314,7 +314,7 @@ Optional 5th argument NIL-FOR-TOO-LONG non-nil means return nil
 (defmacro with-coding-priority (coding-systems &rest body)
   "Execute BODY like `progn' with CODING-SYSTEMS at the front of priority list.
 CODING-SYSTEMS is a list of coding systems.  See `set-coding-system-priority'.
-This affects the implicit sorting of lists of coding sysems returned by
+This affects the implicit sorting of lists of coding systems returned by
 operations such as `find-coding-systems-region'."
   (let ((current (make-symbol "current")))
   `(let ((,current (coding-system-priority-list)))
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index d078d98a480..1beffa5218b 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1785,7 +1785,7 @@ contents of the current buffer following point against
 succeed, it checks to see if any function in `auto-coding-functions'
 gives a match.
 
-If a coding system is specifed, the return value is a cons
+If a coding system is specified, the return value is a cons
 \(CODING . SOURCE), where CODING is the specified coding system and
 SOURCE is a symbol `auto-coding-alist', `auto-coding-regexp-alist',
 `:coding', or `auto-coding-functions' indicating by what CODING is
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index a29b729dcf0..3e0f543492a 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -2703,7 +2703,7 @@ KEY BINDINGS FOR CONVERSION
 
 ;; 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
+;; of a key strings to type to input C.  The length of key string is at
 ;; most 2.  If it is 2, more keys may be required to input C.
 
 (defun quail-gen-decode-map ()
@@ -2832,7 +2832,7 @@ STATE-n are symbols to denote state.  STATE-0 is the initial state.
 TRANSITION-n-m are transition rules from STATE-n, and have the form
 \(RULES . STATE-x) or RULES, where STATE-x is one of STATE-n above,
 RULES is a symbol whose value is an alist of keys \(string) vs the
-correponding characters or strings.  The format of the symbol value of
+corresponding characters or strings.  The format of the symbol value of
 RULES is the same as arguments to `quail-define-rules'.
 
 If TRANSITION-n-m has the form (RULES . STATE-x), it means that
@@ -2846,7 +2846,7 @@ The generated map can be set for the current Quail package by the
 function `quail-install-map' (which see)."
   (let ((state-alist (mapcar (lambda (x) (list (car x))) table))
         tail elt)
-    ;; STATE-ALIST is an alist of states vs the correponding sub Quail
+    ;; STATE-ALIST is an alist of states vs the corresponding sub Quail
     ;; map.  It is now initialized to ((STATE-0) (STATE-1) ...).
     ;; Set key sequence mapping rules in cdr part of each element.
     (while table
diff --git a/lisp/international/robin.el b/lisp/international/robin.el
index 443a292f4c1..c50277686ff 100644
--- a/lisp/international/robin.el
+++ b/lisp/international/robin.el
@@ -50,9 +50,9 @@
 ;; identified by a string called package name.  Use robin-define-package
 ;; to define a robin package.
 
-;; (robin-define-package NAME DOCTSTRING
-;;   (INPUT1 OUPUT1)
-;;   (INPUT2 OUPUT2)
+;; (robin-define-package NAME DOCSTRING
+;;   (INPUT1 OUTPUT1)
+;;   (INPUT2 OUTPUT2)
 ;;   ...)
 
 ;; NAME is a string identifying the robin package.  It often starts with a
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 6614ac8b416..304dc01abe4 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -103,7 +103,7 @@ For example:
 
 \\<quail-translation-docstring>
 
-For double-width GB2312 characters correponding to ASCII, use the
+For double-width GB2312 characters corresponding to ASCII, use the
 input method `chinese-qj'.")
 
     ("chinese-ecdict" "$(05CKH(B"
@@ -122,7 +122,7 @@ compose one Chinese character.
 
 In this input method, you enter a Chinese character by first typing
 keys corresponding to Zhuyin symbols (see the above table) followed by
-SPC, 1, 2, 3, or 4 specifing a tone (SPC:$(0?v(N(B, 1:$(0M=Vy(B, 2:$(0Dm(N(B, 3: $(0&9Vy(B,
+SPC, 1, 2, 3, or 4 specifying a tone (SPC:$(0?v(N(B, 1:$(0M=Vy(B, 2:$(0Dm(N(B, 3: $(0&9Vy(B,
 4:$(0(+Vy(B).
 
 \\<quail-translation-docstring>")
@@ -191,7 +191,7 @@ For instance, to input $ADc(B, you type \"n i 3 3\", the first \"n i\" is
 a Pinyin, the next \"3\" specifies tone, and the last \"3\" selects
 the third character from the candidate list.
 
-For double-width GB2312 characters correponding to ASCII, use the
+For double-width GB2312 characters corresponding to ASCII, use the
 input method `chinese-qj'.")
 
     ("chinese-zozy" "$(0I\0D(B"
@@ -203,7 +203,7 @@ compose a Chinese character.
 
 In this input method, you enter a Chinese character by first typing
 keys corresponding to Zhuyin symbols (see the above table) followed by
-SPC, 6, 3, 4, or 7 specifing a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy(B, 4:$(0(+Vy(B,
+SPC, 6, 3, 4, or 7 specifying a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy(B, 4:$(0(+Vy(B,
 7:$(0M=Vy(B).
 
 \\<quail-translation-docstring>")))
diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el
index df05b355b46..8d13eb2039d 100644
--- a/lisp/international/ucs-normalize.el
+++ b/lisp/international/ucs-normalize.el
@@ -227,7 +227,7 @@ Note that Hangul are excluded.")
          (eval-when-compile decomposition-pair-to-composition)))
 
 (defun ucs-normalize-primary-composite (decomposition-pair composition-predicate)
-  "Convert DECOMPOSITION-PAIR to primay composite using COMPOSITION-PREDICATE."
+  "Convert DECOMPOSITION-PAIR to primary composite using COMPOSITION-PREDICATE."
   (let ((char (or (gethash decomposition-pair
                            ucs-normalize-decomposition-pair-to-primary-composite)
                   (and (<= #x1100 (car decomposition-pair))
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index eea3009faf4..6915640944a 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -747,7 +747,7 @@ If kbd macro currently being defined end it before activating it."
 ;; Create a separate keymap installed as a minor-mode keymap (e.g. in
 ;; the emulation-mode-map-alists) in which macro bindings are made
 ;; independent of any other bindings.  When first binding is made,
-;; the kemap is created, installed, and enabled.  Key seq. C-x C-k +
+;; the keymap is created, installed, and enabled.  Key seq. C-x C-k +
 ;; can then be used to toggle the use of this keymap on and off.
 ;; This means that it would be safe(r) to bind ordinary keys like
 ;; letters and digits, provided that we inhibit the keymap while
diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index c44dc44581d..0e87d4d8e8c 100644
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -125,7 +125,7 @@
 (define-coding-system 'chinese-big5
   "BIG5 8-bit encoding for Chinese (MIME:Big5)"
   :coding-type 'big5
-  :mnemonic ?B 
+  :mnemonic ?B
   :charset-list '(ascii big5)
   :mime-charset 'big5)
 
@@ -152,7 +152,7 @@
 (define-coding-system 'chinese-big5-hkscs
   "BIG5-HKSCS 8-bit encoding for Chinese, Hong Kong supplement (MIME:Big5-HKSCS)"
   :coding-type 'charset
-  :mnemonic ?B 
+  :mnemonic ?B
   :charset-list '(ascii big5-hkscs)
   :mime-charset 'big5-hkscs)
 (define-coding-system-alias 'big5-hkscs 'chinese-big5-hkscs)
@@ -191,7 +191,7 @@
                           chinese-cns11643-5 chinese-cns11643-6
                           chinese-cns11643-7)
                  (iso639-language . zh)
-                 (setup-function . (lambda () 
+                 (setup-function . (lambda ()
                                      (use-cjk-char-width-table 'zh_TW)))
                  (exit-function . use-default-char-width-table)
                  (coding-system iso-2022-cn euc-tw)
@@ -211,7 +211,7 @@ accepts Big5 for input also (which is then converted to CNS)."))
                              chinese-cns11643-5 chinese-cns11643-6
                              chinese-cns11643-7 chinese-big5-1 chinese-big5-2)
                     (iso639-language . zh)
-                    (setup-function . (lambda () 
+                    (setup-function . (lambda ()
                                         (use-cjk-char-width-table 'zh_TW)))
                     (exit-function . use-default-char-width-table)
                     (coding-system euc-tw iso-2022-cn)
@@ -220,7 +220,7 @@ accepts Big5 for input also (which is then converted to CNS)."))
                     (features china-util)
                     (input-method . "chinese-cns-quick")
                     (documentation . "\
-Support for Chinese, prefering the EUC-TW character set.  Note that
+Support for Chinese, preferring the EUC-TW character set.  Note that
 the EUC-TW coding system accepts Big5 for input also (which is then
 converted to CNS)."))
  '("Chinese"))
@@ -241,13 +241,13 @@ converted to CNS)."))
 (set-language-info-alist
  "Chinese-GBK" '((charset chinese-gbk)
                  (iso639-language . zh)
-                 (setup-function . (lambda () 
+                 (setup-function . (lambda ()
                                      (use-cjk-char-width-table 'zh_CN)))
                  (exit-function . use-default-char-width-table)
                  (coding-system chinese-gbk)
                  (coding-priority gbk iso-2022-cn chinese-big5
                                   chinese-iso-8bit) ; fixme?
-                 (ctext-non-standard-encodings "gbk-0")          
+                 (ctext-non-standard-encodings "gbk-0")
                  (input-method . "chinese-py-punct") ; fixme?
                  (sample-text . "Chinese ($BCfJ8(B,$BIaDL$A;0(B,$A::So(B) $(D95$B9%(B")
                  (features china-util)
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 8fb7fae720d..c0f857cadee 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -126,7 +126,7 @@ Support for Russian using koi8-r and the russian-computer input method.")
 (define-coding-system 'koi8-u
   "KOI8-U 8-bit encoding for Cyrillic (MIME: KOI8-U)"
   :coding-type 'charset
-  :mnemonic ?U 
+  :mnemonic ?U
   :charset-list '(koi8-u)
   :mime-charset 'koi8-u)
 
@@ -246,7 +246,7 @@ Support for Russian using koi8-r and the russian-computer input method.")
                (ctext-non-standard-encodings "microsoft-cp1251")
                (input-method . "bulgarian-bds")
                (documentation
-                . "Support for Bulgrian with windows-1251 character set."))
+                . "Support for Bulgarian with windows-1251 character set."))
  '("Cyrillic"))
 
 (set-language-info-alist
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 1d93d981f8e..3c39b1eff9c 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -1,4 +1,4 @@
-;;; ethio-util.el --- utilities for Ethiopic    -*- coding: utf-8; -*-
+;;; ethio-util.el --- utilities for Ethiopic    -*- coding: utf-8-emacs; -*-
 
 ;; Copyright (C) 1997-1998, 2002-2011  Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -48,7 +48,7 @@
                         ([f4] . ethio-sera-to-fidel-buffer)
                         ([S-f4] . ethio-sera-to-fidel-region)
                         ([C-f4] . ethio-sera-to-fidel-marker)
-                        ([S-f5] . ethio-toggle-punctuation)
+                        ;; ([S-f5] . ethio-toggle-punctuation)
                         ([S-f6] . ethio-modify-vowel)
                         ([S-f7] . ethio-replace-space)
                         ;; ([S-f8] . ethio-input-special-character) ; deprecated
@@ -890,7 +890,7 @@ Otherwise, [0-9A-F]."
 
 ;;;###autoload
 (defun ethio-find-file nil
-  "Transliterate file content into Ethiopic dependig on filename suffix."
+  "Transliterate file content into Ethiopic depending on filename suffix."
   (cond
 
    ((string-match "\\.sera$" (buffer-file-name))
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index 008eb92dbbc..2a339504409 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -386,7 +386,7 @@ character MAA-SAKOD-n.")
   "Transcribe a Romanized Lao syllable in the region FROM and TO to Lao string.
 Only the first syllable is transcribed.
 The value has the form: (START END LAO-STRING), where
-START and END are the beggining and end positions of the Roman Lao syllable,
+START and END are the beginning and end positions of the Roman Lao syllable,
 LAO-STRING is the Lao character transcription of it.
 
 Optional 3rd arg STR, if non-nil, is a string to search for Roman Lao
diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el
index ea601c041e4..b71c65438be 100644
--- a/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@ -34,7 +34,7 @@
 ;; for representing these characters: VISCII, TCVN-5712, VPS, VIQR,
 ;; and Unicode.  VISCII, TCVN-5712 and VPS are simple 1-byte code
 ;; which assigns 134 unique characters in control-code area
-;; (0x00..0x1F) and right half area (0x80..0xFF).  VIQR is a menmonic
+;; (0x00..0x1F) and right half area (0x80..0xFF).  VIQR is a mnemonic
 ;; encoding specification representing diacritical marks by following
 ;; ASCII characters.
 
@@ -47,7 +47,7 @@
   "Return VISCII character code of CHAR if appropriate."
   (encode-char char 'viscii))
 
-;; VIQR is a menmonic encoding specification for Vietnamese.
+;; VIQR is a mnemonic encoding specification for Vietnamese.
 ;; It represents diacritical marks by ASCII characters as follows:
 ;; ------------+----------+--------
 ;;     mark    | mnemonic | example
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 858cfa85a6f..db511e1ce40 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -3608,7 +3608,7 @@ REG := r0 | r1 | r2 | r3 | r4 | r5 | r6 | r7
 ARG := REG | integer
 
 OPERATOR :=
-        ;; Normal arithmethic operators (same meaning as C code).
+        ;; Normal arithmetic operators (same meaning as C code).
         + | - | * | / | %
 
         ;; Bitwise operators (same meaning as C code)
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 51df6ecff0a..8edda03044a 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -156,7 +156,7 @@ documentation of `unload-feature' for details.")
     (dolist (buffer (buffer-list))
       (set-buffer buffer)
       (let ((proposed major-mode))
-        ;; Look for an antecessor mode not defined in the feature we're processing
+        ;; Look for a predecessor mode not defined in the feature we're processing
         (while (and proposed (rassq proposed unload-function-defs-list))
           (setq proposed (get proposed 'derived-mode-parent)))
         (unless (eq proposed major-mode)
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 576f443c8e2..5b7601c6335 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -437,7 +437,7 @@ and send the mail again%s."
                                 (car bug))
                                items))
                        (nreverse items))))
-      (widget-insert "No bugs maching your keywords found.\n"))
+      (widget-insert "No bugs matching your keywords found.\n"))
     (widget-insert "\n")
     (widget-create 'push-button
                    :notify (lambda (&rest ignore)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 230424c1920..1ea01bdadb8 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4527,7 +4527,7 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "2cb1f29b88b0c724fdba389fd7b98b00")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "91f72e39e6ea7c2be098fe3f05174b9e")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
@@ -4629,7 +4629,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" "1375d6512b953c0d7c3bde52192f4055")
+;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "d5971848a5fb43dc0092008376298a80")
 ;;; Generated autoloads from rmailsum.el
 
 (autoload 'rmail-summary "rmailsum" "\
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index d01cfc7f2c8..03023b07527 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -320,7 +320,7 @@ The value is a vector [INDEX HEADER TAGLINE BODY END], where
             (setq index 2))
         ;; 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
+            ;; The next forward-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))
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index e6a0a34f33b..5c147be3104 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -762,6 +762,12 @@ the message being processed."
                                               (point)))))))))
                (if (null from)
                    "                         "
+                 ;; We are going to return only 25 characters of the
+                 ;; address, so make sure it is RFC2047 decoded before
+                 ;; taking its substring.  This is important when the address is not on the same line as the name, e.g.:
+                 ;; To: =?UTF-8?Q?=C5=A0t=C4=9Bp=C3=A1n_?= =?UTF-8?Q?N=C4=9Bmec?=
+                 ;; <stepnem@gmail.com>
+                 (setq from (rfc2047-decode-string from))
                  (setq len (length from))
                  (setq mch (string-match "[@%]" from))
                  (format "%25s"
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index c844a8f6630..c8e535d4ac0 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -232,12 +232,15 @@ $(lisp)/subdirs.el:
 update-subdirs: update-subdirs-$(SHELLTYPE)
 
 update-subdirs-CMD: doit
-        echo ;; -*- no-byte-compile: t -*-> $(lisp)/subdirs.el
-        echo ;; In load-path, after this directory should come>> $(lisp)/subdirs.el
+        echo ;; In load-path, after this directory should come> $(lisp)/subdirs.el
         echo ;; certain of its subdirectories.  Here we specify them.>> $(lisp)/subdirs.el
         echo (normal-top-level-add-to-load-path $(SQUOTE)(>> $(lisp)/subdirs.el
         @for %%d in ($(WINS_SUBDIR) cedet) do echo "%%d">> $(lisp)/subdirs.el
         echo ))>> $(lisp)/subdirs.el
+        echo ;; Local Variables:>> $(lisp)/subdirs.el
+        echo ;; version-control: never>> $(lisp)/subdirs.el
+        echo ;; no-byte-compile: t>> $(lisp)/subdirs.el
+        echo ;; End:>> $(lisp)/subdirs.el
 
 update-subdirs-SH: doit
         $(srcdir)/update-subdirs $(lisp); \
diff --git a/lisp/man.el b/lisp/man.el
index c9ba64bf5e0..3cdbdddb044 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -687,7 +687,7 @@ POS defaults to `point'."
           ;; Otherwise record the current column and look backwards.
           (setq column (current-column))
           (skip-chars-backward ",; \t")
-          ;; Record the distance travelled.
+          ;; Record the distance traveled.
           (setq distance (- column (current-column)))
           (when (looking-back
                  (concat "([ \t]*\\(?:" Man-section-regexp "\\)[ \t]*)"))
@@ -933,7 +933,8 @@ Return the buffer in which the manpage will appear."
         ;;               minal (using an ioctl(2) if available, the value of
         ;;               $COLUMNS,  or falling back to 80 characters if nei-
         ;;               ther is available).
-        (unless (or (getenv "MANWIDTH") (getenv "COLUMNS"))
+        (when (or window-system
+                  (not (or (getenv "MANWIDTH") (getenv "COLUMNS"))))
           ;; This isn't strictly correct, since we don't know how
           ;; the page will actually be displayed, but it seems
           ;; reasonable.
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 02e531120be..ce8a7e56d60 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -122,7 +122,7 @@
         * mh-mime.el: Shush XEmacs compiler in mh-do-in-xemacs block.
 
         * mh-folder.el: Use boundp instead of fboundp when testing
-        existence of desktop-buffer-mode-handlers.
+        existence of desktop-buffer-mode-handlers (closes SF #1510145).
 
 2011-05-10  Jim Meyering  <meyering@redhat.com>
 
@@ -232,7 +232,8 @@
         (mh-handle-process-error, mh-variant-info):
         * mh-comp.el (mh-forward):
         * mh-alias.el (mh-alias-local-users, mh-alias-which-file-has-alias):
-        (mh-alias-add-alias-to-file): Use with-current-buffer.
+        (mh-alias-add-alias-to-file): Use with-current-buffer (closes SF
+        #1903293).
 
 2009-11-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 871b84dd039..506390896a1 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -428,7 +428,7 @@
 2004-11-08  Satyaki Das  <satyaki@theforce.stanford.edu>
 
         * mh-acros.el (mh-funcall-if-exists): In XEmacs, presence of a
-        function at compile time doesn't guarantee it's existence at run
+        function at compile time doesn't guarantee its existence at run
         time. So make the macro handle that situation better.
 
 2004-11-05  Satyaki Das  <satyaki@theforce.stanford.edu>
@@ -1648,7 +1648,7 @@
         * mh-e.el (mh-version): Do something sensible when
         mh-variant-in-use is undefined.
         * mh-junk.el (mh-spamassassin-blacklist)
-        (mh-spamassassin-whitelist): Change options to be compatoble with
+        (mh-spamassassin-whitelist): Change options to be compatible with
         old version of spamassassin (V2.20).
 
 2003-09-07  Mark D. Baushke  <mdb@gnu.org>
@@ -10195,7 +10195,7 @@
 2002-04-02  Peter S Galbraith  <psg@debian.org>
 
         * mh-e.el: 'defvar mh-folder-unseen-seq-name' called a function to
-        set it's value, and this happens also on byte-compilation (where
+        set its value, and this happens also on byte-compilation (where
         it can fail if the user's MH environment is not setup correctly).
         I now set the value of mh-folder-unseen-seq-name at runtime when I
         first need it.  This should fix Debian bugs
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 7ae6912cf8f..b7fdd9a9bd8 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1664,7 +1664,7 @@ good, skip, fatal, or unknown."
           (if (not (and seen-prompt ange-ftp-pending-error-line))
               (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
+            ;; hasn't been canceled by a good message before
             ;; seeing a prompt, then the error was real.
             (delete-process proc)
             (setq ange-ftp-process-busy nil
@@ -2854,7 +2854,7 @@ NO-ERROR, if a listing for DIRECTORY cannot be obtained."
 ;; that a wasted listing is not done:
 ;; 1. When looking for a .dired file in dired-x.el.
 ;; 2. The syntax of FILE and DIR make it impossible that FILE could be a valid
-;;     subdirectory. This is of course an OS dependent judgement.
+;;     subdirectory. This is of course an OS dependent judgment.
 
 (defvar dired-local-variables-file)
 (defmacro ange-ftp-allow-child-lookup (dir file)
@@ -3637,6 +3637,10 @@ so return the size on the remote host exactly. See RFC 3659."
   (setq filename (expand-file-name filename)
         newname (expand-file-name newname))
 
+  (or (file-exists-p filename)
+      (signal 'file-error
+              (list "Copy file" "no such file or directory" filename)))
+
   ;; canonicalize newname if a directory.
   (if (file-directory-p newname)
       (setq newname (expand-file-name (file-name-nondirectory filename) newname)))
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 8a8d9e6332f..9254fef8a7f 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -101,7 +101,7 @@ Otherwise, return result of last form in BODY, or all other errors."
 (defvar dbus-event-error-hooks nil
   "Functions to be called when a D-Bus error happens in the event handler.
 Every function must accept two arguments, the event and the error variable
-catched in `condition-case' by `dbus-error'.")
+caught in `condition-case' by `dbus-error'.")
 
 
 ;;; Hash table of registered functions.
diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el
index b04863b5fc0..80836b03978 100644
--- a/lisp/net/netrc.el
+++ b/lisp/net/netrc.el
@@ -237,7 +237,7 @@ MODE can be \"login\" or \"password\", suitable for passing to
 ;;;###autoload
 (defun netrc-credentials (machine &rest ports)
   "Return a user name/password pair.
-Port specifications will be prioritised in the order they are
+Port specifications will be prioritized in the order they are
 listed in the PORTS list."
   (let ((list (netrc-parse))
         found)
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index e27b4541ab5..9c07953c9c9 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -115,7 +115,7 @@ values:
   capability command, and should return the command to switch on
   STARTTLS if the server supports STARTTLS, and nil otherwise.
 
-:always-query-capabilies says whether to query the server for
+:always-query-capabilities says whether to query the server for
   capabilities, even if we're doing a `plain' network connection.
 
 :client-certificate should either be a list where the first
diff --git a/lisp/net/ntlm.el b/lisp/net/ntlm.el
index 9af148e8faa..8bcb1ef2966 100644
--- a/lisp/net/ntlm.el
+++ b/lisp/net/ntlm.el
@@ -440,7 +440,7 @@ length of STR is LEN."
 
 (defun ntlm-smb-dohash (in key forw)
   "Return the hash value for a string IN and a string KEY.
-Length of IN and KEY are 64.  FORW non nill means forward, nil means
+Length of IN and KEY are 64.  FORW non-nil means forward, nil means
 backward."
   (let (pk1                             ;string of length 56
         c                               ;string of length 28
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index df841bade79..27dff3aa8d9 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -188,7 +188,7 @@
 ;;   STRING               stable_name
 ;;   STRING               x_content_types       Since GVFS 1.0 only !!!
 ;;   STRING               icon
-;;   STRING               prefered_filename_encoding
+;;   STRING               preferred_filename_encoding
 ;;   BOOLEAN              user_visible
 ;;   ARRAY BYTE           fuse_mountpoint
 ;;   STRUCT               mount_spec
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index ee4c8966626..446a27c65d3 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -44,7 +44,7 @@
 
 (defcustom tramp-inline-compress-start-size 4096
   "*The minimum size of compressing where inline transfer.
-When inline transfer, compress transfered data of file
+When inline transfer, compress transferred data of file
 whose size is this value or above (up to `tramp-copy-size-limit').
 If it is nil, no compression at all will be applied."
   :group 'tramp
@@ -3526,7 +3526,7 @@ variable PATH."
 Here, we are looking for a command which has zero exit status if the
 file exists and nonzero exit status otherwise."
   (let ((existing "/")
-        (nonexisting
+        (nonexistent
          (tramp-shell-quote-argument "/ this file does not exist "))
         result)
     ;; The algorithm is as follows: we try a list of several commands.
@@ -3551,22 +3551,22 @@ file exists and nonzero exit status otherwise."
                   (tramp-send-command-and-check
                    vec (format "%s %s" result existing))
                   (not (tramp-send-command-and-check
-                        vec (format "%s %s" result nonexisting))))
+                        vec (format "%s %s" result nonexistent))))
              (and (setq result "/bin/test -e")
                   (tramp-send-command-and-check
                    vec (format "%s %s" result existing))
                   (not (tramp-send-command-and-check
-                        vec (format "%s %s" result nonexisting))))
+                        vec (format "%s %s" result nonexistent))))
              (and (setq result "/usr/bin/test -e")
                   (tramp-send-command-and-check
                    vec (format "%s %s" result existing))
                   (not (tramp-send-command-and-check
-                        vec (format "%s %s" result nonexisting))))
+                        vec (format "%s %s" result nonexistent))))
              (and (setq result (format "%s -d" (tramp-get-ls-command vec)))
                   (tramp-send-command-and-check
                    vec (format "%s %s" result existing))
                   (not (tramp-send-command-and-check
-                        vec (format "%s %s" result nonexisting)))))
+                        vec (format "%s %s" result nonexistent)))))
       (tramp-error
        vec 'file-error "Couldn't find command to check if file exists"))
     result))
@@ -3726,7 +3726,7 @@ process to set up.  VEC specifies the connection."
   ;; Check whether the output of "uname -sr" has been changed.  If
   ;; yes, this is a strong indication that we must expire all
   ;; connection properties.  We start again with
-  ;; `tramp-maybe-open-connection', it will be catched there.
+  ;; `tramp-maybe-open-connection', it will be caught there.
   (tramp-message vec 5 "Checking system information")
   (let ((old-uname (tramp-get-connection-property vec "uname" nil))
         (new-uname
@@ -4215,7 +4215,7 @@ connection if a previous connection has died for some reason."
             (tramp-send-command vec "echo are you awake" t t)
             (unless (and (memq (process-status p) '(run open))
                          (tramp-wait-for-output p 10))
-              ;; The error will be catched locally.
+              ;; The error will be caught locally.
               (tramp-error vec 'file-error "Awake did fail")))
         (file-error
          (tramp-flush-connection-property vec)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c89b61c2eb1..473ba00fbc2 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -298,8 +298,8 @@ shouldn't return t when it isn't."
       (search-forward-regexp "Missing ControlMaster argument" nil t))))
 
 (defcustom tramp-default-method
-  ;; An external copy method seems to be preferred, because it is much
-  ;; more performant for large files, and it hasn't too serious delays
+  ;; An external copy method seems to be preferred, because it performs
+  ;; much better for large files, and it hasn't too serious delays
   ;; for small files.  But it must be ensured that there aren't
   ;; permanent password queries.  Either a password agent like
   ;; "ssh-agent" or "Pageant" shall run, or the optional
@@ -3506,7 +3506,7 @@ If the `tramp-methods' entry does not exist, return nil."
        (cond
          ((char-equal other-write ?w) (tramp-compat-octal-to-decimal "00002"))
          ((char-equal other-write ?-) 0)
-         (t (error "Nineth char `%c' must be one of `w-'" other-write)))
+         (t (error "Ninth char `%c' must be one of `w-'" other-write)))
        (cond
         ((char-equal other-execute-or-sticky ?x)
          (tramp-compat-octal-to-decimal "00001"))
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el
index ab817a43885..17b22aa03ba 100644
--- a/lisp/net/xesam.el
+++ b/lisp/net/xesam.el
@@ -172,7 +172,7 @@
 
 (defface xesam-highlight '((t :inherit match))
   "Face to highlight query entries.
-It will be overlayed by `widget-documentation-face', so it shall
+It will be overlaid by `widget-documentation-face', so it shall
 be different at least in one face property not set in that face."
   :group 'xesam)
 
@@ -279,8 +279,8 @@ fields are supported.")
 
 (defun xesam-dbus-call-method (&rest args)
   "Apply a D-Bus method call.
-`dbus-call-method' is to be preferred, because it is more
-performant.  If the target D-Bus service is owned by Emacs, this
+`dbus-call-method' is preferred, because it performs better.
+If the target D-Bus service is owned by Emacs, this
 is not applicable, and `dbus-call-method-non-blocking' must be
 used instead.  ARGS are identical to the argument list of both
 functions."
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el
index cc538c224dc..a889a6a4177 100644
--- a/lisp/net/zeroconf.el
+++ b/lisp/net/zeroconf.el
@@ -82,7 +82,7 @@
 
 ;; The function `zeroconf-publish-service' publishes a new service to
 ;; the Avahi daemon.  Although the domain, where to the service is
-;; published, can be specified by this function, it is usally the
+;; published, can be specified by this function, it is usually the
 ;; default domain "local" (also written as nil or "").
 
 ;;   (zeroconf-publish-service
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 9a29e3d4cca..1f69f5d7bf3 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -377,8 +377,8 @@ The schema is set like `rng-auto-set-schema'."
 (defun rng-kill-timers ()
   ;; rng-validate-timer and rng-validate-quick-timer have the
   ;; permanent-local property, so that the timers can be
-  ;; cancelled even after changing mode.
-  ;; This function takes care of cancelling the timers and
+  ;; canceled even after changing mode.
+  ;; This function takes care of canceling the timers and
   ;; then killing the local variables.
   (when (local-variable-p 'rng-validate-timer)
     (when rng-validate-timer
diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el
index c33794f668d..0c0580b55dc 100644
--- a/lisp/obsolete/old-whitespace.el
+++ b/lisp/obsolete/old-whitespace.el
@@ -515,12 +515,12 @@ See `whitespace-buffer' docstring for a summary of the problems."
   (whitespace-check-whitespace-mode current-prefix-arg)
   (if (and buffer-file-name whitespace-mode)
       (let ((whitespace-any nil)
-            (whitespace-tabwith 8)
-            (whitespace-tabwith-saved tab-width))
+            (whitespace-tabwidth 8)
+            (whitespace-tabwidth-saved tab-width))
 
         ;; since all printable TABS should be 8, irrespective of how
         ;; they are displayed.
-        (setq tab-width whitespace-tabwith)
+        (setq tab-width whitespace-tabwidth)
 
         (if (and whitespace-check-buffer-leading
                  (whitespace-buffer-leading))
@@ -562,7 +562,7 @@ See `whitespace-buffer' docstring for a summary of the problems."
                   (message "The region is now clean")
                 (message "%s is now clean" buffer-file-name)))
             (whitespace-update-modeline)))
-        (setq tab-width whitespace-tabwith-saved))))
+        (setq tab-width whitespace-tabwidth-saved))))
 
 ;;;###autoload
 (defun whitespace-cleanup-region (s e)
diff --git a/lisp/obsolete/pgg.el b/lisp/obsolete/pgg.el
index 42030f7d502..876f3744bc2 100644
--- a/lisp/obsolete/pgg.el
+++ b/lisp/obsolete/pgg.el
@@ -174,7 +174,7 @@ is true, or else the output buffer is displayed."
 (defvar pgg-pending-timers (make-vector 7 0)
   "Hash table for managing scheduled pgg cache management timers.
 
-We associate key and timer, so the timer can be cancelled if a new
+We associate key and timer, so the timer can be canceled if a new
 timeout for the key is set while an old one is still pending.")
 
 (defun pgg-read-passphrase (prompt &optional key notruncate)
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 1c8a3e72956..6f835c7bfa4 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ob.el (org-babel-expand-body:generic, org-babel-number-p):
+        * ob-ref.el (org-babel-ref-parse): Fix typos.
+
 2011-11-24  Juanma Barranquero  <lekktu@gmail.com>
 
         * ob.el (org-babel-execute-src-block): Fix typo.
@@ -278,7 +283,7 @@
 
         * org-archive.el (org-archive-subtree): While it might be possible
         to archive an headline of a temporary buffer (i.e. not visiting a
-        file), it wouldn't be really sensical.
+        file), it wouldn't be really sensible.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
@@ -4008,7 +4013,7 @@
         * org-list.el (org-list-blocks): New variable.
         (org-list-context): New function.
         (org-list-full-item-re): New variable.
-        (org-list-struct-assoc-at-point): Use new varible.
+        (org-list-struct-assoc-at-point): Use new variable.
         (org-list-struct): Rewrite of function.  Now, list data is
         collected by looking at the list line after line.  It reads the
         whole list each time because reading only a subtree was not enough
@@ -7119,7 +7124,7 @@
 2010-11-11  Dan Davison  <davison@stats.ox.ac.uk>
 
         * ob.el (org-babel-get-src-block-info): Form info list correctly
-        when parenthesised arguments are missing.
+        when parenthesized arguments are missing.
 
 2010-11-11  Dan Davison  <davison@stats.ox.ac.uk>
 
@@ -8139,7 +8144,7 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-list.el (org-insert-item-internal): New function to handle
-        positionning and contents of an item being inserted at a specific
+        positioning and contents of an item being inserted at a specific
         pos. It is not possible anymore to split a term in a description
         list or a checkbox when inserting a new item.
 
@@ -9758,7 +9763,7 @@
 
 2010-07-19  Bastien Guerry  <bzg@altern.org>
 
-        * org-timer.el (org-timer-set-timer): Fix bug about cancelling
+        * org-timer.el (org-timer-set-timer): Fix bug about canceling
         timers.
 
 2010-07-19  David Maus  <dmaus@ictsoc.de>
@@ -12582,7 +12587,7 @@
         buffer and at the position of the given clock.  However, changes
         to the current clock are local and have no effect on the user's
         active clock.  This allows, for example, far any clock to be
-        cancelled without cancelling the active clock.
+        canceled without canceling the active clock.
         (org-clock-clock-in): New inline function that switches the active
         clock to the given clock.  If either the argument RESUME, or the
         global `org-clock-in-resume', are non-nil, it will resume a clock
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index d0a2c14bee9..1e14021a364 100644
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -69,7 +69,7 @@
   "Parse a variable ASSIGNMENT in a header argument.
 If the right hand side of the assignment has a literal value
 return that value, otherwise interpret as a reference to an
-external resource and find it's value using
+external resource and find its value using
 `org-babel-ref-resolve'.  Return a list with two elements.  The
 first element of the list will be the name of the variable, and
 the second will be an emacs-lisp representation of the value of
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index f34d1fbda9e..8bba4672169 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -464,7 +464,7 @@ block."
 
 (defun org-babel-expand-body:generic (body params &optional var-lines)
   "Expand BODY with PARAMS.
-Expand a block of code with org-babel according to it's header
+Expand a block of code with org-babel according to its header
 arguments.  This generic implementation of body expansion is
 called for languages which have not defined their own specific
 org-babel-expand-body:lang function."
@@ -2045,7 +2045,7 @@ appropriate."
     cell))
 
 (defun org-babel-number-p (string)
-  "If STRING represents a number return it's value."
+  "If STRING represents a number return its value."
   (if (and (string-match "^-?[0-9]*\\.?[0-9]*$" string)
            (= (length (substring string (match-beginning 0)
                                  (match-end 0)))
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 2f4617f5146..a54f3c4c3d3 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -8331,7 +8331,7 @@ tag and (if present) the flagging note."
           (org-agenda-remove-flag hdmarker)
           (let ((win (get-buffer-window "*Flagging Note*")))
             (and win (delete-window win)))
-          (message "Entry unflaged"))
+          (message "Entry unflagged"))
       (setq note (org-entry-get hdmarker "THEFLAGGINGNOTE"))
       (unless note
         (error "No flagging note"))
@@ -8354,7 +8354,7 @@ tag and (if present) the flagging note."
       (org-entry-delete nil "THEFLAGGINGNOTE")
       (setq newhead (org-get-heading)))
     (org-agenda-change-all-lines newhead marker)
-    (message "Entry unflaged")))
+    (message "Entry unflagged")))
 
 (defun org-agenda-get-any-marker (&optional pos)
   (or (get-text-property (or pos (point-at-bol)) 'org-hd-marker)
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 6d82d4529b6..09b646d40ba 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -328,7 +328,7 @@ to add an effort property.")
   "Hook run when stopping the current clock.")
 
 (defvar org-clock-cancel-hook nil
-  "Hook run when cancelling the current clock.")
+  "Hook run when canceling the current clock.")
 (defvar org-clock-goto-hook nil
   "Hook run when selecting the currently clocked-in entry.")
 (defvar org-clock-has-been-used nil
@@ -346,7 +346,7 @@ to add an effort property.")
 (defvar org-clock-start-time "")
 
 (defvar org-clock-leftover-time nil
-  "If non-nil, user cancelled a clock; this is when leftover time started.")
+  "If non-nil, user canceled a clock; this is when leftover time started.")
 
 (defvar org-clock-effort ""
   "Effort estimate of the currently clocking task.")
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index a86c145a9ee..72fc71854e2 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -68,7 +68,7 @@
 
 ;; Computing a list structure can be a costly operation on huge lists
 ;; (a few thousand lines long).  Thus, code should follow the rule :
-;; "collect once, use many".  As a corollary, it is usally a bad idea
+;; "collect once, use many".  As a corollary, it is usually a bad idea
 ;; to use directly an interactive function inside the code, as those,
 ;; being independent entities, read the whole list structure another
 ;; time.
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 655123cafa9..bbb93b07fc9 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -145,8 +145,8 @@
 (defgroup org-protocol nil
   "Intercept calls from emacsclient to trigger custom actions.
 
-This is done by advising `server-visit-files' to scann the list of filenames
-for `org-protocol-the-protocol' and sub-procols defined in
+This is done by advising `server-visit-files' to scan the list of filenames
+for `org-protocol-the-protocol' and sub-protocols defined in
 `org-protocol-protocol-alist' and `org-protocol-protocol-alist-default'."
   :version "22.1"
   :group 'convenience
@@ -546,8 +546,8 @@ as filename."
               (when (string-match proto fname)
                 (let* ((func (plist-get (cdr prolist) :function))
                        (greedy (plist-get (cdr prolist) :greedy))
-                       (splitted (split-string fname proto))
-                       (result (if greedy restoffiles (cadr splitted))))
+                       (split (split-string fname proto))
+                       (result (if greedy restoffiles (cadr split))))
                   (when (plist-get (cdr prolist) :kill-client)
                     (message "Greedy org-protocol handler. Killing client.")
                     (server-edit))
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index 0c924cd9f07..7a0d7b56e22 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -278,12 +278,12 @@ in the sitemap."
   :type 'string)
 
 (defcustom org-publish-sitemap-file-entry-format "%t"
-  "How a sitemap file entry is formated.
+  "How a sitemap file entry is formatted.
 You could use brackets to delimit on what part the link will be.
 
 %t is the title.
 %a is the author.
-%d is the date formated using `org-publish-sitemap-date-format'."
+%d is the date formatted using `org-publish-sitemap-date-format'."
   :group 'org-publish
   :type 'string)
 
@@ -715,7 +715,7 @@ If :auto-sitemap is set, publish the sitemap too.
 If :makeindex is set, also produce a file theindex.org."
   (mapc
    (lambda (project)
-     ;; Each project uses it's own cache file:
+     ;; Each project uses its own cache file:
      (org-publish-initialize-cache (car project))
      (let*
          ((project-plist (cdr project))
diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el
index 1fb3114bf3f..45b16aecf12 100644
--- a/lisp/org/org-taskjuggler.el
+++ b/lisp/org/org-taskjuggler.el
@@ -571,7 +571,7 @@ with separator \"\n\"."
     (and filtered-items (mapconcat 'identity filtered-items "\n"))))
 
 (defun org-taskjuggler-get-attributes (item attributes)
-  "Return all attribute as a single formated string. ITEM is an
+  "Return all attributes as a single formatted string. ITEM is an
 alist representing either a resource or a task. ATTRIBUTES is a
 list of symbols. Only entries from ITEM are considered that are
 listed in ATTRIBUTES."
diff --git a/lisp/org/org.el b/lisp/org/org.el
index afd4ea6b4c3..8aca74e69cc 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -2580,7 +2580,7 @@ To turn this on on a per-file basis, insert anywhere in the file:
 (defcustom org-time-stamp-custom-formats
   '("<%m/%d/%y %a>" . "<%m/%d/%y %a %H:%M>") ; american
   "Custom formats for time stamps.  See `format-time-string' for the syntax.
-These are overlayed over the default ISO format if the variable
+These are overlaid over the default ISO format if the variable
 `org-display-custom-times' is set.  Time like %H:%M should be at the
 end of the second format.  The custom formats are also honored by export
 commands, if custom time display is turned on at the time of export."
@@ -15109,7 +15109,7 @@ The command returns the inserted time stamp."
   (org-restart-font-lock)
   (setq org-table-may-need-update t)
   (if org-display-custom-times
-      (message "Time stamps are overlayed with custom format")
+      (message "Time stamps are overlaid with custom format")
     (message "Time stamp overlays removed")))
 
 (defun org-display-custom-time (beg end)
@@ -18961,7 +18961,7 @@ contexts are:
 :target           on a <<target>>
 :radio-target     on a <<<radio-target>>>
 :latex-fragment   on a LaTeX fragment
-:latex-preview    on a LaTeX fragment with overlayed preview image
+:latex-preview    on a LaTeX fragment with overlaid preview image
 
 This function expects the position to be visible because it uses font-lock
 faces as a help to recognize the following contexts: :table-special, :link,
diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index 608a9dc2e88..3b2a944f5bb 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -35,7 +35,7 @@
 ;; User Variables:
 
 (defcustom pcmpl-gnu-makefile-regexps
-  '("\\`GNUmakefile" "\\`Makefile" "\\.mak\\'")
+  '("\\`GNUmakefile" "\\`[Mm]akefile" "\\.ma?k\\'")
   "A list of regexps that will match Makefile names."
   :type '(repeat regexp)
   :group 'pcmpl-gnu)
@@ -99,7 +99,10 @@
   "Completion for GNU `make'."
   (let ((pcomplete-help "(make)Top"))
     (pcomplete-opt "bmC/def(pcmpl-gnu-makefile-names)hiI/j?kl?no.pqrsStvwW.")
-    (while (pcomplete-here (pcmpl-gnu-make-rule-names) nil 'identity))))
+    (while (pcomplete-here (completion-table-in-turn
+                            (pcmpl-gnu-make-rule-names)
+                            (pcomplete-entries))
+                           nil 'identity))))
 
 (defun pcmpl-gnu-makefile-names ()
   "Return a list of possible makefile names."
@@ -109,14 +112,16 @@
   "Return a list of possible make rule names in MAKEFILE."
   (let* ((minus-f (member "-f" pcomplete-args))
          (makefile (or (cadr minus-f)
-                       (if (file-exists-p "GNUmakefile")
-                           "GNUmakefile"
-                         "Makefile")))
+                       (cond
+                        ((file-exists-p "GNUmakefile") "GNUmakefile")
+                        ((file-exists-p "makefile") "makefile")
+                        (t "Makefile"))))
          rules)
     (if (not (file-readable-p makefile))
         (unless minus-f (list "-f"))
       (with-temp-buffer
-        (insert-file-contents-literally makefile)
+        (ignore-errors                  ;Could be a directory or something.
+          (insert-file-contents makefile))
         (while (re-search-forward
                 (concat "^\\s-*\\([^\n#%.$][^:=\n]*\\)\\s-*:[^=]") nil t)
           (setq rules (append (split-string (match-string 1)) rules))))
diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el
index 4d514d2d0aa..e7ed146b4a1 100644
--- a/lisp/play/gametree.el
+++ b/lisp/play/gametree.el
@@ -549,7 +549,7 @@ Argument is a character, naming the register."
 (defun gametree-save-and-hack-layout ()
   "Save the current tree layout and hack the file local variable spec.
 This function saves the current layout in `gametree-local-layout' and,
-if a local file varible specification for this variable exists in the
+if a local file variable specification for this variable exists in the
 buffer, it is replaced by the new value.  See the documentation for
 `gametree-local-layout' for more information."
   (interactive)
diff --git a/lisp/printing.el b/lisp/printing.el
index 2dea24149a7..a604b9f1027 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -2536,7 +2536,7 @@ LPR-PRINT	It's a symbol function for text printing.  It's invoked with
                 nil, it's used (point-max).
 
 PS-PRINT        It's a symbol function for PostScript printing.  It's invoked
-                with 3 arguments: n-up printing, file name and the list:
+                with three arguments: n-up printing, file name and the list:
                 (HEADER-LINES  LEFT-HEADER  RIGHT-HEADER DEFAULT...).
 
                 Usually PS-PRINT function prepares the environment or buffer
@@ -4710,12 +4710,12 @@ Interactively, you have the following situations:
 
    M-x pr-ps-fast-fire RET
       The command prompts the user for a N-UP value and printing will
-      immediatelly be done using the current active printer.
+      immediately be done using the current active printer.
 
    C-u   M-x pr-ps-fast-fire RET
    C-u 0 M-x pr-ps-fast-fire RET
       The command prompts the user for a N-UP value and also for a current
-      PostScript printer, then printing will immediatelly be done using the new
+      PostScript printer, then printing will immediately be done using the new
       current active printer.
 
    C-u 1 M-x pr-ps-fast-fire RET
@@ -4736,7 +4736,7 @@ zero and the argument SELECT is treated as follows:
    If it's nil, send the image to the printer.
 
    If it's a list or an integer lesser or equal to zero, the command prompts
-   the user for a current PostScript printer, then printing will immediatelly
+   the user for a current PostScript printer, then printing will immediately
    be done using the new current active printer.
 
    If it's an integer equal to 1, the command prompts the user for a file name
@@ -4749,7 +4749,7 @@ zero and the argument SELECT is treated as follows:
    instead of sending it to the printer.
 
    If it's a symbol which it's defined in `pr-ps-printer-alist', it's the new
-   active printer and printing will immediatelly be done using the new active
+   active printer and printing will immediately be done using the new active
    printer.
 
    Otherwise, send the image to the printer.
@@ -4800,7 +4800,7 @@ Noninteractively, the argument SELECT-PRINTER is treated as follows:
    If it's nil, the printing is sent to the current active text printer.
 
    If it's a symbol which it's defined in `pr-txt-printer-alist', it's the new
-   active printer and printing will immediatelly be done using the new active
+   active printer and printing will immediately be done using the new active
    printer.
 
    If it's non-nil, the command prompts the user for a new active text printer.
diff --git a/lisp/proced.el b/lisp/proced.el
index e4987bd926c..baee7c0f6ee 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -1332,7 +1332,7 @@ Prefix ARG controls sort order, see `proced-sort-interactive'."
             (proced-sort-interactive key arg)
           (message "No sorter defined here."))))))
 
-;;; Formating
+;;; Formatting
 
 (defun proced-format-time (time)
   "Format time interval TIME."
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 64734420a8c..17ff4bd32a6 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -499,7 +499,7 @@ Used to define `ada-*-keywords.'"))
 
 (defvar ada-case-exception-substring '()
   "Alist of substrings (entities) that have special casing.
-The substrings are detected for word constituant when the word
+The substrings are detected for word constituent when the word
 is not itself in `ada-case-exception', and only for substrings that
 either are at the beginning or end of the word, or start after '_'.")
 
@@ -1773,7 +1773,7 @@ ATTENTION: This function might take very long for big buffers!"
 ;;    `ada-insert-paramlist'.
 ;; Both steps are called from `ada-format-paramlist'.
 ;; Note: Comments inside the parameter list are lost.
-;;       The syntax has to be correct, or the reformating will fail.
+;;       The syntax has to be correct, or the reformatting will fail.
 ;;--------------------------------------------------------------
 
 (defun ada-format-paramlist ()
@@ -2139,7 +2139,7 @@ command like:
 
   (while command-line-args-left
     (let ((source (car command-line-args-left)))
-      (message "Formating %s" source)
+      (message "Formatting %s" source)
       (find-file source)
       (ada-indent-region (point-min) (point-max))
       (ada-adjust-case-buffer)
diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el
index e48055c9f50..b33da441eeb 100644
--- a/lisp/progmodes/ada-stmt.el
+++ b/lisp/progmodes/ada-stmt.el
@@ -56,7 +56,7 @@
 ;; BUGS:
 ;;;> I have the following suggestions for the function template: 1) I
 ;;;> don't want it automatically assigning it a name for the return variable. I
-;;;> never want it to be called "Result" because that is nondescriptive. If you
+;;;> never want it to be called "Result" because that is nondescript. If you
 ;;;> must define a variable, give me the ability to specify its name.
 ;;;>
 ;;;> 2) You do not provide a type for variable 'Result'. Its type is the same
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 2f6a7be393a..f30457992a3 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -30,7 +30,7 @@
 ;;; for lookup and completion in Ada mode.
 ;;;
 ;;; If a file *.`adp' exists in the ada-file directory, then it is
-;;; read for configuration informations.  It is read only the first
+;;; read for configuration information.  It is read only the first
 ;;; time a cross-reference is asked for, and is not read later.
 
 ;;; You need Emacs >= 20.2 to run this package
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index 8213a83461b..ef67a18d807 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -545,7 +545,7 @@
 (defun c-awk-vsemi-status-unknown-p ()
   ;; Are we unsure whether there is a virtual semicolon on the current line?
   ;; DO NOT under any circumstances attempt to calculate this; that would
-  ;; defeat the (admittedly kludgey) purpose of this function, which is to
+  ;; defeat the (admittedly kludgy) purpose of this function, which is to
   ;; prevent an infinite recursion in c-beginning-of-statement-1 when point
   ;; starts at a `while' token.
   (not (c-get-char-property (c-point 'eol) 'c-awk-NL-prop)))
@@ -894,9 +894,9 @@ std\\(err\\|in\\|out\\)\\|user\\)\\)\\>\
      ;; Keywords.
      (concat "\\<"
              (regexp-opt
-              '("BEGIN" "END" "break" "continue" "delete" "do" "else"
-                "exit" "for" "getline" "if" "in" "next" "nextfile"
-                "return" "while")
+              '("BEGIN" "END" "break" "case" "continue" "default" "delete"
+                "do" "else" "exit" "for" "getline" "if" "in" "next"
+                "nextfile" "return" "switch" "while")
               t) "\\>")
 
      ;; Builtins.
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 8e4ac92d96f..686695bc838 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1360,7 +1360,7 @@ No indentation or other \"electric\" behavior is performed."
   ;; Determine where we are with respect to functions (or other brace
   ;; constructs, included in the term "function" in the rest of this comment).
   ;; Point is assumed to be outside any macro or literal.
-  ;; This is used by c-\(begining\|end\)-of-defun.
+  ;; This is used by c-\(beginning\|end\)-of-defun.
   ;;
   ;; Return one of these symbols:
   ;; at-header       : we're at the start of a function's header.
@@ -2051,7 +2051,7 @@ function does not require the declaration to contain a brace block."
         (c-narrow-to-comment-innards range) ; This may move point back.
         (let* ((here (point))
                last
-               (here-filler        ; matches WS and comment-prefices at point.
+               (here-filler        ; matches WS and comment-prefixes at point.
                 (concat "\\=\\(^[ \t]*\\(" c-current-comment-prefix "\\)"
                         "\\|[ \t\n\r\f]\\)*"))
                (prefix-at-bol-here ; matches WS and prefix at BOL, just before point
@@ -2071,7 +2071,7 @@ function does not require the declaration to contain a brace block."
 
           ;; Now seek successively earlier sentence ends between PAR-BEG and
           ;; HERE, until the "start of sentence" following it is earlier than
-          ;; HERE, or we hit PAR-BEG.  Beware of comment prefices!
+          ;; HERE, or we hit PAR-BEG.  Beware of comment prefixes!
           (while (and (re-search-backward (c-sentence-end) par-beg 'limit)
                       (setq last (point))
                       (goto-char (match-end 0)) ; tentative beginning of sentence
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index c91fe13543a..2991b511830 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -473,7 +473,7 @@ various buffer change hooks."
 
   (let ((saved-undo-list (elt saved-state 0)))
     (if (eq buffer-undo-list saved-undo-list)
-        ;; No change was done afterall.
+        ;; No change was done after all.
         (setq buffer-undo-list (cdr saved-undo-list))
 
       (if keep
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 9544c4f8728..0865ddfed69 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -195,9 +195,6 @@
       (not prevstate)
     (> arg 0)))
 
-;; Dynamically bound cache for `c-in-literal'.
-(defvar c-in-literal-cache t)
-
 
 ;; Basic handling of preprocessor directives.
 
@@ -2093,28 +2090,35 @@ comment at the start of cc-engine.el for more info."
 ;; `c-state-literal-at'.
 
 (defsubst c-state-pp-to-literal (from to)
-  ;; Do a parse-partial-sexp from FROM to TO, returning the bounds of any
-  ;; literal at TO as a cons, otherwise NIL.
-  ;; FROM must not be in a literal, and the buffer should already be wide
-  ;; enough.
+  ;; Do a parse-partial-sexp from FROM to TO, returning either
+  ;;     (STATE TYPE (BEG . END))     if TO is in a literal; or
+  ;;     (STATE)                      otherwise,
+  ;; where STATE is the parsing state at TO, TYPE is the type of the literal
+  ;; (one of 'c, 'c++, 'string) and (BEG . END) is the boundaries of the literal.
+  ;;
+  ;; Only elements 3 (in a string), 4 (in a comment), 5 (following a quote),
+  ;; 7 (comment type) and 8 (start of comment/string) (and possibly 9) of
+  ;; STATE are valid.
   (save-excursion
-    (let ((s (parse-partial-sexp from to)))
+    (let ((s (parse-partial-sexp from to))
+          ty)
       (when (or (nth 3 s) (nth 4 s))    ; in a string or comment
+        (setq ty (cond
+                  ((nth 3 s) 'string)
+                  ((eq (nth 7 s) t) 'c++)
+                  (t 'c)))
         (parse-partial-sexp (point) (point-max)
                             nil                  ; TARGETDEPTH
                             nil                  ; STOPBEFORE
                             s                    ; OLDSTATE
-                            'syntax-table)       ; stop at end of literal
-        (cons (nth 8 s) (point))))))
+                            'syntax-table))      ; stop at end of literal
+      (if ty
+          `(,s ,ty (,(nth 8 s) . ,(point)))
+        `(,s)))))
 
-(defun c-state-literal-at (here)
-  ;; If position HERE is inside a literal, return (START . END), the
-  ;; boundaries of the literal (which may be outside the accessible bit of the
-  ;; buffer).  Otherwise, return nil.
-  ;;
-  ;; This function is almost the same as `c-literal-limits'.  It differs in
-  ;; that it is a lower level function, and that it rigourously follows the
-  ;; syntax from BOB, whereas `c-literal-limits' uses a "local" safe position.
+(defun c-state-safe-place (here)
+  ;; Return a buffer position before HERE which is "safe", i.e. outside any
+  ;; string, comment, or macro.
   ;;
   ;; NOTE: This function manipulates `c-state-nonlit-pos-cache'.  This cache
   ;; MAY NOT contain any positions within macros, since macros are frequently
@@ -2137,7 +2141,7 @@ comment at the start of cc-engine.el for more info."
 
         (while (<= (setq npos (+ pos c-state-nonlit-pos-interval))
                    here)
-          (setq lit (c-state-pp-to-literal pos npos))
+          (setq lit (car (cddr (c-state-pp-to-literal pos npos))))
           (setq pos (or (cdr lit) npos)) ; end of literal containing npos.
           (goto-char pos)
           (when (and (c-beginning-of-macro) (/= (point) pos))
@@ -2148,9 +2152,22 @@ comment at the start of cc-engine.el for more info."
 
         (if (> pos c-state-nonlit-pos-cache-limit)
             (setq c-state-nonlit-pos-cache-limit pos))
-        (if (< pos here)
-            (setq lit (c-state-pp-to-literal pos here)))
-        lit))))
+        pos))))
+        
+(defun c-state-literal-at (here)
+  ;; If position HERE is inside a literal, return (START . END), the
+  ;; boundaries of the literal (which may be outside the accessible bit of the
+  ;; buffer).  Otherwise, return nil.
+  ;;
+  ;; This function is almost the same as `c-literal-limits'.  Previously, it
+  ;; differed in that it was a lower level function, and that it rigourously
+  ;; followed the syntax from BOB.  `c-literal-limits' is now (2011-12)
+  ;; virtually identical to this function.
+  (save-restriction
+    (widen)
+    (save-excursion
+      (let ((pos (c-state-safe-place here)))
+            (car (cddr (c-state-pp-to-literal pos here)))))))
 
 (defsubst c-state-lit-beg (pos)
   ;; Return the start of the literal containing POS, or POS itself.
@@ -4181,7 +4198,7 @@ comment at the start of cc-engine.el for more info."
 
 ;; Tools for handling comments and string literals.
 
-(defun c-slow-in-literal (&optional lim detect-cpp)
+(defun c-in-literal (&optional lim detect-cpp)
   "Return the type of literal point is in, if any.
 The return value is `c' if in a C-style comment, `c++' if in a C++
 style comment, `string' if in a string literal, `pound' if DETECT-CPP
@@ -4194,67 +4211,12 @@ The last point calculated is cached if the cache is enabled, i.e. if
 
 Note that this function might do hidden buffer changes.  See the
 comment at the start of cc-engine.el for more info."
-
-  (if (and (vectorp c-in-literal-cache)
-           (= (point) (aref c-in-literal-cache 0)))
-      (aref c-in-literal-cache 1)
-    (let ((rtn (save-excursion
-                 (let* ((pos (point))
-                        (lim (or lim (progn
-                                       (c-beginning-of-syntax)
-                                       (point))))
-                        (state (parse-partial-sexp lim pos)))
-                   (cond
-                    ((elt state 3) 'string)
-                    ((elt state 4) (if (elt state 7) 'c++ 'c))
-                    ((and detect-cpp (c-beginning-of-macro lim)) 'pound)
-                    (t nil))))))
-      ;; cache this result if the cache is enabled
-      (if (not c-in-literal-cache)
-          (setq c-in-literal-cache (vector (point) rtn)))
-      rtn)))
-
-;; XEmacs has a built-in function that should make this much quicker.
-;; I don't think we even need the cache, which makes our lives more
-;; 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
-;; conjunction with syntax-table-properties.  The bug is present in, e.g.,
-;; XEmacs 21.4.4.  It manifested itself thus:
-;;
-;; Starting with an empty AWK Mode buffer, type
-;; /regexp/ {<C-j>
-;; Point gets wrongly left at column 0, rather than being indented to tab-width.
-;;
-;; AWK Mode is designed such that when the first / is typed, it gets the
-;; syntax-table property "string fence".  When the second / is typed, BOTH /s
-;; are given the s-t property "string".  However, buffer-syntactic-context
-;; 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 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 initialized.
-;;
-;; (Alan Mackenzie, 2003/4/30).
-
-(defun c-fast-in-literal (&optional lim detect-cpp)
-  ;; This function might do hidden buffer changes.
-  (let ((context (buffer-syntactic-context)))
-    (cond
-     ((eq context 'string) 'string)
-     ((eq context 'comment) 'c++)
-     ((eq context 'block-comment) 'c)
-     ((and detect-cpp (save-excursion (c-beginning-of-macro lim))) 'pound))))
-
-(defalias 'c-in-literal
-  (if (fboundp 'buffer-syntactic-context)
-    'c-fast-in-literal                  ; XEmacs
-    'c-slow-in-literal))                ; GNU Emacs
-
-;; The defalias above isn't enough to shut up the byte compiler.
-(cc-bytecomp-defun c-in-literal)
+  (let* ((safe-place (c-state-safe-place (point)))
+         (lit (c-state-pp-to-literal safe-place (point))))
+    (or (cadr lit)
+        (and detect-cpp
+             (save-excursion (c-beginning-of-macro))
+             'pound))))
 
 (defun c-literal-limits (&optional lim near not-in-delimiter)
   "Return a cons of the beginning and end positions of the comment or
@@ -4273,64 +4235,56 @@ comment at the start of cc-engine.el for more info."
 
   (save-excursion
     (let* ((pos (point))
-           (lim (or lim (progn
-                          (c-beginning-of-syntax)
-                          (point))))
-           (state (parse-partial-sexp lim pos)))
-
-      (cond ((elt state 3)              ; String.
-             (goto-char (elt state 8))
-             (cons (point) (or (c-safe (c-forward-sexp 1) (point))
-                               (point-max))))
-
-            ((elt state 4)              ; Comment.
-             (goto-char (elt state 8))
-             (cons (point) (progn (c-forward-single-comment) (point))))
-
-            ((and (not not-in-delimiter)
-                  (not (elt state 5))
-                  (eq (char-before) ?/)
-                  (looking-at "[/*]"))
-             ;; We're standing in a comment starter.
-             (backward-char 1)
-             (cons (point) (progn (c-forward-single-comment) (point))))
-
-            (near
-             (goto-char pos)
-
-             ;; Search forward for a literal.
-             (skip-chars-forward " \t")
+           (lim (or lim (c-state-safe-place pos)))
+           (pp-to-lit (c-state-pp-to-literal lim pos))
+           (state (car pp-to-lit))
+           (lit-type (cadr pp-to-lit))
+           (lit-limits (car (cddr pp-to-lit))))
 
-             (cond
-              ((looking-at c-string-limit-regexp) ; String.
-               (cons (point) (or (c-safe (c-forward-sexp 1) (point))
-                                 (point-max))))
+      (cond
+       (lit-limits)
+       ((and (not not-in-delimiter)
+             (not (elt state 5))
+             (eq (char-before) ?/)
+             (looking-at "[/*]")) ; FIXME!!! use c-line/block-comment-starter.  2008-09-28.
+        ;; We're standing in a comment starter.
+        (backward-char 1)
+        (cons (point) (progn (c-forward-single-comment) (point))))
+
+       (near
+        (goto-char pos)
+        ;; Search forward for a literal.
+        (skip-chars-forward " \t")
+        (cond
+         ((looking-at c-string-limit-regexp) ; String.
+          (cons (point) (or (c-safe (c-forward-sexp 1) (point))
+                            (point-max))))
 
-              ((looking-at c-comment-start-regexp) ; Line or block comment.
-               (cons (point) (progn (c-forward-single-comment) (point))))
+         ((looking-at c-comment-start-regexp) ; Line or block comment.
+          (cons (point) (progn (c-forward-single-comment) (point))))
 
-              (t
-               ;; Search backward.
-               (skip-chars-backward " \t")
+         (t
+          ;; Search backward.
+          (skip-chars-backward " \t")
 
-               (let ((end (point)) beg)
-                 (cond
-                  ((save-excursion
-                     (< (skip-syntax-backward c-string-syntax) 0)) ; String.
-                   (setq beg (c-safe (c-backward-sexp 1) (point))))
-
-                  ((and (c-safe (forward-char -2) t)
-                        (looking-at "*/"))
-                   ;; Block comment.  Due to the nature of line
-                   ;; comments, they will always be covered by the
-                   ;; normal case above.
-                   (goto-char end)
-                   (c-backward-single-comment)
-                   ;; If LIM is bogus, beg will be bogus.
-                   (setq beg (point))))
-
-                 (if beg (cons beg end))))))
-            ))))
+          (let ((end (point)) beg)
+            (cond
+             ((save-excursion
+                (< (skip-syntax-backward c-string-syntax) 0)) ; String.
+              (setq beg (c-safe (c-backward-sexp 1) (point))))
+
+             ((and (c-safe (forward-char -2) t)
+                   (looking-at "*/"))
+              ;; Block comment.  Due to the nature of line
+              ;; comments, they will always be covered by the
+              ;; normal case above.
+              (goto-char end)
+              (c-backward-single-comment)
+              ;; If LIM is bogus, beg will be bogus.
+              (setq beg (point))))
+
+            (if beg (cons beg end))))))
+       ))))
 
 ;; In case external callers use this; it did have a docstring.
 (defalias 'c-literal-limits-fast 'c-literal-limits)
@@ -6832,7 +6786,7 @@ comment at the start of cc-engine.el for more info."
                        got-suffix-after-parens
                        (eq (char-after got-suffix-after-parens) ?\())
               ;; Got a type, no declarator but a paren suffix. I.e. it's a
-              ;; normal function call afterall (or perhaps a C++ style object
+              ;; normal function call after all (or perhaps a C++ style object
               ;; instantiation expression).
               (throw 'at-decl-or-cast nil))))
 
@@ -9151,7 +9105,7 @@ comment at the start of cc-engine.el for more info."
                                     'label))
                             (if (eq step 'up)
                                 (setq placeholder (point))
-                              ;; There was no containing statement afterall.
+                              ;; There was no containing statement after all.
                               (goto-char placeholder)))))
                     placeholder))
                (if (looking-at c-block-stmt-2-key)
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index a31de35f3ba..97cfe808322 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -194,9 +194,13 @@
          (unless (face-property-instance oldface 'reverse)
            (invert-face newface)))))
 
-(defvar c-annotation-face (make-face 'c-annotation-face)
-  "Face used to highlight annotations in java-mode and other modes that may wish to use it.")
-(set-face-foreground 'c-annotation-face "blue")
+(defvar c-annotation-face 'c-annotation-face)
+
+(defface c-annotation-face
+  '((default :inherit font-lock-constant-face))
+  "Face for highlighting annotations in Java mode and similar modes."
+  :version "24.1"
+  :group 'c)
 
 (eval-and-compile
   ;; We need the following definitions during compilation since they're
@@ -1207,7 +1211,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
           ;; o - '<> if the arglist is of angle bracket type;
           ;; o - 'arglist if it's some other arglist;
           ;; o - nil, if not in an arglist at all.  This includes the
-          ;;   parenthesised condition which follows "if", "while", etc.
+          ;;   parenthesized condition which follows "if", "while", etc.
           context
           ;; The position of the next token after the closing paren of
           ;; the last detected cast.
@@ -1534,24 +1538,8 @@ casts and declarations are fontified.  Used on level 2 and higher."
   ;; prevent a repeat invocation.  See elisp/lispref page "Search-based
   ;; Fontification".
   (let* ((paren-state (c-parse-state))
-         (start (point))
-         decl-context bo-decl in-typedef type-type ps-elt)
-
-    ;; First, are we actually in a "local" declaration?
-    (setq decl-context (c-beginning-of-decl-1)
-          bo-decl (point)
-          in-typedef (looking-at c-typedef-key))
-    (if in-typedef (c-forward-token-2))
-    (when (and (eq (car decl-context) 'same)
-               (< bo-decl start))
-      ;; Are we genuinely at a type?
-      (setq type-type (c-forward-type t))
-      (if (and type-type
-               (or (not (eq type-type 'maybe))
-                   (looking-at c-symbol-key)))
-          (c-font-lock-declarators limit t in-typedef)))
-
-    ;; Secondly, are we in any nested struct/union/class/etc. braces?
+         decl-context in-typedef ps-elt)
+    ;; Are we in any nested struct/union/class/etc. braces?
     (while paren-state
       (setq ps-elt (car paren-state)
             paren-state (cdr paren-state))
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 37818638d41..2aca885ca35 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -485,28 +485,56 @@ The functions are called even when font locking isn't enabled.
 When the mode is initialized, the functions are called with
 parameters \(point-min) and \(point-max).")
 
-(c-lang-defconst c-before-font-lock-function
-  "If non-nil, a function called just before font locking.
-Typically it will extend the region about to be fontified \(see
+(c-lang-defconst c-before-font-lock-functions
+  ;; For documentation see the following c-lang-defvar of the same name.
+  ;; The value here may be a list of functions or a single function.
+  t 'c-change-set-fl-decl-start
+  (c c++ objc) '(c-neutralize-syntax-in-and-mark-CPP
+                 c-change-set-fl-decl-start)
+  awk 'c-awk-extend-and-syntax-tablify-region)
+(c-lang-defvar c-before-font-lock-functions
+               (let ((fs (c-lang-const c-before-font-lock-functions)))
+                 (if (listp fs)
+                     fs
+                   (list fs)))
+  "If non-nil, a list of functions called just before font locking.
+Typically they will extend the region about to be fontified \(see
 below) and will set `syntax-table' text properties on the region.
 
-It takes 3 parameters, the BEG, END, and OLD-LEN supplied to
-every after-change function; point is undefined on both entry and
-exit; on entry, the buffer will have been widened and match-data
-will have been saved; the return value is ignored.
+These functions will be run in the order given.  Each of them
+takes 3 parameters, the BEG, END, and OLD-LEN supplied to every
+after-change function; point is undefined on both entry and exit;
+on entry, the buffer will have been widened and match-data will
+have been saved; the return value is ignored.
 
-The function may extend the region to be fontified by setting the
+The functions may extend the region to be fontified by setting the
 buffer local variables c-new-BEG and c-new-END.
 
-The function is called even when font locking is disabled.
+The functions are called even when font locking is disabled.
 
-When the mode is initialized, this function is called with
-parameters \(point-min), \(point-max) and <buffer size>."
-  t nil
-  (c c++ objc) 'c-neutralize-syntax-in-and-mark-CPP
-  awk 'c-awk-extend-and-syntax-tablify-region)
-(c-lang-defvar c-before-font-lock-function
-               (c-lang-const c-before-font-lock-function))
+When the mode is initialized, these functions are called with
+parameters \(point-min), \(point-max) and <buffer size>.")
+
+(c-lang-defconst c-before-context-fontification-functions
+  awk nil
+  t 'c-context-set-fl-decl-start)
+  ;; For documentation see the following c-lang-defvar of the same name.
+  ;; The value here may be a list of functions or a single function.
+(c-lang-defvar c-before-context-fontification-functions
+  (let ((fs (c-lang-const c-before-context-fontification-functions)))
+    (if (listp fs)
+        fs
+      (list fs)))
+  "If non-nil, a list of functions called just before context (or
+other non-change) fontification is done.  Typically they will
+extend the region.
+
+These functions will be run in the order given.  Each of them
+takes 2 parameters, the BEG and END of the region to be
+fontified.  Point is undefined on both entry and exit.  On entry,
+the buffer will have been widened and match-data will have been
+saved; the return value is a cons of the adjusted
+region, (NEW-BEG . NEW-END).")
 
 
 ;;; Syntactic analysis ("virtual semicolons") for line-oriented languages (AWK).
@@ -522,7 +550,7 @@ don't have EOL terminated statements. "
 
 (c-lang-defconst c-vsemi-status-unknown-p-fn
   "Contains a function \"are we unsure whether there is a virtual semicolon on this line?\".
-The (admittedly kludgey) purpose of such a function is to prevent an infinite
+The (admittedly kludgy) purpose of such a function is to prevent an infinite
 recursion in c-beginning-of-statement-1 when point starts at a `while' token.
 The function MUST NOT UNDER ANY CIRCUMSTANCES call c-beginning-of-statement-1,
 even indirectly.  This variable contains nil for languages which don't have
@@ -2242,8 +2270,7 @@ This construct is \"<keyword> <expression> :\"."
 
 (c-lang-defconst c-label-kwds
   "Keywords introducing colon terminated labels in blocks."
-  t '("case" "default")
-  awk nil)
+  t '("case" "default"))
 
 (c-lang-defconst c-label-kwds-regexp
   ;; Adorned regexp matching any keyword that introduces a label.
@@ -2998,18 +3025,19 @@ neither in a statement nor in a declaration context.  The regexp is
 tested at the beginning of every sexp in a suspected label,
 i.e. before \":\".  Only used if `c-recognize-colon-labels' is set."
   t (concat
-     ;; Don't allow string literals.
-     "\"\\|"
      ;; All keywords except `c-label-kwds' and `c-protection-kwds'.
      (c-make-keywords-re t
        (set-difference (c-lang-const c-keywords)
                        (append (c-lang-const c-label-kwds)
                                (c-lang-const c-protection-kwds))
                        :test 'string-equal)))
+  ;; Don't allow string literals, except in AWK.  Character constants are OK.
+  (c objc java pike idl) (concat "\"\\|"
+                                 (c-lang-const c-nonlabel-token-key))
   ;; Also check for open parens in C++, to catch member init lists in
   ;; constructors.  We normally allow it so that macros with arguments
   ;; work in labels.
-  c++ (concat "\\s\(\\|" (c-lang-const c-nonlabel-token-key)))
+  c++ (concat "\\s\(\\|\"\\|" (c-lang-const c-nonlabel-token-key)))
 (c-lang-defvar c-nonlabel-token-key (c-lang-const c-nonlabel-token-key))
 
 (c-lang-defconst c-nonlabel-token-2-key
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index cc5a5236255..1bc0741b0aa 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -599,8 +599,8 @@ that requires a literal mode spec at compile time."
 
 ;; Buffer local variables defining the region to be fontified by a font lock
 ;; after-change function.  They are set in c-after-change to
-;; after-change-function's BEG and END, and may be modified by a
-;; `c-before-font-lock-function'.
+;; after-change-functions' BEG and END, and may be modified by functions in
+;; `c-before-font-lock-functions'.
 (defvar c-new-BEG 0)
 (make-variable-buffer-local 'c-new-BEG)
 (defvar c-new-END 0)
@@ -633,13 +633,13 @@ compatible with old code; callers should always specify it."
     (setq c-new-BEG (point-min))
     (setq c-new-END (point-max))
     (save-excursion
-      (if c-get-state-before-change-functions
-          (mapc (lambda (fn)
-                  (funcall fn (point-min) (point-max)))
-                c-get-state-before-change-functions))
-      (if c-before-font-lock-function
-          (funcall c-before-font-lock-function (point-min) (point-max)
-                   (- (point-max) (point-min))))))
+      (mapc (lambda (fn)
+              (funcall fn (point-min) (point-max)))
+            c-get-state-before-change-functions)
+      (mapc (lambda (fn)
+              (funcall fn (point-min) (point-max)
+                       (- (point-max) (point-min))))
+            c-before-font-lock-functions)))
 
   (set (make-local-variable 'outline-regexp) "[^#\n\^M]")
   (set (make-local-variable 'outline-level) 'c-outline-level)
@@ -830,6 +830,35 @@ Note that the style variables are always made local to the buffer."
                                  ; with a c-cpp-delimiter category property
   (setq c-old-EOM (point)))
 
+(defun c-extend-font-lock-region-for-macros (begg endd &optional old-len)
+  ;; Extend the region (BEGG ENDD) to cover all (possibly changed)
+  ;; preprocessor macros; return the cons (new-BEG . new-END).  OLD-LEN should
+  ;; be either the old length parameter when called from an
+  ;; after-change-function, or nil otherwise.  This defun uses the variables
+  ;; c-old-BOM, c-new-BOM.
+  ;;
+  ;; Point is undefined on both entry and exit to this function.  The buffer
+  ;; will have been widened on entry.
+  (let (limits new-beg new-end)
+    (goto-char c-old-BOM)         ; already set to old start of macro or begg.
+    (setq new-beg
+          (min begg
+               (if (setq limits (c-state-literal-at (point)))
+                   (cdr limits)     ; go forward out of any string or comment.
+                 (point))))
+
+    (goto-char endd)
+    (if (setq limits (c-state-literal-at (point)))
+        (goto-char (car limits)))  ; go backward out of any string or comment.
+    (if (c-beginning-of-macro)
+        (c-end-of-macro))
+    (setq new-end (max endd
+                       (if old-len
+                           (+ (- c-old-EOM old-len) (- endd begg))
+                         c-old-EOM)
+                       (point)))
+    (cons new-beg new-end)))
+
 (defun c-neutralize-CPP-line (beg end)
   ;; BEG and END bound a region, typically a preprocessor line.  Put a
   ;; "punctuation" syntax-table property on syntactically obtrusive
@@ -881,31 +910,19 @@ Note that the style variables are always made local to the buffer."
   ;; Point is undefined both before and after this function call, the buffer
   ;; has been widened, and match-data saved.  The return value is ignored.
   ;;
-  ;; This function is the C/C++/ObjC value of `c-before-font-lock-function'.
+  ;; This function is in the C/C++/ObjC value of `c-before-font-lock-functions'.
   ;;
   ;; Note: SPEED _MATTERS_ IN THIS FUNCTION!!!
   ;;
   ;; This function might make hidden buffer changes.
-  (c-save-buffer-state (limits)
+  (c-save-buffer-state (new-bounds)
     ;; First determine the region, (c-new-BEG c-new-END), which will get font
     ;; locked.  It might need "neutralizing".  This region may not start
     ;; inside a string, comment, or macro.
-    (goto-char c-old-BOM)         ; already set to old start of macro or begg.
-    (setq c-new-BEG
-          (min c-new-BEG
-               (if (setq limits (c-state-literal-at (point)))
-                   (cdr limits)     ; go forward out of any string or comment.
-                 (point))))
-
-    (goto-char endd)
-    (if (setq limits (c-state-literal-at (point)))
-        (goto-char (car limits)))  ; go backward out of any string or comment.
-    (if (c-beginning-of-macro)
-        (c-end-of-macro))
-    (setq c-new-END (max c-new-END
-                         (+ (- c-old-EOM old-len) (- endd begg))
-                         (point)))
-
+    (setq new-bounds (c-extend-font-lock-region-for-macros
+                      c-new-BEG c-new-END old-len))
+    (setq c-new-BEG (car new-bounds)
+          c-new-END (cdr new-bounds))
     ;; Clear all old relevant properties.
     (c-clear-char-property-with-value c-new-BEG c-new-END 'syntax-table '(1))
     (c-clear-char-property-with-value c-new-BEG c-new-END 'category 'c-cpp-delimiter)
@@ -943,7 +960,7 @@ Note that the style variables are always made local to the buffer."
   ;; Note that this function must be FAST rather than accurate.  Note
   ;; also that it only has any effect when font locking is enabled.
   ;; We exploit this by checking for font-lock-*-face instead of doing
-  ;; rigourous syntactic analysis.
+  ;; rigorous syntactic analysis.
 
   ;; If either change boundary is wholly inside an identifier, delete
   ;; it/them from the cache.  Don't worry about being inside a string
@@ -1015,6 +1032,11 @@ Note that the style variables are always made local to the buffer."
                   c-get-state-before-change-functions))
         ))))
 
+(defvar c-in-after-change-fontification nil)
+(make-variable-buffer-local 'c-in-after-change-fontification)
+;; A flag to prevent region expanding stuff being done twice for after-change
+;; fontification.
+
 (defun c-after-change (beg end old-len)
   ;; Function put on `after-change-functions' to adjust various caches
   ;; etc.  Prefer speed to finesse here, since there will be an order
@@ -1026,7 +1048,7 @@ Note that the style variables are always made local to the buffer."
   ;; these caches from inside them, and we must thus be sure that this
   ;; has already been executed.
   ;;
-  ;; This calls the language variable c-before-font-lock-function, if non nil.
+  ;; This calls the language variable c-before-font-lock-functions, if non nil.
   ;; This typically sets `syntax-table' properties.
 
   (c-save-buffer-state ()
@@ -1066,19 +1088,113 @@ Note that the style variables are always made local to the buffer."
         ;; larger than (beg end).
         (setq c-new-BEG beg
               c-new-END end)
-        (if c-before-font-lock-function
-            (save-excursion
-              (funcall c-before-font-lock-function beg end old-len)))))))
-
+        (setq c-in-after-change-fontification t)
+        (save-excursion
+          (mapc (lambda (fn)
+                  (funcall fn beg end old-len))
+                c-before-font-lock-functions))))))
+
+(defun c-set-fl-decl-start (pos)
+  ;; If the beginning of the line containing POS is in the middle of a "local"
+  ;; declaration (i.e. one which does not start outside of braces enclosing
+  ;; POS, such as a struct), return the beginning of that declaration.
+  ;; Otherwise return POS.  Note that declarations, in this sense, can be
+  ;; nested.
+  ;;
+  ;; This function is called indirectly from font locking stuff - either from
+  ;; c-after-change (to prepare for after-change font-lockng) or from font
+  ;; lock context (etc.) fontification.
+  (let ((lit-limits (c-literal-limits))
+        (new-pos pos)
+        bod-lim bo-decl)
+    (goto-char (c-point 'bol new-pos))
+    (when lit-limits                    ; Comment or string.
+      (goto-char (car lit-limits)))
+    (setq bod-lim (max (- (point) 500) (point-min)))
+
+    (while
+        ;; Go to a less nested declaration each time round this loop.
+        (and
+         (eq (car (c-beginning-of-decl-1 bod-lim)) 'same)
+         (progn (setq bo-decl (point))
+                ;; Are we looking at a keyword such as "template" or
+                ;; "typedef" which can decorate a type, or the type itself?
+                (when (or (looking-at c-prefix-spec-kwds-re)
+                          (c-forward-type t))
+                  ;; We've found another candidate position.
+                  (setq new-pos (min new-pos bo-decl))
+                  (goto-char bo-decl))
+                t)
+         ;; Try and go out a level to search again.
+         (progn
+           (c-backward-syntactic-ws bod-lim)
+           (or (memq (char-before) '(?\( ?\[))
+               (and (eq (char-before) ?\<)
+                    (eq (c-get-char-property
+                         (1- (point)) 'syntax-table)
+                        c-<-as-paren-syntax))))
+         (not (bobp)))
+      (backward-char))
+    new-pos))                           ; back over (, [, <.
+
+(defun c-change-set-fl-decl-start (beg end old-len)
+  ;; Set c-new-BEG to the beginning of a "local" declaration if it('s BOL) is
+  ;; inside one.  This is called from an after-change-function, but the
+  ;; parameters BEG END and OLD-LEN are ignored.  See `c-set-fl-decl-start'
+  ;; for the detailed functionality.
+  (if font-lock-mode
+      (setq c-new-BEG (c-set-fl-decl-start c-new-BEG))))
+
+(defun c-context-set-fl-decl-start (beg end)
+  ;; Return a cons (NEW-BEG . END), where NEW-BEG is the beginning of a
+  ;; "local" declaration (BOL at) NEW is inside or BEG.  See
+  ;; `c-set-fl-decl-start' for the detailed functionality.
+  (cons (c-set-fl-decl-start beg) end))
+
+(defvar c-standard-font-lock-fontify-region-function nil
+  "Standard value of `font-lock-fontify-region-function'")
+
+(defun c-font-lock-fontify-region (beg end &optional verbose)
+  ;; Effectively advice around `font-lock-fontify-region' which extends the
+  ;; region (BEG END), for example, to avoid context fontification chopping
+  ;; off the start of the context.  Do not do anything if it's already been
+  ;; done (i.e. from and after-change fontification.  An example (C++) where
+  ;; this used to happen is this:
+  ;;
+  ;;     template <typename T>
+  ;;
+  ;;
+  ;;     void myfunc(T* p) {}
+  ;; 
+  ;; Type a space in the first blank line, and the fontification of the next
+  ;; line was fouled up by context fontification.
+  (let ((new-beg beg) (new-end end) new-region)
+    (if c-in-after-change-fontification
+        (setq c-in-after-change-fontification nil)
+      (save-restriction
+        (widen)
+        (save-excursion
+          (mapc (lambda (fn)
+                  (setq new-region (funcall fn new-beg new-end))
+                  (setq new-beg (car new-region)  new-end (cdr new-region)))
+                c-before-context-fontification-functions))))
+    (funcall c-standard-font-lock-fontify-region-function
+             new-beg new-end verbose)))
+  
 (defun c-after-font-lock-init ()
-  ;; Put on `font-lock-mode-hook'.
+  ;; Put on `font-lock-mode-hook'.  This function ensures our after-change
+  ;; function will get excuted before the font-lock one.  Amongst other
+  ;; things.
   (remove-hook 'after-change-functions 'c-after-change t)
-  (add-hook 'after-change-functions 'c-after-change nil t))
+  (add-hook 'after-change-functions 'c-after-change nil t)
+  (setq c-standard-font-lock-fontify-region-function
+        (default-value 'font-lock-fontify-region-function)))
 
 (defun c-font-lock-init ()
   "Set up the font-lock variables for using the font-lock support in CC Mode.
 This does not load the font-lock package.  Use after
-`c-basic-common-init' and after cc-fonts has been loaded."
+`c-basic-common-init' and after cc-fonts has been loaded.
+This function is called from `c-common-init', once per mode initialization."
 
   (set (make-local-variable 'font-lock-defaults)
         `(,(if (c-major-mode-is 'awk-mode)
@@ -1092,6 +1208,10 @@ This does not load the font-lock package.  Use after
           c-beginning-of-syntax
           (font-lock-mark-block-function
            . c-mark-function)))
+
+  (make-local-variable 'font-lock-fontify-region-function)
+  (setq font-lock-fontify-region-function 'c-font-lock-fontify-region)
+
   (if (featurep 'xemacs)
       (make-local-hook 'font-lock-mode-hook))
   (add-hook 'font-lock-mode-hook 'c-after-font-lock-init nil t))
@@ -1562,10 +1682,6 @@ Key bindings:
   (c-common-init 'awk-mode)
   (c-awk-unstick-NL-prop)
 
-  ;; 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)
-
   (c-run-mode-hooks 'c-mode-common-hook 'awk-mode-hook)
   (c-update-modeline))
 
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 549f94387d2..a4338a3193b 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -586,7 +586,7 @@ in a mode hook, you have to call `c-setup-doc-comment-style'
 afterwards to redo that work."
   ;; Symbols other than those documented above may be used on this
   ;; variable.  If a variable exists that has that name with
-  ;; "-font-lock-keywords" appended, it's value is prepended to the
+  ;; "-font-lock-keywords" appended, its value is prepended to the
   ;; font lock keywords list.  If it's a function then it's called and
   ;; the result is prepended.
   :type '(radio
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 823304bd250..ffe8edfaeb6 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -5,6 +5,7 @@
 ;; Author: Dave Love <fx@gnu.org>
 ;; Maintainer: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: languages
+;; Version: 1.1
 
 ;; This file is part of GNU Emacs.
 
@@ -29,18 +30,18 @@
 ;; The CFEngine 3.x support doesn't have Imenu support but patches are
 ;; welcome.
 
-;; You can set it up so either cfengine-mode (2.x and earlier) or
-;; cfengine3-mode (3.x) will be picked, depending on the buffer
+;; You can set it up so either `cfengine2-mode' (2.x and earlier) or
+;; `cfengine3-mode' (3.x) will be picked, depending on the buffer
 ;; contents:
 
-;; (add-to-list 'auto-mode-alist '("\\.cf\\'" . cfengine-auto-mode))
+;; (add-to-list 'auto-mode-alist '("\\.cf\\'" . cfengine-mode))
 
 ;; OR you can choose to always use a specific version, if you prefer
-;; it
+;; it:
 
 ;; (add-to-list 'auto-mode-alist '("\\.cf\\'" . cfengine3-mode))
-;; (add-to-list 'auto-mode-alist '("^cf\\." . cfengine-mode))
-;; (add-to-list 'auto-mode-alist '("^cfagent.conf\\'" . cfengine-mode))
+;; (add-to-list 'auto-mode-alist '("^cf\\." . cfengine2-mode))
+;; (add-to-list 'auto-mode-alist '("^cfagent.conf\\'" . cfengine2-mode))
 
 ;; This is not the same as the mode written by Rolf Ebert
 ;; <ebert@waporo.muc.de>, distributed with cfengine-2.0.5.  It does
@@ -49,31 +50,36 @@
 ;;; Code:
 
 (defgroup cfengine ()
-  "Editing Cfengine files."
+  "Editing CFEngine files."
   :group 'languages)
 
 (defcustom cfengine-indent 2
-  "*Size of a Cfengine indentation step in columns."
+  "*Size of a CFEngine indentation step in columns."
   :group 'cfengine
   :type 'integer)
 
+(defvar cfengine-mode-debug nil
+  "Whether `cfengine-mode' should print debugging info.")
+
 (defcustom cfengine-mode-abbrevs nil
-  "Abbrevs for Cfengine mode."
+  "Abbrevs for CFEngine2 mode."
   :group 'cfengine
   :type '(repeat (list (string :tag "Name")
                        (string :tag "Expansion")
                        (choice  :tag "Hook" (const nil) function))))
 
+(make-obsolete-variable 'cfengine-mode-abbrevs 'edit-abbrevs "24.1")
+
 ;; Taken from the doc for pre-release 2.1.
 (eval-and-compile
-  (defconst cfengine-actions
+  (defconst cfengine2-actions
     '("acl" "alerts" "binservers" "broadcast" "control" "classes" "copy"
       "defaultroute" "disks" "directories" "disable" "editfiles" "files"
       "filters" "groups" "homeservers" "ignore" "import" "interfaces"
       "links" "mailserver" "methods" "miscmounts" "mountables"
       "processes" "packages" "rename" "required" "resolve"
       "shellcommands" "tidy" "unmount"
-      ;; cfservd
+      ;; Keywords for cfservd.
       "admit" "grant" "deny")
     "List of the action keywords supported by Cfengine.
 This includes those for cfservd as well as cfagent.")
@@ -98,11 +104,11 @@ This includes those for cfservd as well as cfagent.")
      '(string int real slist ilist rlist irange rrange counter))
     "List of the CFEngine 3.x variable types."))
 
-(defvar cfengine-font-lock-keywords
+(defvar cfengine2-font-lock-keywords
   `(;; Actions.
     ;; List the allowed actions explicitly, so that errors are more obvious.
     (,(concat "^[ \t]*" (eval-when-compile
-                          (regexp-opt cfengine-actions t))
+                          (regexp-opt cfengine2-actions t))
               ":")
      1 font-lock-keyword-face)
     ;; Classes.
@@ -117,46 +123,54 @@ This includes those for cfservd as well as cfagent.")
 
 (defvar cfengine3-font-lock-keywords
   `(
+    ;; Defuns.  This happens early so they don't get caught by looser
+    ;; patterns.
+    (,(concat "\\<" cfengine3-defuns-regex "\\>"
+              "[ \t]+\\<\\([[:alnum:]_]+\\)\\>"
+              "[ \t]+\\<\\([[:alnum:]_]+\\)"
+              ;; Optional parentheses with variable names inside.
+              "\\(?:(\\([^)]*\\))\\)?")
+     (1 font-lock-builtin-face)
+     (2 font-lock-constant-face)
+     (3 font-lock-function-name-face)
+     (4 font-lock-variable-name-face nil t))
+
+    ;; Class selectors.
     (,(concat "^[ \t]*" cfengine3-class-selector-regex)
      1 font-lock-keyword-face)
+
+    ;; Categories.
     (,(concat "^[ \t]*" cfengine3-category-regex)
      1 font-lock-builtin-face)
+
     ;; Variables, including scope, e.g. module.var
     ("[@$](\\([[:alnum:]_.]+\\))" 1 font-lock-variable-name-face)
     ("[@$]{\\([[:alnum:]_.]+\\)}" 1 font-lock-variable-name-face)
+
     ;; Variable definitions.
     ("\\<\\([[:alnum:]_]+\\)[ \t]*=[ \t]*(" 1 font-lock-variable-name-face)
 
-    ;; CFEngine 3.x faces
-    ;; defuns
-    (,(concat "\\<" cfengine3-defuns-regex "\\>"
-              "[ \t]+\\<\\([[:alnum:]_]+\\)\\>"
-              "[ \t]+\\<\\([[:alnum:]_]+\\)\\((\\([^)]*\\))\\)?")
-    (1 font-lock-builtin-face)
-    (2 font-lock-constant-name-face)
-    (3 font-lock-function-name-face)
-    (5 font-lock-variable-name-face))
-    ;; variable types
+    ;; Variable types.
     (,(concat "\\<" (eval-when-compile (regexp-opt cfengine3-vartypes t)) "\\>")
      1 font-lock-type-face)))
 
-(defvar cfengine-imenu-expression
+(defvar cfengine2-imenu-expression
   `((nil ,(concat "^[ \t]*" (eval-when-compile
-                              (regexp-opt cfengine-actions t))
+                              (regexp-opt cfengine2-actions t))
                   ":[^:]")
          1)
     ("Variables/classes" "\\<\\([[:alnum:]_]+\\)[ \t]*=[ \t]*(" 1)
     ("Variables/classes" "\\<define=\\([[:alnum:]_]+\\)" 1)
     ("Variables/classes" "\\<DefineClass\\>[ \t]+\\([[:alnum:]_]+\\)" 1))
-  "`imenu-generic-expression' for Cfengine mode.")
+  "`imenu-generic-expression' for CFEngine mode.")
 
-(defun cfengine-outline-level ()
-  "`outline-level' function for Cfengine mode."
+(defun cfengine2-outline-level ()
+  "`outline-level' function for CFEngine mode."
   (if (looking-at "[^:]+\\(?:[:]+\\)$")
       (length (match-string 1))))
 
-(defun cfengine-beginning-of-defun ()
-  "`beginning-of-defun' function for Cfengine mode.
+(defun cfengine2-beginning-of-defun ()
+  "`beginning-of-defun' function for CFEngine mode.
 Treats actions as defuns."
   (unless (<= (current-column) (current-indentation))
     (end-of-line))
@@ -165,8 +179,8 @@ Treats actions as defuns."
     (goto-char (point-min)))
   t)
 
-(defun cfengine-end-of-defun ()
-  "`end-of-defun' function for Cfengine mode.
+(defun cfengine2-end-of-defun ()
+  "`end-of-defun' function for CFEngine mode.
 Treats actions as defuns."
   (end-of-line)
   (if (re-search-forward "^[[:alpha:]]+: *$" nil t)
@@ -176,7 +190,7 @@ Treats actions as defuns."
 
 ;; Fixme: Should get an extra indent step in editfiles BeginGroup...s.
 
-(defun cfengine-indent-line ()
+(defun cfengine2-indent-line ()
   "Indent a line in Cfengine mode.
 Intended as the value of `indent-line-function'."
   (let ((pos (- (point-max) (point))))
@@ -283,15 +297,17 @@ Intended as the value of `indent-line-function'."
       (narrow-to-defun)
       (back-to-indentation)
       (setq parse (parse-partial-sexp (point-min) (point)))
-      (message "%S" parse)
+      (when cfengine-mode-debug
+        (message "%S" parse))
+
       (cond
-       ;; body/bundle blocks start at 0
+       ;; Body/bundle blocks start at 0.
        ((looking-at (concat cfengine3-defuns-regex "\\>"))
         (indent-line-to 0))
-       ;; categories are indented one step
+       ;; Categories are indented one step.
        ((looking-at (concat cfengine3-category-regex "[ \t]*$"))
         (indent-line-to cfengine-indent))
-       ;; class selectors are indented two steps
+       ;; Class selectors are indented two steps.
        ((looking-at (concat cfengine3-class-selector-regex "[ \t]*$"))
         (indent-line-to (* 2 cfengine-indent)))
        ;; Outdent leading close brackets one step.
@@ -303,11 +319,17 @@ Intended as the value of `indent-line-function'."
                               (backward-sexp)
                               (current-column)))
           (error nil)))
-       ;; inside a string and it starts before this line
+       ;; Inside a string and it starts before this line.
        ((and (nth 3 parse)
              (< (nth 8 parse) (save-excursion (beginning-of-line) (point))))
         (indent-line-to 0))
-       ;; inside a defun, but not a nested list (depth is 1)
+
+       ;; Inside a defun, but not a nested list (depth is 1).  This is
+       ;; a promise, usually.
+
+       ;; Indent to cfengine-indent times the nested depth
+       ;; plus 2.  That way, promises indent deeper than class
+       ;; selectors, which in turn are one deeper than categories.
        ((= 1 (nth 0 parse))
         (indent-line-to (* (+ 2 (nth 0 parse)) cfengine-indent)))
        ;; Inside brackets/parens: indent to start column of non-comment
@@ -411,18 +433,18 @@ Intended as the value of `indent-line-function'."
   (set (make-local-variable 'parse-sexp-ignore-comments) t))
 
 (defun cfengine-common-syntax (table)
-  ;; the syntax defaults seem OK to give reasonable word movement
+  ;; The syntax defaults seem OK to give reasonable word movement.
   (modify-syntax-entry ?# "<" table)
   (modify-syntax-entry ?\n ">#" table)
   (modify-syntax-entry ?\" "\"" table)
-  ;; variable substitution:
+  ;; Variable substitution.
   (modify-syntax-entry ?$ "." table)
-  ;; Doze path separators:
+  ;; Doze path separators.
   (modify-syntax-entry ?\\ "." table))
 
 ;;;###autoload
-(define-derived-mode cfengine3-mode prog-mode "CFEngine3"
-  "Major mode for editing cfengine input.
+(define-derived-mode cfengine3-mode prog-mode "CFE3"
+  "Major mode for editing CFEngine3 input.
 There are no special keybindings by default.
 
 Action blocks are treated as defuns, i.e. \\[beginning-of-defun] moves
@@ -434,46 +456,46 @@ to the action header."
   (setq font-lock-defaults
         '(cfengine3-font-lock-keywords nil nil nil beginning-of-defun))
 
-  ;; use defuns as the essential syntax block
+  ;; Use defuns as the essential syntax block.
   (set (make-local-variable 'beginning-of-defun-function)
        #'cfengine3-beginning-of-defun)
   (set (make-local-variable 'end-of-defun-function)
        #'cfengine3-end-of-defun))
 
 ;;;###autoload
-(define-derived-mode cfengine-mode prog-mode "Cfengine"
-  "Major mode for editing cfengine input.
+(define-derived-mode cfengine2-mode prog-mode "CFE2"
+  "Major mode for editing CFEngine2 input.
 There are no special keybindings by default.
 
 Action blocks are treated as defuns, i.e. \\[beginning-of-defun] moves
 to the action header."
   (cfengine-common-settings)
-  (cfengine-common-syntax cfengine-mode-syntax-table)
+  (cfengine-common-syntax cfengine2-mode-syntax-table)
 
   ;; Shell commands can be quoted by single, double or back quotes.
   ;; It's debatable whether we should define string syntax, but it
   ;; should avoid potential confusion in some cases.
-  (modify-syntax-entry ?\' "\"" cfengine-mode-syntax-table)
-  (modify-syntax-entry ?\` "\"" cfengine-mode-syntax-table)
+  (modify-syntax-entry ?\' "\"" cfengine2-mode-syntax-table)
+  (modify-syntax-entry ?\` "\"" cfengine2-mode-syntax-table)
 
-  (set (make-local-variable 'indent-line-function) #'cfengine-indent-line)
+  (set (make-local-variable 'indent-line-function) #'cfengine2-indent-line)
   (set (make-local-variable 'outline-regexp) "[ \t]*\\(\\sw\\|\\s_\\)+:+")
-  (set (make-local-variable 'outline-level) #'cfengine-outline-level)
+  (set (make-local-variable 'outline-level) #'cfengine2-outline-level)
   (set (make-local-variable 'fill-paragraph-function)
        #'cfengine-fill-paragraph)
-  (define-abbrev-table 'cfengine-mode-abbrev-table cfengine-mode-abbrevs)
+  (define-abbrev-table 'cfengine2-mode-abbrev-table cfengine-mode-abbrevs)
   (setq font-lock-defaults
-        '(cfengine-font-lock-keywords nil nil nil beginning-of-line))
+        '(cfengine2-font-lock-keywords nil nil nil beginning-of-line))
   ;; Fixme: set the args of functions in evaluated classes to string
   ;; syntax, and then obey syntax properties.
-  (setq imenu-generic-expression cfengine-imenu-expression)
+  (setq imenu-generic-expression cfengine2-imenu-expression)
   (set (make-local-variable 'beginning-of-defun-function)
-       #'cfengine-beginning-of-defun)
-  (set (make-local-variable 'end-of-defun-function) #'cfengine-end-of-defun))
+       #'cfengine2-beginning-of-defun)
+  (set (make-local-variable 'end-of-defun-function) #'cfengine2-end-of-defun))
 
 ;;;###autoload
 (defun cfengine-auto-mode ()
-  "Choose between `cfengine-mode' and `cfengine3-mode' depending
+  "Choose between `cfengine2-mode' and `cfengine3-mode' depending
 on the buffer contents"
   (let ((v3 nil))
     (save-restriction
@@ -481,7 +503,9 @@ on the buffer contents"
       (while (not (or (eobp) v3))
         (setq v3 (looking-at (concat cfengine3-defuns-regex "\\>")))
         (forward-line)))
-    (if v3 (cfengine3-mode) (cfengine-mode))))
+    (if v3 (cfengine3-mode) (cfengine2-mode))))
+
+(defalias 'cfengine-mode 'cfengine-auto-mode)
 
 (provide 'cfengine3)
 (provide 'cfengine)
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 13fa310106c..86284eaa30a 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -958,7 +958,7 @@ B) Speed of editing operations.
   `cperl-array-face'                    Array names
   `cperl-hash-face'                     Hash names
   `font-lock-comment-face'      Comments, PODs and whatever is considered
-                                syntaxically to be not code
+                                syntactically to be not code
   `font-lock-constant-face'     HERE-doc delimiters, labels, delimiters of
                                 2-arg operators s/y/tr/ or of RExen,
   `font-lock-warning-face'      Special-cased m// and s//foo/,
@@ -970,7 +970,7 @@ B) Speed of editing operations.
   `cperl-nonoverridable-face'   Non-overridable keywords, modifiers of RExen
   `font-lock-string-face'       Strings, qw() constructs, RExen, POD sections,
                                 literal parts and the terminator of formats
-                                and whatever is syntaxically considered
+                                and whatever is syntactically considered
                                 as string literals
   `font-lock-type-face'         Overridable keywords
   `font-lock-variable-name-face' Variable declarations, indirect array and
@@ -1537,8 +1537,8 @@ default.)  You can always quote (with \\[quoted-insert]) the left
 since most the time you mean \"less\".  CPerl mode tries to guess
 whether you want to type pair <>, and inserts is if it
 appropriate.  You can set `cperl-electric-parens-string' to the string that
-contains the parenths from the above list you want to be electrical.
-Electricity of parenths is controlled by `cperl-electric-parens'.
+contains the parens from the above list you want to be electrical.
+Electricity of parens is controlled by `cperl-electric-parens'.
 You may also set `cperl-electric-parens-mark' to have electric parens
 look for active mark and \"embrace\" a region if possible.'
 
@@ -3517,7 +3517,7 @@ Works before syntax recognition is done."
 (defvar font-lock-warning-face)
 
 (defun cperl-find-sub-attrs (&optional st-l b-fname e-fname pos)
-  "Syntaxically mark (and fontify) attributes of a subroutine.
+  "Syntactically mark (and fontify) attributes of a subroutine.
 Should be called with the point before leading colon of an attribute."
   ;; Works *before* syntax recognition is done
   (or st-l (setq st-l (list nil)))      ; Avoid overwriting '()
@@ -4994,7 +4994,7 @@ conditional/loop constructs."
           (setq top (point))
           ;; Plan A: if line has an unfinished paren-group, go to end-of-group
           (while (= -1 (nth 0 (parse-partial-sexp (point) tmp-end -1)))
-            (setq top (point)))         ; Get the outermost parenths in line
+            (setq top (point)))         ; Get the outermost parens in line
           (goto-char top)
           (while (< (point) tmp-end)
             (parse-partial-sexp (point) tmp-end nil t) ; To start-sexp or eol
@@ -5906,7 +5906,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
                        3 font-lock-variable-name-face)))
             '("\\<for\\(each\\)?\\([ \t]+\\(my\\|local\\|our\\)\\)?[ \t]*\\(\\$[a-zA-Z_][a-zA-Z_0-9]*\\)[ \t]*("
               4 font-lock-variable-name-face)
-            ;; Avoid $!, and s!!, qq!! etc. when not fontifying syntaxically
+            ;; Avoid $!, and s!!, qq!! etc. when not fontifying syntactically
             '("\\(?:^\\|[^smywqrx$]\\)\\(!\\)" 1 font-lock-negation-char-face)
             '("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend)))
           (setq
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index d855861d552..eeb145e2b1a 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -708,7 +708,7 @@ Returns point of the found command line or nil if not able to move."
             (setq done t)               ; not a label-only line, exit the loop
             (setq retval (point))))
         ;; We couldn't go further back, and we haven't found a command yet.
-        ;; Return to the start positionn
+        ;; Return to the start position.
         (goto-char start)
         (setq done t)
         (setq retval nil)))
@@ -756,7 +756,7 @@ Returns point of the found command line or nil if not able to move."
               (setq done t)             ; not a label-only line, exit the loop
               (setq retval (point)))))
         ;; We couldn't go further back, and we haven't found a command yet.
-        ;; Return to the start positionn
+        ;; Return to the start position.
         (goto-char start)
         (setq done t)
         (setq retval nil)))
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index d9adff6c8b8..240deb39ce3 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -3260,7 +3260,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
 
 % --- Corners
 
-%>corner Right Descendent: height arrow corner_RD
+%>corner Right Descendant: height arrow corner_RD
 %   _             | arrow
 %  /   height > 0 |  0 - none
 % |               |  1 - right
@@ -3299,7 +3299,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
  Gstroke
 }def
 
-%>corner Right Ascendent: height arrow corner_RA
+%>corner Right Ascendant: height arrow corner_RA
 %                 | arrow
 %    | height > 0 |  0 - none
 %   /             |  1 - right
@@ -3338,7 +3338,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
  Gstroke
 }def
 
-%>corner Left Descendent: height arrow corner_LD
+%>corner Left Descendant: height arrow corner_LD
 %  _              | arrow
 %   \\  height > 0 |  0 - none
 %    |            |  1 - right
@@ -3377,7 +3377,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
  Gstroke
 }def
 
-%>corner Left Ascendent: height arrow corner_LA
+%>corner Left Ascendant: height arrow corner_LA
 %                 | arrow
 % |    height > 0 |  0 - none
 %  \\              |  1 - right
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index ab40dff24f1..1c38c59bba6 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -811,6 +811,9 @@ detailed description of this mode.
   (define-key gud-minor-mode-map [left-margin C-mouse-3]
     'gdb-mouse-jump)
 
+  (set (make-local-variable 'gud-gdb-completion-function)
+       'gud-gdbmi-completions)
+
   (add-hook 'completion-at-point-functions #'gud-gdb-completion-at-point
             nil 'local)
   (local-set-key "\C-i" 'completion-at-point)
@@ -859,31 +862,28 @@ detailed description of this mode.
   (set-process-filter (get-process "gdb-inferior") 'gdb-inferior-filter)
   (gdb-input
    ;; Needs GDB 6.4 onwards
-   (list (concat "-inferior-tty-set "
-                 (or
-                  ;; The process can run on a remote host.
-                  (process-get (get-process "gdb-inferior") 'remote-tty)
-                  (process-tty-name (get-process "gdb-inferior"))))
-         'ignore))
+   (concat "-inferior-tty-set "
+           (or
+            ;; The process can run on a remote host.
+            (process-get (get-process "gdb-inferior") 'remote-tty)
+            (process-tty-name (get-process "gdb-inferior"))))
+   'ignore)
   (if (eq window-system 'w32)
-      (gdb-input (list "-gdb-set new-console off" 'ignore)))
-  (gdb-input (list "-gdb-set height 0" 'ignore))
+      (gdb-input "-gdb-set new-console off" 'ignore))
+  (gdb-input "-gdb-set height 0" 'ignore)
 
   (when gdb-non-stop
-    (gdb-input (list "-gdb-set non-stop 1" 'gdb-non-stop-handler)))
+    (gdb-input "-gdb-set non-stop 1" 'gdb-non-stop-handler))
 
-  (gdb-input (list "-enable-pretty-printing" 'ignore))
+  (gdb-input "-enable-pretty-printing" 'ignore)
 
   ;; find source file and compilation directory here
   (if gdb-create-source-file-list
-      (gdb-input
-                                        ; Needs GDB 6.2 onwards.
-       (list "-file-list-exec-source-files" 'gdb-get-source-file-list)))
-  (gdb-input
-                                        ; Needs GDB 6.0 onwards.
-   (list "-file-list-exec-source-file" 'gdb-get-source-file))
-  (gdb-input
-   (list "-gdb-show prompt" 'gdb-get-prompt)))
+      ;; Needs GDB 6.2 onwards.
+      (gdb-input "-file-list-exec-source-files" 'gdb-get-source-file-list))
+  ;; Needs GDB 6.0 onwards.
+  (gdb-input "-file-list-exec-source-file" 'gdb-get-source-file)
+  (gdb-input "-gdb-show prompt" 'gdb-get-prompt))
 
 (defun gdb-non-stop-handler ()
   (goto-char (point-min))
@@ -894,8 +894,8 @@ detailed description of this mode.
         (setq gdb-non-stop nil)
         (setq gdb-supports-non-stop nil))
     (setq gdb-supports-non-stop t)
-    (gdb-input (list "-gdb-set target-async 1" 'ignore))
-    (gdb-input (list "-list-target-features" 'gdb-check-target-async))))
+    (gdb-input "-gdb-set target-async 1" 'ignore)
+    (gdb-input "-list-target-features" 'gdb-check-target-async)))
 
 (defun gdb-check-target-async ()
   (goto-char (point-min))
@@ -903,7 +903,7 @@ detailed description of this mode.
     (message
      "Target doesn't support non-stop mode.  Turning it off.")
     (setq gdb-non-stop nil)
-    (gdb-input (list "-gdb-set non-stop 0" 'ignore))))
+    (gdb-input "-gdb-set non-stop 0" 'ignore)))
 
 (defvar gdb-define-alist nil "Alist of #define directives for GUD tooltips.")
 
@@ -948,9 +948,8 @@ detailed description of this mode.
     (goto-char (point-min))
     (if (search-forward "expands to: " nil t)
         (unless (looking-at "\\S-+.*(.*).*")
-          (gdb-input
-           (list  (concat "-data-evaluate-expression " expr)
-                  `(lambda () (gdb-tooltip-print ,expr))))))))
+          (gdb-input (concat "-data-evaluate-expression " expr)
+                     `(lambda () (gdb-tooltip-print ,expr)))))))
 
 (defun gdb-init-buffer ()
   (set (make-local-variable 'gud-minor-mode) 'gdbmi)
@@ -1080,9 +1079,8 @@ With arg, enter name of variable to be watched in the minibuffer."
                        (concat (if (derived-mode-p 'gdb-registers-mode) "$")
                                (tooltip-identifier-from-point (point)))))))
               (set-text-properties 0 (length expr) nil expr)
-              (gdb-input
-               (list (concat "-var-create - * "  expr "")
-                     `(lambda () (gdb-var-create-handler ,expr)))))))
+              (gdb-input (concat "-var-create - * "  expr "")
+                         `(lambda () (gdb-var-create-handler ,expr))))))
       (message "gud-watch is a no-op in this mode."))))
 
 (defun gdb-var-create-handler (expr)
@@ -1111,7 +1109,7 @@ With arg, enter name of variable to be watched in the minibuffer."
   (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame)
              (not (gdb-pending-p 'gdb-speedbar-timer)))
     ;; Dummy command to update speedbar even when idle.
-    (gdb-input (list "-environment-pwd" 'gdb-speedbar-timer-fn))
+    (gdb-input "-environment-pwd" 'gdb-speedbar-timer-fn)
     ;; Keep gdb-pending-triggers non-nil till end.
     (gdb-add-pending 'gdb-speedbar-timer)))
 
@@ -1132,12 +1130,9 @@ With arg, enter name of variable to be watched in the minibuffer."
 
                                         ; Uses "-var-list-children --all-values".  Needs GDB 6.1 onwards.
 (defun gdb-var-list-children (varnum)
-  (gdb-input
-   (list (concat "-var-update " varnum) 'ignore))
-  (gdb-input
-   (list (concat "-var-list-children --all-values "
-                 varnum)
-         `(lambda () (gdb-var-list-children-handler ,varnum)))))
+  (gdb-input (concat "-var-update " varnum) 'ignore)
+  (gdb-input (concat "-var-list-children --all-values " varnum)
+             `(lambda () (gdb-var-list-children-handler ,varnum))))
 
 (defun gdb-var-list-children-handler (varnum)
   (let* ((var-list nil)
@@ -1169,13 +1164,11 @@ With arg, enter name of variable to be watched in the minibuffer."
   "Set the output format for a variable displayed in the speedbar."
   (let* ((var (nth (- (count-lines (point-min) (point)) 2) gdb-var-list))
          (varnum (car var)))
-    (gdb-input
-     (list (concat "-var-set-format " varnum " " format) 'ignore))
+    (gdb-input (concat "-var-set-format " varnum " " format) 'ignore)
     (gdb-var-update)))
 
 (defun gdb-var-delete-1 (var varnum)
-  (gdb-input
-   (list (concat "-var-delete " varnum) 'ignore))
+  (gdb-input (concat "-var-delete " varnum) 'ignore)
   (setq gdb-var-list (delq var gdb-var-list))
   (dolist (varchild gdb-var-list)
     (if (string-match (concat (car var) "\\.") (car varchild))
@@ -1194,17 +1187,15 @@ With arg, enter name of variable to be watched in the minibuffer."
 
 (defun gdb-var-delete-children (varnum)
   "Delete children of variable object at point from the speedbar."
-  (gdb-input
-   (list (concat "-var-delete -c " varnum) 'ignore)))
+  (gdb-input (concat "-var-delete -c " varnum) 'ignore))
 
 (defun gdb-edit-value (_text _token _indent)
   "Assign a value to a variable displayed in the speedbar."
   (let* ((var (nth (- (count-lines (point-min) (point)) 2) gdb-var-list))
          (varnum (car var)) (value))
     (setq value (read-string "New value: "))
-    (gdb-input
-     (list (concat "-var-assign " varnum " " value)
-           `(lambda () (gdb-edit-value-handler ,value))))))
+    (gdb-input (concat "-var-assign " varnum " " value)
+               `(lambda () (gdb-edit-value-handler ,value)))))
 
 (defconst gdb-error-regexp "\\^error,msg=\\(\".+\"\\)")
 
@@ -1216,8 +1207,7 @@ With arg, enter name of variable to be watched in the minibuffer."
                                         ; Uses "-var-update --all-values".  Needs GDB 6.4 onwards.
 (defun gdb-var-update ()
   (if (not (gdb-pending-p 'gdb-var-update))
-      (gdb-input
-       (list "-var-update --all-values *" 'gdb-var-update-handler)))
+      (gdb-input "-var-update --all-values *" 'gdb-var-update-handler))
   (gdb-add-pending 'gdb-var-update))
 
 (defun gdb-var-update-handler ()
@@ -1697,13 +1687,17 @@ static char *magick[] = {
                                         gdb-continuation string "\"\n"))
       (setq gdb-continuation nil))))
 
-(defun gdb-input (item)
-  (if gdb-enable-debug (push (cons 'send-item item) gdb-debug-log))
+(defun gdb-input (command handler-function)
+  "Send COMMAND to GDB via the MI interface.
+Run the function HANDLER-FUNCTION, with no arguments, once the command is
+complete."
+  (if gdb-enable-debug (push (list 'send-item command handler-function)
+                             gdb-debug-log))
   (setq gdb-token-number (1+ gdb-token-number))
-  (setcar item (concat (number-to-string gdb-token-number) (car item)))
-  (push (cons gdb-token-number (car (cdr item))) gdb-handler-alist)
+  (setq command (concat (number-to-string gdb-token-number) command))
+  (push (cons gdb-token-number handler-function) gdb-handler-alist)
   (process-send-string (get-buffer-process gud-comint-buffer)
-                       (concat (car item) "\n")))
+                       (concat command "\n")))
 
 ;; NOFRAME is used for gud execution control commands
 (defun gdb-current-context-command (command)
@@ -1890,15 +1884,16 @@ is running."
       (let ((record-type (cadr output-record))
             (arg1 (nth 2 output-record))
             (arg2 (nth 3 output-record)))
-        (if (eq record-type 'gdb-error)
-            (gdb-done-or-error arg2 arg1 'error)
-          (if (eq record-type 'gdb-done)
-              (gdb-done-or-error arg2 arg1 'done)
-            ;; Suppress "No registers." since GDB 6.8 and earlier duplicates MI
-            ;; error message on internal stream.  Don't print to GUD buffer.
-            (unless (and (eq record-type 'gdb-internals)
-                         (string-equal (read arg1) "No registers.\n"))
-              (funcall record-type arg1))))))
+        (cond ((eq record-type 'gdb-error)
+               (gdb-done-or-error arg2 arg1 'error))
+              ((eq record-type 'gdb-done)
+               (gdb-done-or-error arg2 arg1 'done))
+              ;; Suppress "No registers."  GDB 6.8 and earlier
+              ;; duplicates MI error message on internal stream.
+              ;; Don't print to GUD buffer.
+              ((not (and (eq record-type 'gdb-internals)
+                         (string-equal (read arg1) "No registers.\n")))
+               (funcall record-type arg1)))))
 
     (setq gdb-output-sink 'user)
     ;; Remove padding.
@@ -1991,11 +1986,10 @@ current thread and update GDB buffers."
     ;; -data-list-register-names needs to be issued for any stopped
     ;; thread
     (when (not gdb-register-names)
-      (gdb-input
-       (list (concat "-data-list-register-names"
-                     (if gdb-supports-non-stop
-                         (concat " --thread " thread-id)))
-             'gdb-register-names-handler)))
+      (gdb-input (concat "-data-list-register-names"
+                         (if gdb-supports-non-stop
+                             (concat " --thread " thread-id)))
+                 'gdb-register-names-handler))
 
 ;;; Don't set gud-last-frame here as it's currently done in gdb-frame-handler
 ;;; because synchronous GDB doesn't give these fields with CLI.
@@ -2062,9 +2056,7 @@ current thread and update GDB buffers."
 ;; (frontend MI commands should not print to this stream)
 (defun gdb-console (output-field)
   (setq gdb-filter-output
-        (gdb-concat-output
-         gdb-filter-output
-         (read output-field))))
+        (gdb-concat-output gdb-filter-output (read output-field))))
 
 (defun gdb-done-or-error (output-field token-number type)
   (if (string-equal token-number "")
@@ -2102,12 +2094,11 @@ current thread and update GDB buffers."
               (assq-delete-all token-number gdb-handler-alist)))))
 
 (defun gdb-concat-output (so-far new)
-  (let ((sink gdb-output-sink))
-    (cond
-     ((eq sink 'user) (concat so-far new))
-     ((eq sink 'emacs)
-      (gdb-append-to-partial-output new)
-      so-far))))
+  (cond
+   ((eq gdb-output-sink 'user) (concat so-far new))
+   ((eq gdb-output-sink 'emacs)
+    (gdb-append-to-partial-output new)
+    so-far)))
 
 (defun gdb-append-to-partial-output (string)
   (with-current-buffer (gdb-get-buffer-create 'gdb-partial-output-buffer)
@@ -2317,9 +2308,8 @@ trigger argument when describing buffer types with
              (memq signal ,signal-list))
        (when (not (gdb-pending-p
                    (cons (current-buffer) ',trigger-name)))
-         (gdb-input
-          (list ,gdb-command
-                (gdb-bind-function-to-buffer ',handler-name (current-buffer))))
+         (gdb-input ,gdb-command
+                    (gdb-bind-function-to-buffer ',handler-name (current-buffer)))
          (gdb-add-pending (cons (current-buffer) ',trigger-name))))))
 
 ;; Used by disassembly buffer only, the rest use
@@ -2446,13 +2436,10 @@ HANDLER-NAME handler uses customization of CUSTOM-DEFUN. See
                 ;; Only want one breakpoint icon at each location.
                 (gdb-put-breakpoint-icon (string-equal flag "y") bptno
                                          (string-to-number line)))
-            (gdb-input
-             (list (concat "list " file ":1")
-                   'ignore))
-            (gdb-input
-             (list "-file-list-exec-source-file"
-                   `(lambda () (gdb-get-location
-                           ,bptno ,line ,flag))))))))))
+            (gdb-input (concat "list " file ":1") 'ignore)
+            (gdb-input "-file-list-exec-source-file"
+                       `(lambda () (gdb-get-location
+                                    ,bptno ,line ,flag)))))))))
 
 (defvar gdb-source-file-regexp "fullname=\"\\(.*?\\)\"")
 
@@ -2782,7 +2769,7 @@ on the current line."
 (def-gdb-thread-buffer-command gdb-select-thread
   (let ((new-id (bindat-get-field thread 'id)))
     (gdb-setq-thread-number new-id)
-    (gdb-input (list (concat "-thread-select " new-id) 'ignore))
+    (gdb-input (concat "-thread-select " new-id) 'ignore)
     (gdb-update))
   "Select the thread at current line of threads buffer.")
 
@@ -3538,8 +3525,8 @@ member."
         (if (gdb-buffer-shows-main-thread-p)
             (let ((new-level (bindat-get-field frame 'level)))
               (setq gdb-frame-number new-level)
-              (gdb-input (list (concat "-stack-select-frame " new-level)
-                               'ignore))
+              (gdb-input (concat "-stack-select-frame " new-level)
+                         'ignore)
               (gdb-update))
           (error "Could not select frame for non-current thread"))
       (error "Not recognized as frame line"))))
@@ -3767,14 +3754,11 @@ member."
 
 ;; Needs GDB 6.4 onwards (used to fail with no stack).
 (defun gdb-get-changed-registers ()
-  (if (and (gdb-get-buffer 'gdb-registers-buffer)
-           (not (gdb-pending-p 'gdb-get-changed-registers)))
-      (progn
-        (gdb-input
-         (list
-          "-data-list-changed-registers"
-          'gdb-changed-registers-handler))
-        (gdb-add-pending 'gdb-get-changed-registers))))
+  (when (and (gdb-get-buffer 'gdb-registers-buffer)
+             (not (gdb-pending-p 'gdb-get-changed-registers)))
+    (gdb-input "-data-list-changed-registers"
+               'gdb-changed-registers-handler)
+    (gdb-add-pending 'gdb-get-changed-registers)))
 
 (defun gdb-changed-registers-handler ()
   (gdb-delete-pending 'gdb-get-changed-registers)
@@ -3803,18 +3787,15 @@ is set in them."
   (dolist (buffer (buffer-list))
     (with-current-buffer buffer
       (when (member buffer-file-name gdb-source-file-list)
-        (gdb-init-buffer))))
-  (gdb-force-mode-line-update
-   (propertize "ready" 'face font-lock-variable-name-face)))
+        (gdb-init-buffer)))))
 
 (defun gdb-get-main-selected-frame ()
   "Trigger for `gdb-frame-handler' which uses main current
 thread. Called from `gdb-update'."
   (if (not (gdb-pending-p 'gdb-get-main-selected-frame))
       (progn
-        (gdb-input
-         (list (gdb-current-context-command "-stack-info-frame")
-               'gdb-frame-handler))
+        (gdb-input (gdb-current-context-command "-stack-info-frame")
+                   'gdb-frame-handler)
         (gdb-add-pending 'gdb-get-main-selected-frame))))
 
 (defun gdb-frame-handler ()
@@ -3862,7 +3843,7 @@ overlay arrow in source buffer."
 If BUF is already displayed in some window, show it, deiconifying
 the frame if necessary. Otherwise, find least recently used
 window and show BUF there, if the window is not used for GDB
-already, in which case that window is splitted first."
+already, in which case that window is split first."
   (let ((answer (get-buffer-window buf (or frame 0))))
     (if answer
         (display-buffer buf nil (or frame 0)) ;Deiconify frame if necessary.
@@ -4145,7 +4126,9 @@ buffers, if required."
     (gdb-get-buffer-create 'gdb-breakpoints-buffer)
     (if (and gdb-show-main gdb-main-file)
         (let ((pop-up-windows t))
-          (display-buffer (gud-find-file gdb-main-file))))))
+          (display-buffer (gud-find-file gdb-main-file)))))
+  (gdb-force-mode-line-update
+   (propertize "ready" 'face font-lock-variable-name-face)))
 
 ;;from put-image
 (defun gdb-put-string (putstring pos &optional dprop &rest sprops)
@@ -4256,6 +4239,42 @@ BUFFER nil or omitted means use the current buffer."
           (set-window-margins
            window left-margin-width right-margin-width)))))
 
+
+;;; Functions for inline completion.
+
+(defvar gud-gdb-fetch-lines-in-progress)
+(defvar gud-gdb-fetch-lines-string)
+(defvar gud-gdb-fetch-lines-break)
+(defvar gud-gdb-fetched-lines)
+
+(defun gud-gdbmi-completions (context command)
+  "Completion table for GDB/MI commands.
+COMMAND is the prefix for which we seek completion.
+CONTEXT is the text before COMMAND on the line."
+  (let ((gud-gdb-fetch-lines-in-progress t)
+        (gud-gdb-fetch-lines-string nil)
+        (gud-gdb-fetch-lines-break (length context))
+        (gud-gdb-fetched-lines nil)
+        ;; This filter dumps output lines to `gud-gdb-fetched-lines'.
+        (gud-marker-filter #'gud-gdbmi-fetch-lines-filter)
+        complete-list)
+    (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer)
+      (gdb-input (concat "complete " context command)
+                 (lambda () (setq gud-gdb-fetch-lines-in-progress nil)))
+      (while gud-gdb-fetch-lines-in-progress
+        (accept-process-output (get-buffer-process gud-comint-buffer))))
+    (gud-gdb-completions-1 gud-gdb-fetched-lines)))
+
+(defun gud-gdbmi-fetch-lines-filter (string)
+  "Custom filter function for `gud-gdbmi-completions'."
+  (setq string (concat gud-gdb-fetch-lines-string
+                       (gud-gdbmi-marker-filter string)))
+  (while (string-match "\n" string)
+    (push (substring string gud-gdb-fetch-lines-break (match-beginning 0))
+          gud-gdb-fetched-lines)
+    (setq string (substring string (match-end 0))))
+  "")
+
 (provide 'gdb-mi)
 
 ;;; gdb-mi.el ends here
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 75d71d2d8a9..38b17a9b1ee 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -108,7 +108,7 @@ To change the default value, use Customize or call the function
 
 Setting it causes the grep commands to put point at the end of their
 output window so that the end of the output is always visible rather
-than the begining."
+than the beginning."
   :type 'boolean
   :version "22.1"
   :group 'grep)
@@ -959,7 +959,10 @@ can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-err
 in the grep output buffer,
 to go to the lines where grep found matches.
 
-This command shares argument histories with \\[lgrep] and \\[grep-find]."
+This command shares argument histories with \\[lgrep] and \\[grep-find].
+
+When called programmatically and FILES is nil, REGEXP is expected
+to specify a command to run."
   (interactive
    (progn
      (grep-compute-defaults)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 406db76487d..7215ac4ea73 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -756,6 +756,8 @@ directory and source-file directory for your debugger."
 
   (add-hook 'completion-at-point-functions #'gud-gdb-completion-at-point
             nil 'local)
+  (set (make-local-variable 'gud-gdb-completion-function) 'gud-gdb-completions)
+
   (local-set-key "\C-i" 'completion-at-point)
   (setq comint-prompt-regexp "^(.*gdb[+]?) *")
   (setq paragraph-start comint-prompt-regexp)
@@ -768,6 +770,12 @@ directory and source-file directory for your debugger."
 ;; context-sensitive command completion.  We preserve that feature
 ;; in the GUD buffer by using a GDB command designed just for Emacs.
 
+(defvar gud-gdb-completion-function nil
+  "Completion function for GDB commands.
+It receives two arguments: COMMAND, the prefix for which we seek
+completion; and CONTEXT, the text before COMMAND on the line.
+It should return a list of completion strings.")
+
 ;; The completion process filter indicates when it is finished.
 (defvar gud-gdb-fetch-lines-in-progress)
 
@@ -806,28 +814,32 @@ CONTEXT is the text before COMMAND on the line."
     (and complete-list
          (string-match "^Undefined command: \"complete\"" (car complete-list))
          (error "This version of GDB doesn't support the `complete' command"))
-    ;; Sort the list like readline.
-    (setq complete-list (sort complete-list (function string-lessp)))
-    ;; Remove duplicates.
-    (let ((first complete-list)
-          (second (cdr complete-list)))
-      (while second
-        (if (string-equal (car first) (car second))
-            (setcdr first (setq second (cdr second)))
-          (setq first second
-                second (cdr second)))))
-    ;; Add a trailing single quote if there is a unique completion
-    ;; and it contains an odd number of unquoted single quotes.
-    (and (= (length complete-list) 1)
-         (let ((str (car complete-list))
-               (pos 0)
-               (count 0))
-           (while (string-match "\\([^'\\]\\|\\\\'\\)*'" str pos)
-             (setq count (1+ count)
-                   pos (match-end 0)))
-           (and (= (mod count 2) 1)
-                (setq complete-list (list (concat str "'"))))))
-    complete-list))
+    (gud-gdb-completions-1 complete-list)))
+
+;; This function is also used by `gud-gdbmi-completions'.
+(defun gud-gdb-completions-1 (complete-list)
+  ;; Sort the list like readline.
+  (setq complete-list (sort complete-list (function string-lessp)))
+  ;; Remove duplicates.
+  (let ((first complete-list)
+        (second (cdr complete-list)))
+    (while second
+      (if (string-equal (car first) (car second))
+          (setcdr first (setq second (cdr second)))
+        (setq first second
+              second (cdr second)))))
+  ;; Add a trailing single quote if there is a unique completion
+  ;; and it contains an odd number of unquoted single quotes.
+  (and (= (length complete-list) 1)
+       (let ((str (car complete-list))
+             (pos 0)
+             (count 0))
+         (while (string-match "\\([^'\\]\\|\\\\'\\)*'" str pos)
+           (setq count (1+ count)
+                 pos (match-end 0)))
+         (and (= (mod count 2) 1)
+              (setq complete-list (list (concat str "'"))))))
+  complete-list)
 
 (defun gud-gdb-completion-at-point ()
   "Return the data to complete the GDB command before point."
@@ -838,7 +850,7 @@ CONTEXT is the text before COMMAND on the line."
            (point))))
     (list start end
           (completion-table-dynamic
-           (apply-partially #'gud-gdb-completions
+           (apply-partially gud-gdb-completion-function
                             (buffer-substring (comint-line-beginning-position)
                                               start))))))
 
@@ -851,11 +863,11 @@ CONTEXT is the text before COMMAND on the line."
 
 ;; The completion process filter is installed temporarily to slurp the
 ;; output of GDB up to the next prompt and build the completion list.
-(defun gud-gdb-fetch-lines-filter (string filter)
+(defun gud-gdb-fetch-lines-filter (string)
   "Filter used to read the list of lines output by a command.
 STRING is the output to filter.
-It is passed through FILTER before we look at it."
-  (setq string (funcall filter string))
+It is passed through `gud-gdb-marker-filter' before we look at it."
+  (setq string (gud-gdb-marker-filter string))
   (setq string (concat gud-gdb-fetch-lines-string string))
   (while (string-match "\n" string)
     (push (substring string gud-gdb-fetch-lines-break (match-beginning 0))
@@ -880,17 +892,6 @@ It is passed through FILTER before we look at it."
 (defvar gud-gdb-fetched-stack-frame nil
   "Stack frames we are fetching from GDB.")
 
-;(defun gud-gdb-get-scope-data (text token indent)
-;  ;; checkdoc-params: (indent)
-;  "Fetch data associated with a stack frame, and expand/contract it.
-;Data to do this is retrieved from TEXT and TOKEN."
-;  (let ((args nil) (scope nil))
-;    (gud-gdb-run-command-fetch-lines "info args")
-;
-;    (gud-gdb-run-command-fetch-lines "info local")
-;
-;    ))
-
 (defun gud-gdb-get-stackframe (buffer)
   "Extract the current stack frame out of the GUD GDB BUFFER."
   (let ((newlst nil)
@@ -934,21 +935,16 @@ It is passed through FILTER before we look at it."
 BUFFER is the current buffer which may be the GUD buffer in which to run.
 SKIP is the number of chars to skip on each line, it defaults to 0."
   (with-current-buffer gud-comint-buffer
-    (if (and (eq gud-comint-buffer buffer)
-             (save-excursion
-               (goto-char (point-max))
-               (forward-line 0)
-               (not (looking-at comint-prompt-regexp))))
-        nil
-      ;; Much of this copied from GDB complete, but I'm grabbing the stack
-      ;; frame instead.
+    (unless (and (eq gud-comint-buffer buffer)
+                 (save-excursion
+                   (goto-char (point-max))
+                   (forward-line 0)
+                   (not (looking-at comint-prompt-regexp))))
       (let ((gud-gdb-fetch-lines-in-progress t)
             (gud-gdb-fetched-lines nil)
             (gud-gdb-fetch-lines-string nil)
             (gud-gdb-fetch-lines-break (or skip 0))
-            (gud-marker-filter
-             `(lambda (string)
-                (gud-gdb-fetch-lines-filter string ',gud-marker-filter))))
+            (gud-marker-filter #'gud-gdb-fetch-lines-filter))
         ;; Issue the command to GDB.
         (gud-basic-call command)
         ;; Slurp the output.
@@ -1919,7 +1915,7 @@ extension EXTN.  Normally EXTN is given as the regular expression
 ;; in petticoat junction.
 (defun gud-jdb-skip-block ()
 
-  ;; Find the begining of the block.
+  ;; Find the beginning of the block.
   (while
       (not (eq (following-char) ?{))
 
@@ -1936,7 +1932,7 @@ extension EXTN.  Normally EXTN is given as the regular expression
       (gud-jdb-skip-character-literal))
      (t (forward-char))))
 
-  ;; Now at the begining of the block.
+  ;; Now at the beginning of the block.
   (forward-char)
 
   ;; Skip over the body of the block as well as the final brace.
@@ -3422,7 +3418,7 @@ With arg, dereference expr if ARG is positive, otherwise do not dereference."
         ((xdb pdb) (concat "p " expr))
         (sdb (concat expr "/"))))
 
-(declare-function gdb-input "gdb-mi" (item))
+(declare-function gdb-input "gdb-mi" (command handler))
 (declare-function tooltip-expr-to-print "tooltip" (event))
 (declare-function tooltip-event-buffer "tooltip" (event))
 
@@ -3468,12 +3464,12 @@ so they have been disabled."))
                 (if (eq gud-minor-mode 'gdbmi)
                     (if gdb-macro-info
                         (gdb-input
-                         (list (concat
-                                "server macro expand " expr "\n")
-                               `(lambda () (gdb-tooltip-print-1 ,expr))))
+                         (concat
+                          "server macro expand " expr "\n")
+                         `(lambda () (gdb-tooltip-print-1 ,expr)))
                       (gdb-input
-                       (list  (concat cmd "\n")
-                              `(lambda () (gdb-tooltip-print ,expr)))))
+                       (concat cmd "\n")
+                       `(lambda () (gdb-tooltip-print ,expr))))
                   (setq gud-tooltip-original-filter (process-filter process))
                   (set-process-filter process 'gud-tooltip-process-output)
                   (gud-basic-call cmd))
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 374a45acec6..82961376669 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -822,7 +822,7 @@ Point is left unchanged."
 
 (defun hif-possibly-hide ()
   "Called at #ifX expression, this hides those parts that should be hidden.
-It uses the judgement of `hide-ifdef-evaluator'."
+It uses the judgment of `hide-ifdef-evaluator'."
   ;; (message "hif-possibly-hide") (sit-for 1)
   (let ((test (hif-canonicalize))
         (range (hif-find-range)))
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index d8715599d74..6ce415b563d 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -2464,7 +2464,7 @@ If prefix ARG < 0 then move forward to enclosing block end."
 (defun idlwave-down-block (&optional arg)
   "Go down a block.
 With ARG: ARG >= 0 go forwards, ARG < 0 go backwards.
-Returns non-nil if successfull."
+Returns non-nil if successful."
   (interactive "p")
   (let (status)
     (if (< arg 0)
@@ -7866,7 +7866,7 @@ itself."
   "Display online help about the completion at point."
   (interactive "eP")
   ;; Restore last-command for next command, to make
-  ;; scrolling/cancelling of completions work.
+  ;; scrolling/canceling of completions work.
   (setq this-command last-command)
   (idlwave-do-mouse-completion-help ev))
 
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 1328e303d45..dd24aeea9a3 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -36,7 +36,7 @@
 ;; This makes these modes easier to use.
 
 ;; For documentation on the functionality provided by comint mode, and
-;; the hooks available for customising it, see the file comint.el.
+;; the hooks available for customizing it, see the file comint.el.
 ;; For further information on inferior-lisp mode, see the comments below.
 
 ;; Needs fixin:
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 94a9c250fee..f0c86265232 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3000,7 +3000,7 @@ browser, respectively."
                       '(js> ((fifth hitab) "selectedTab") (fourth hitab))
                       cmds)))
 
-                  ;; Hilighting whole window
+                  ;; Highlighting whole window
                   ((third hitab)
                    (push '(js! ((third hitab) "document"
                                 "documentElement" "setAttribute")
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index c1a87a9d033..024744957c6 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -315,25 +315,32 @@ not be enclosed in { } or ( )."
   "List of keywords understood by automake.")
 
 (defconst makefile-gmake-statements
-  `("-sinclude" "sinclude" "vpath"      ; makefile-makepp-statements takes rest
+  `("-sinclude" "sinclude"              ; makefile-makepp-statements takes rest
     "ifdef" "ifndef" "ifeq" "ifneq" "-include" "define" "endef" "export"
-    "override define" "override" "unexport"
+    "override define" "override" "unexport" "vpath"
     ,@(cdr makefile-automake-statements))
   "List of keywords understood by gmake.")
 
-;; These are even more silly, because you can have more spaces in between.
 (defconst makefile-makepp-statements
-  `("and ifdef" "and ifndef" "and ifeq" "and ifneq" "and ifperl"
-    "and ifmakeperl" "and ifsys" "and ifnsys" "build_cache" "build_check"
+  `(t                                   ; - alternately means _
+    ;; todo: take if* out of these lists, and let the negation regexp do it all
+    "ifperl" "ifmakeperl" "ifsys" "ifnsys" "iftrue" "ifntrue"
+    "and ifdef" "and ifndef" "and ifeq" "and ifneq" "and ifperl"
+    "and ifmakeperl" "and ifsys" "and ifnsys" "and iftrue" "and ifntrue"
     "else ifdef" "else ifndef" "else ifeq" "else ifneq" "else ifperl"
-    "else ifmakeperl" "else ifsys" "else ifnsys" "enddef" "global"
-    "load_makefile" "ifperl" "ifmakeperl" "ifsys" "ifnsys" "_include"
-    "makeperl" "makesub" "no_implicit_load" "perl" "perl-begin" "perl_begin"
-    "perl-end" "perl_end" "prebuild" "or ifdef" "or ifndef" "or ifeq"
-    "or ifneq" "or ifperl" "or ifmakeperl" "or ifsys" "or ifnsys"
-    "override export" "override global" "register_command_parser"
-    "register_scanner" "repository" "runtime" "signature" "sub"
-    ,@(nthcdr 3 makefile-gmake-statements))
+    "else ifmakeperl" "else ifsys" "else ifnsys" "else iftrue" "else ifntrue"
+    "or ifdef" "or ifndef" "or ifeq" "or ifneq" "or ifperl"
+    "or ifmakeperl" "or ifsys" "or ifnsys" "or iftrue" "or ifntrue"
+
+    "autoload" "build-cache" "build-check" "enddef" "export define"
+    "global" "global build-cache" "global build-check" "global define"
+    "global signature" "global override signature" "load-makefile"
+    "make" "makeperl" "makesub" "no-implicit-load" "perl" "perl-begin"
+    "perl-end" "prebuild" "override export" "override global" "register-parser"
+    "register-command-parser" "register-input-suffix"
+    "register-scanner" "repository" "runtime" "signature" "sub"
+
+    ,@(nthcdr 2 makefile-gmake-statements))
   "List of keywords understood by gmake.")
 
 (defconst makefile-bsdmake-statements
@@ -372,7 +379,12 @@ not be enclosed in { } or ( )."
 
     ;; Fontify conditionals and includes.
     (,(concat "^\\(?: [ \t]*\\)?"
-              (regexp-opt keywords t)
+              (replace-regexp-in-string
+               " " "[ \t]+"
+               (if (eq (car keywords) t)
+                   (replace-regexp-in-string "-" "[_-]"
+                                             (regexp-opt (cdr keywords) t))
+                 (regexp-opt keywords t)))
               "\\>[ \t]*\\([^: \t\n#]*\\)")
      (1 font-lock-keyword-face) (2 font-lock-variable-name-face))
 
@@ -436,7 +448,7 @@ not be enclosed in { } or ( )."
    makefile-var-use-regex
    makefile-makepp-statements
    nil
-   "^\\(?: [ \t]*\\)?\\(?:and[ \t]+\\|else[ \t]+\\|or[ \t]+\\)?if\\(n\\)\\(?:def\\|eq\\|sys\\)\\>"
+   "^\\(?: [ \t]*\\)?\\(?:and[ \t]+\\|else[ \t]+\\|or[ \t]+\\)?if\\(n\\)\\(?:def\\|eq\\|sys\\|true\\)\\>"
 
    '("[^$]\\(\\$[({]\\(?:output\\|stem\\|target\\)s?\\_>.*?[})]\\)"
      1 'makefile-targets append)
@@ -447,17 +459,17 @@ not be enclosed in { } or ( )."
      (2 font-lock-keyword-face t)
      (3 font-lock-variable-name-face t))
 
-   ;; $(function ...) $((function ...)) ${function ...} ${{function ...}}
-   '("[^$]\\$\\(?:((?\\|{{?\\)\\([-a-zA-Z0-9_.]+\\s \\)"
+   ;; $(function ...) $((function ...)) ${...} ${{...}} $[...] $[[...]]
+   '("[^$]\\$\\(?:((?\\|{{?\\|\\[\\[?\\)\\([-a-zA-Z0-9_.]+\\s \\)"
      1 font-lock-function-name-face prepend)
 
-   ;; $(shell ...) $((shell ...)) ${shell ...} ${{shell ...}}
-   '("[^$]\\$\\(((?\\|{{?\\)shell\\(?:[-_]\\(?:global[-_]\\)?once\\)?[ \t]+"
+   ;; $(shell ...) $((shell ...)) ${...} ${{...}} $[...] $[[...]]
+   '("[^$]\\$\\(((?\\|{{?\\|\\[\\[?\\)shell\\(?:[-_]\\(?:global[-_]\\)?once\\)?[ \t]+"
      makefile-match-function-end nil nil
      (1 'makefile-shell prepend t))
 
-   ;; $(perl ...) $((perl ...)) ${perl ...} ${{perl ...}}
-   '("[^$]\\$\\(((?\\|{{?\\)makeperl[ \t]+"
+   ;; $(perl ...) $((perl ...)) ${...} ${{...}} $[...] $[[...]]
+   '("[^$]\\$\\(((?\\|{{?\\|\\[\\[?\\)makeperl[ \t]+"
      makefile-match-function-end nil nil
      (1 'makefile-makepp-perl prepend t))
    '("[^$]\\$\\(((?\\|{{?\\)perl[ \t]+"
@@ -1688,8 +1700,10 @@ The anchor must have matched the opening parens in the first group."
     ;; FIXME forward-sexp or somesuch would be better?
     (if (setq s (cond ((string= s "(") ")")
                       ((string= s "{") "}")
+                      ((string= s "[") "]")
                       ((string= s "((") "))")
-                      ((string= s "{{") "}}")))
+                      ((string= s "{{") "}}")
+                      ((string= s "[[") "]]")))
         (re-search-forward (concat "\\(.*\\)[ \t]*" s) (line-end-position) t))))
 
 (defun makefile-match-dependency (bound)
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index b1502adbeb1..2db4309d9e0 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -786,6 +786,7 @@ on the line which ends a function or procedure named NAME."
     (if (looking-at "[ \t]+$")
         (skip-chars-forward " \t"))))
 
+(defvar ind)                           ;Used via `eval' in pascal-indent-alist.
 (defun pascal-indent-line ()
   "Indent current line as a Pascal statement."
   (let* ((indent-str (pascal-calculate-indent))
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 5b229cc0c24..0efc2ca231b 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -147,9 +147,9 @@
 ;;  o  Introduced three new customizable variables: electric colon
 ;;     (`prolog-electric-colon-flag', default nil), electric dash
 ;;     (`prolog-electric-dash-flag', default nil), and a possibility
-;;     to prevent the predicate template insertion from adding commata
+;;     to prevent the predicate template insertion from adding commas
 ;;     (`prolog-electric-dot-full-predicate-template', defaults to t
-;;     since it seems quicker to me to just type those commata).  A
+;;     since it seems quicker to me to just type those commas).  A
 ;;     trivial adaptation of a patch by Markus Triska.
 ;;  o  Improved the behavior of electric if-then-else to only skip
 ;;     forward if the parenthesis/semicolon is preceded by
@@ -512,7 +512,7 @@ It does not apply in strings and comments."
 (defcustom prolog-electric-dot-full-predicate-template nil
   "*If nil, electric dot inserts only the current predicate's name and `('
 for recursive calls or new clause heads.  Non-nil means to also
-insert enough commata to cover the predicate's arity and `)',
+insert enough commas to cover the predicate's arity and `)',
 and dot and newline for recursive calls."
   :group 'prolog-keyboard
   :type 'boolean)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index fbf7c3c42f7..6081d8e838b 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2343,7 +2343,7 @@ Interactively, prompt for the name with completion."
 ;;;; Bicycle Repair Man support
 
 (autoload 'pymacs-load "pymacs" nil t)
-(autoload 'brm-init "bikemacs")
+(autoload 'brm-init "bikeemacs")
 (defvar brm-menu)
 
 ;; I'm not sure how useful BRM really is, and it's certainly dangerous
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 03e095b6bfc..60ba768a80e 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -4224,7 +4224,7 @@ The default comes from `process-coding-system-alist' and
     "^\\(.+\\) (hex ..)$"
     "SET \\1")
 
-   ;; FEDDBACK ON for 99 or more rows
+   ;; FEEDBACK ON for 99 or more rows
    ;; feedback OFF
    (sql-redirect-value
     sqlbuf
diff --git a/lisp/progmodes/vera-mode.el b/lisp/progmodes/vera-mode.el
index b02324871ff..434984c8bf1 100644
--- a/lisp/progmodes/vera-mode.el
+++ b/lisp/progmodes/vera-mode.el
@@ -427,7 +427,7 @@ Key bindings:
     "icompare" "insert" "inst_get_at_least" "inst_get_auto_bin_max"
     "inst_get_collect" "inst_get_cov_weight" "inst_get_coverage_goal"
     "inst_getcross_bin_max" "inst_query" "inst_set_at_least"
-    "inst_set_auto_bin_max" "inst_set_bin_activiation" "inst_set_collect"
+    "inst_set_auto_bin_max" "inst_set_bin_activation" "inst_set_collect"
     "inst_set_cov_weight" "inst_set_coverage_goal" "inst_set_cross_bin_max"
     "itoa"
     "last" "last_index" "len" "load"
@@ -438,7 +438,7 @@ Key bindings:
     "push_front" "putc"
     "query" "query_str"
     "rand_mode" "randomize" "reserve" "reverse" "rsort"
-    "search" "set_at_least" "set_auto_bin_max" "set_bin_activiation"
+    "search" "set_at_least" "set_auto_bin_max" "set_bin_activation"
     "set_cov_weight" "set_coverage_goal" "set_cross_bin_max" "set_name" "size"
     "sort" "substr" "sum"
     "thismatch" "tolower" "toupper"
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 3ae66a477e8..52e7b6e2429 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -981,7 +981,7 @@ of each Verilog file that requires it, rather than being set globally."
   "*If true, AUTORESET will reset those signals which were
 assigned with blocking assignments (=) even in a block with
 non-blocking assignments (<=).
-  
+
 If nil, all blocking assigned signals are ignored when any
 non-blocking assignment is in the AUTORESET block.  This allows
 blocking assignments to be used for temporary values and not have
@@ -2011,7 +2011,7 @@ find the errors."
        "`uvm_component_utils"
        "`uvm_create"
        "`uvm_create_on"
-       "`uvm_create_seq"                ;; Undocumented in 1.1 
+       "`uvm_create_seq"                ;; Undocumented in 1.1
        "`uvm_declare_p_sequencer"
        "`uvm_declare_sequence_lib"      ;; Deprecated in 1.1
        "`uvm_do"
@@ -7505,7 +7505,7 @@ Signals must be in standard (base vector) form."
     (nreverse out-list)))
 
 (defun verilog-signals-combine-bus (in-list)
-  "Return a list of signals in IN-LIST, with busses combined.
+  "Return a list of signals in IN-LIST, with buses combined.
 Duplicate signals are also removed.  For example A[2] and A[1] become A[2:1]."
   (let (combo buswarn
         out-list
@@ -9907,7 +9907,7 @@ If optional WHITESPACE true, ignore whitespace."
            (p2 (with-current-buffer b2 (goto-char (point-min))))
            (maxp1 (with-current-buffer b1 (point-max)))
            (maxp2 (with-current-buffer b2 (point-max)))
-           (op1 -1) (op2 -1) 
+           (op1 -1) (op2 -1)
            progress size)
       (while (not (and (eq p1 op1) (eq p2 op2)))
         ;; If both windows have whitespace optionally skip over it.
@@ -10100,7 +10100,7 @@ instantiating the resulting module.  Long lines are split based
 on the `fill-column', see \\[set-fill-column].
 
 Limitations:
-  Concatenation and outputting partial busses is not supported.
+  Concatenation and outputting partial buses is not supported.
 
   Typedefs must match `verilog-typedef-regexp', which is disabled by default.
 
@@ -10932,7 +10932,7 @@ Typing \\[verilog-auto] will make this into:
 (defun verilog-auto-logic ()
   "Expand AUTOLOGIC statements, as part of \\[verilog-auto].
 Make wire statements using the SystemVerilog logic keyword.
-This is currently equivelent to:
+This is currently equivalent to:
 
     /*AUTOWIRE*/
 
@@ -10958,7 +10958,7 @@ the datatype of the declarations.
 
 Limitations:
   This ONLY detects outputs of AUTOINSTants (see `verilog-read-sub-decls'),
-  and all busses must have widths, such as those from AUTOINST, or using []
+  and all buses must have widths, such as those from AUTOINST, or using []
   in AUTO_TEMPLATEs.
 
   This does NOT work on memories or SystemVerilog .name connections,
@@ -11315,7 +11315,7 @@ Limitations:
   If placed inside the parenthesis of a module declaration, it creates
   Verilog 2001 style, else uses Verilog 1995 style.
 
-  Concatenation and outputting partial busses is not supported.
+  Concatenation and outputting partial buses is not supported.
 
   Module names must be resolvable to filenames.  See `verilog-auto-inst'.
 
@@ -11439,7 +11439,7 @@ Limitations:
   If placed inside the parenthesis of a module declaration, it creates
   Verilog 2001 style, else uses Verilog 1995 style.
 
-  Concatenation and outputting partial busses is not supported.
+  Concatenation and outputting partial buses is not supported.
 
   Module names must be resolvable to filenames.  See `verilog-auto-inst'.
 
@@ -11490,7 +11490,7 @@ Limitations:
   If placed inside the parenthesis of a module declaration, it creates
   Verilog 2001 style, else uses Verilog 1995 style.
 
-  Concatenation and outputting partial busses is not supported.
+  Concatenation and outputting partial buses is not supported.
 
   Module names must be resolvable to filenames.  See `verilog-auto-inst'.
 
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 3a94601768d..deac85581d2 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -1714,7 +1714,7 @@ an absolute path (i.e. all caches can be stored in one global directory)."
 
 
 (defgroup vhdl-menu nil
-  "Customizations for menues."
+  "Customizations for menus."
   :group 'vhdl)
 
 (defcustom vhdl-index-menu nil
@@ -1844,7 +1844,7 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry
 ;; Internal variables
 
 (defvar vhdl-menu-max-size 20
-  "*Specifies the maximum size of a menu before splitting it into submenues.")
+  "*Specifies the maximum size of a menu before splitting it into submenus.")
 
 (defvar vhdl-progress-interval 1
   "*Interval used to update progress status during long operations.
@@ -2468,7 +2468,7 @@ conversion."
   (goto-char marker))
 
 (defun vhdl-menu-split (list title)
-  "Split menu LIST into several submenues, if number of
+  "Split menu LIST into several submenus, if number of
 elements > `vhdl-menu-max-size'."
   (if (> (length list) vhdl-menu-max-size)
       (let ((remain list)
@@ -4266,7 +4266,7 @@ Usage:
 
   CODE BEAUTIFICATION:
     `C-c M-b' and `C-c C-b' beautify the code of a region or of the entire
-    buffer respectively.  This inludes indentation, alignment, and case
+    buffer respectively.  This includes indentation, alignment, and case
     fixing.  Code beautification can also be run non-interactively using the
     command:
 
@@ -10812,7 +10812,7 @@ but not if inside a comment or quote."
 
 (defvar vhdl-port-list nil
   "Variable to hold last port map parsed.")
-;; structure: (parenthesised expression means list of such entries)
+;; structure: (parenthesized expression means list of such entries)
 ;; (ent-name
 ;;  ((generic-names) generic-type generic-init generic-comment group-comment)
 ;;  ((port-names) port-object port-direct port-type port-comment group-comment)
@@ -11660,7 +11660,7 @@ reflected in a subsequent paste operation."
 
 (defvar vhdl-subprog-list nil
   "Variable to hold last subprogram interface parsed.")
-;; structure: (parenthesised expression means list of such entries)
+;; structure: (parenthesized expression means list of such entries)
 ;; (subprog-name kind
 ;;  ((names) object direct type init comment group-comment)
 ;;  return-type return-comment group-comment)
@@ -12971,7 +12971,7 @@ This does background highlighting of translate-off regions.")
 (defvar vhdl-entity-alist nil
   "Cache with entities and corresponding architectures for each
 project/directory.")
-;; structure: (parenthesised expression means list of such entries)
+;; structure: (parenthesized expression means list of such entries)
 ;; (cache-key
 ;;   (ent-key ent-name ent-file ent-line
 ;;     (arch-key arch-name arch-file arch-line
@@ -12982,7 +12982,7 @@ project/directory.")
 
 (defvar vhdl-config-alist nil
   "Cache with configurations for each project/directory.")
-;; structure: (parenthesised expression means list of such entries)
+;; structure: (parenthesized expression means list of such entries)
 ;; (cache-key
 ;;   (conf-key conf-name conf-file conf-line ent-key arch-key
 ;;     (inst-key inst-comp-name inst-ent-key inst-arch-key
@@ -12991,7 +12991,7 @@ project/directory.")
 
 (defvar vhdl-package-alist nil
   "Cache with packages for each project/directory.")
-;; structure: (parenthesised expression means list of such entries)
+;; structure: (parenthesized expression means list of such entries)
 ;; (cache-key
 ;;   (pack-key pack-name pack-file pack-line
 ;;     (comp-key comp-name comp-file comp-line)
@@ -13003,19 +13003,19 @@ project/directory.")
 
 (defvar vhdl-ent-inst-alist nil
   "Cache with instantiated entities for each project/directory.")
-;; structure: (parenthesised expression means list of such entries)
+;; structure: (parenthesized expression means list of such entries)
 ;; (cache-key (inst-ent-key))
 
 (defvar vhdl-file-alist nil
   "Cache with design units in each file for each project/directory.")
-;; structure: (parenthesised expression means list of such entries)
+;; structure: (parenthesized expression means list of such entries)
 ;; (cache-key
 ;;   (file-name (ent-list) (arch-list) (arch-ent-list) (conf-list)
 ;;              (pack-list) (pack-body-list) (inst-list) (inst-ent-list))
 
 (defvar vhdl-directory-alist nil
   "Cache with source directories for each project.")
-;; structure: (parenthesised expression means list of such entries)
+;; structure: (parenthesized expression means list of such entries)
 ;; (cache-key (directory))
 
 (defvar vhdl-speedbar-shown-unit-alist nil
@@ -13655,7 +13655,7 @@ of PROJECT."
       (vhdl-speedbar-update-current-unit)
       (when updated (message "Updating hierarchy...done")))))
 
-;; structure (parenthesised expression means list of such entries)
+;; structure (parenthesized expression means list of such entries)
 ;; (inst-key inst-file-marker comp-ent-key comp-ent-file-marker
 ;;  comp-arch-key comp-arch-file-marker comp-conf-key comp-conf-file-marker
 ;;  comp-lib-name level)
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index c8bdc271f5f..db5b57f8585 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -932,7 +932,7 @@ the sequence."
     (list ps-mule-bitmap-prologue)))
 
 (defun ps-mule-generate-bitmap-font (font-spec size relative-compose
-                                               baselie-offset bbx)
+                                               baseline-offset bbx)
   (let* ((id (ps-mule-font-spec-id font-spec))
          (bytes (ps-mule-font-spec-bytes font-spec))
          output-list)
@@ -941,7 +941,7 @@ the sequence."
               (list (format "/E%02X [ 0 1 255 {pop /.notdef} for ] def\n" id)
                     (format "%%%% %s\n" (ps-mule-font-spec-name font-spec))
                     (format "/F%02X %f %S %d E%02X NBF\n" id size
-                            relative-compose baselie-offset id)))
+                            relative-compose baseline-offset id)))
       (setq output-list
             (list (list (format "/E%02X [ 0 1 255 { pop 0 } for ] def\n" id))
                   (list (format "/V%02X [" id))
@@ -950,7 +950,7 @@ the sequence."
                   (format "/F%02X E%02X V%02X NPF\n" id id id))))
     (aset ps-mule-bitmap-font-record id
           (vector (= bytes 1) output-list
-                  size relative-compose baselie-offset bbx))
+                  size relative-compose baseline-offset bbx))
     (if ps-mule-bitmap-dict-list
         output-list
       (setq ps-mule-bitmap-dict-list (list "/BitmapDict <<\n" ">> def\n"))
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index cb19197d16d..da804d99ae0 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -6658,7 +6658,7 @@ If FACE is not a valid face name, use default face."
 ;; But autoload them here to make the separation invisible.
 
 ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
-;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "98fcbceecff2ac603ba35672b99b5278")
+;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "01641c7c3af4e45e1c3afeb75a73120c")
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\
diff --git a/lisp/reveal.el b/lisp/reveal.el
index ea46cfd1dd3..8b4ac22a717 100644
--- a/lisp/reveal.el
+++ b/lisp/reveal.el
@@ -106,7 +106,7 @@ Each element has the form (WINDOW . OVERLAY).")
           (let ((inv (overlay-get ol 'invisible)) open)
             (when (and inv
                        ;; There's an `invisible' property.  Make sure it's
-                       ;; actually invisible, and ellipsised.
+                       ;; actually invisible, and ellipsized.
                        (and (consp buffer-invisibility-spec)
                             (cdr (assq inv buffer-invisibility-spec)))
                        (or (setq open
@@ -189,12 +189,12 @@ Each element has the form (WINDOW . OVERLAY).")
 
 ;;;###autoload
 (define-minor-mode reveal-mode
-  "Toggle decloaking of invisible text near point (Reveal mode).
+  "Toggle uncloaking of invisible text near point (Reveal mode).
 With a prefix argument ARG, enable Reveal mode if ARG is
 positive, and disable it otherwise.  If called from Lisp, enable
 Reveal mode if ARG is omitted or nil.
 
-Reveral mode is a buffer-local minor mode.  When enabled, it
+Reveal mode is a buffer-local minor mode.  When enabled, it
 reveals invisible text around point."
   :group 'reveal
   :lighter (global-reveal-mode nil " Reveal")
diff --git a/lisp/server.el b/lisp/server.el
index e02f63a8268..edd8f2afa93 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -307,11 +307,13 @@ Updates `server-clients'."
 
       (setq server-clients (delq proc server-clients))
 
-      ;; Delete the client's tty.
-      (let ((terminal (process-get proc 'terminal)))
-        ;; Only delete the terminal if it is non-nil.
-        (when (and terminal (eq (terminal-live-p terminal) t))
-          (delete-terminal terminal)))
+      ;; Delete the client's tty, except on Windows (both GUI and console),
+      ;; where there's only one terminal and does not make sense to delete it.
+      (unless (eq system-type 'windows-nt)
+        (let ((terminal (process-get proc 'terminal)))
+          ;; Only delete the terminal if it is non-nil.
+          (when (and terminal (eq (terminal-live-p terminal) t))
+            (delete-terminal terminal))))
 
       ;; Delete the client's process.
       (if (eq (process-status proc) 'open)
@@ -1035,7 +1037,11 @@ The following commands are accepted by the client:
                  (setq tty-name (pop args-left)
                        tty-type (pop args-left)
                        dontkill (or dontkill
-                                    (not use-current-frame))))
+                                    (not use-current-frame)))
+                 ;; On Windows, emacsclient always asks for a tty frame.
+                 ;; If running a GUI server, force the frame type to GUI.
+                 (when (eq window-system 'w32)
+                   (push "-window-system" args-left)))
 
                 ;; -position LINE[:COLUMN]:  Set point to the given
                 ;;  position in the next file.
diff --git a/lisp/ses.el b/lisp/ses.el
index 6c9d0a7a50d..d5947472c1a 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -327,7 +327,7 @@ need to be recalculated.")
 
 (defvar ses-call-printer-return nil
   "Set to t if last cell printer invoked by `ses-call-printer' requested
-left-justification of the result.  Set to error-signal if ses-call-printer
+left-justification of the result.  Set to error-signal if `ses-call-printer'
 encountered an error during printing.  Otherwise nil.")
 
 (defvar ses-start-time nil
@@ -394,7 +394,7 @@ functions refer to its value."
             val)))))
 
 (defmacro ses-cell-property-get (property-name row &optional col)
-   "Get property named PROPERTY-NAME From a CELL or a pair (ROW,COL).
+   "Get property named PROPERTY-NAME from a CELL or a pair (ROW,COL).
 
 When COL is omitted, CELL=ROW is a cell object.  When COL is
 present ROW and COL are the integer coordinates of the cell of
@@ -490,8 +490,8 @@ PROPERTY-NAME."
   `(aref ses--col-printers ,col))
 
 (defmacro ses-sym-rowcol (sym)
-  "From a cell-symbol SYM, gets the cons (row . col).  A1 => (0 . 0).  Result
-is nil if SYM is not a symbol that names a cell."
+  "From a cell-symbol SYM, gets the cons (row . col).  A1 => (0 . 0).
+Result is nil if SYM is not a symbol that names a cell."
   `(and (symbolp ,sym) (get ,sym 'ses-cell)))
 
 (defmacro ses-cell (sym value formula printer references)
@@ -625,7 +625,7 @@ is a vector--if a symbol, the new vector is assigned as the symbol's value."
     (delete-region pos (point))))
 
 (defun ses-printer-validate (printer)
-  "Signals an error if PRINTER is not a valid SES cell printer."
+  "Signal an error if PRINTER is not a valid SES cell printer."
   (or (not printer)
       (stringp printer)
       (functionp printer)
@@ -642,7 +642,7 @@ checking that it is a valid printer function."
       (add-to-list 'ses-read-printer-history (prin1-to-string printer))))
 
 (defun ses-formula-record (formula)
-  "If FORMULA is of the form 'symbol, adds it to the list of symbolic formulas
+  "If FORMULA is of the form 'symbol, add it to the list of symbolic formulas
 for this spreadsheet."
   (when (and (eq (car-safe formula) 'quote)
              (symbolp (cadr formula)))
@@ -691,7 +691,7 @@ for this spreadsheet."
         buffer-undo-list))
 
 (defun ses-reset-header-string ()
-  "Flags the header string for update.  Upon undo, the header string will be
+  "Flag the header string for update.  Upon undo, the header string will be
 updated again."
   (push '(apply ses-reset-header-string) buffer-undo-list)
   (setq ses--header-hscroll -1))
@@ -727,7 +727,7 @@ cell (ROW,COL).  This is undoable.  The cell's data will be updated through
   nil) ; Make coverage-tester happy.
 
 (defun ses-cell-set-formula (row col formula)
-  "Store a new formula for (ROW . COL) and enqueues the cell for
+  "Store a new formula for (ROW . COL) and enqueue the cell for
 recalculation via `post-command-hook'.  Updates the reference lists for the
 cells that this cell refers to.  Does not update cell value or reprint the
 cell.  To avoid inconsistencies, this function is not interruptible, which
@@ -812,9 +812,9 @@ means Emacs will crash if FORMULA contains a circular list."
                   errors)))))
     (if errors
       (warn "----------------------------------------------------------------
-Some reference where corrupted.
+Some references were corrupted.
 
-The following is a list of where each element ELT is such
+The following is a list where each element ELT is such
 that (car ELT) is the reference of cell CELL with corruption,
 and (cdr ELT) is a property list where
 
@@ -922,8 +922,7 @@ the old and FORCE is nil."
   (ses-cell-set-formula row col nil))
 
 (defcustom ses-self-reference-early-detection nil
-  "True if cycle detection is early for cells that refer to
-themselves."
+  "True if cycle detection is early for cells that refer to themselves."
   :type 'boolean
   :group 'ses)
 
@@ -989,7 +988,7 @@ if the cell's value is unchanged and FORCE is nil."
 ;;----------------------------------------------------------------------------
 
 (defun ses-in-print-area ()
-  "Returns t if point is in print area of spreadsheet."
+  "Return t if point is in print area of spreadsheet."
   (<= (point) ses--data-marker))
 
 ;; We turn off point-motion-hooks and explicitly position the cursor, in case
@@ -1011,7 +1010,7 @@ if the cell's value is unchanged and FORCE is nil."
          (forward-char))))
 
 (defun ses-set-curcell ()
-  "Sets `ses--curcell' to the current cell symbol, or a cons (BEG,END) for a
+  "Set `ses--curcell' to the current cell symbol, or a cons (BEG,END) for a
 region, or nil if cursor is not at a cell."
   (if (or (not mark-active)
           deactivate-mark
@@ -1030,10 +1029,10 @@ region, or nil if cursor is not at a cell."
   nil)
 
 (defun ses-check-curcell (&rest args)
-  "Signal an error if ses--curcell is inappropriate.  The end marker is
-appropriate if some argument is 'end.  A range is appropriate if some
-argument is 'range.  A single cell is appropriate unless some argument is
-'needrange."
+  "Signal an error if `ses--curcell' is inappropriate.
+The end marker is appropriate if some argument is 'end.
+A range is appropriate if some argument is 'range.
+A single cell is appropriate unless some argument is 'needrange."
   (if (eq ses--curcell t)
       ;; curcell recalculation was postponed, but user typed ahead.
       (ses-set-curcell))
@@ -1168,7 +1167,7 @@ preceding cell has spilled over."
       sig)))
 
 (defun ses-call-printer (printer &optional value)
-  "Invokes PRINTER (a string or parenthesized string or function-symbol or
+  "Invoke PRINTER (a string or parenthesized string or function-symbol or
 lambda of one argument) on VALUE.  Result is the printed cell as a string.
 The variable `ses-call-printer-return' is set to t if the printer used
 parenthesis to request left-justification, or the error-signal if the
@@ -1200,7 +1199,7 @@ printer signaled one (and \"%s\" is used as the default printer), else nil."
 (defun ses-adjust-print-width (col change)
   "Insert CHANGE spaces in front of column COL, or at end of line if
 COL=NUMCOLS.  Deletes characters if CHANGE < 0.  Caller should bind
-inhibit-quit to t."
+`inhibit-quit' to t."
   (let ((inhibit-read-only t)
         (blank  (if (> change 0) (make-string change ?\s)))
         (at-end (= col ses--numcols)))
@@ -1219,9 +1218,9 @@ inhibit-quit to t."
         (delete-char (- change))))))
 
 (defun ses-print-cell-new-width (row col)
-  "Same as ses-print-cell, except if the cell's value is *skip*, the preceding
-nonskipped cell is reprinted.  This function is used when the width of
-cell (ROW,COL) has changed."
+  "Same as `ses-print-cell', except if the cell's value is *skip*,
+the preceding nonskipped cell is reprinted.  This function is used
+when the width of cell (ROW,COL) has changed."
   (if (not (eq (ses-cell-value row col) '*skip*))
       (ses-print-cell row col)
     ;;Cell was skipped over - reprint previous
@@ -1344,7 +1343,7 @@ Newlines in the data are escaped."
 ;;----------------------------------------------------------------------------
 
 (defun ses-formula-references (formula &optional result-so-far)
-  "Produce a list of symbols for cells that this formula's value
+  "Produce a list of symbols for cells that this FORMULA's value
 refers to.  For recursive calls, RESULT-SO-FAR is the list being
 constructed, or t to get a wrong-type-argument error when the
 first reference is found."
@@ -1389,8 +1388,8 @@ by (ROWINCR,COLINCR)."
 
 (defun ses-relocate-formula (formula startrow startcol rowincr colincr)
   "Produce a copy of FORMULA where all symbols that refer to cells in row
-STARTROW or above and col STARTCOL or above are altered by adding ROWINCR
-and COLINCR.  STARTROW and STARTCOL are 0-based. Example:
+STARTROW or above, and col STARTCOL or above, are altered by adding ROWINCR
+and COLINCR.  STARTROW and STARTCOL are 0-based.  Example:
         (ses-relocate-formula '(+ A1 B2 D3) 1 2 1 -1)
         => (+ A1 B2 C4)
 If ROWINCR or COLINCR is negative, references to cells being deleted are
@@ -1618,7 +1617,8 @@ to each symbol."
     (makunbound sym)))
 
 (defun ses-aset-with-undo (array idx newval)
-  "Like aset, but undoable.  Result is t if element has changed"
+  "Like `aset', but undoable.
+Result is t if element has changed."
   (unless (equal (aref array idx) newval)
     (push `(apply ses-aset-with-undo ,array ,idx
                   ,(aref array idx)) buffer-undo-list)
@@ -1631,8 +1631,8 @@ to each symbol."
 ;;----------------------------------------------------------------------------
 
 (defun ses-load ()
-  "Parse the current buffer and sets up buffer-local variables.  Does not
-execute cell formulas or print functions."
+  "Parse the current buffer and set up buffer-local variables.
+Does not execute cell formulas or print functions."
   (widen)
   ;; Read our global parameters, which should be a 3-element list.
   (goto-char (point-max))
@@ -2082,8 +2082,7 @@ to are recalculated first."
     (ses-jump-safe startcell)))
 
 (defun ses-truncate-cell ()
-  "Reprint current cell, but without spillover into any following blank
-cells."
+  "Reprint current cell, but without spillover into any following blank cells."
   (interactive "*")
   (ses-check-curcell)
   (let* ((rowcol (ses-sym-rowcol ses--curcell))
@@ -2273,7 +2272,7 @@ cells."
 
 (defun ses-read-printer (prompt default)
   "Common code for `ses-read-cell-printer', `ses-read-column-printer', and `ses-read-default-printer'.
-PROMPT should end with \": \".  Result is t if operation was cancelled."
+PROMPT should end with \": \".  Result is t if operation was canceled."
   (barf-if-buffer-read-only)
   (if (eq default t)
       (setq default "")
@@ -2331,8 +2330,8 @@ right-justified) or a list of one string (will be left-justified)."
       (ses-print-cell row col))))
 
 (defun ses-read-column-printer (col newval)
-  "Set the printer function for the current column.  See
-`ses-read-cell-printer' for input forms."
+  "Set the printer function for the current column.
+See `ses-read-cell-printer' for input forms."
   (interactive
    (let ((col (cdr (ses-sym-rowcol ses--curcell))))
      (ses-check-curcell)
@@ -2348,8 +2347,8 @@ right-justified) or a list of one string (will be left-justified)."
         (ses-print-cell row col)))))
 
 (defun ses-read-default-printer (newval)
-  "Set the default printer function for cells that have no other.  See
-`ses-read-cell-printer' for input forms."
+  "Set the default printer function for cells that have no other.
+See `ses-read-cell-printer' for input forms."
   (interactive
    (list (ses-read-printer "Default printer: " ses--default-printer)))
   (unless (eq newval t)
@@ -2363,8 +2362,8 @@ right-justified) or a list of one string (will be left-justified)."
 ;;----------------------------------------------------------------------------
 
 (defun ses-insert-row (count)
-  "Insert a new row before the current one.  With prefix, insert COUNT rows
-before current one."
+  "Insert a new row before the current one.
+With prefix, insert COUNT rows before current one."
   (interactive "*p")
   (ses-check-curcell 'end)
   (or (> count 0) (signal 'args-out-of-range nil))
@@ -2416,8 +2415,8 @@ before current one."
     (ses-goto-print (1- ses--numrows) 0)))
 
 (defun ses-delete-row (count)
-  "Delete the current row.  With prefix, Deletes COUNT rows starting from the
-current one."
+  "Delete the current row.
+With prefix, deletes COUNT rows starting from the current one."
   (interactive "*p")
   (ses-check-curcell)
   (or (> count 0) (signal 'args-out-of-range nil))
@@ -2509,8 +2508,8 @@ If COL is specified, the new column(s) get the specified WIDTH and PRINTER
   (ses-jump-safe ses--curcell))
 
 (defun ses-delete-column (count)
-  "Delete the current column.  With prefix, Deletes COUNT columns starting
-from the current one."
+  "Delete the current column.
+With prefix, deletes COUNT columns starting from the current one."
   (interactive "*p")
   (ses-check-curcell)
   (or (> count 0) (signal 'args-out-of-range nil))
@@ -2584,7 +2583,7 @@ inserts a new row if at bottom of print area.  Repeat COUNT times."
     (forward-char)))
 
 (defun ses-append-row-jump-first-column ()
-  "Insert a new row after current one and jumps to its first column."
+  "Insert a new row after current one and jump to its first column."
   (interactive "*")
   (ses-check-curcell)
   (ses-begin-change)
@@ -2687,8 +2686,8 @@ the corresponding data cell."
   line)
 
 (defun ses-kill-override (beg end)
-  "Generic override for any commands that kill text.  We clear the killed
-cells instead of deleting them."
+  "Generic override for any commands that kill text.
+We clear the killed cells instead of deleting them."
   (interactive "r")
   (ses-check-curcell 'needrange)
   ;; For some reason, the text-read-only error is not caught by `delete-region',
@@ -2749,9 +2748,9 @@ as symbols."
 
 (defun ses-yank-pop (arg)
   "Replace just-yanked stretch of killed text with a different stretch.
-This command is allowed only immediately after a `yank' or a `yank-pop', when
-the region contains a stretch of reinserted previously-killed text.  We
-replace it with a different stretch of killed text.
+This command is allowed only immediately after a `yank' or a `yank-pop',
+when the region contains a stretch of reinserted previously-killed text.
+We replace it with a different stretch of killed text.
   Unlike standard `yank-pop', this function uses `undo' to delete the
 previous insertion."
   (interactive "*p")
@@ -2765,7 +2764,7 @@ previous insertion."
   (setq this-command 'yank))
 
 (defun ses-yank-cells (text arg)
-  "If the TEXT has a proper set of 'ses attributes, inserts the text as
+  "If the TEXT has a proper set of 'ses attributes, insert the text as
 cells, else return nil.  The cells are reprinted--the supplied text is
 ignored because the column widths, default printer, etc. at yank time might
 be different from those at kill-time.  ARG is a list to indicate that
@@ -2848,8 +2847,8 @@ cons of ROW and COL).  Treat plain symbols as strings unless ARG is a list."
       (ses-cell-set-formula row col val))))
 
 (defun ses-yank-tsf (text arg)
-  "If TEXT contains tabs and/or newlines, treats the tabs as
-column-separators and the newlines as row-separators and inserts the text as
+  "If TEXT contains tabs and/or newlines, treat the tabs as
+column-separators and the newlines as row-separators and insert the text as
 cell formulas--else return nil.  Treat plain symbols as strings unless ARG
 is a list.  Ignore a final newline."
   (if (or (not (string-match "[\t\n]" text))
@@ -2887,8 +2886,8 @@ is a list.  Ignore a final newline."
       t)))
 
 (defun ses-yank-resize (needrows needcols)
-  "If this yank will require inserting rows and/or columns, asks for
-confirmation and then inserts them.  Result is (row,col) for top left of yank
+  "If this yank will require inserting rows and/or columns, ask for
+confirmation and then insert them.  Result is (row,col) for top left of yank
 spot, or error signal if user requests cancel."
   (ses-begin-change)
   (let ((rowcol (if ses--curcell
@@ -2931,9 +2930,9 @@ newlines between rows.  Result is placed in kill ring."
   (ses-export-tab t))
 
 (defun ses-export-tab (want-formulas)
-  "Export the current range with tabs between columns and newlines between
-rows.  Result is placed in kill ring.  The export is values unless
-WANT-FORMULAS is non-nil.  Newlines and tabs in the export text are escaped."
+  "Export the current range with tabs between columns and newlines between rows.
+Result is placed in kill ring.  The export is values unless WANT-FORMULAS
+is non-nil.  Newlines and tabs in the export text are escaped."
   (ses-check-curcell 'needrange)
   (let ((print-escape-newlines t)
         result item)
@@ -2992,7 +2991,7 @@ The top row is row 1.  Selecting row 0 displays the default header row."
   (ses-reset-header-string))
 
 (defun ses-mark-row ()
-  "Marks the entirety of current row as a range."
+  "Mark the entirety of current row as a range."
   (interactive)
   (ses-check-curcell 'range)
   (let ((row (car (ses-sym-rowcol (or (car-safe ses--curcell) ses--curcell)))))
@@ -3002,7 +3001,7 @@ The top row is row 1.  Selecting row 0 displays the default header row."
     (ses-goto-print row 0)))
 
 (defun ses-mark-column ()
-  "Marks the entirety of current column as a range."
+  "Mark the entirety of current column as a range."
   (interactive)
   (ses-check-curcell 'range)
   (let ((col (cdr (ses-sym-rowcol (or (car-safe ses--curcell) ses--curcell))))
@@ -3046,13 +3045,14 @@ The top row is row 1.  Selecting row 0 displays the default header row."
         (ses-goto-print row col)))))
 
 (defun ses-renarrow-buffer ()
-  "Narrow the buffer so only the print area is visible.  Use after \\[widen]."
+  "Narrow the buffer so only the print area is visible.
+Use after \\[widen]."
   (interactive)
   (setq ses--deferred-narrow t))
 
 (defun ses-sort-column (sorter &optional reverse)
-  "Sorts the range by a specified column.  With prefix, sorts in
-REVERSE order."
+  "Sort the range by a specified column.
+With prefix, sorts in REVERSE order."
   (interactive "*sSort column: \nP")
   (ses-check-curcell 'needrange)
   (let ((min (ses-sym-rowcol (car ses--curcell)))
@@ -3103,7 +3103,7 @@ REVERSE order."
       (ses-sort-column (ses-column-letter col) reverse))))
 
 (defun ses-insert-range ()
-  "Inserts into minibuffer the list of cells currently highlighted in the
+  "Insert into minibuffer the list of cells currently highlighted in the
 spreadsheet."
   (interactive "*")
   (let (x)
@@ -3115,7 +3115,7 @@ spreadsheet."
     (insert (substring (prin1-to-string (nreverse x)) 1 -1))))
 
 (defun ses-insert-ses-range ()
-  "Inserts \"(ses-range x y)\" in the minibuffer to represent the currently
+  "Insert \"(ses-range x y)\" in the minibuffer to represent the currently
 highlighted range in the spreadsheet."
   (interactive "*")
   (let (x)
@@ -3145,7 +3145,7 @@ highlighted range in the spreadsheet."
 ;;----------------------------------------------------------------------------
 
 (defun ses-safe-printer (printer)
-  "Returns PRINTER if safe, or the substitute printer `ses-unsafe' otherwise."
+  "Return PRINTER if safe, or the substitute printer `ses-unsafe' otherwise."
   (if (or (stringp printer)
           (stringp (car-safe printer))
           (not printer)
@@ -3154,16 +3154,16 @@ highlighted range in the spreadsheet."
     'ses-unsafe))
 
 (defun ses-safe-formula (formula)
-  "Returns FORMULA if safe, or the substitute formula *unsafe* otherwise."
+  "Return FORMULA if safe, or the substitute formula *unsafe* otherwise."
   (if (ses-warn-unsafe formula 'unsafep)
       formula
     `(ses-unsafe ',formula)))
 
 (defun ses-warn-unsafe (formula checker)
-  "Applies CHECKER to FORMULA.  If result is non-nil, asks user for
-confirmation about FORMULA, which might be unsafe.  Returns t if formula
-is safe or user allows execution anyway.  Always returns t if
-`safe-functions' is t."
+  "Apply CHECKER to FORMULA.
+If result is non-nil, asks user for confirmation about FORMULA,
+which might be unsafe.  Returns t if formula is safe or user allows
+execution anyway.  Always returns t if `safe-functions' is t."
   (if (eq safe-functions t)
       t
     (setq checker (funcall checker formula))
@@ -3178,13 +3178,13 @@ is safe or user allows execution anyway.  Always returns t if
 ;;----------------------------------------------------------------------------
 
 (defun ses--clean-! (&rest x)
-  "Clean by delq list X from any occurrence of `nil' or `*skip*'."
+  "Clean by `delq' list X from any occurrence of `nil' or `*skip*'."
   (delq nil (delq '*skip* x)))
 
 (defun ses--clean-_ (x y)
   "Clean list X  by replacing by Y any occurrence of `nil' or `*skip*'.
 
-This will change X by making setcar on its cons cells."
+This will change X by making `setcar' on its cons cells."
   (let ((ret x) ret-elt)
     (while ret
       (setq ret-elt (car ret))
@@ -3194,7 +3194,7 @@ This will change X by making setcar on its cons cells."
   x)
 
 (defmacro ses-range (from to &rest rest)
-  "Expands to a list of cell-symbols for the range going from
+  "Expand to a list of cell-symbols for the range going from
 FROM up to TO.  The range automatically expands to include any
 new row or column inserted into its middle.  The SES library code
 specifically looks for the symbol `ses-range', so don't create an
@@ -3207,8 +3207,8 @@ In the sequel we assume that cells A1, B1, A2 B2 have respective values
 1 2 3 and 4.
 
 Readout direction is specified by a `>v', '`>^', `<v', `<^',
-`v>', `v<', `^>', `^<' flag. For historical reasons, in absence
-of such a flag, a default direction of `^<' is assumed. This
+`v>', `v<', `^>', `^<' flag.  For historical reasons, in absence
+of such a flag, a default direction of `^<' is assumed.  This
 way `(ses-range A1 B2 ^>)' will evaluate to `(1 3 2 4)',
 while `(ses-range A1 B2 >^)' will evaluate to (3 4 1 2).
 
@@ -3221,18 +3221,18 @@ If the range is one column, then `v' can be used as a shorthand to
 A `!' flag will remove all cells whose value is nil or `*skip*'.
 
 A `_' flag will replace nil or `*skip*' by the value following
-the `_' flag. If the `_' flag is the last argument, then they are
+the `_' flag.  If the `_' flag is the last argument, then they are
 replaced by integer 0.
 
 A `*', `*1' or `*2' flag will vectorize the range in the sense of
-Calc. See info node `(Calc) Top'. Flag `*' will output either a
+Calc.  See info node `(Calc) Top'.  Flag `*' will output either a
 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 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."
+confusing results if you are not aware of Calc data format.
+Use `math-format-value' as a printer for Calc objects."
   (let (result-row
         result
         (prev-row -1)
@@ -3319,10 +3319,10 @@ are ignored.  Result is always floating-point, even if all args are integers."
   (/ (float (apply '+ list)) (length list)))
 
 (defmacro ses-select (fromrange test torange)
-  "Select cells in FROMRANGE that are `equal' to TEST.  For each match, return
-the corresponding cell from TORANGE.  The ranges are macroexpanded but not
-evaluated so they should be either (ses-range BEG END) or (list ...).  The
-TEST is evaluated."
+  "Select cells in FROMRANGE that are `equal' to TEST.
+For each match, return the corresponding cell from TORANGE.
+The ranges are macroexpanded but not evaluated so they should be
+either (ses-range BEG END) or (list ...).  The TEST is evaluated."
   (setq fromrange (cdr (macroexpand fromrange))
         torange   (cdr (macroexpand torange))
         test      (eval test))
@@ -3352,9 +3352,10 @@ TEST is evaluated."
 (defvar col)
 
 (defun ses-center (value &optional span fill)
-  "Print VALUE, centered within column.  FILL is the fill character for
-centering (default = space).  SPAN indicates how many additional rightward
-columns to include in width (default = 0)."
+  "Print VALUE, centered within column.
+FILL is the fill character for centering (default = space).
+SPAN indicates how many additional rightward columns to include
+in width (default = 0)."
   (let ((printer (or (ses-col-printer col) ses--default-printer))
         (width   (ses-col-width col))
         half)
@@ -3373,8 +3374,8 @@ columns to include in width (default = 0)."
 
 (defun ses-center-span (value &optional fill)
   "Print VALUE, centered within the span that starts in the current column
-and continues until the next nonblank column.  FILL specifies the fill
-character (default = space)."
+and continues until the next nonblank column.
+FILL specifies the fill character (default = space)."
   (let ((end (1+ col)))
     (while (and (< end ses--numcols)
                 (memq (ses-cell-value row end) '(nil *skip*)))
@@ -3382,8 +3383,8 @@ character (default = space)."
     (ses-center value (- end col 1) fill)))
 
 (defun ses-dashfill (value &optional span)
-  "Print VALUE centered using dashes.  SPAN indicates how many rightward
-columns to include in width (default = 0)."
+  "Print VALUE centered using dashes.
+SPAN indicates how many rightward columns to include in width (default = 0)."
   (ses-center value span ?-))
 
 (defun ses-dashfill-span (value)
@@ -3397,7 +3398,7 @@ current column and continues until the next nonblank column."
   (ses-center-span value ?~))
 
 (defun ses-unsafe (value)
-  "Substitute for an unsafe formula or printer"
+  "Substitute for an unsafe formula or printer."
   (error "Unsafe formula or printer"))
 
 ;;All standard printers are safe, including ses-unsafe!
diff --git a/lisp/shell.el b/lisp/shell.el
index 47119e6769c..fdfc8b3cf19 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -35,7 +35,7 @@
 ;; This makes these modes easier to use.
 
 ;; For documentation on the functionality provided by comint mode, and
-;; the hooks available for customising it, see the file comint.el.
+;; the hooks available for customizing it, see the file comint.el.
 ;; For further information on shell mode, see the comments below.
 
 ;; Needs fixin:
diff --git a/lisp/simple.el b/lisp/simple.el
index 1dc866cf64d..b7165c9f6a9 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1052,16 +1052,23 @@ In addition, with prefix argument, show details about that character
 in *Help* buffer.  See also the command `describe-char'."
   (interactive "P")
   (let* ((char (following-char))
-         ;; If the character is one of LRE, LRO, RLE, RLO, it will
-         ;; start a directional embedding, which could completely
-         ;; disrupt the rest of the line (e.g., RLO will display the
-         ;; rest of the line right-to-left).  So we put an invisible
-         ;; PDF character after these characters, to end the
-         ;; embedding, which eliminates any effects on the rest of the
-         ;; line.
-         (pdf (if (memq char '(?\x202a ?\x202b ?\x202d ?\x202e))
-                  (propertize (string ?\x202c) 'invisible t)
-                ""))
+         (bidi-fixer
+          (cond ((memq char '(?\x202a ?\x202b ?\x202d ?\x202e))
+                 ;; If the character is one of LRE, LRO, RLE, RLO, it
+                 ;; will start a directional embedding, which could
+                 ;; completely disrupt the rest of the line (e.g., RLO
+                 ;; will display the rest of the line right-to-left).
+                 ;; So we put an invisible PDF character after these
+                 ;; characters, to end the embedding, which eliminates
+                 ;; any effects on the rest of the line.
+                 (propertize (string ?\x202c) 'invisible t))
+                ;; Strong right-to-left characters cause reordering of
+                ;; the following numerical characters which show the
+                ;; codepoint, so append LRM to countermand that.
+                ((memq (get-char-code-property char 'bidi-class) '(R AL))
+                 (propertize (string ?\x200e) 'invisible t))
+                (t
+                 "")))
          (beg (point-min))
          (end (point-max))
          (pos (point))
@@ -1125,14 +1132,15 @@ in *Help* buffer.  See also the command `describe-char'."
                      (if (< char 256)
                          (single-key-description char)
                        (buffer-substring-no-properties (point) (1+ (point))))
-                     pdf encoding-msg pos total percent beg end col hscroll)
+                     bidi-fixer
+                     encoding-msg pos total percent beg end col hscroll)
           (message "Char: %s%s %s point=%d of %d (%d%%) column=%d%s"
                    (if enable-multibyte-characters
                        (if (< char 128)
                            (single-key-description char)
                          (buffer-substring-no-properties (point) (1+ (point))))
                      (single-key-description char))
-                   pdf encoding-msg pos total percent col hscroll))))))
+                   bidi-fixer encoding-msg pos total percent col hscroll))))))
 
 ;; Initialize read-expression-map.  It is defined at C level.
 (let ((m (make-sparse-keymap)))
@@ -1217,11 +1225,11 @@ this command arranges for all errors to enter the debugger."
       (push (eval eval-expression-arg lexical-binding) values)
     (let ((old-value (make-symbol "t")) new-value)
       ;; Bind debug-on-error to something unique so that we can
-      ;; detect when evaled code changes it.
+      ;; detect when evalled code changes it.
       (let ((debug-on-error old-value))
         (push (eval eval-expression-arg lexical-binding) values)
         (setq new-value debug-on-error))
-      ;; If evaled code has changed the value of debug-on-error,
+      ;; If evalled code has changed the value of debug-on-error,
       ;; propagate that change to the global binding.
       (unless (eq old-value new-value)
         (setq debug-on-error new-value))))
@@ -1582,7 +1590,7 @@ by the new completion."
      n)
     ;; next-matching-history-element always puts us at (point-min).
     ;; Move to the position we were at before changing the buffer contents.
-    ;; This is still sensical, because the text before point has not changed.
+    ;; This is still sensible, because the text before point has not changed.
     (goto-char point-at-start)))
 
 (defun previous-complete-history-element (n)
@@ -2907,11 +2915,11 @@ These commands include \\[set-mark-command] and \\[start-kbd-macro]."
 
 (defvar filter-buffer-substring-functions nil
   "Wrapper hook around `filter-buffer-substring'.
-The functions on this special hook are called with 4 arguments:
+The functions on this special hook are called with four arguments:
   NEXT-FUN BEG END DELETE
-NEXT-FUN is a function of 3 arguments (BEG END DELETE)
-that performs the default operation.  The other 3 arguments are like
-the ones passed to `filter-buffer-substring'.")
+NEXT-FUN is a function of three arguments (BEG END DELETE)
+that performs the default operation.  The other three arguments
+are like the ones passed to `filter-buffer-substring'.")
 
 (defvar buffer-substring-filters nil
   "List of filter functions for `filter-buffer-substring'.
@@ -4721,7 +4729,7 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
         (let ((line-move-visual nil))
           (line-move (1- arg) t)))
 
-    ;; Move to beginning-of-line, ignoring fields and invisibles.
+    ;; Move to beginning-of-line, ignoring fields and invisible text.
     (skip-chars-backward "^\n")
     (while (and (not (bobp)) (invisible-p (1- (point))))
       (goto-char (previous-char-property-change (point)))
@@ -5704,7 +5712,7 @@ At top-level, as an editor command, this simply beeps."
 (defvar buffer-quit-function nil
   "Function to call to \"quit\" the current buffer, or nil if none.
 \\[keyboard-escape-quit] calls this function when its more local actions
-\(such as cancelling a prefix argument, minibuffer or region) do not apply.")
+\(such as canceling a prefix argument, minibuffer or region) do not apply.")
 
 (defun keyboard-escape-quit ()
   "Exit the current \"mode\" (in a generalized sense of the word).
@@ -6015,7 +6023,7 @@ of the text to replace.  If END is nil, point is used instead.")
 
 (defvar completion-list-insert-choice-function #'completion--replace
   "Function to use to insert the text chosen in *Completions*.
-Called with 3 arguments (BEG END TEXT), it should replace the text
+Called with three arguments (BEG END TEXT), it should replace the text
 between BEG and END with TEXT.  Expected to be set buffer-locally
 in the *Completions* buffer.")
 
@@ -6209,7 +6217,7 @@ BASE-POSITION, says where to insert the completion."
                choice buffer base-position nil)
         ;; This remove-text-properties should be unnecessary since `choice'
         ;; comes from buffer-substring-no-properties.
-        ;;(remove-text-properties 0 (lenth choice) '(mouse-face nil) choice)
+        ;;(remove-text-properties 0 (length choice) '(mouse-face nil) choice)
         ;; Insert the completion into the buffer where it was requested.
         (funcall (or insert-function completion-list-insert-choice-function)
                  (or (car base-position) (point))
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index b8a734784be..efe7832aca6 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -696,7 +696,7 @@ function `speedbar-extension-list-to-regex'.")
   (append '(".[ch]\\(\\+\\+\\|pp\\|c\\|h\\|xx\\)?" ".tex\\(i\\(nfo\\)?\\)?"
             ".el" ".emacs" ".l" ".lsp" ".p" ".java" ".js" ".f\\(90\\|77\\|or\\)?")
           (if speedbar-use-imenu-flag
-              '(".ada" ".p[lm]" ".tcl" ".m" ".scm" ".pm" ".py" ".g"
+              '(".ad[abs]" ".p[lm]" ".tcl" ".m" ".scm" ".pm" ".py" ".g"
                 ;; html is not supported by default, but an imenu tags package
                 ;; is available.  Also, html files are nice to be able to see.
                 ".s?html"
@@ -1862,7 +1862,7 @@ of the special mode functions."
             (if (not v)
                 (setq speedbar-special-mode-expansion-list t)
               ;; If it is autoloaded, we need to load it now so that
-              ;; we have access to the varialbe -speedbar-menu-items.
+              ;; we have access to the variable -speedbar-menu-items.
               ;; Is this XEmacs safe?
               (let ((sf (symbol-function v)))
                 (if (and (listp sf) (eq (car sf) 'autoload))
diff --git a/lisp/term.el b/lisp/term.el
index 484bc36363e..47cda9beeed 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -37,8 +37,8 @@
 ;; --------------------------------------
 ;;
 ;; While the message passing and the colorization surely introduce some
-;; overhead this has became so small that IMHO is surely outweighted by
-;; the benefits you get but, as usual, YMMV
+;; overhead this has became so small that IMHO it is surely outweighed by
+;; the benefits you get but, as usual, YMMV.
 ;;
 ;; Important caveat, when deciding the cursor/'gray keys' keycodes I had to
 ;; make a choice: on my Linux box this choice allows me to run all the
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index b639af7cda0..df0ddd7de8b 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -702,19 +702,24 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 
 ;;;; Pasteboard support.
 
-(declare-function ns-get-cut-buffer-internal "nsselect.m" (buffer))
+(declare-function ns-get-selection-internal "nsselect.m" (buffer))
+(declare-function ns-store-selection-internal "nsselect.m" (buffer string))
+
+(define-obsolete-function-alias 'ns-get-cut-buffer-internal
+  'ns-get-selection-internal "24.1")
+(define-obsolete-function-alias 'ns-store-cut-buffer-internal
+  'ns-store-selection-internal "24.1")
+
 
 (defun ns-get-pasteboard ()
   "Returns the value of the pasteboard."
-  (ns-get-cut-buffer-internal 'CLIPBOARD))
-
-(declare-function ns-store-cut-buffer-internal "nsselect.m" (buffer string))
+  (ns-get-selection-internal 'CLIPBOARD))
 
 (defun ns-set-pasteboard (string)
   "Store STRING into the pasteboard of the Nextstep display server."
   ;; Check the data type of STRING.
   (if (not (stringp string)) (error "Nonstring given to pasteboard"))
-  (ns-store-cut-buffer-internal 'CLIPBOARD string))
+  (ns-store-selection-internal 'CLIPBOARD string))
 
 ;; We keep track of the last text selected here, so we can check the
 ;; current selection against it, and avoid passing back our own text
@@ -742,11 +747,11 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 (defun ns-copy-including-secondary ()
   (interactive)
   (call-interactively 'kill-ring-save)
-  (ns-store-cut-buffer-internal 'SECONDARY
-                                (buffer-substring (point) (mark t))))
+  (ns-store-selection-internal 'SECONDARY
+                               (buffer-substring (point) (mark t))))
 (defun ns-paste-secondary ()
   (interactive)
-  (insert (ns-get-cut-buffer-internal 'SECONDARY)))
+  (insert (ns-get-selection-internal 'SECONDARY)))
 
 
 ;;;; Scrollbar handling.
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index c784892ce6b..c64dc0e7a19 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -228,7 +228,7 @@ for the currently selected frame."
         ;; 216 non-gray colors first
         (let ((r 0) (g 0) (b 0))
           (while (> ncolors 24)
-            ;; This and other formulae taken from 256colres.pl and
+            ;; This and other formulas taken from 256colres.pl and
             ;; 88colres.pl in the xterm distribution.
             (tty-color-define (format "color-%d" (- 256 ncolors))
                               (- 256 ncolors)
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 05e18ed24a0..ac0f833da63 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -126,7 +126,7 @@ a file in the home directory."
 
 (defun emacs-session-save ()
   "This function is called when the window system is shutting down.
-If this function returns non-nil, the window system shutdown is cancelled.
+If this function returns non-nil, the window system shutdown is canceled.
 
 When a session manager tells Emacs that the window system is shutting
 down, this function is called.  It calls the functions in the hook
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index c2856660ea8..f9d11cb2685 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -637,7 +637,7 @@ versions of xterm."
         ;; 216 non-gray colors first
         (let ((r 0) (g 0) (b 0))
           (while (> ncolors 24)
-            ;; This and other formulae taken from 256colres.pl and
+            ;; This and other formulas taken from 256colres.pl and
             ;; 88colres.pl in the xterm distribution.
             (tty-color-define (format "color-%d" (- 256 ncolors))
                               (- 256 ncolors)
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index 0efabc2135a..2e90a4bf241 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -3960,11 +3960,11 @@ The 2-point shape SHAPE is drawn from X1, Y1 to X2, Y2."
 ;; Implementation note: This really should honor the interval-fn entry
 ;; in the master table, `artist-mt', which would mean leaving a timer
 ;; that calls `draw-fn' every now and then. That timer would then have
-;; to be cancelled and reinstalled whenever the user moves the cursor.
+;; to be canceled and reinstalled whenever the user moves the cursor.
 ;; This could be done, but what if the user suddenly switches to another
 ;; drawing mode, or even kills the buffer! In the mouse case, it is much
 ;; simpler: when at the end of `artist-mouse-draw-continously', the
-;; user has released the button, so the timer will always be cancelled
+;; user has released the button, so the timer will always be canceled
 ;; at that point.
 (defun artist-key-draw-continously (x y)
   "Draw current continuous shape at X,Y."
@@ -4455,7 +4455,7 @@ If N is negative, move backward."
   "Set current fill character to be C."
   (interactive "cType fill char (type RET to turn off): ")
   (cond ((eq c ?\r) (setq artist-fill-char-set nil)
-                    (message "Fill cancelled"))
+                    (message "Fill canceled"))
         (t          (setq artist-fill-char-set t)
                     (setq artist-fill-char c)
                     (message "Fill set to \"%c\"" c))))
@@ -5589,7 +5589,7 @@ The event, EV, is the mouse event."
 ;;         of drawing mode.
 ;;
 ;;         You should provide these functions. You might think that
-;;         only you is using your type of mode, so noone will be able
+;;         only you is using your type of mode, so no one will be able
 ;;         to switch to another operation of the same type of mode,
 ;;         but someone else might base a new drawing mode upon your
 ;;         work.
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index b8614b16f82..610b0c71357 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -82,7 +82,7 @@ reinserts the fill prefix in each resulting line."
       (setq fill-prefix nil)))
   (if fill-prefix
       (message "fill-prefix: \"%s\"" fill-prefix)
-    (message "fill-prefix cancelled")))
+    (message "fill-prefix canceled")))
 
 (defcustom adaptive-fill-mode t
   "Non-nil means determine a paragraph's fill prefix from its text."
@@ -383,7 +383,7 @@ and `fill-nobreak-invisible'."
   "Char-table of characters that don't use space between words.")
 
 (progn
-  ;; Register `kinsoku' for scripts HAN, KANA, BOPOMPFO, and CJK-MISS.
+  ;; Register `kinsoku' for scripts HAN, KANA, BOPOMOFO, and CJK-MISC.
   ;; Also tell that they don't use space between words.
   (map-char-table
    #'(lambda (key val)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index d0967d63740..ba7b84fe1dd 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2499,7 +2499,7 @@ scrolling the current window.  Leave the new window selected."
       ;; hidden by new window, scroll it to just below new win
       ;; otherwise set top line of other win so it doesn't scroll.
       (if (< oldot top) (setq top oldot))
-      ;; if frame is unsplitable, temporarily disable that...
+      ;; if frame is unsplittable, temporarily disable that...
       (if (cdr (assq 'unsplittable (frame-parameters (selected-frame))))
           (let ((frame (selected-frame)))
             (modify-frame-parameters frame '((unsplittable . nil)))
@@ -3979,7 +3979,7 @@ Both should not be used to define a buffer-local dictionary."
 ; LocalWords:  AMStex hspace includeonly nocite epsfig displaymath eqnarray reg
 ; LocalWords:  minipage modeline pers dict unhighlight buf grep sync prev inc
 ; LocalWords:  fn oldot NB AIX msg init read's bufs pt cmd Quinlan eg
-; LocalWords:  uuencoded unidiff sc nn VM SGML eval IspellPersDict unsplitable
+; LocalWords:  uuencoded unidiff sc nn VM SGML eval IspellPersDict
 ; LocalWords:  lns XEmacs HTML casechars Multibyte
 
 ;;; ispell.el ends here
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 678d48758da..3356ce195f2 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -742,7 +742,7 @@ by supplying an argument.
 Entry to this mode calls the value of `picture-mode-hook' if non-nil.
 
 Note that Picture mode commands will work outside of Picture mode, but
-they are not defaultly assigned to keys."
+they are not by default assigned to keys."
   (interactive)
   (if (eq major-mode 'picture-mode)
       (error "You are already editing a picture")
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index ff6ffffc382..2aecc34e2b0 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -212,7 +212,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'."
       (add-hook 'pre-command-hook 'reftex-highlight-shall-die)
 
       (when (eq how 'tmp-window)
-        ;; Resize window and arrange restauration
+        ;; Resize window and arrange restoration
         (shrink-window (1- (- (window-height) 9)))
         (recenter '(4))
         (add-hook 'pre-command-hook 'reftex-restore-window-conf))
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 07a4fae9c30..c184a90dfc2 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -474,7 +474,7 @@ If this is nil, then `diary-file' will be used instead."
           (replace-match
            (let ((style (if (boundp 'calendar-date-style)
                             calendar-date-style
-                          ;; Don't complain about obsoleteness.
+                          ;; Don't complain about obsolescence.
                           (if (with-no-warnings european-calendar-style)
                               'european
                             'american))))
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 64dffe78d50..f2dba1575c2 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -243,7 +243,7 @@
     (define-key map [(control ?=)] 'rst-adjust) ;; (Does not work on the Mac OSX.)
     ;; Display the hierarchy of decorations implied by the current document contents.
     (define-key map [(control c) (control h)] 'rst-display-decorations-hierarchy)
-    ;; Homogeneize the decorations in the document.
+    ;; Homogenize the decorations in the document.
     (define-key map [(control c) (control s)] 'rst-straighten-decorations)
 ;;    (define-key map [(control c) (control s)] 'rst-straighten-deco-spacing)
 
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 65f6d98ef79..6f9e592d8ed 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -345,7 +345,7 @@
 ;; Above code is well known ~/.emacs idiom for customizing a mode
 ;; specific keymap however it does not work for this package.  This is
 ;; because there is no table mode in effect.  This package does not
-;; use a local map therefor you must modify `table-cell-map'
+;; use a local map therefore you must modify `table-cell-map'
 ;; explicitly.  The correct way of achieving above task is:
 ;;
 ;;   (add-hook 'table-cell-map-hook
@@ -2155,7 +2155,7 @@ specified."
 (defun table-shorten-cell (n)
   "Shorten the current cell by N lines by shrinking the cell vertically.
 Shortening is done by removing blank lines from the bottom of the cell
-and possibly from the top of the cell as well.  Therefor, the cell
+and possibly from the top of the cell as well.  Therefore, the cell
 must have some bottom/top blank lines to be shorten effectively.  This
 is applicable to all the cells aligned horizontally with the current
 one because they are also shortened in order to keep the rectangular
@@ -4293,7 +4293,7 @@ cache buffer into the designated cell in the table buffer."
     (car (table--get-coordinate (cdr (table--horizontal-cell-list nil t))))
     (1+ (cdr (table--get-coordinate (cdr (table--vertical-cell-list nil t))))))))
 
-(defun table-call-interactively (function &optional recoard-flag keys)
+(defun table-call-interactively (function &optional record-flag keys)
   "Call FUNCTION, or a table version of it if applicable.
 See `call-interactively' for full description of the arguments."
   (let ((table-func (intern-soft (format "*table--cell-%s" function))))
@@ -4301,7 +4301,7 @@ See `call-interactively' for full description of the arguments."
      (if (and table-func
               (table--point-in-cell-p))
          table-func
-       function) recoard-flag keys)))
+       function) record-flag keys)))
 
 (defun table-funcall (function &rest arguments)
   "Call FUNCTION, or a table version of it if applicable.
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index a337d6f9f40..b186b02851d 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -2088,11 +2088,11 @@ This command is executed when texinfmt sees @item inside @multitable."
         (table-entry-height 0)
         ;; unformatted row looks like:  A1  @tab  A2  @tab  A3
         ;; extract-row command deletes the source line in the table.
-        (unformated-row (texinfo-multitable-extract-row)))
+        (unformatted-row (texinfo-multitable-extract-row)))
     ;; Use a temporary buffer
     (set-buffer (get-buffer-create texinfo-multitable-buffer-name))
     (delete-region (point-min) (point-max))
-    (insert unformated-row)
+    (insert unformatted-row)
     (goto-char (point-min))
 ;; 1. Check for correct number of @tab in line.
     (let ((tab-number 1))               ; one @tab between two columns
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index 047bba72ccd..69d68a76d4b 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -23,7 +23,9 @@
 
 ;;; Commentary:
 
-;; Known bug: update commands fail to ignore @ignore.
+;; Known bug: update commands fail to ignore @ignore, and fail to DTRT
+;; with the @if... directives (so expect trouble when the manual uses
+;; different @node lines or @menu items in @iftex and in @ifnottex).
 
 ;; Summary: how to use the updating commands
 
@@ -37,6 +39,16 @@
 ;; With a prefix argument, the `texinfo-update-node' and
 ;; `texinfo-make-menu' functions do their jobs in the region.
 ;;
+;; Important note: We do NOT recommend use of these commands to update
+;; the `Next', `Previous' and `Up' pointers on @node lines.  Most
+;; manuals, including those whose Texinfo files adhere to the strucure
+;; described below, don't need these pointers, because makeinfo will
+;; generate them automatically (see the node "makeinfo Pointer
+;; Creation" in the Texinfo manual).  By contrast, due to known bugs
+;; described above, texinfo-update-node etc. could produce incorrect
+;; pointers, and thus make a perfectly valid Texinfo file into an
+;; invalid one.  You _have_ been warned!
+;;
 ;; In brief, the functions for creating or updating nodes and menus, are:
 ;;
 ;;     texinfo-update-node (&optional beginning end)
@@ -89,6 +101,16 @@
 ;; It does not matter whether the  `@node' line has pre-existing
 ;; `Next', `Previous', or `Up' pointers in it.  They are removed.
 
+;; Warning: Since the pre-existing pointers are replaced with the ones
+;; computed by `texinfo-update-node', and since this function has
+;; known bugs with the more advanced Texinfo features (see above), it
+;; could produce an invalid Texinfo file.  You are well advised not to
+;; use this function, except if you know what you are doing and
+;; exercise extreme caution.  Keep in mind that most manuals do not
+;; need the `Next', `Previous', and `Up' pointers to be present on the
+;; @node lines; makeinfo will automatically generate them when it
+;; produces the Info or HTML versions of the manual.
+
 ;; The `texinfo-every-node-update' function runs `texinfo-update-node'
 ;; on the whole buffer.
 
@@ -119,12 +141,15 @@
 ;; on the whole buffer.
 
 ;; The `texinfo-master-menu' function creates an extended menu located
-;; after the top node.  (The file must have a top node.)  The function
-;; first updates all the regular menus in the buffer (incorporating the
-;; descriptions from pre-existing menus), and then constructs a master
-;; menu that includes every entry from every other menu.  (However, the
-;; function cannot update an already existing master menu; if one
-;; exists, it must be removed before calling the function.)
+;; after the top node.  (The file must have a top node.)  This
+;; function works only on Texinfo files all of whose menus are
+;; present in a single file; use `texinfo-multiple-files-update' for
+;; multi-file manuals.  The function constructs a master menu that
+;; includes every entry from every other menu.  Use this command to
+;; create or update the @detailmenu menu after you've created or
+;; updated all the menus in the file, including the menu in the Top
+;; node, using the `texinfo-make-menu' or the `texinfo-all-menus-update'
+;; command.
 
 ;; The `texinfo-indent-menu-description' function indents every
 ;; description in the menu following point, to the specified column.
@@ -142,7 +167,7 @@
 ;; as node names in pre-existing `@node' lines that lack names.
 ;;
 ;; Since node names should be more concise than section or chapter
-;; titles, node names so inserted will need to be edited manually.
+;; titles, you will usually want to manually edit node names so inserted.
 
 
 ;;; Code:
@@ -330,8 +355,13 @@ at the level specified by LEVEL.  Point is left at the end of menu."
   "Update every regular menu in a Texinfo file.
 Update pre-existing master menu, if there is one.
 
+Only single-file manuals are supported by this function.  For
+multi-file manuals, use `texinfo-multiple-files-update'.
+
 If called with a non-nil argument, this function first updates all the
-nodes in the buffer before updating the menus.
+nodes in the buffer before updating the menus.  Do NOT invoke this
+command with an argument if your Texinfo file uses @node lines without
+the `Next', `Previous', and `Up' pointers!
 
 Indents the first line of descriptions, and leaves trailing whitespace
 in a menu that lacks descriptions, so descriptions will format well.
@@ -843,20 +873,35 @@ second and subsequent lines of a multi-line description."
 
 (defun texinfo-master-menu (update-all-nodes-menus-p)
   "Make a master menu for a whole Texinfo file.
-Non-nil argument (prefix, if interactive) means first update all
-existing nodes and menus.  Remove pre-existing master menu, if there is one.
-
-This function creates a master menu that follows the top node.  The
-master menu includes every entry from all the other menus.  It
-replaces any existing ordinary menu that follows the top node.
-
-If called with a non-nil argument, this function first updates all the
-menus in the buffer (incorporating descriptions from pre-existing
-menus) before it constructs the master menu.
-
-The function removes the detailed part of an already existing master
-menu.  This action depends on the pre-existing master menu using the
-standard `texinfo-master-menu-header'.
+Remove pre-existing master menu, if there is one.
+
+This function supports only single-file manuals.  For multi-file
+manuals, use `texinfo-multiple-files-update'.
+
+This function creates or updates the @detailmenu section of a
+master menu that follows the Top node.  It replaces any existing
+detailed menu that follows the top node.  The detailed menu
+includes every entry from all the other menus.  By default, the
+existing menus, including the menu in the Top node, are not
+updated according to the buffer contents, so all the menus should
+be updated first using `texinfo-make-menu' or
+`texinfo-all-menus-update', which see.  Alternatively, invoke
+this function with a prefix argument, see below.
+
+Non-nil, non-numeric argument (C-u prefix, if interactive) means
+first update all existing menus in the buffer (incorporating
+descriptions from pre-existing menus) before it constructs the
+master menu.  If the argument is numeric (e.g., \"C-u 2\"),
+update all existing nodes as well, by calling
+\`texinfo-update-node' on the entire file.  Warning: do NOT
+invoke with a numeric argument if your Texinfo file uses @node
+lines without the `Next', `Previous', `Up' pointers, as the
+result could be an invalid Texinfo file!
+
+The function removes and recreates the detailed part of an already
+existing master menu.  This action assumes that the pre-existing
+master menu uses the standard `texinfo-master-menu-header' for the
+detailed menu.
 
 The master menu has the following format, which is adapted from the
 recommendation in the Texinfo Manual:
@@ -909,10 +954,11 @@ section titles are often too short to explain a node well."
 
     (if update-all-nodes-menus-p
         (progn
-          (message "Making a master menu in %s ...first updating all nodes... "
-                   (buffer-name))
-          (texinfo-update-node (point-min) (point-max))
-
+          (when (numberp update-all-nodes-menus-p)
+            (message
+             "Making a master menu in %s ...first updating all nodes... "
+             (buffer-name))
+            (texinfo-update-node (point-min) (point-max)))
           (message "Updating all menus in %s ... " (buffer-name))
           (texinfo-make-menu (point-min) (point-max))))
 
@@ -978,7 +1024,7 @@ However, there does not need to be a title field."
   (let ((first-chapter
          (save-excursion (re-search-forward "^@node\\|^@include") (point))))
     (unless (re-search-forward "^@menu" first-chapter t)
-      (error "Buffer lacks ordinary `Top' menu in which to insert master")))
+      (error "Buffer lacks a menu in its first node; create it, then run me again")))
   (beginning-of-line)
   (delete-region      ; buffer must have ordinary top menu
    (point)
@@ -1119,7 +1165,7 @@ error if the node is not the top node and a section is not found."
          "texinfo-specific-section-type: Chapter or section not found"))))))
 
 (defun texinfo-hierarchic-level ()
-  "Return the general hierarchal level of the next node in a texinfo file.
+  "Return the general hierarchical level of the next node in a texinfo file.
 Thus, a subheading or appendixsubsec is of type subsection."
   (let ((case-fold-search t))
     (cadr (assoc
@@ -1207,6 +1253,11 @@ end of that region; it limits the search."
   "Without any prefix argument, update the node in which point is located.
 Interactively, a prefix argument means to operate on the region.
 
+Warning: do NOT use this function if your Texinfo file uses @node
+lines without the `Next', `Previous', `Up' pointers, because the
+result could be an invalid Texinfo file due to known deficiencies
+in this command: it does not support @ignore and @if* directives.
+
 The functions for creating or updating nodes and menus, and their
 keybindings, are:
 
@@ -1246,7 +1297,12 @@ which menu descriptions are indented. Its default value is 32."
           (message "Done...nodes updated in region.  You may save the buffer."))))))
 
 (defun texinfo-every-node-update ()
-  "Update every node in a Texinfo file."
+  "Update every node in a Texinfo file.
+
+Warning: do NOT use this function if your Texinfo file uses @node
+lines without the `Next', `Previous', `Up' pointers, because the
+result could be an invalid Texinfo file due to known deficiencies
+in this command: it does not support @ignore and @if* directives."
   (interactive)
   (save-excursion
     (texinfo-update-node (point-min) (point-max))
@@ -1934,7 +1990,11 @@ With optional UPDATE-EVERYTHING argument (numeric prefix arg, if
 interactive), update all the menus and all the `Next', `Previous', and
 `Up' pointers of all the files included in OUTER-FILE before inserting
 a master menu in OUTER-FILE.  Also, update the `Top' level node
-pointers of OUTER-FILE.
+pointers of OUTER-FILE.  Do NOT invoke this command with a numeric prefix
+arg, if your files use @node lines without the `Next', `Previous', `Up'
+pointers, because this could produce invalid Texinfo files due to known
+deficiencies in `texinfo-update-node': it does not support the @ignore
+and @if... directives.
 
 Notes:
 
diff --git a/lisp/time.el b/lisp/time.el
index ac4a011bdf8..4955b177545 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -369,7 +369,7 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'."
       nil)))
 
 (with-no-warnings
-  ;; Warnings are suppresed to avoid "global/dynamic var `X' lacks a prefix".
+  ;; Warnings are suppressed to avoid "global/dynamic var `X' lacks a prefix".
   (defvar now)
   (defvar time)
   (defvar load)
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 48d2caf35f4..db28770ad0e 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1673,7 +1673,7 @@
         (url-dav-process-DAV:activelock)
         (url-dav-process-DAV:lockdiscovery): Can now correctly parse
         DAV:lockdiscovery nodes, so that we can find out who has a
-        resource locked and properly parse the reponse to a LOCK request.
+        resource locked and properly parse the response to a LOCK request.
         (url-dav-process-DAV:status): Now parses out the numeric status
         from the HTTP response line.
         (url-dav-process-response): New function to handle all the
@@ -2448,7 +2448,7 @@
         * lisp/url-nfs.el (url-nfs-create-wrapper): New function to create
         wrappers onto the appropriate file-based URLs for file-name-handlers.
 
-        * lisp/url-ftp.el: Moved the FTP stuff into it's own file - it
+        * lisp/url-ftp.el: Moved the FTP stuff into its own file - it
         might get messy with file-name-handlers and things.
 
         * lisp/url-http.el (url-http-clean-headers): Fix problem when
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index f8417791ce5..746a4dc77b5 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -316,7 +316,7 @@ telling Microsoft that."
          (set (if (> trusted untrusted) 'untrusted 'trusted) nil))
     (cond
      (untrusted
-      ;; The site was explicity marked as untrusted by the user.
+      ;; The site was explicitly marked as untrusted by the user.
       nil)
      ((or (eq url-privacy-level 'paranoid)
           (and (listp url-privacy-level) (memq 'cookies url-privacy-level)))
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 7d80f2f6725..a3a384b7a90 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -72,12 +72,12 @@ This list will be executed as a command after logging in via telnet."
   :group 'url-gateway)
 
 (defcustom url-gateway-telnet-login-prompt "^\r*.?login:"
-  "Prompt that tells us we should send our username when loggin in w/telnet."
+  "Prompt that tells us we should send our username when logging in w/telnet."
   :type 'regexp
   :group 'url-gateway)
 
 (defcustom url-gateway-telnet-password-prompt "^\r*.?password:"
-  "Prompt that tells us we should send our password when loggin in w/telnet."
+  "Prompt that tells us we should send our password when logging in w/telnet."
   :type 'regexp
   :group 'url-gateway)
 
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index a9ff042d681..9b9bdb6416e 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -237,12 +237,12 @@ request.")
     (if proxy-auth
         (setq proxy-auth (concat "Proxy-Authorization: " proxy-auth "\r\n")))
 
-    ;; Protection against stupid values in the referer
+    ;; Protection against stupid values in the referrer
     (if (and ref-url (stringp ref-url) (or (string= ref-url "file:nil")
                                            (string= ref-url "")))
         (setq ref-url nil))
 
-    ;; We do not want to expose the referer if the user is paranoid.
+    ;; We do not want to expose the referrer if the user is paranoid.
     (if (or (memq url-privacy-level '(low high paranoid))
             (and (listp url-privacy-level)
                  (memq 'lastloc url-privacy-level)))
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index cfb98c6937e..19e0b621d87 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -62,7 +62,6 @@
 (mapc 'make-variable-buffer-local
       '(
         url-current-object
-        url-current-referer
         url-current-mime-headers
         ))
 
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 787a8b7c0f1..d3db66a9e2a 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -370,7 +370,7 @@ It needs to be killed when we quit the session.")
              this-command)))
 
 (defgroup ediff-highlighting nil
-  "Hilighting of difference regions in Ediff."
+  "Highlighting of difference regions in Ediff."
   :prefix "ediff-"
   :group 'ediff)
 
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index ef273c610fe..6563dca5ec6 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -373,7 +373,7 @@ other files, enter /dev/null
                          (concat actual-dir (cdr proposed-file-names)))))
               ))
           ediff-patch-map)
-    ;; Check for the existing files in each pair and discard the nonexisting
+    ;; Check for the existing files in each pair and discard the nonexistent
     ;; ones. If both exist, ask the user.
     (mapcar (lambda (session-info)
               (let* ((file1 (car (ediff-get-session-objA-name session-info)))
diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index 3ba5bcdb90a..bc4b0725c4e 100644
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -1754,7 +1754,7 @@ to the left margin, if they are in windows."
 ;; If there are min-lines lines above and below the region, then don't do
 ;; anything.
 ;; If not, recenter the region to make it so.
-;; If that isn't possible, remove context lines balancedly from top and bottom
+;; If that isn't possible, remove context lines evenly from top and bottom
 ;; so the entire region shows.
 ;; If that isn't possible, show the top of the region.
 ;; BEG must be at the beginning of a line.
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index 256719d4c84..9a8be04fc38 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -322,7 +322,7 @@ The argument is added (or not) to the list of FLAGS and is constructed
 by appending the branch to ARG which defaults to \"-r\".
 Since the `cvs-secondary-branch-prefix' is only active if the primary
 prefix is active, it is important to read the secondary prefix before
-the primay since reading the primary can deactivate it."
+the primary since reading the primary can deactivate it."
   (let ((branch (and (cvs-prefix-get 'cvs-branch-prefix 'read-only)
                      (cvs-prefix-get 'cvs-secondary-branch-prefix))))
     (if branch (cons (concat (or arg "-r") branch) flags) flags)))
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index c5c0ce73b3a..508420f026a 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -764,7 +764,10 @@ REV non-nil gets an error."
 
 (defun vc-bzr-rename-file (old new)
   "Rename file from OLD to NEW using `bzr mv'."
-  (vc-bzr-command "mv" nil 0 new old))
+  (setq old (expand-file-name old))
+  (setq new (expand-file-name new))
+  (vc-bzr-command "mv" nil 0 new old)
+  (message "Renamed %s => %s" old new))
 
 (defvar vc-bzr-annotation-table nil
   "Internal use.")
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index d4b631a1d1b..f14b8830d43 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -534,57 +534,71 @@ If a prefix argument is given, move by that many lines."
         (save-excursion
           (goto-char (region-beginning))
           (while (<= (line-number-at-pos) lastl)
-            (funcall mark-unmark-function))))
+            (condition-case nil
+                (funcall mark-unmark-function)
+              ;; `vc-dir-mark-file' signals an error if we try marking
+              ;; a directory containing marked files in its tree, or a
+              ;; file in a marked directory tree.  Just continue.
+              (error (vc-dir-next-line 1))))))
     (funcall mark-unmark-function)))
 
 (defun vc-dir-parent-marked-p (arg)
-  ;; Return nil if none of the parent directories of arg is marked.
+  ;; Non-nil iff a parent directory of arg is marked.
+  ;; Return value, if non-nil is the `ewoc-data' for the marked parent.
   (let* ((argdir (vc-dir-node-directory arg))
          (arglen (length argdir))
          (crt arg)
-         data dir)
+         (found nil))
     ;; Go through the predecessors, checking if any directory that is
     ;; a parent is marked.
-    (while (setq crt (ewoc-prev vc-ewoc crt))
-      (setq data (ewoc-data crt))
-      (setq dir (vc-dir-node-directory crt))
-      (when (and (vc-dir-fileinfo->directory data)
-                 (vc-string-prefix-p dir argdir))
-        (when (vc-dir-fileinfo->marked data)
-          (error "Cannot mark `%s', parent directory `%s' marked"
-                 (vc-dir-fileinfo->name (ewoc-data arg))
-                 (vc-dir-fileinfo->name data)))))
-    nil))
+    (while (and (null found)
+                (setq crt (ewoc-prev vc-ewoc crt)))
+      (let ((data (ewoc-data crt))
+            (dir (vc-dir-node-directory crt)))
+        (and (vc-dir-fileinfo->directory data)
+             (vc-string-prefix-p dir argdir)
+             (vc-dir-fileinfo->marked data)
+             (setq found data))))
+    found))
 
 (defun vc-dir-children-marked-p (arg)
-  ;; Return nil if none of the children of arg is marked.
+  ;; Non-nil iff a child of ARG is marked.
+  ;; Return value, if non-nil, is the `ewoc-data' for the marked child.
   (let* ((argdir-re (concat "\\`" (regexp-quote (vc-dir-node-directory arg))))
          (is-child t)
          (crt arg)
-         data dir)
-    (while (and is-child (setq crt (ewoc-next vc-ewoc crt)))
-      (setq data (ewoc-data crt))
-      (setq dir (vc-dir-node-directory crt))
-      (if (string-match argdir-re dir)
-          (when (vc-dir-fileinfo->marked data)
-            (error "Cannot mark `%s', child `%s' marked"
-                   (vc-dir-fileinfo->name (ewoc-data arg))
-                   (vc-dir-fileinfo->name data)))
-        ;; We are done, we got to an entry that is not a child of `arg'.
-        (setq is-child nil)))
-    nil))
+         (found nil))
+    (while (and is-child
+                (null found)
+                (setq crt (ewoc-next vc-ewoc crt)))
+      (let ((data (ewoc-data crt))
+            (dir (vc-dir-node-directory crt)))
+        (if (string-match argdir-re dir)
+            (if (vc-dir-fileinfo->marked data)
+                (setq found data))
+          ;; We are done, we got to an entry that is not a child of `arg'.
+          (setq is-child nil))))
+    found))
 
 (defun vc-dir-mark-file (&optional arg)
   ;; Mark ARG or the current file and move to the next line.
   (let* ((crt (or arg (ewoc-locate vc-ewoc)))
          (file (ewoc-data crt))
-         (isdir (vc-dir-fileinfo->directory file)))
-    (when (or (and isdir (not (vc-dir-children-marked-p crt)))
-              (and (not isdir) (not (vc-dir-parent-marked-p crt))))
-      (setf (vc-dir-fileinfo->marked file) t)
-      (ewoc-invalidate vc-ewoc crt)
-      (unless (or arg (mouse-event-p last-command-event))
-        (vc-dir-next-line 1)))))
+         (isdir (vc-dir-fileinfo->directory file))
+         ;; Forbid marking a directory containing marked files in its
+         ;; tree, or a file in a marked directory tree.
+         (conflict (if isdir
+                       (vc-dir-children-marked-p crt)
+                     (vc-dir-parent-marked-p crt))))
+    (when conflict
+      (error (if isdir
+                 "File `%s' in this directory is already marked"
+               "Parent directory `%s' is already marked")
+             (vc-dir-fileinfo->name conflict)))
+    (setf (vc-dir-fileinfo->marked file) t)
+    (ewoc-invalidate vc-ewoc crt)
+    (unless (or arg (mouse-event-p last-command-event))
+      (vc-dir-next-line 1))))
 
 (defun vc-dir-mark ()
   "Mark the current file or all files in the region.
@@ -621,19 +635,19 @@ share the same state."
              (setf (vc-dir-fileinfo->marked filearg) t)
              t))
          vc-ewoc))
-    (let ((data (ewoc-data (ewoc-locate vc-ewoc))))
+    (let* ((crt  (ewoc-locate vc-ewoc))
+           (data (ewoc-data crt)))
       (if (vc-dir-fileinfo->directory data)
           ;; It's a directory, mark child files.
-          (let ((crt (ewoc-locate vc-ewoc)))
-            (unless (vc-dir-children-marked-p crt)
-              (while (setq crt (ewoc-next vc-ewoc crt))
-                (let ((crt-data (ewoc-data crt)))
-                  (unless (vc-dir-fileinfo->directory crt-data)
-                    (setf (vc-dir-fileinfo->marked crt-data) t)
-                    (ewoc-invalidate vc-ewoc crt))))))
+          (let (crt-data)
+            (while (and (setq crt (ewoc-next vc-ewoc crt))
+                        (setq crt-data (ewoc-data crt))
+                        (not (vc-dir-fileinfo->directory crt-data)))
+              (setf (vc-dir-fileinfo->marked crt-data) t)
+              (ewoc-invalidate vc-ewoc crt)))
         ;; It's a file
-        (let ((state (vc-dir-fileinfo->state data))
-              (crt (ewoc-nth vc-ewoc 0)))
+        (let ((state (vc-dir-fileinfo->state data)))
+          (setq crt (ewoc-nth vc-ewoc 0))
           (while crt
             (let ((crt-data (ewoc-data crt)))
               (when (and (not (vc-dir-fileinfo->marked crt-data))
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 0516abbf024..7b90536a31b 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -216,7 +216,7 @@ highlighting the Log View buffer."
              ((eq state ?R) 'removed)
              ((eq state ?!) 'missing)
              ((eq state ??) 'unregistered)
-             ((eq state ?C) 'up-to-date) ;; Older mercurials use this
+             ((eq state ?C) 'up-to-date) ;; Older mercurial versions use this.
              (t 'up-to-date)))))))
 
 (defun vc-hg-working-revision (file)
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 148f6cde930..c9e30772318 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -114,9 +114,9 @@ Otherwise, not displayed."
   :group 'vc)
 
 (defcustom vc-keep-workfiles t
-  "If non-nil, don't delete working files after registering changes.
-If the back-end is CVS, workfiles are always kept, regardless of the
-value of this flag."
+  "Whether to keep work files on disk after commits, on a locking VCS.
+This variable has no effect on modern merging-based version
+control systems."
   :type 'boolean
   :group 'vc)
 
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index eea1a992094..87e8901e33a 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -951,13 +951,13 @@ Within directories, only files already under version control are noticed."
 (defun vc-deduce-fileset (&optional observer allow-unregistered
                                     state-model-only-files)
   "Deduce a set of files and a backend to which to apply an operation.
-
 Return (BACKEND FILESET FILESET-ONLY-FILES STATE CHECKOUT-MODEL).
-If we're in VC-dir mode, the fileset is the list of marked files.
-Otherwise, if we're looking at a buffer visiting a version-controlled file,
-the fileset is a singleton containing this file.
-If none of these conditions is met, but ALLOW_UNREGISTERED is on and the
-visited file is not registered, return a singleton fileset containing it.
+
+If we're in VC-dir mode, FILESET is the list of marked files.
+Otherwise, if in a buffer visiting a version-controlled file,
+FILESET is a single-file fileset containing that file.
+Otherwise, if ALLOW-UNREGISTERED is non-nil and the visited file
+is unregistered, FILESET is a single-file fileset containing it.
 Otherwise, throw an error.
 
 STATE-MODEL-ONLY-FILES if non-nil, means that the caller needs
@@ -1048,34 +1048,27 @@ current buffer."
 ;;;###autoload
 (defun vc-next-action (verbose)
   "Do the next logical version control operation on the current fileset.
-This requires that all files in the fileset be in the same state.
-
-For locking systems:
-   If every file is not already registered, this registers each for version
-control.
-   If every file is registered and not locked by anyone, this checks out
-a writable and locked file of each ready for editing.
-   If every file is checked out and locked by the calling user, this
-first checks to see if each file has changed since checkout.  If not,
-it performs a revert on that file.
-   If every file has been changed, this pops up a buffer for entry
-of a log message; when the message has been entered, it checks in the
-resulting changes along with the log message as change commentary.  If
-the variable `vc-keep-workfiles' is non-nil (which is its default), a
-read-only copy of each changed file is left in place afterwards.
-   If the affected file is registered and locked by someone else, you are
-given the option to steal the lock(s).
-
-For merging systems:
-   If every file is not already registered, this registers each one for version
-control.  This does an add, but not a commit.
-   If every file is added but not committed, each one is committed.
-   If every working file is changed, but the corresponding repository file is
-unchanged, this pops up a buffer for entry of a log message; when the
-message has been entered, it checks in the resulting changes along
-with the logmessage as change commentary.  A writable file is retained.
-   If the repository file is changed, you are asked if you want to
-merge in the changes into your working copy."
+This requires that all files in the current VC fileset be in the
+same state.  If not, signal an error.
+
+For merging-based version control systems:
+  If every file in the VC fileset is not registered for version
+   control, register the fileset (but don't commit).
+  If every work file in the VC fileset is added or changed, pop
+   up a *vc-log* buffer to commit the fileset.
+  For a centralized version control system, if any work file in
+   the VC fileset is out of date, offer to update the fileset.
+
+For old-style locking-based version control systems, like RCS:
+  If every file is not registered, register the file(s).
+  If every file is registered and unlocked, check out (lock)
+   the file(s) for editing.
+  If every file is locked by you and has changes, pop up a
+   *vc-log* buffer to check in the changes.  If the variable
+   `vc-keep-workfiles' is non-nil (the default), leave a
+   read-only copy of each changed file after checking in.
+  If every file is locked by you and unchanged, unlock them.
+  If every file is locked by someone else, offer to steal the lock."
   (interactive "P")
   (let* ((vc-fileset (vc-deduce-fileset nil t 'state-model-only-files))
          (backend (car vc-fileset))
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index d4fc35920a9..b8673f2049f 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -223,7 +223,7 @@
 ;; automatically for a PC if Oemacs is detected.  This set uses separate
 ;; control, shift and meta keys with function keys 1 to 10.  In
 ;; particular, movement keys are concentrated on f5 to f8 with (in
-;; increasing order of distance travelled) C-, M- and S- as prefixes.
+;; increasing order of distance traveled) C-, M- and S- as prefixes.
 ;; See the actual bindings below (search for C-f1).  This is because the
 ;; C-S- prefix is represented by weird key sequences and the set is
 ;; incomplete; if you don't mind that, some hints are given in comments
diff --git a/lisp/view.el b/lisp/view.el
index a5349445964..0d8ad3336f9 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -481,7 +481,7 @@ Entry to view-mode runs the normal hook `view-mode-hook'."
   ;; sets view-read-only to t as a buffer-local variable
   ;; after exiting View mode.  That arranges that the next toggle-read-only
   ;; will reenable View mode.
-  ;; Cancelling View mode in any other way should cancel that, too,
+  ;; Canceling View mode in any other way should cancel that, too,
   ;; so that View mode stays off if toggle-read-only is called.
   (if (local-variable-p 'view-read-only)
       (kill-local-variable 'view-read-only))
@@ -496,7 +496,7 @@ Entry to view-mode runs the normal hook `view-mode-hook'."
   "Update `view-return-to-alist' of buffer BUFFER.
 Remove from `view-return-to-alist' all entries referencing dead
 windows.  Optional argument ITEM non-nil means add ITEM to
-`view-return-to-alist' after purging.  For a decsription of items
+`view-return-to-alist' after purging.  For a description of items
 that can be added see the RETURN-TO-ALIST argument of the
 function `view-mode-exit'.  If `view-return-to-alist' contains an
 entry for the selected window, purge that entry from
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 8c4df9fc9cf..07eccaff4fb 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -295,10 +295,10 @@ minibuffer."
              (error "Canceled"))
            value))))
 
-(defun widget-remove-if (predictate list)
+(defun widget-remove-if (predicate list)
   (let (result (tail list))
     (while tail
-      (or (funcall predictate (car tail))
+      (or (funcall predicate (car tail))
           (setq result (cons (car tail) result)))
       (setq tail (cdr tail)))
     (nreverse result)))
@@ -577,7 +577,7 @@ This is only meaningful for radio buttons or checkboxes in a list."
   "Map FUNCTION over the buttons in BUFFER.
 FUNCTION is called with the arguments WIDGET and MAPARG.
 
-If FUNCTION returns non-nil, the walk is cancelled.
+If FUNCTION returns non-nil, the walk is canceled.
 
 The arguments MAPARG, and BUFFER default to nil and (current-buffer),
 respectively."
diff --git a/lisp/window.el b/lisp/window.el
index 69276a839bd..0014d85a816 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -296,7 +296,7 @@ is unpredictable."
   "Return first window on FRAME with PARAMETER non-nil.
 FRAME defaults to the selected frame.  Optional argument VALUE
 non-nil means only return a window whose window-parameter value
-for PARAMETER equals VALUE \(comparison is done with `equal').
+for PARAMETER equals VALUE (comparison is done with `equal').
 Optional argument ANY non-nil means consider internal windows
 too."
   (let (this-value windows)
@@ -312,7 +312,7 @@ too."
 (defun window-atom-root (&optional window)
   "Return root of atomic window WINDOW is a part of.
 WINDOW can be any window and defaults to the selected one.
-Return nil if WINDOW is not part of a atomic window."
+Return nil if WINDOW is not part of an atomic window."
   (setq window (window-normalize-window window))
   (let (root)
     (while (and window (window-parameter window 'window-atom))
@@ -380,7 +380,7 @@ Otherwise, top and bottom side windows are full width."
 (defcustom window-sides-slots '(nil nil nil nil)
   "Maximum number of side window slots.
 The value is a list of four elements specifying the number of
-side window slots on \(in this order) the left, top, right and
+side window slots on (in this order) the left, top, right and
 bottom side of each frame.  If an element is a number, this means
 to display at most that many side windows on the corresponding
 side.  If an element is nil, this means there's no bound on the
@@ -504,7 +504,7 @@ If the value is `width', then only the window's width is fixed.
 Any other non-nil value fixes both the width and the height.
 
 Emacs won't change the size of any window displaying that buffer,
-unless it has no other choice \(like when deleting a neighboring
+unless it has no other choice (like when deleting a neighboring
 window).")
 (make-variable-buffer-local 'window-size-fixed)
 
@@ -749,7 +749,7 @@ Optional argument NOUP non-nil means don't go up in the window
 tree but try to enlarge windows within WINDOW's combination only.
 
 Optional argument NODOWN non-nil means don't check whether WINDOW
-itself \(and its child windows) can be shrunk; check only whether
+itself (and its child windows) can be shrunk; check only whether
 at least one other window can be enlarged appropriately."
   (setq window (window-normalize-window window))
   (let ((size (window-total-size window horizontal))
@@ -831,7 +831,7 @@ tree but try to obtain the entire space from windows within
 WINDOW's combination.
 
 Optional argument NODOWN non-nil means do not check whether
-WINDOW itself \(and its child windows) can be enlarged; check
+WINDOW itself (and its child windows) can be enlarged; check
 only whether other windows can be shrunk appropriately."
   (setq window (window-normalize-window window))
   (if (and (not (window--size-ignore window ignore))
@@ -1211,7 +1211,7 @@ More precisely, cycle through all windows calling the function
 PREDICATE on each one of them with the window as its sole
 argument.  Return the first window for which PREDICATE returns
 non-nil.  Windows are scanned starting with the window following
-the selcted window.  If no window satisfies PREDICATE, return
+the selected window.  If no window satisfies PREDICATE, return
 DEFAULT.
 
 MINIBUF t means include the minibuffer window even if the
@@ -1418,7 +1418,7 @@ windows."
 ;; window and is currently used, for example, by ispell.el.
 (defun window--resize-mini-window (window delta)
   "Resize minibuffer window WINDOW by DELTA lines.
-If WINDOW cannot be resized by DELTA lines make it as large \(or
+If WINDOW cannot be resized by DELTA lines make it as large (or
 as small) as possible but don't signal an error."
   (when (window-minibuffer-p window)
     (let* ((frame (window-frame window))
@@ -1513,12 +1513,12 @@ instead."
   "Recursively set new normal height of child windows of window PARENT.
 HORIZONTAL non-nil means set the new normal width of these
 windows.  WINDOW specifies a child window of PARENT that has been
-resized by THIS-DELTA lines \(columns).
+resized by THIS-DELTA lines (columns).
 
 Optional argument TRAIL either 'before or 'after means set values
 for windows before or after WINDOW only.  Optional argument
-OTHER-DELTA a number specifies that this many lines \(columns)
-have been obtained from \(or returned to) an ancestor window of
+OTHER-DELTA a number specifies that this many lines (columns)
+have been obtained from (or returned to) an ancestor window of
 PARENT in order to resize WINDOW."
   (let* ((delta-normal
           (if (and (= (- this-delta) (window-total-size window horizontal))
@@ -2190,7 +2190,7 @@ for a horizontal split, and t for a vertical split.  EDGES gives
 the combined size and position of the child windows in the split,
 and the rest of the elements are the child windows in the split.
 Each of the child windows may again be a window or a list
-representing a window split, and so on.  EDGES is a list \(LEFT
+representing a window split, and so on.  EDGES is a list (LEFT
 TOP RIGHT BOTTOM) as returned by `window-edges'."
   (setq frame (window-normalize-frame frame))
   (window--subtree (frame-root-window frame) t))
@@ -2204,9 +2204,9 @@ skip -COUNT windows backwards.  COUNT zero means do not skip any
 window, so select the selected window.  In an interactive call,
 COUNT is the numeric prefix argument.  Return nil.
 
-If the `other-window' parameter of WINDOW is a function and
-`ignore-window-parameters' is nil, call that function with the
-arguments COUNT and ALL-FRAMES.
+If the `other-window' parameter of the selected window is a
+function and `ignore-window-parameters' is nil, call that
+function with the arguments COUNT and ALL-FRAMES.
 
 This function does not select a window whose `no-other-window'
 window parameter is non-nil.
@@ -2430,7 +2430,7 @@ the value returned by that function.
 Otherwise, if WINDOW is part of an atomic window, call this
 function with the root of the atomic window as its argument.  If
 WINDOW is a non-side window, make WINDOW the only non-side window
-on the frame.  Side windows are not deleted. If WINDOW is a side
+on the frame.  Side windows are not deleted.  If WINDOW is a side
 window signal an error."
   (interactive)
   (setq window (window-normalize-window window))
@@ -2455,7 +2455,7 @@ window signal an error."
         (throw 'done (delete-other-windows atom-root)))
        ((eq window-side 'none)
         ;; Set side-main to the major non-side window.
-        (setq side-main (window-with-parameter 'window-side 'none nil t)))
+        (setq side-main (window-with-parameter 'window-side 'none frame t)))
        ((memq window-side window-sides)
         (error "Cannot make side window the only window")))
       ;; If WINDOW is the main non-side window, do nothing.
@@ -2938,9 +2938,9 @@ With prefix argument KILL non-nil, kill the buffer instead of
 burying it.
 
 According to information stored in WINDOW's `quit-restore' window
-parameter either \(1) delete WINDOW and its frame, \(2) delete
-WINDOW, \(3) restore the buffer previously displayed in WINDOW,
-or \(4) make WINDOW display some other buffer than the present
+parameter either (1) delete WINDOW and its frame, (2) delete
+WINDOW, (3) restore the buffer previously displayed in WINDOW,
+or (4) make WINDOW display some other buffer than the present
 one.  If non-nil, reset `quit-restore' parameter to nil."
   (interactive "P")
   (setq window (window-normalize-window window t))
@@ -3047,14 +3047,14 @@ WINDOW's size.  Interactively, SIZE is the prefix argument.
 Optional third argument SIDE nil (or `below') specifies that the
 new window shall be located below WINDOW.  SIDE `above' means the
 new window shall be located above WINDOW.  In both cases SIZE
-specifies the new number of lines for WINDOW \(or the new window
+specifies the new number of lines for WINDOW (or the new window
 if SIZE is negative) including space reserved for the mode and/or
 header line.
 
 SIDE t (or `right') specifies that the new window shall be
 located on the right side of WINDOW.  SIDE `left' means the new
 window shall be located on the left of WINDOW.  In both cases
-SIZE specifies the new number of columns for WINDOW \(or the new
+SIZE specifies the new number of columns for WINDOW (or the new
 window provided SIZE is negative) including space reserved for
 fringes and the scrollbar or a divider column.  Any other non-nil
 value for SIDE is currently handled like t (or `right').
@@ -3604,7 +3604,7 @@ specific buffers."
                 (with-current-buffer (window-buffer window)
                   (let ((point (window-point-1 window))
                         (start (window-start window))
-                        (mark (mark)))
+                        (mark (mark t)))
                     `((buffer
                        ,(buffer-name buffer)
                        (selected . ,selected)
@@ -3713,7 +3713,7 @@ value can be also stored on disk and read back in a new session."
               (if (window-sizable-p window (- size) horizontal 'safe)
                   (let* ((window-combination-limit
                           (assq 'combination-limit item)))
-                    ;; We must inherit the combiantion limit, otherwise
+                    ;; We must inherit the combination limit, otherwise
                     ;; we might mess up handling of atomic and side
                     ;; window.
                     (setq new (split-window window size horizontal)))
@@ -3870,10 +3870,10 @@ windows can get as small as `window-safe-min-height' and
 (defun display-buffer-record-window (type window buffer)
   "Record information for window used by `display-buffer'.
 TYPE specifies the type of the calling operation and must be one
-of the symbols 'reuse \(when WINDOW existed already and was
-reused for displaying BUFFER), 'window \(when WINDOW was created
-on an already existing frame), or 'frame \(when WINDOW was
-created on a new frame). WINDOW is the window used for or created
+of the symbols 'reuse (when WINDOW existed already and was
+reused for displaying BUFFER), 'window (when WINDOW was created
+on an already existing frame), or 'frame (when WINDOW was
+created on a new frame).  WINDOW is the window used for or created
 by the `display-buffer' routines.  BUFFER is the buffer that
 shall be displayed.
 
@@ -3968,7 +3968,7 @@ the buffer as first, and nil as second argument.
 
 Alternatively, an element of this list can be specified as
 \(BUFFER-NAME FRAME-PARAMETERS), where BUFFER-NAME is a buffer
-name and FRAME-PARAMETERS an alist of \(PARAMETER . VALUE) pairs.
+name and FRAME-PARAMETERS an alist of (PARAMETER . VALUE) pairs.
 `special-display-popup-frame' will interpret such pairs as frame
 parameters when it creates a special frame, overriding the
 corresponding values from `special-display-frame-alist'.
@@ -4044,7 +4044,7 @@ name matches REGEXP, overriding the corresponding values from
 
 As a special case, if FRAME-PARAMETERS contains (same-window . t)
 `special-display-popup-frame' displays buffers matching REGEXP in
-the selected window.  \(same-frame . t) in FRAME-PARAMETERS means
+the selected window.  (same-frame . t) in FRAME-PARAMETERS means
 to display such buffers in a window on the selected frame.
 
 If `special-display-function' specifies some other function than
@@ -4139,8 +4139,8 @@ Optional argument ARGS is a list specifying additional
 information.
 
 If ARGS is an alist, use it as a list of frame parameters.  If
-these parameters contain \(same-window . t), display BUFFER in
-the selected window.  If they contain \(same-frame . t), display
+these parameters contain (same-window . t), display BUFFER in
+the selected window.  If they contain (same-frame . t), display
 BUFFER in a window of the selected frame.
 
 If ARGS is a list whose car is a symbol, use (car ARGS) as a
@@ -4234,7 +4234,7 @@ See also `same-window-buffer-names'."
   "Return non-nil if a buffer named BUFFER-NAME would be shown in the \"same\" window.
 This function returns non-nil if `display-buffer' or
 `pop-to-buffer' would show a buffer named BUFFER-NAME in the
-selected rather than \(as usual\) some other window.  See
+selected rather than (as usual) some other window.  See
 `same-window-buffer-names' and `same-window-regexps'."
   (cond
    ((not (stringp buffer-name)))
@@ -4396,11 +4396,11 @@ the largest or least recently used window.  To change the default
 customize the option `split-window-preferred-function'.
 
 You can enforce this function to not split WINDOW horizontally,
-by setting \(or binding) the variable `split-width-threshold' to
+by setting (or binding) the variable `split-width-threshold' to
 nil.  If, in addition, you set `split-height-threshold' to zero,
 chances increase that this function does split WINDOW vertically.
 
-In order to not split WINDOW vertically, set \(or bind) the
+In order to not split WINDOW vertically, set (or bind) the
 variable `split-height-threshold' to nil.  Additionally, you can
 set `split-width-threshold' to zero to make a horizontal split
 more likely to occur.
@@ -4526,19 +4526,6 @@ Return WINDOW."
 The actual non-nil value of this variable will be copied to the
 `window-dedicated-p' flag.")
 
-(defun window-normalize-buffer-to-display (buffer-or-name)
-  "Normalize BUFFER-OR-NAME argument for buffer display functions.
-If BUFFER-OR-NAME is nil, return the current buffer.  Else, if a
-buffer specified by BUFFER-OR-NAME exists, return that buffer.
-If no such buffer exists, create a buffer with the name
-BUFFER-OR-NAME and return that buffer."
-  (if buffer-or-name
-      (or (get-buffer buffer-or-name)
-          (let ((buffer (get-buffer-create buffer-or-name)))
-            (set-buffer-major-mode buffer)
-            buffer))
-    (current-buffer)))
-
 (defconst display-buffer--action-function-custom-type
   '(choice :tag "Function"
            (const :tag "--" ignore) ; default for insertion
@@ -4565,7 +4552,7 @@ BUFFER-OR-NAME and return that buffer."
 (defvar display-buffer-overriding-action '(nil . nil)
   "Overriding action to perform to display a buffer.
 It should be a cons cell (FUNCTION . ALIST), where FUNCTION is a
-function or a list of functions.  Each function should accept 2
+function or a list of functions.  Each function should accept two
 arguments: a buffer to display and an alist similar to ALIST.
 See `display-buffer' for details.")
 (put 'display-buffer-overriding-action 'risky-local-variable t)
@@ -4579,7 +4566,7 @@ This is a list of elements (CONDITION . ACTION), where:
 
  ACTION is a cons cell (FUNCTION . ALIST), where FUNCTION is a
   function or a list of functions.  Each such function should
-  accept 2 arguments: a buffer to display and an alist of the
+  accept two arguments: a buffer to display and an alist of the
   same form as ALIST.  See `display-buffer' for details."
   :type `(alist :key-type
                 (choice :tag "Condition"
@@ -4593,7 +4580,7 @@ This is a list of elements (CONDITION . ACTION), where:
 (defcustom display-buffer-base-action '(nil . nil)
   "User-specified default action for `display-buffer'.
 It should be a cons cell (FUNCTION . ALIST), where FUNCTION is a
-function or a list of functions.  Each function should accept 2
+function or a list of functions.  Each function should accept two
 arguments: a buffer to display and an alist similar to ALIST.
 See `display-buffer' for details."
   :type display-buffer--action-custom-type
@@ -4640,7 +4627,7 @@ specified, e.g. by the user options `display-buffer-alist' or
   "A `display-buffer' action for displaying in another frame.")
 (put 'display-buffer--other-frame-action 'risky-local-variable t)
 
-(defun display-buffer (&optional buffer-or-name action frame)
+(defun display-buffer (buffer-or-name &optional action frame)
   "Display BUFFER-OR-NAME in some window, without selecting it.
 BUFFER-OR-NAME must be a buffer or the name of an existing
 buffer.  Return the window chosen for displaying BUFFER-OR-NAME,
@@ -4648,8 +4635,8 @@ or nil if no such window is found.
 
 Optional argument ACTION should have the form (FUNCTION . ALIST).
 FUNCTION is either a function or a list of functions.  Each such
-function is called with 2 arguments: the buffer to display and an
-alist.  It should either display the buffer and return the
+function is called with two arguments: the buffer to display and
+an alist.  It should either display the buffer and return the
 window, or return nil if unable to display the buffer.
 
 The `display-buffer' function builds a function list and an alist
@@ -4688,7 +4675,9 @@ search for a window that is already displaying the buffer.  See
 `display-buffer-reuse-window'."
   (interactive (list (read-buffer "Display buffer: " (other-buffer))
                      (if current-prefix-arg t)))
-  (let ((buffer (window-normalize-buffer-to-display buffer-or-name))
+  (let ((buffer (if (bufferp buffer-or-name)
+                    buffer-or-name
+                  (get-buffer buffer-or-name)))
         ;; Handle the old form of the first argument.
         (inhibit-same-window (and action (not (listp action)))))
     (unless (listp action) (setq action nil))
@@ -4996,7 +4985,7 @@ minibuffer.  The variable `confirm-nonexistent-file-or-buffer'
 determines whether to request confirmation before creating a new
 buffer.
 
-BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or
+BUFFER-OR-NAME may be a buffer, a string (a buffer name), or
 nil.  If BUFFER-OR-NAME is a string that does not identify an
 existing buffer, create a buffer with that name.  If
 BUFFER-OR-NAME is nil, switch to the buffer returned by
@@ -5036,7 +5025,7 @@ Return the buffer switched to."
 
 (defun switch-to-buffer-other-window (buffer-or-name &optional norecord)
   "Select the buffer specified by BUFFER-OR-NAME in another window.
-BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or
+BUFFER-OR-NAME may be a buffer, a string (a buffer name), or
 nil.  Return the buffer switched to.
 
 If called interactively, prompt for the buffer name using the
@@ -5060,7 +5049,7 @@ documentation for additional customization information."
 
 (defun switch-to-buffer-other-frame (buffer-or-name &optional norecord)
   "Switch to buffer BUFFER-OR-NAME in another frame.
-BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or
+BUFFER-OR-NAME may be a buffer, a string (a buffer name), or
 nil.  Return the buffer switched to.
 
 If called interactively, prompt for the buffer name using the
@@ -5169,7 +5158,7 @@ WINDOW can be any live window and defaults to the selected one.
 Optional argument MAX-HEIGHT specifies the maximum height of
 WINDOW and defaults to the height of WINDOW's frame.  Optional
 argument MIN-HEIGHT specifies the minimum height of WINDOW and
-defaults to `window-min-height'.  Both, MAX-HEIGHT and MIN-HEIGHT
+defaults to `window-min-height'.  Both MAX-HEIGHT and MIN-HEIGHT
 are specified in lines and include the mode line and header line,
 if any.
 
@@ -5234,7 +5223,7 @@ WINDOW was scrolled."
         ;; This `condition-case' shouldn't be necessary, but who knows?
         (condition-case nil
             (if (zerop delta)
-                ;; Return zero if DELTA became zero in the proces.
+                ;; Return zero if DELTA became zero in the process.
                 0
               ;; Don't try to redisplay with the cursor at the end on its
               ;; own line--that would force a scroll and spoil things.
@@ -5332,7 +5321,7 @@ A list of elements with possible values `top', `middle', `bottom',
 integer or float numbers that define the cycling order for
 the command `recenter-top-bottom'.
 
-Top and bottom destinations are `scroll-margin' lines the from true
+Top and bottom destinations are `scroll-margin' lines from the true
 window top and bottom.  Middle redraws the frame and centers point
 vertically within the window.  Integer number moves current line to
 the specified absolute window-line.  Float number between 0.0 and 1.0
@@ -5571,9 +5560,9 @@ With arg N, put point N/10 of the way from the true end."
 
 (defvar mouse-autoselect-window-state nil
   "When non-nil, special state of delayed window autoselection.
-Possible values are `suspend' \(suspend autoselection after a menu or
-scrollbar interaction\) and `select' \(the next invocation of
-'handle-select-window' shall select the window immediately\).")
+Possible values are `suspend' (suspend autoselection after a menu or
+scrollbar interaction) and `select' (the next invocation of
+`handle-select-window' shall select the window immediately).")
 
 (defun mouse-autoselect-window-cancel (&optional force)
   "Cancel delayed window autoselection.
@@ -5610,8 +5599,8 @@ means suspend autoselection."
 (defun mouse-autoselect-window-select ()
   "Select window with delayed window autoselection.
 If the mouse position has stabilized in a non-selected window, select
-that window.  The minibuffer window is selected only if the minibuffer is
-active.  This function is run by `mouse-autoselect-window-timer'."
+that window.  The minibuffer window is selected only if the minibuffer
+is active.  This function is run by `mouse-autoselect-window-timer'."
   (ignore-errors
    (let* ((mouse-position (mouse-position))
           (window