upstream

433 files changed, 3263 insertions, 2771 deletions

diff --git a/ChangeLog b/ChangeLog
index 34039b3860c..0232a3f8415 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2011-11-22  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in (EMACSDATA, EMACSDOC): If set, print, since they can
+        have confusing effects on the build.  (Bug#6401)
+
+        * Makefile.in (install-arch-dep): Tweak previous change.
+
+2011-11-22  Yavor Doganov  <yavor@gnu.org>
+
+        Do not install arch-dependent files in the app bundle if
+        --disable-ns-self-contained is requested.  (Bug#1335)
+        * configure.in (exec_prefix, libexecdir): Define relative to
+        `ns_appbindir' only if configured for a self-contained app.
+        * Makefile.in (install-arch-dep): Test for the existence of
+        libexec in the Emacs.app bundle before executing commands.
+
+2011-11-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * configure.in: Remove reference to src/m/ibms390.h.
+
 2011-11-13  Glenn Morris  <rgm@gnu.org>
 
         * INSTALL: Tiny updates for disk space used during installation.
@@ -689,7 +709,7 @@
         * autogen/Makefile.in: Add auto-updated generated files.
         * autogen.sh: No longer a no-op, now it tests for autotools
         and runs them as necessary.
-        * configure.in: Defaule maintainer-mode to on.
+        * configure.in: Default maintainer-mode to on.
         * aclocal.m4, configure, lib/Makefile.in: Remove files.
 
 2011-03-13  Paul Eggert  <eggert@cs.ucla.edu>
@@ -9711,7 +9731,7 @@
         paths.h.in, Makefile.in in src.
 
         * configure: Delete .tmp files before creating them; don't bother
-        trying to make final targets writeable first, since it won't
+        trying to make final targets writable first, since it won't
         matter to move-if-change.
 
 1992-05-19  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
diff --git a/Makefile.in b/Makefile.in
index f5bc0ce7015..c0d108877c1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -474,10 +474,10 @@ install-arch-dep: mkdir
             if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
             if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \
             rm -fr share ) ; \
-          ( cd ${ns_appbindir}libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \
-            rm -fr emacs ) ; \
-          ( cd ${ns_appbindir}bin ; rm -f emacs emacs-24* ; \
-            ln -sf ../libexec/* .) ; \
+          ( cd ${ns_appbindir} ; \
+            if cd libexec ; then dir=emacs/*/*/* ; $(MV_DIRS); \
+            rm -fr emacs; if cd ../bin; then rm -f emacs emacs-24*; \
+            ln -sf ../libexec/* . ; fi ; fi ) ; \
         else true ; fi
 
 ## FIXME is the emacs-24* bit above really necessary and correct?
@@ -666,7 +666,7 @@ install-etc: mkdir
 ### Install LEIM files.  Although they are machine-independent, we
 ### have separate target here instead of including it in
 ### `install-arch-indep'.  People who extracted LEIM files after they
-### insalled Emacs itself can install only LEIM files by this target.
+### installed Emacs itself can install only LEIM files by this target.
 install-leim: leim/Makefile mkdir
         cd leim; $(MAKE) install
 
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 6e0f736a06f..c5f8c7ab31f 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -48,7 +48,7 @@ SYSTEM_MALLOC	Use the system library's malloc.
 subprocesses    System can use subprocesses (for M-x shell for example).  Defined by default, only MSDOS undefines it.
 USE_LISP_UNION_TYPE Define it in lisp.h to make Lisp_Object be a union type instead of the default int.
 
-** System specific macros, decribed in detail in src/s/template.h
+** System specific macros, described in detail in src/s/template.h
 CLASH_DETECTION
 COFF
 FIRST_PTY_LETTER
@@ -58,9 +58,6 @@ NARROWPROTO
 SEPCHAR
 SYSTEM_TYPE
 
-** Machine specific macros, decribed in detail in src/m/template.h
-VIRT_ADDR_VARIES
-
 ** Misc macros
 USER_FULL_NAME   If defined, overrides the default pw->pw_gecos for getting at the full user name.  Only MSDOS overrides the default.
 
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6030dd8f6d3..aa815c552b4 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * CPP-DEFINES (VIRT_ADDR_VARIES): Remove.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * admin.el (manual-dvi): Fix typo.
@@ -398,7 +402,7 @@
 
 2009-06-24  Kenichi Handa  <handa@m17n.org>
 
-        * charsets/mapconv: For the UNICODE format files, do reverse sort
+        * charsets/mapconv: For the Unicode format files, do reverse sort
         and don't compact the map.  This is to prefer the first one in the
         duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0).
 
diff --git a/admin/grammars/c.by b/admin/grammars/c.by
index 004f0b5f30f..b49f8ce76c7 100644
--- a/admin/grammars/c.by
+++ b/admin/grammars/c.by
@@ -122,7 +122,7 @@
 %put DELETE summary "delete <object>;"
 
 ;; Despite this, this parser can find templates by ignoring the TEMPLATE
-;; keyword, and finding the class/method being templateized.
+;; keyword, and finding the class/method being templatized.
 %token TEMPLATE "template"
 %put TEMPLATE summary "template <class TYPE ...> TYPE_OR_FUNCTION"
 
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy
index 99d2b9df81d..f4b2f1f1f49 100644
--- a/admin/grammars/java-tags.wy
+++ b/admin/grammars/java-tags.wy
@@ -740,7 +740,7 @@ It ignores whitespaces, newlines and comments."
   wisent-java-tags-wy--<symbol>-regexp-analyzer
   wisent-java-tags-wy--<punctuation>-string-analyzer
   wisent-java-tags-wy--<block>-block-analyzer
-  ;; In theory, unicode chars should be turned into normal chars
+  ;; In theory, Unicode chars should be turned into normal chars
   ;; and then combined into regular ascii keywords and text.  This
   ;; analyzer just keeps these things from making the lexer go boom.
   wisent-java-tags-wy--<unicode>-regexp-analyzer
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index 410e3aa8614..8a10997eb8b 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -521,7 +521,7 @@ THINGS TO DO
 
 ** Very strange bug: visible-bell does not work on secondary
    terminals in xterm and konsole.  The screen does flicker a bit,
-   but it's so quick it isn't noticable.
+   but it's so quick it isn't noticeable.
 
    (Update: This is probably some problem with padding or whatnot on
    the secondary terminals.)
@@ -585,7 +585,7 @@ DIARY OF CHANGES
 -- other-frame should cycle through the frames on the `current'
    terminal only.
 
-   (Done, by trivially modifiying next_frame and prev_frame.)
+   (Done, by trivially modifying next_frame and prev_frame.)
 
 -- Support different terminal sizes.
 
@@ -984,7 +984,7 @@ DIARY OF CHANGES
    wrt foreground/background process groups.)
 
 -- There is a flicker during the startup of `emacs -nw'; it's as if
-   the terminal is initialized, reset and then initialialized again.
+   the terminal is initialized, reset and then initialized again.
    Debug this.  (Hint: narrow_foreground_group is called twice during
    startup.)
 
diff --git a/admin/notes/nextstep b/admin/notes/nextstep
index cf0ebbc11aa..a2e5ce2c9b0 100644
--- a/admin/notes/nextstep
+++ b/admin/notes/nextstep
@@ -83,7 +83,7 @@ original NeXT Display PostScript (DPS) APIs are available and used.  Under
 Cocoa, these were removed and Quartz drawing functions replaced them.
 
 In both cases, font glyphs are accessed through UTF8 character
-representations.  It would be preferable to use unicode indices, but prior
+representations.  It would be preferable to use Unicode indices, but prior
 attempts at this have failed.
 
 Multi-script fontsets are auto-created in nsfont_make_fontset_for_font() using
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 82e33cc5418..c320bbe915d 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -254,7 +254,7 @@ See the end of the file for license conditions.
 
   Another valuable source of information and help which should not be
   overlooked is the various Usenet news groups dedicated to Emacs.
-  These are particuarly good for help with general issues which aren't
+  These are particularly good for help with general issues which aren't
   specific to the Windows port of Emacs.  The main news groups to use
   for seeking help are:
 
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index 1002bb003af..713b0512e09 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -158,7 +158,7 @@
 ;; DEFAULT: the default value of the property.  It may have the form
 ;;   (VAL0 (FROM1 TO1 VAL1) ...) which indicates that the default
 ;;   value is VAL0 except for characters in the ranges specified by
-;;   FROMn and TOn (incusive).  The default value of characters
+;;   FROMn and TOn (inclusive).  The default value of characters
 ;;   between FROMn and TOn is VALn.
 ;; VAL-LIST: list of specially ordered property values
 
diff --git a/autogen/configure b/autogen/configure
index b22541d8b22..eae55274761 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -4461,7 +4461,6 @@ case "${canonical}" in
     opsys=gnu-linux
     case ${canonical} in
       alpha*)   machine=alpha ;;
-      s390-*)   machine=ibms390 ;;
       s390x-*)  machine=ibms390x ;;
       powerpc*) machine=macppc ;;
       sparc*)   machine=sparc ;;
@@ -9984,10 +9983,10 @@ if test "${HAVE_NS}" = yes; then
   window_system=nextstep
   with_xft=no
   # set up packaging dirs
-  exec_prefix=${ns_appbindir}
-  libexecdir=${ns_appbindir}/libexec
   if test "${EN_NS_SELF_CONTAINED}" = yes; then
      prefix=${ns_appresdir}
+     exec_prefix=${ns_appbindir}
+     libexecdir=${ns_appbindir}/libexec
   fi
   ns_frag=$srcdir/src/ns.mk
   NS_OBJ="fontset.o fringe.o image.o"
@@ -13640,7 +13639,7 @@ $as_echo "#define NS_IMPL_GNUSTEP 1" >>confdefs.h
 
     # See also .m.o rule in Makefile.in */
     # FIXME: are all these flags really needed?  Document here why.  */
-    C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
+            C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
     ## Extra CFLAGS applied to src/*.m files.
     GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
   fi
@@ -24294,6 +24293,13 @@ echo "  Does Emacs use -lxft?                                   ${HAVE_XFT}"
 echo "  Does Emacs use toolkit scroll bars?                     ${USE_TOOLKIT_SCROLL_BARS}"
 echo
 
+if test -n "${EMACSDATA}"; then
+   echo "  Environment variable EMACSDATA set to:                  $EMACSDATA"
+fi
+if test -n "${EMACSDOC}"; then
+   echo "  Environment variable EMACSDOC set to:                   $EMACSDOC"
+fi
+
 if test $USE_XASSERTS = yes; then
    echo "  Compiling with asserts turned on."
    CPPFLAGS="$CPPFLAGS -DXASSERTS=1"
diff --git a/configure.in b/configure.in
index ec938bf37cd..5b686e017f6 100644
--- a/configure.in
+++ b/configure.in
@@ -418,7 +418,6 @@ case "${canonical}" in
     opsys=gnu-linux
     case ${canonical} in
       alpha*)   machine=alpha ;;
-      s390-*)   machine=ibms390 ;;
       s390x-*)  machine=ibms390x ;;
       powerpc*) machine=macppc ;;
       sparc*)   machine=sparc ;;
@@ -1571,10 +1570,10 @@ if test "${HAVE_NS}" = yes; then
   window_system=nextstep
   with_xft=no
   # set up packaging dirs
-  exec_prefix=${ns_appbindir}
-  libexecdir=${ns_appbindir}/libexec
   if test "${EN_NS_SELF_CONTAINED}" = yes; then
      prefix=${ns_appresdir}
+     exec_prefix=${ns_appbindir}
+     libexecdir=${ns_appbindir}/libexec
   fi
   ns_frag=$srcdir/src/ns.mk
   NS_OBJ="fontset.o fringe.o image.o"
@@ -2637,6 +2636,8 @@ if test "${HAVE_NS}" = "yes"; then
     AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.])
     # See also .m.o rule in Makefile.in */
     # FIXME: are all these flags really needed?  Document here why.  */
+    dnl FIXME this should be renamed to GNUSTEP_CFLAGS, and only
+    dnl used in src/Makefile.in.
     C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
     ## Extra CFLAGS applied to src/*.m files.
     GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
@@ -3786,6 +3787,13 @@ echo "       Does xwidgets support clutter(demo code)?          ${HAVE_CLUTTER}"
 echo "       Does xwidgets support goocanvas(demo code)?        ${HAVE_GOOCANVAS}"
 echo
 
+if test -n "${EMACSDATA}"; then
+   echo "  Environment variable EMACSDATA set to:                  $EMACSDATA"
+fi
+if test -n "${EMACSDOC}"; then
+   echo "  Environment variable EMACSDOC set to:                   $EMACSDOC"
+fi
+
 if test $USE_XASSERTS = yes; then
    echo "  Compiling with asserts turned on."
    CPPFLAGS="$CPPFLAGS -DXASSERTS=1"
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b796acd8b39..6e687bcefc9 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-21  Chong Yidong  <cyd@gnu.org>
+
+        * mark.texi (Global Mark Ring): Fix description of global mark
+        ring (Bug#10032).
+
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * msdog.texi (Windows Fonts): Fix typo.
+
 2011-11-17  Glenn Morris  <rgm@gnu.org>
 
         * regs.texi (Bookmarks): Small fixes related to saving.  (Bug#10058)
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 6801c7f1e0e..d7022ba739b 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -549,7 +549,7 @@ Taichi Kawabata added support for Devanagari script and the Indian
 languages, and wrote @file{ucs-normalize.el} for Unicode normalization.
 
 @item
-Taro Kawagishi implented the MD4 Message Digest Algorithm in Lisp; and
+Taro Kawagishi implemented the MD4 Message Digest Algorithm in Lisp; and
 wrote @file{ntlm.el} and @file{sasl-ntlm.el} for NT LanManager
 authentication support.
 
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 0eccef41711..7d65719e5f0 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -354,9 +354,12 @@ Positions in Registers}).
 @vindex global-mark-ring-max
   In addition to the ordinary mark ring that belongs to each buffer,
 Emacs has a single @dfn{global mark ring}.  Each time you set a mark,
-in any buffer, this is recorded in the global mark ring in addition to
-the current buffer's own mark ring.  The length of this ring can be
-controlled by @code{global-mark-ring-max}, and is 16 by default.
+this is recorded in the global mark ring in addition to the current
+buffer's own mark ring, if you have switched buffers since the
+previous mark setting.  Hence, the global mark ring records a sequence
+of buffers that you have been in, and, for each buffer, a place where
+you set the mark.  The length of the global mark ring is controlled by
+@code{global-mark-ring-max}, and is 16 by default.
 
 @kindex C-x C-@key{SPC}
 @findex pop-global-mark
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index bbaf31ade85..e3c9b8d4fc2 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -914,7 +914,7 @@ as a fallback with the font family left unspecified.
 @vindex w32-charset-info-alist
 @item registry
 Specifies the character set registry that the font is
-expected to cover.  Most TrueType and OpenType fonts will be unicode fonts
+expected to cover.  Most TrueType and OpenType fonts will be Unicode fonts
 that cover several national character sets, but you can narrow down the
 selection of fonts to those that support a particular character set by
 using a specific registry from @code{w32-charset-info-alist} here.
@@ -936,9 +936,9 @@ Options specific to @code{GDI} fonts:
 @table @code
 
 @cindex font scripts (MS Windows)
-@cindex font unicode subranges (MS Windows)
+@cindex font Unicode subranges (MS Windows)
 @item script
-Specifies a unicode subrange the font should support.
+Specifies a Unicode subrange the font should support.
 
 The following scripts are recognized on Windows: @code{latin}, @code{greek},
 @code{coptic}, @code{cyrillic}, @code{armenian}, @code{hebrew}, @code{arabic},
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index ad2040c9047..c44b67454a2 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -34,11 +34,11 @@ has its own value of point.
 
 @cindex selected window
   At any time, one Emacs window is the @dfn{selected window}; the
-buffer this window is displaying is the current buffer.  Each window
-has its own value of point.  On graphical displays, the point is
-indicated by a solid blinking cursor in the selected window, and by a
-hollow box in non-selected windows.  On text-only terminals, the
-cursor is drawn only in the selected window.  @xref{Cursor Display}.
+buffer this window is displaying is the current buffer.  On graphical
+displays, the point is indicated by a solid blinking cursor in the
+selected window, and by a hollow box in non-selected windows.  On
+text-only terminals, the cursor is drawn only in the selected window.
+@xref{Cursor Display}.
 
   Commands to move point affect the value of point for the selected
 Emacs window only.  They do not change the value of point in other
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index ef04626e95f..244d95d6937 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -887,7 +887,7 @@ but in this case, it is best to treat it as a novel or as a travel guide
 to a country not yet visited: interesting, but not the same as being
 there.
 
-Much of this introduction is dedicated to walk-throughs or guided tours
+Much of this introduction is dedicated to walkthroughs or guided tours
 of code used in GNU Emacs.  These tours are designed for two purposes:
 first, to give you familiarity with real, working code (code you use
 every day); and, second, to give you familiarity with the way Emacs
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 0fa50492481..293f253c545 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,43 @@
+2011-11-21  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Windows and Frames, Splitting Windows): Fix
+        typos.
+
+2011-11-21  Chong Yidong  <cyd@gnu.org>
+
+        * windows.texi (Splitting Windows): Fix error in documentation of
+        window-combination-limit.
+        (Cyclic Window Ordering): Minor fixes to next-window,
+        one-window-p, and get-lru-window docs.  Don't document
+        window-list-1.
+        (Buffers and Windows): Copyedits.
+        (Choosing Window): Document special handling of special-display-*.
+        (Choosing Window Options): Fix display-buffer-reuse-frames doc.
+        Don't document even-window-heights, which is going away.  Clarify
+        which options are obeyed by which action functions.
+
+2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * display.texi (Invisible Text): Clarify point adjustment (bug#10072).
+
+2011-11-20  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Resizing Windows, Splitting Windows):
+        Remove term "status" when talking about combination limits.
+
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * compile.texi (Compiler Errors):
+        * help.texi (Help Functions): Fix typos.
+
+2011-11-19  Chong Yidong  <cyd@gnu.org>
+
+        * windows.texi (Splitting Windows): Clarify role of window
+        parameters in split-window.  Shorten the example.
+        (Deleting Windows): Rewrite intro to handle internal windows.
+        Fix delete-windows-on doc.
+        (Selecting Windows): Copyedits.
+
 2011-11-17  Martin Rudalics  <rudalics@gmx.at>
 
         * windows.texi (Resizing Windows, Splitting Windows)
@@ -6,8 +46,8 @@
 
 2011-11-16  Martin Rudalics  <rudalics@gmx.at>
 
-        * windows.texi (Resizing Windows, Splitting Windows): Rename
-        occurrences of window-nest to window-combination-limit.
+        * windows.texi (Resizing Windows, Splitting Windows):
+        Rename occurrences of window-nest to window-combination-limit.
 
 2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -15,8 +55,8 @@
 
 2011-11-12  Martin Rudalics  <rudalics@gmx.at>
 
-        * windows.texi (Splitting Windows, Deleting Windows): Remove
-        references to splits status of windows.
+        * windows.texi (Splitting Windows, Deleting Windows):
+        Remove references to splits status of windows.
 
 2011-11-10  Glenn Morris  <rgm@gnu.org>
 
@@ -68,8 +108,8 @@
         (Windows and Frames): Various clarifications, e.g. non-live
         windows also belong to frames.  Fix window-list description.
         Simplify window nesting example.
-        (Splitting Windows, Window Configurations): Use
-        split-window-below.
+        (Splitting Windows, Window Configurations):
+        Use split-window-below.
 
 2011-11-04  Eli Zaretskii  <eliz@gnu.org>
 
@@ -119,8 +159,8 @@
 
 2011-10-05  Chong Yidong  <cyd@stupidchicken.com>
 
-        * display.texi (Low-Level Font, Face Attributes, Font Lookup): Fix
-        Emacs manual xref (Bug#9675).
+        * display.texi (Low-Level Font, Face Attributes, Font Lookup):
+        Fix Emacs manual xref (Bug#9675).
 
 2011-10-01  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -159,8 +199,8 @@
         * windows.texi (Window History): New node.  Move text here from
         Buffers and Windows.
         (Switching Buffers): Rename from Displaying Buffers, since we
-        don't document display-buffer here; callers changed.  Document
-        FORCE-SAME-WINDOW arg to switch-to-buffer and
+        don't document display-buffer here; callers changed.
+        Document FORCE-SAME-WINDOW arg to switch-to-buffer and
         switch-to-buffer-other-frame.  Delete duplicate
         replace-buffer-in-windows doc.
         (Choosing Window): Document display actions.
@@ -191,10 +231,10 @@
         Provide examples.  Describe window-nest and window-splits
         options.
         (Deleting Windows): Minor rewrite.
-        (Selecting Windows): Minor rewrite.  Describe
-        frame-selected-window and set-frame-selected-window here.
-        (Cyclic Window Ordering): Minor rewrite.  Describe
-        window-list-1.
+        (Selecting Windows): Minor rewrite.
+        Describe frame-selected-window and set-frame-selected-window here.
+        (Cyclic Window Ordering): Minor rewrite.
+        Describe window-list-1.
         (Buffers and Windows): Rewrite.  Explain a window's previous and
         next buffers and the corresponding functions.
         (Window Tree): Merge into Windows and Frames section.
@@ -296,8 +336,8 @@
 
         * display.texi (Bidirectional Display): Document the pitfalls of
         concatenating strings with bidirectional content, with possible
-        solutions.  Document bidi-string-mark-left-to-right.  Mention
-        paragraph direction in modes that inherit from prog-mode.
+        solutions.  Document bidi-string-mark-left-to-right.
+        Mention paragraph direction in modes that inherit from prog-mode.
         Document use of `bidi-class' and `mirroring' properties as part of
         reordering.
 
@@ -353,8 +393,8 @@
         the next character, and doesn't affect longer sequences in
         particular (bug#8935).
 
-        * debugging.texi (Using Debugger): Mention
-        @code{eval-expression-debug-on-error} (bug#8549).
+        * debugging.texi (Using Debugger):
+        Mention @code{eval-expression-debug-on-error} (bug#8549).
 
 2011-07-14  Eli Zaretskii  <eliz@gnu.org>
 
@@ -503,7 +543,7 @@
 
 2011-06-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * processes.texi (Process Information): Renamed `process-alive-p'
+        * processes.texi (Process Information): Rename `process-alive-p'
         to `process-live-p' for consistency with other `-live-p' functions.
 
 2011-06-03  Paul Eggert  <eggert@cs.ucla.edu>
@@ -520,8 +560,8 @@
 
 2011-05-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * processes.texi (Process Information): Document
-        `process-alive-p'.
+        * processes.texi (Process Information):
+        Document `process-alive-p'.
 
 2011-05-29  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -1919,8 +1959,8 @@
 
 2009-05-09  Eli Zaretskii  <eliz@gnu.org>
 
-        * nonascii.texi (Default Coding Systems): Document
-        find-auto-coding, set-auto-coding, and auto-coding-alist.
+        * nonascii.texi (Default Coding Systems):
+        Document find-auto-coding, set-auto-coding, and auto-coding-alist.
         Add indexing.
         (Lisp and Coding Systems): Add index entries.
 
@@ -2237,7 +2277,7 @@
         (Future Local Variables): Node deleted.
 
         * objects.texi (General Escape Syntax): Update explanation of
-        unicode escape syntax.
+        Unicode escape syntax.
 
 2009-02-23  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -5151,8 +5191,8 @@
         (Saving Buffers): Mention code and EOL conversions by file I/O
         primitives and subroutines.
 
-        * nonascii.texi (Lisp and Coding Systems): Document
-        coding-system-eol-type.  Add index entries for eol conversion.
+        * nonascii.texi (Lisp and Coding Systems):
+        Document coding-system-eol-type.  Add index entries for eol conversion.
 
         * display.texi (Defining Faces): Mention `mac', and add an xref to
         where window-system is described.
@@ -9102,7 +9142,7 @@
 
         * functions.texi (Defining Functions): Explain about redefining
         primitives.
-        (Function Safety): Renamed.  Minor changes.
+        (Function Safety): Rename.  Minor changes.
         Comment out the detailed criteria for what is safe.
 
 2003-06-22  Andreas Schwab  <schwab@suse.de>
@@ -9603,7 +9643,7 @@
 
         * Makefile (infodir, prefix): New vars.
         (install): Use infodir.
-        (emacsinfodir): Deleted.
+        (emacsinfodir): Delete.
 
 1993-05-27  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
 
@@ -9614,7 +9654,7 @@
 
 1993-05-16  Jim Blandy  (jimb@wookumz.gnu.ai.mit.edu)
 
-        * Makefile (dist): Changed to use Gzip instead of compress.
+        * Makefile (dist): Change to use Gzip instead of compress.
 
 1993-04-23  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
 
diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi
index fe5563370c4..372c041ab7a 100644
--- a/doc/lispref/compile.texi
+++ b/doc/lispref/compile.texi
@@ -528,7 +528,7 @@ but the compiler does not issue warnings for anything that occurs
 inside @var{body}.
 
 We recommend that you use this construct around the smallest
-possible piece of code, to avoid missing possible warnings other than one
+possible piece of code, to avoid missing possible warnings other than
 one you intend to suppress.
 @end defspec
 
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 034d92f78c3..9849420b1f5 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -870,15 +870,21 @@ ignore invisible newlines if @code{line-move-ignore-invisible} is
 non-@code{nil} (the default), but only because they are explicitly
 programmed to do so.
 
-  However, if a command ends with point inside or immediately before
-invisible text, the main editing loop moves point further forward or
-further backward (in the same direction that the command already moved
-it) until that condition is no longer true.  Thus, if the command
-moved point back into an invisible range, Emacs moves point back to
-the beginning of that range, and then back one more character.  If the
-command moved point forward into an invisible range, Emacs moves point
-forward up to the first visible character that follows the invisible
-text.
+  However, if a command ends with point inside or at the boundary of invisible
+text, the main editing loop moves point to one of the two ends of the invisible
+text.  Which end to move to is chosen based on the following factors: make sure
+that the overall movement of the command is still in the same direction, and
+prefer a position where an inserted char would not inherit the @code{invisible}
+property.  Additionally, if the text is not replaced by an ellipsis and the
+command only moved within the invisible text, then point is moved one extra
+character so as to try and reflect the command's movement by a visible movement
+of the cursor.
+
+  Thus, if the command moved point back to an invisible range (with the usual
+stickiness), Emacs moves point back to the beginning of that range.  If the
+command moved point forward into an invisible range, Emacs moves point forward
+to the first visible character that follows the invisible text and then forward
+one more character.
 
   Incremental search can make invisible overlays visible temporarily
 and/or permanently when a match includes invisible text.  To enable
@@ -4546,7 +4552,7 @@ you may prefer to use a different one for a given image type (which
 @c FIXME how is this priority determined?
 loader will be used in practice depends on the priority of the loaders).
 @c FIXME why are these uppercase when image-types is lower-case?
-@c FIXME what are the possibe options?  Are these actually file extensions?
+@c FIXME what are the possible options?  Are these actually file extensions?
 For example, if you never want to use the ImageMagick loader to use
 JPEG files, add @code{JPG} to this list.
 
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index d2e86a77112..dad1f28026e 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -953,7 +953,7 @@ variable, Emacs uses the latter.  By default,
 The @code{alpha} frame parameter can also be a cons cell
 @code{(@samp{active} . @samp{inactive})}, where @samp{active} is the
 opacity of the frame when it is selected, and @samp{inactive} is the
-opactity when it is not selected.
+opacity when it is not selected.
 @end table
 
 The following frame parameters are semi-obsolete in that they are
diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi
index 0ce05d55a07..3426e81cdb3 100644
--- a/doc/lispref/help.texi
+++ b/doc/lispref/help.texi
@@ -653,7 +653,7 @@ buffer, which is used to regenerate the help information when the user
 clicks on the @samp{Back} or @samp{Forward} buttons.  Most commands
 that use the @samp{*Help*} buffer should invoke this function before
 clearing the buffer.  The @var{item} argument should have the form
-@code{(@var{funtion} . @var{args})}, where @var{funtion} is a function
+@code{(@var{function} . @var{args})}, where @var{function} is a function
 to call, with argument list @var{args}, to regenerate the help buffer.
 The @var{interactive-p} argument is non-@code{nil} if the calling
 command was invoked interactively; in that case, the stack of items
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index fe7c805c6f7..a601ed0c2c0 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -1213,7 +1213,7 @@ match data around it, to prevent it from being overwritten.
 
   Notice that all functions are allowed to overwrite the match data
 unless they're explicitly documented not to do so.  A consequence is
-that functions that are run implictly in the background
+that functions that are run implicitly in the background
 (@pxref{Timers}, and @ref{Idle Timers}) should likely save and restore
 the match data explicitly.
 
diff --git a/doc/lispref/spellfile b/doc/lispref/spellfile
index e66dcc88f71..5c0a6d0f5ea 100644
--- a/doc/lispref/spellfile
+++ b/doc/lispref/spellfile
@@ -376,7 +376,6 @@ inserting'
 integerp
 intermixed
 ints
-inturned
 irreversibly
 jum
 keymapp
@@ -530,7 +529,6 @@ pointer'
 pointm
 pos
 preallocate
-predicale
 preload
 prepend
 prepended
@@ -641,7 +639,7 @@ suspension'
 symbolp
 symlink
 syms
-syntatic
+syntactic
 tabname
 temacs
 temporarily'
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 8c99a06909b..bb1b0524689 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -110,6 +110,7 @@ including for the case where @var{object} is a deleted window.
 @end defun
 
 @cindex selected window
+@cindex window selected within a frame
   In each frame, at any time, exactly one Emacs window is designated
 as @dfn{selected within the frame}.  For the selected frame, that
 window is called the @dfn{selected window}---the one in which most
@@ -148,10 +149,10 @@ the minibuffer window in the returned list.  If @var{minibuffer} is
 active.  If @var{minibuffer} is neither @code{nil} nor @code{t}, the
 minibuffer window is never included.
 
-The optional argument @var{window}, if non-@code{nil}, should be a
-live window on the specified frame; then @var{window} will be the
-first element in the returned list.  If @var{window} is omitted or
-@code{nil}, the window selected within the frame is first element.
+The optional argument @var{window}, if non-@code{nil}, should be a live
+window on the specified frame; then @var{window} will be the first
+element in the returned list.  If @var{window} is omitted or @code{nil},
+the window selected within the frame is the first element.
 @end defun
 
 @cindex window tree
@@ -634,9 +635,9 @@ function @code{window-resizable} above.
 
 The choice of which window edges this function alters depends on the
 values of the option @code{window-combination-resize} and the
-combination-limit status of the involved windows; in some cases, it may
-alter both edges.  @xref{Splitting Windows}.  To resize by moving only
-the bottom or right edge of a window, use the function
+combination limits of the involved windows; in some cases, it may alter
+both edges.  @xref{Splitting Windows}.  To resize by moving only the
+bottom or right edge of a window, use the function
 @code{adjust-window-trailing-edge}, below.
 @end defun
 
@@ -774,22 +775,24 @@ properties from it, including margins and scroll bars.  If
 @var{window} is an internal window, the new window inherits the
 properties of the window selected within @var{window}'s frame.
 
-If the variable @code{ignore-window-parameters} is non-@code{nil}
-(@pxref{Window Parameters}), this function ignores window parameters.
-Otherwise, it consults the @code{split-window} parameter of
-@var{window}; if this is @code{t}, it splits the window disregarding
-any other window parameters.  If the @code{split-window} parameter
-specifies a function, that function is called with the arguments
-@var{window}, @var{size}, and @var{side} to split @var{window}, in
-lieu of the usual action of @code{split-window}.
+The behavior of this function may be altered by the window parameters
+of @var{window}, so long as the variable
+@code{ignore-window-parameters} is non-@code{nil}.  If the value of
+the @code{split-window} window parameter is @code{t}, this function
+ignores all other window parameters.  Otherwise, if the value of the
+@code{split-window} window parameter is a function, that function is
+called with the arguments @var{window}, @var{size}, and @var{side}, in
+lieu of the usual action of @code{split-window}.  Otherwise, this
+function obeys the @code{window-atom} or @code{window-side} window
+parameter, if any.  @xref{Window Parameters}.
 @end deffn
 
-  As an example, we show a combination of @code{split-window} calls
-that yields the window configuration discussed in @ref{Windows and
-Frames}.  This example demonstrates splitting a live window as well as
-splitting an internal window.  We begin with a frame containing a
-single window (a live root window), which we denote by @var{W4}.
-Calling @code{(split-window W3)} yields this window configuration:
+  As an example, here is a sequence of @code{split-window} calls that
+yields the window configuration discussed in @ref{Windows and Frames}.
+This example demonstrates splitting a live window as well as splitting
+an internal window.  We begin with a frame containing a single window
+(a live root window), which we denote by @var{W4}.  Calling
+@code{(split-window W4)} yields this window configuration:
 
 @smallexample
 @group
@@ -841,9 +844,6 @@ A new live window @var{W2} is created, to the left of the internal
 window @var{W3}.  A new internal window @var{W1} is created, becoming
 the new root window.
 
-  The following two options can be used to modify the operation of
-@code{split-window}.
-
 @defopt window-combination-resize
 If this variable is @code{nil}, @code{split-window} can only split a
 window (denoted by @var{window}) if @var{window}'s screen area is
@@ -854,18 +854,17 @@ If this variable is non-@code{nil}, @code{split-window} tries to
 resize all windows that are part of the same combination as
 @var{window}, in order to accommodate the new window.  In particular,
 this may allow @code{split-window} to succeed even if @var{window} is
-a fixed-size window or too small to ordinarily split.
-
-Also if this variable is non-@code{nil}, subsequent resizing and
-deleting @var{window} will usually affect @emph{all} windows in
-@var{window}'s combination.
+a fixed-size window or too small to ordinarily split.  Furthermore,
+subsequently resizing or deleting @var{window} may resize all other
+windows in its combination.
 
-The setting of this variable has no effect if
-@code{window-combination-limit} (see below) is non-@code{nil}.
+This variable has no effect if @code{window-combination-limit} is
+non-@code{nil} (see below).
 @end defopt
 
-To illustrate the use of @code{window-combination-resize} consider the
-following window configuration:
+  To illustrate the effect of @code{window-combination-resize},
+consider the following window configuration:
+
 @smallexample
 @group
      ______________________________________
@@ -886,9 +885,10 @@ following window configuration:
 @end group
 @end smallexample
 
-Splitting window @code{W3} with @code{window-combination-resize}
-@code{nil} produces a configuration where the size of @code{W2} remains
-unchanged:
+@noindent
+If @code{window-combination-resize} is @code{nil}, splitting window
+@code{W3} leaves the size of @code{W2} unchanged:
+
 @smallexample
 @group
      ______________________________________
@@ -909,8 +909,11 @@ unchanged:
 @end group
 @end smallexample
 
-Splitting @code{W3} with @code{window-combination-resize} non-@code{nil}
-instead steals the space for @code{W4} from both @code{W2} and @code{W3}:
+@noindent
+If @code{window-combination-resize} is non-@code{nil}, splitting
+@code{W3} instead leaves all three live windows with approximately the
+same height:
+
 @smallexample
 @group
      ______________________________________
@@ -932,53 +935,51 @@ instead steals the space for @code{W4} from both @code{W2} and @code{W3}:
 @end smallexample
 
 @defopt window-combination-limit
-If this variable is @code{nil}, @code{split-window} creates a new parent
-window if and only if the old window has no parent window or shall be
-split orthogonally to the combination it is part of.  If this variable
-is @code{t}, @code{split-window} always creates a new parent window.  If
-this variable is always @code{t}, a frame's window tree is a binary tree
-so every window but the frame's root window has exactly one sibling.
-Other values are reserved for future use.
-
-The value of this variable is also assigned to the combination-limit
-status of the new parent window.  The combination-limit status of any
-window can be retrieved via the function @code{window-combination-limit}
-and altered by the function @code{set-window-combination-limit}, see
-below.
+If the value of this variable is @code{t}, the @code{split-window}
+function always creates a new internal window.  If the value is
+@code{nil}, the new live window is allowed to share the existing
+parent window, if one exists, provided the split occurs in the same
+direction as the existing window combination (otherwise, a new
+internal window is created anyway).  The default is @code{nil}.  Other
+values are reserved for future use.
+
+Thus, if the value is always @code{t}, each window tree is a binary
+tree: each window except the root window has exactly one sibling.
+
+Furthermore, @code{split-window} calls
+@code{set-window-combination-limit} on the newly-created internal
+window, recording the current value of this variable.  This affects
+how the window tree is rearranged when the child windows are deleted
+(see below).
 @end defopt
 
-@defun window-combination-limit &optional window
-This function returns the combination-limit status of @var{window}.  The
-argument @var{window} can be any window and defaults to the selected
-one.  Note, however, that the combination-limit status is currently
-meaningful for internal windows only.
-
-@cindex combination-limit status
-The @dfn{combination-limit status} of a window specifies whether that
-window may be removed and its child windows recombined with that
-window's siblings when such a sibling's child window is deleted.  The
-combination-limit status is initially assigned by @code{split-window}
-from the current value of the variable @code{window-combination-limit}
-(see above) and can be reset by the function
-@code{set-window-combination-limit} (see below).
-
-If the return value is @code{nil}, child windows of @var{window} may be
-recombined with @var{window}'s siblings when a window gets deleted.  A
-return value of @code{nil} means that child windows of @var{window} are
-never (re-)combined with @var{window}'s siblings in such a case.
-@end defun
-
-@defun set-window-combination-limit window &optional status
-This functions sets the combination-limit status (see above) of
-@var{window} to @var{status}.  The argument @var{window} can be any
-window and defaults to the selected one.  Note that setting the
-combination-limit status is meaningful for internal windows only.  The
-return value is @var{status}.
-@end defun
-
-To illustrate the use of @code{window-combination-limit} consider the
-following configuration (throughout the following examples we shall
-assume that @code{window-combination-resize} invariantly is @code{nil}).
+@cindex window combination limit
+@defun set-window-combination-limit window limit
+This functions sets the @dfn{combination limit} of the window
+@var{window} to @var{limit}.  This value can be retrieved via the
+function @code{window-combination-limit}.  See below for its effects;
+note that it is only meaningful for internal windows.  The
+@code{split-window} function automatically calls this function, passing
+the value of the variable @code{window-combination-limit} as
+@var{limit}.
+@end defun
+
+@defun window-combination-limit window
+This function returns the combination limit for @var{window}.
+
+The combination limit is meaningful only for an internal window.  If
+it is @code{nil}, then Emacs is allowed to automatically delete
+@var{window}, in response to a window deletion, in order to group the
+child windows of @var{window} with its sibling windows to form a new
+window combination.  If the combination limit is @code{t}, the child
+windows of @var{window} are never automatically re-combined with its
+siblings.
+@end defun
+
+  To illustrate the effect of @code{window-combination-limit},
+consider the following configuration (throughout this example, we will
+assume that @code{window-combination-resize} is @code{nil}):
+
 @smallexample
 @group
      ______________________________________
@@ -999,31 +1000,10 @@ assume that @code{window-combination-resize} invariantly is @code{nil}).
 @end group
 @end smallexample
 
-Splitting @code{W2} into two windows above each other with
-@code{window-combination-limit} equal @code{nil} will get you a
-configuration like:
-@smallexample
-@group
-     ______________________________________
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||_________________W2_________________||
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||_________________W4_________________||
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||_________________W3_________________||
-    |__________________W1__________________|
-
-@end group
-@end smallexample
+@noindent
+If @code{window-combination-limit} is @code{nil}, splitting @code{W2}
+into two windows, one above the other, yields
 
-If you now enlarge window @code{W4}, Emacs steals the necessary space
-from window @code{W3} resulting in a configuration like:
 @smallexample
 @group
      ______________________________________
@@ -1034,43 +1014,24 @@ from window @code{W3} resulting in a configuration like:
     | ____________________________________ |
     ||                                    ||
     ||                                    ||
-    ||                                    ||
     ||_________________W4_________________||
     | ____________________________________ |
     ||                                    ||
+    ||                                    ||
     ||_________________W3_________________||
     |__________________W1__________________|
 
 @end group
 @end smallexample
 
-Deleting window @code{W4}, will return its space to @code{W2} as
-follows:
-@smallexample
-@group
-     ______________________________________
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||                                    ||
-    ||_________________W2_________________||
-    | ____________________________________ |
-    ||                                    ||
-    ||_________________W3_________________||
-    |__________________W1__________________|
+@noindent
+The newly-created window, @code{W4}, shares the same internal window
+@code{W1}.  If @code{W4} is resized, it is allowed to resize the other
+live window, @code{W3}.
 
-@end group
-@end smallexample
+  If @code{window-combination-limit} is @code{t}, splitting @code{W2}
+in the initial configuration would instead have produced this:
 
-Hence, with respect to the initial configuration, window @code{W2} has
-grown at the expense of window @code{W3}.  If, however, in the initial
-configuration you had split @code{W2} with
-@code{window-combination-limit} bound to @code{t}, a new internal window
-@code{W5} would have been created as depicted below.
 @smallexample
 @group
      ______________________________________
@@ -1091,143 +1052,110 @@ configuration you had split @code{W2} with
 @end group
 @end smallexample
 
-Enlarging @code{W4} would now have stolen the necessary space from
-@code{W2} instead of @code{W3} as
-@smallexample
-@group
-     ______________________________________
-    | ____________________________________ |
-    || __________________________________ ||
-    |||________________W2________________|||
-    || __________________________________ ||
-    |||                                  |||
-    |||                                  |||
-    |||________________W4________________|||
-    ||_________________W5_________________||
-    | ____________________________________ |
-    ||                                    ||
-    ||                                    ||
-    ||_________________W3_________________||
-    |__________________W1__________________|
-
-@end group
-@end smallexample
+@noindent
+A new internal window @code{W5} has been created; its children are
+@code{W2} and the new live window @code{W4}.  Now, @code{W2} is the
+only sibling of @code{W4}, so resizing @code{W4} will resize
+@code{W2}, leaving @code{W3} unaffected.
 
-and the subsequent deletion of @code{W4} would have restored the initial
-configuration.
+  For interactive use, Emacs provides two commands which always split
+the selected window.  These call @code{split-window} internally.
 
-For interactive use, Emacs provides two commands which always split the
-selected window.
+@deffn Command split-window-right &optional size
+This function splits the selected window into two side-by-side
+windows, putting the selected window on the left.  If @var{size} is
+positive, the left window gets @var{size} columns; if @var{size} is
+negative, the right window gets @minus{}@var{size} columns.
+@end deffn
 
 @deffn Command split-window-below &optional size
-This function splits the selected window into two windows, one above the
-other, leaving the upper of the two windows selected, with @var{size}
-lines.  (If @var{size} is negative, then the lower of the two windows
-gets @minus{}@var{size} lines and the upper window gets the rest, but
-the upper window is still the one selected.)  However, if
-@code{split-window-keep-point} (see below) is @code{nil}, then either
-window can be selected.
-
-   In other respects, this function is similar to @code{split-window}.
-In particular, the upper window is the original one and the return value
-is the new, lower window.
+This function splits the selected window into two windows, one above
+the other, leaving the upper window selected.  If @var{size} is
+positive, the upper window gets @var{size} lines; if @var{size} is
+negative, the lower window gets @minus{}@var{size} lines.
 @end deffn
 
 @defopt split-window-keep-point
-If this variable is non-@code{nil} (the default), then
+If the value of this variable is non-@code{nil} (the default),
 @code{split-window-below} behaves as described above.
 
-   If it is @code{nil}, then @code{split-window-below} adjusts point
-in each of the two windows to avoid scrolling.  (This is useful on
-slow terminals.)  It selects whichever window contains the screen line
-that point was previously on.  Other functions are not affected by
-this variable.
+If it is @code{nil}, @code{split-window-below} adjusts point in each
+of the two windows to minimize redisplay.  (This is useful on slow
+terminals.)  It selects whichever window contains the screen line that
+point was previously on.  Note that this only affects
+@code{split-window-below}, not the lower-level @code{split-window}
+function.
 @end defopt
 
-@deffn Command split-window-right &optional size
-This function splits the selected window into two windows
-side-by-side, leaving the selected window on the left with @var{size}
-columns.  If @var{size} is negative, the rightmost window gets
-@minus{}@var{size} columns, but the leftmost window still remains
-selected.
-@end deffn
-
-
 @node Deleting Windows
 @section Deleting Windows
 @cindex deleting windows
 
-A window remains visible on its frame unless you @dfn{delete} it by
-calling certain functions that delete windows.  A deleted window cannot
-appear on the screen, but continues to exist as a Lisp object until
-there are no references to it.  There is no way to cancel the deletion
-of a window aside from restoring a saved window configuration
-(@pxref{Window Configurations}).  Restoring a window configuration also
-deletes any windows that aren't part of that configuration.  Erroneous
-information may result from using a deleted window as if it were live.
+  @dfn{Deleting} a window removes it from the frame's window tree.  If
+the window is a live window, it disappears from the screen.  If the
+window is an internal window, its child windows are deleted too.
 
-@deffn Command delete-window &optional window
-This function removes @var{window} from display and returns @code{nil}.
-The argument @var{window} can denote any window and defaults to the
-selected one.  An error is signaled if @var{window} is the only window
-on its frame.  Hence @var{window} must have at least one sibling window
-(@pxref{Windows and Frames}) in order to get deleted.  If @var{window}
-is the selected window on its frame, this function selects the most
-recently selected live window on that frame instead.
-
-If the variable @code{ignore-window-parameters} (@pxref{Window
-Parameters}) is non-@code{nil}, this function ignores all parameters of
-@var{window}.  Otherwise, if the @code{delete-window} parameter of
-@var{window} is @code{t}, it deletes the window disregarding other
-window parameters.  If the @code{delete-window} parameter specifies a
-function, that function is called with @var{window} as its sole
-argument.
+  Even after a window is deleted, it continues to exist as a Lisp
+object, until there are no more references to it.  Window deletion can
+be reversed, by restoring a saved window configuration (@pxref{Window
+Configurations}).
 
-If @code{window-combination-resize} (@pxref{Splitting Windows}) is
-@code{nil}, the space @var{window} took up is given to its left sibling
-if such a window exists and to its right sibling otherwise.  If
-@code{window-combination-resize} is non-@code{nil}, the space of
-@var{window} is proportionally distributed among the remaining windows
-in the same combination.
+@deffn Command delete-window &optional window
+This function removes @var{window} from display and returns
+@code{nil}.  If @var{window} is omitted or @code{nil}, it defaults to
+the selected window.  If deleting the window would leave no more
+windows in the window tree (e.g. if it is the only live window in the
+frame), an error is signaled.
+
+By default, the space taken up by @var{window} is given to one of its
+adjacent sibling windows, if any.  However, if the variable
+@code{window-combination-resize} is non-@code{nil}, the space is
+proportionally distributed among any remaining windows in the window
+combination.  @xref{Splitting Windows}.
+
+The behavior of this function may be altered by the window parameters
+of @var{window}, so long as the variable
+@code{ignore-window-parameters} is non-@code{nil}.  If the value of
+the @code{delete-window} window parameter is @code{t}, this function
+ignores all other window parameters.  Otherwise, if the value of the
+@code{delete-window} window parameter is a function, that function is
+called with the argument @var{window}, in lieu of the usual action of
+@code{delete-window}.  Otherwise, this function obeys the
+@code{window-atom} or @code{window-side} window parameter, if any.
+@xref{Window Parameters}.
 @end deffn
 
 @deffn Command delete-other-windows &optional window
-This function makes @var{window} fill its frame and returns @code{nil}.
-The argument @var{window} can denote an arbitrary window and defaults to
-the selected one.  Upon exit, @var{window} will be the selected window
-on its frame.
-
-If the variable @code{ignore-window-parameters} (@pxref{Window
-Parameters}) is non-@code{nil}, this function ignores all parameters of
-@var{window}.  Otherwise, if the @code{delete-other-windows} parameter
-of @var{window} equals @code{t}, it deletes all other windows
-disregarding any remaining window parameters.  If the
-@code{delete-other-windows} parameter of @var{window} specifies a
-function, it calls that function with @var{window} as its sole argument.
+This function makes @var{window} fill its frame, by deleting other
+windows as necessary.  If @var{window} is omitted or @code{nil}, it
+defaults to the selected window.  The return value is @code{nil}.
+
+The behavior of this function may be altered by the window parameters
+of @var{window}, so long as the variable
+@code{ignore-window-parameters} is non-@code{nil}.  If the value of
+the @code{delete-other-windows} window parameter is @code{t}, this
+function ignores all other window parameters.  Otherwise, if the value
+of the @code{delete-other-windows} window parameter is a function,
+that function is called with the argument @var{window}, in lieu of the
+usual action of @code{delete-other-windows}.  Otherwise, this function
+obeys the @code{window-atom} or @code{window-side} window parameter,
+if any.  @xref{Window Parameters}.
 @end deffn
 
 @deffn Command delete-windows-on &optional buffer-or-name frame
-This function deletes all windows showing @var{buffer-or-name}.  If
-there are no windows showing @var{buffer-or-name}, it does nothing.
-The optional argument @var{buffer-or-name} may be a buffer or the name
-of an existing buffer and defaults to the current buffer.  Invoking
-this command on a minibuffer signals an error.
-
-The function @code{delete-windows-on} operates by calling
-@code{delete-window} for each window showing @var{buffer-or-name}.  If a
-frame has several windows showing different buffers, then those showing
-@var{buffer-or-name} are removed, and the other windows expand to fill
-the space.
-
-If all windows in some frame are showing @var{buffer-or-name} (including
-the case where there is only one window), then that frame is deleted
-provided there are other frames left.
-
-The optional argument @var{frame} specifies which frames to operate on.
-This function does not use it in quite the same way as the other
-functions which scan all live windows (@pxref{Cyclic Window Ordering});
-specifically, the values @code{t} and @code{nil} have the opposite of
-their meanings in the other functions.  Here are the full details:
+This function deletes all windows showing @var{buffer-or-name}, by
+calling @code{delete-window} on those windows.  @var{buffer-or-name}
+should be a buffer, or the name of a buffer; if omitted or @code{nil},
+it defaults to the current buffer.  If there are no windows showing
+the specified buffer, this function does nothing.  If the specified
+buffer is a minibuffer, an error is signaled.
+
+If there is a dedicated window showing the buffer, and that window is
+the only one on its frame, this function also deletes that frame if it
+is not the only frame on the terminal.
+
+The optional argument @var{frame} specifies which frames to operate
+on:
 
 @itemize @bullet
 @item @code{nil}
@@ -1241,34 +1169,37 @@ means operate on all visible or iconified frames.
 @item A frame
 means operate on that frame.
 @end itemize
-@end deffn
 
+Note that this argument does not have the same meaning as in other
+functions which scan all live windows (@pxref{Cyclic Window
+Ordering}).  Specifically, the values @code{t} and @code{nil} have the
+opposite of their meanings in those other functions.
+@end deffn
 
 @node Selecting Windows
 @section Selecting Windows
 @cindex selecting a window
 
 @defun select-window window &optional norecord
-This function makes @var{window} the selected window, see @ref{Basic
-Windows}.  Unless @var{window} already is the selected window, this also
-makes @var{window}'s buffer (@pxref{Buffers and Windows}) the current
-buffer.  Moreover, the cursor for selected windows will be displayed in
-@var{window} after the next redisplay.  This function returns
-@var{window}.
+This function makes @var{window} the selected window, as well as the
+window selected within its frame (@pxref{Basic Windows}).
+@var{window} must be a live window.  Unless @var{window} already is the
+selected window, its buffer becomes the current buffer (@pxref{Buffers
+and Windows}).  The return value is @var{window}.
 
-Normally, @var{window}'s selected buffer is moved to the front of the
-buffer list (@pxref{The Buffer List}) and @var{window} becomes the most
-recently selected window.  But if the optional argument @var{norecord}
-is non-@code{nil}, the buffer list remains unchanged and @var{window}
-does not become the most recently selected one.
+By default, this function also moves @var{window}'s selected buffer to
+the front of the buffer list (@pxref{The Buffer List}), and makes
+@var{window} the most recently selected window.  However, if the
+optional argument @var{norecord} is non-@code{nil}, these additional
+actions are omitted.
 @end defun
 
 @cindex most recently selected windows
-The sequence of calls to @code{select-window} with a non-@code{nil}
+  The sequence of calls to @code{select-window} with a non-@code{nil}
 @var{norecord} argument determines an ordering of windows by their
 selection time.  The function @code{get-lru-window} can be used to
-retrieve the least recently selected live window in this ordering, see
-@ref{Cyclic Window Ordering}.
+retrieve the least recently selected live window (@pxref{Cyclic Window
+Ordering}).
 
 @defmac save-selected-window forms@dots{}
 This macro records the selected frame, as well as the selected window
@@ -1300,33 +1231,26 @@ The order of recently selected windows and the buffer list are not
 changed by this macro.
 @end defmac
 
-@cindex frame selected window
-@cindex window selected within frame
-Earlier (@pxref{Basic Windows}) we mentioned that at any time, exactly
-one window on any frame is selected within the frame.  The significance
-of this designation is that selecting the frame also selects this
-window.  Conversely, selecting a window for Emacs with
-@code{select-window} also makes that window selected within its frame.
-
-@defun frame-selected-window  &optional frame
-This function returns the window on @var{frame} that is selected within
-@var{frame}.  The optional argument @var{frame} must denote a live frame
-and defaults to the selected one.
+@defun frame-selected-window &optional frame
+This function returns the window on @var{frame} that is selected
+within that frame.  @var{frame} should be a live frame; if omitted or
+@code{nil}, it defaults to the selected frame.
 @end defun
 
 @defun set-frame-selected-window frame window &optional norecord
-This function sets the selected window of frame @var{frame} to
-@var{window}.  The argument @var{frame} must denote a live frame and
-defaults to the selected one.  If @var{frame} is the selected frame,
-this also makes @var{window} the selected window.  The argument
-@var{window} must denote a live window.  This function returns
-@var{window}.
+This function makes @code{window} the window selected within the frame
+@var{frame}.  @var{frame} should be a live frame; if omitted or
+@code{nil}, it defaults to the selected frame.  @var{window} should be
+a live window; if omitted or @code{nil}, it defaults to the selected
+window.
 
-Optional argument @var{norecord} non-@code{nil} means to neither change
-the list of most recently selected windows (@pxref{Selecting Windows})
-nor the buffer list (@pxref{The Buffer List}).
-@end defun
+If @var{frame} is the selected frame, this makes @var{window} the
+selected window.
 
+If the optional argument @var{norecord} is non-@code{nil}, this
+function does not alter the list of most recently selected windows,
+nor the buffer list.
+@end defun
 
 @node Cyclic Window Ordering
 @section Cyclic Ordering of Windows
@@ -1334,28 +1258,22 @@ nor the buffer list (@pxref{The Buffer List}).
 @cindex ordering of windows, cyclic
 @cindex window ordering, cyclic
 
-When you use the command @kbd{C-x o} (@code{other-window}) to select
+  When you use the command @kbd{C-x o} (@code{other-window}) to select
 some other window, it moves through live windows in a specific order.
-For any given configuration of windows, this order never varies.  It is
-called the @dfn{cyclic ordering of windows}.
-
-   For a particular frame, this ordering is determined by the window
-tree of that frame, see @ref{Windows and Frames}.  More precisely, the
-ordering is obtained by a depth-first traversal of the frame's window
-tree supplemented, if requested, by the frame's minibuffer window.
+For any given configuration of windows, this order never varies.  It
+is called the @dfn{cyclic ordering of windows}.
 
-   If there's just one live frame, the cyclic ordering is the ordering
-for that frame.  Otherwise, the cyclic ordering is obtained by appending
-the orderings for individual frames in order of the list of all live
-frames, @ref{Finding All Frames}.  In any case, the ordering is made
-``cyclic'' by having the last window precede the first window in the
-ordering.
+  The ordering is determined by a depth-first traversal of the frame's
+window tree, retrieving the live windows which are the leaf nodes of
+the tree (@pxref{Windows and Frames}).  If the minibuffer is active,
+the minibuffer window is included too.  The ordering is cyclic, so the
+last window in the sequence is followed by the first one.
 
 @defun next-window &optional window minibuf all-frames
 @cindex minibuffer window, and @code{next-window}
-This function returns the window following @var{window} in the cyclic
-ordering of windows.  The argument @var{window} must specify a live
-window and defaults to the selected one.
+This function returns a live window, the one following @var{window} in
+the cyclic ordering of windows.  @var{window} should be a live window;
+if omitted or @code{nil}, it defaults to the selected window.
 
 The optional argument @var{minibuf} specifies whether minibuffer windows
 shall be included in the cyclic ordering.  Normally, when @var{minibuf}
@@ -1369,139 +1287,100 @@ minibuffer windows.  If @var{minibuf} is neither @code{t} nor
 @code{nil}, minibuffer windows are not included even if they are active.
 
 The optional argument @var{all-frames} specifies which frames to
-consider.  Here are the possible values and their meanings:
+consider:
 
 @itemize @bullet
 @item @code{nil}
-means consider all windows on @var{window}'s frame, plus the minibuffer
-window used by that frame even if it lies in some other frame.  If the
-minibuffer counts (as determined by @var{minibuf}), then all windows on
-all frames that share that minibuffer count too.
+means to consider windows on @var{window}'s frame.  If the minibuffer
+window is considered (as specified by the @var{minibuf} argument),
+then frames that share the minibuffer window are considered too.
 
 @item @code{t}
-means consider all windows on all existing frames.
+means to consider windows on all existing frames.
 
 @item @code{visible}
-means consider all windows on all visible frames.  (To get useful
-results, ensure that @var{window} is on a visible frame.)
+means to consider windows on all visible frames.
 
 @item 0
-means consider all windows on all visible or iconified frames.
+means to consider windows on all visible or iconified frames.
 
 @item A frame
-means consider all windows on that frame.
+means to consider windows on that specific frame.
 
 @item Anything else
-means consider the windows on @var{window}'s frame, and no others.
+means to consider windows on @var{window}'s frame, and no others.
 @end itemize
 
-This example assumes there are two windows, both displaying the
-buffer @samp{windows.texi}:
-
-@example
-@group
-(selected-window)
-     @result{} #<window 56 on windows.texi>
-@end group
-@group
-(next-window (selected-window))
-     @result{} #<window 52 on windows.texi>
-@end group
-@group
-(next-window (next-window (selected-window)))
-     @result{} #<window 56 on windows.texi>
-@end group
-@end example
+If more than one frame is considered, the cyclic ordering is obtained
+by appending the orderings for those frames, in the same order as the
+list of all live frames (@pxref{Finding All Frames}).
 @end defun
 
 @defun previous-window &optional window minibuf all-frames
-This function returns the window preceding @var{window} in the cyclic
-ordering of windows.  The other arguments specify which windows to
-consider as in @code{next-window}.
+This function returns a live window, the one preceding @var{window} in
+the cyclic ordering of windows.  The other arguments are handled like
+in @code{next-window}.
 @end defun
 
 @deffn Command other-window count &optional all-frames
-This function selects another window in the cyclic ordering of windows.
-@var{count} specifies the number of windows to skip in the ordering,
-starting with the selected window, before making the selection.  If
-@var{count} is a positive number, it skips @var{count} windows forwards.
-@var{count} negative means skip @minus{}@var{count} windows backwards.
-If @var{count} is zero, it does not skip any window, thus re-selecting
-the selected window.  In an interactive call, @var{count} is the numeric
-prefix argument.
+This function selects a live window, one @var{count} places from the
+selected window in the cyclic ordering of windows.  If @var{count} is
+a positive number, it skips @var{count} windows forwards; if
+@var{count} is negative, it skips @minus{}@var{count} windows
+backwards; if @var{count} is zero, that simply re-selects the selected
+window.  When called interactively, @var{count} is the numeric prefix
+argument.
 
 The optional argument @var{all-frames} has the same meaning as in
-@code{next-window}, but the @var{minibuf} argument of @code{next-window}
-is always effectively @code{nil}.  This function returns @code{nil}.
+@code{next-window}, like a @code{nil} @var{minibuf} argument to
+@code{next-window}.
 
 This function does not select a window that has a non-@code{nil}
 @code{no-other-window} window parameter (@pxref{Window Parameters}).
 @end deffn
 
-The following function returns a copy of the list of windows in the
-cyclic ordering.
+@defun walk-windows fun &optional minibuf all-frames
+This function calls the function @var{fun} once for each live window,
+with the window as the argument.
 
-@defun window-list-1 &optional window &optional minibuf &optional all_frames
-This function returns a list of live windows.  The optional arguments
-@var{minibuf} and @var{all-frames} specify the set of windows to include
-in the list.  See the description of @code{next-window} for details.
+It follows the cyclic ordering of windows.  The optional arguments
+@var{minibuf} and @var{all-frames} specify the set of windows
+included; these have the same arguments as in @code{next-window}.  If
+@var{all-frames} specifies a frame, the first window walked is the
+first window on that frame (the one returned by
+@code{frame-first-window}), not necessarily the selected window.
 
-The optional argument @var{window} specifies the first window to list
-and defaults to the selected window.  If @var{window} is not on the list
-of windows returned, some other window will be listed first but no error
-is signaled.
+If @var{fun} changes the window configuration by splitting or deleting
+windows, that does not alter the set of windows walked, which is
+determined prior to calling @var{fun} for the first time.
 @end defun
 
-The functions described below use @code{window-list-1} for generating a
-copy of the list of all relevant windows.  Hence, any change of the
-window configuration that occurs while one of these functions is
-executed is @emph{not} reflected in the list of windows investigated.
-
-@defun walk-windows proc &optional minibuf all-frames
-This function cycles through live windows.  It calls the function
-@var{proc} once for each window, with the window as its sole argument.
-
-The optional arguments @var{minibuf} and @var{all-frames} specify the
-set of windows to include in the walk, see @code{next-window} above.  If
-@var{all-frames} specifies a frame, the first window walked is the first
-window on that frame as returned by @code{frame-first-window} and not
-necessarily the selected window.
-
-If @var{proc} changes the window configuration by splitting or deleting
-windows, that change is not reflected in the set of windows walked.
-That set is determined entirely by the set of live windows at the time
-this function was invoked.
-@end defun
-
-The following function allows to determine whether a specific window is
-the only live window.
-
 @defun one-window-p &optional no-mini all-frames
-This function returns non-@code{nil} if the selected window is the only
-window.
+This function returns @code{t} if the selected window is the only live
+window, and @code{nil} otherwise.
 
-The optional argument @var{no-mini}, if non-@code{nil}, means don't
-count the minibuffer even if it is active; otherwise, the minibuffer
-window is counted when it is active.  The optional argument
-@var{all-frames} has the same meaning as for @code{next-window}, see
-above.
+If the minibuffer window is active, it is normally considered (so that
+this function returns @code{nil}).  However, if the optional argument
+@var{no-mini} is non-@code{nil}, the minibuffer window is ignored even
+if active.  The optional argument @var{all-frames} has the same
+meaning as for @code{next-window}.
 @end defun
 
 @cindex finding windows
-  The following functions choose (but do not select) one of the windows
-on the screen, offering various criteria for the choice.
+  The following functions return a window which satisfies some
+criterion, without selecting it:
 
 @cindex least recently used window
 @defun get-lru-window &optional all-frames dedicated
-This function returns the window least recently ``used'' (that is,
-selected).  If any full-width windows are present, it only considers
-these.  The optional argument @var{all-frames} has the same meaning as
-in @code{next-window}.
+This function returns a live window which is heuristically the ``least
+recently used'' window.  The optional argument @var{all-frames} has
+the same meaning as in @code{next-window}.
 
-The selected window is returned if it is the only candidate.  A
-minibuffer window is never a candidate.  A dedicated window
-(@pxref{Dedicated Windows}) is never a candidate unless the optional
-argument @var{dedicated} is non-@code{nil}.
+If any full-width windows are present, only those windows are
+considered.  The selected window is never returned, unless it is the
+only candidate.  A minibuffer window is never a candidate.  A
+dedicated window (@pxref{Dedicated Windows}) is never a candidate
+unless the optional argument @var{dedicated} is non-@code{nil}.
 @end defun
 
 @cindex largest window
@@ -1515,22 +1394,23 @@ If there are two candidate windows of the same size, this function
 prefers the one that comes first in the cyclic ordering of windows,
 starting from the selected window.
 
-The optional argument @var{all-frames} specifies which set of windows to
-consider as with @code{next-window}, see above.
+The optional argument @var{all-frames} specifies the windows to
+search, and has the same meaning as in @code{next-window}.
 @end defun
 
 @cindex window that satisfies a predicate
 @cindex conditional selection of windows
 @defun get-window-with-predicate predicate &optional minibuf all-frames default
-This function returns a window satisfying @var{predicate}.  It cycles
-through all visible windows calling @var{predicate} on each one of them
-with that window as its argument.  The function returns the first window
-for which @var{predicate} returns a non-@code{nil} value; if that never
-happens, it returns @var{default} (which defaults to @code{nil}).
+This function calls the function @var{predicate} for each of the
+windows in the cyclic order of windows in turn, passing it the window
+as an argument.  If the predicate returns non-@code{nil} for any
+window, this function stops and returns that window.  If no such
+window is found, the return value is @var{default} (which defaults to
+@code{nil}).
 
 The optional arguments @var{minibuf} and @var{all-frames} specify the
-set of windows to investigate.  See the description of
-@code{next-window} for details.
+windows to search, and have the same meanings as in
+@code{next-window}.
 @end defun
 
 @node Buffers and Windows
@@ -1539,47 +1419,41 @@ set of windows to investigate.  See the description of
 @cindex windows, controlling precisely
 @cindex buffers, controlled in windows
 
-To find out which buffer is displayed in a given window the following
-function is used.
+  This section describes low-level functions for examining and setting
+the contents of windows.  @xref{Switching Buffers}, for higher-level
+functions for displaying a specific buffer in a window.
 
 @defun window-buffer &optional window
-This function returns the buffer that @var{window} is displaying.  The
-argument @var{window} can be any window and defaults to the selected
-one.  If @var{window} is an internal window, this function returns
+This function returns the buffer that @var{window} is displaying.  If
+@var{window} is omitted or @code{nil} it defaults to the selected
+window.  If @var{window} is an internal window, this function returns
 @code{nil}.
 @end defun
 
-The basic, low-level function to associate a window with a buffer is
-@code{set-window-buffer}.  Higher-level functions like
-@code{switch-to-buffer} and @code{display-buffer} try to obey a number
-of user customizations regulating which windows are supposed to
-display which buffers.  @xref{Switching Buffers}.  When writing an
-application, you should avoid using @code{set-window-buffer} unless
-you are sure you need it.
-
 @defun set-window-buffer window buffer-or-name &optional keep-margins
-This function makes @var{window} display @var{buffer-or-name} and
-returns @code{nil}.  The argument @var{window} has to denote a live
-window and defaults to the selected one.  The argument
-@var{buffer-or-name} must specify a buffer or the name of an existing
-buffer.  An error is signaled when @var{window} is @dfn{strongly}
-dedicated to its buffer (@pxref{Dedicated Windows}) and does not already
-display @var{buffer-or-name}.
-
-Normally, displaying @var{buffer-or-name} in @var{window} resets the
-window's position, display margins, fringe widths, and scroll bar
-settings based on the local variables of the specified buffer.  However,
-if the optional argument @var{keep-margins} is non-@code{nil}, display
-margins and fringe widths of @var{window} remain unchanged.
-@xref{Fringes}.
-
-This function is the fundamental primitive for changing which buffer is
-displayed in a window, and all ways of doing that call this function.
-Neither the selected window nor the current buffer are changed by this
-function.
+This function makes @var{window} display @var{buffer-or-name}.
+@var{window} should be a live window; if @code{nil}, it defaults to
+the selected window.  @var{buffer-or-name} should be a buffer, or the
+name of an existing buffer.  This function does not change which
+window is selected, nor does it directly change which buffer is
+current (@pxref{Current Buffer}).  Its return value is @code{nil}.
 
-This function runs @code{window-scroll-functions} before running
-@code{window-configuration-change-hook}, see @ref{Window Hooks}.
+If @var{window} is @dfn{strongly dedicated} to a buffer and
+@var{buffer-or-name} does not specify that buffer, this function
+signals an error.  @xref{Dedicated Windows}.
+
+By default, this function resets @var{window}'s position, display
+margins, fringe widths, and scroll bar settings, based on the local
+variables in the specified buffer.  However, if the optional argument
+@var{keep-margins} is non-@code{nil}, it leaves the display margins
+and fringe widths unchanged.
+
+When writing an application, you should normally use the higher-level
+functions described in @ref{Switching Buffers}, instead of calling
+@code{set-window-buffer} directly.
+
+This function runs @code{window-scroll-functions}, followed by
+@code{window-configuration-change-hook}.  @xref{Window Hooks}.
 @end defun
 
 @defvar buffer-display-count
@@ -1589,28 +1463,26 @@ displayed in a window.  It is incremented each time
 @end defvar
 
 @defvar buffer-display-time
-This variable records the time at which a buffer was last made visible
-in a window.  It is always local in each buffer; each time
-@code{set-window-buffer} is called, it sets this variable to
-@code{(current-time)} in the specified buffer (@pxref{Time of Day}).
-When a buffer is first created, @code{buffer-display-time} starts out
-with the value @code{nil}.
+This buffer-local variable records the time at which a buffer was last
+displayed in a window.  The value is @code{nil} if the buffer has
+never been displayed.  It is updated each time
+@code{set-window-buffer} is called for the buffer, with the value
+returned by @code{current-time} (@pxref{Time of Day}).
 @end defvar
 
 @defun get-buffer-window &optional buffer-or-name all-frames
-This function returns a window displaying @var{buffer-or-name}, or
-@code{nil} if there is none.  If there are several such windows, then
-the function returns the first one in the cyclic ordering of windows,
-starting from the selected window, @xref{Cyclic Window Ordering}.
+This function returns the first window displaying @var{buffer-or-name}
+in the cyclic ordering of windows, starting from the selected window
+(@pxref{Cyclic Window Ordering}).  If no such window exists, the
+return value is @code{nil}.
 
-The argument @var{buffer-or-name} may be a buffer or a buffer name and
-defaults to the current buffer.  The optional argument @var{all-frames}
-specifies which windows to consider:
+@var{buffer-or-name} should be a buffer or the name of a buffer; if
+omitted or @code{nil}, it defaults to the current buffer.  The
+optional argument @var{all-frames} specifies which windows to
+consider:
 
 @itemize @bullet
 @item
-@code{nil} means consider windows on the selected frame.
-@item
 @code{t} means consider windows on all existing frames.
 @item
 @code{visible} means consider windows on all visible frames.
@@ -1618,44 +1490,45 @@ specifies which windows to consider:
 0 means consider windows on all visible or iconified frames.
 @item
 A frame means consider windows on that frame only.
+@item
+Any other value means consider windows on the selected frame.
 @end itemize
 
-Observe that the behavior of @code{get-buffer-window} may differ from
-that of @code{next-window} (@pxref{Cyclic Window Ordering}) when
-@var{all-frames} equals @code{nil} or any value not listed here.
-Perhaps we will change @code{get-buffer-window} in the future to make it
-compatible with the other functions.
+Note that these meanings differ slightly from those of the
+@var{all-frames} argument to @code{next-window} (@pxref{Cyclic Window
+Ordering}).  This function may be changed in a future version of Emacs
+to eliminate this discrepancy.
 @end defun
 
 @defun get-buffer-window-list &optional buffer-or-name minibuf all-frames
 This function returns a list of all windows currently displaying
-@var{buffer-or-name}.  The argument @var{buffer-or-name} may be a buffer
-or the name of an existing buffer and defaults to the current buffer.
+@var{buffer-or-name}.  @var{buffer-or-name} should be a buffer or the
+name of an existing buffer.  If omitted or @code{nil}, it defaults to
+the current buffer.
 
-The two remaining arguments work like the same-named arguments of
-@code{next-window} (@pxref{Cyclic Window Ordering}); they are @emph{not}
-like the optional arguments of @code{get-buffer-window}.
+The arguments @var{minibuf} and @var{all-frames} have the same
+meanings as in the function @code{next-window} (@pxref{Cyclic Window
+Ordering}).  Note that the @var{all-frames} argument does @emph{not}
+behave exactly like in @code{get-buffer-window}.
 @end defun
 
 @deffn Command replace-buffer-in-windows &optional buffer-or-name
 This command replaces @var{buffer-or-name} with some other buffer, in
-all windows displaying it.  For each such window, it choose another
-buffer using @code{switch-to-prev-buffer} (@pxref{Window History}).
-
-The argument @var{buffer-or-name} may be a buffer, or the name of an
-existing buffer; it defaults to the current buffer.
-
-If a window displaying @var{buffer-or-name} is dedicated
-(@pxref{Dedicated Windows}) and is not the only window on its frame,
-that window is deleted.  If that window is the only window on its frame
-and there are other frames on the frame's terminal, that frame is dealt
-with by the function specified by @code{frame-auto-hide-function}
-(@pxref{Quitting Windows}).  Otherwise, the buffer provided by the
-function @code{switch-to-prev-buffer} (@pxref{Window History}) is
-displayed in the window instead.
+all windows displaying it.  @var{buffer-or-name} should be a buffer,
+or the name of an existing buffer; if omitted or @code{nil}, it
+defaults to the current buffer.
+
+The replacement buffer in each window is chosen via
+@code{switch-to-prev-buffer} (@pxref{Window History}).  Any dedicated
+window displaying @var{buffer-or-name} is deleted (@pxref{Dedicated
+Windows}), unless it is the only window on its frame---if it is the
+only window, and that frame is not the only frame on its terminal, the
+frame is ``dismissed'' by calling the function specified by
+@code{frame-auto-hide-function} (@pxref{Quitting Windows}).  If the
+dedicated window is the only window on the only frame on its terminal,
+the buffer is replaced anyway.
 @end deffn
 
-
 @node Switching Buffers
 @section Switching to a Buffer in a Window
 @cindex switching to a buffer
@@ -1731,9 +1604,12 @@ The @var{buffer-or-name} and @var{norecord} arguments have the same
 meanings as in @code{switch-to-buffer}.
 @end deffn
 
-The above commands use @code{pop-to-buffer}, which is the function
-used by Lisp programs to flexibly display a buffer in some window and
-select that window for editing:
+The above commands use the function @code{pop-to-buffer}, which
+flexibly displays a buffer in some window and selects that window for
+editing.  In turn, @code{pop-to-buffer} uses @code{display-buffer} for
+displaying the buffer.  Hence, all the variables affecting
+@code{display-buffer} will affect it as well.  @xref{Choosing Window},
+for the documentation of @code{display-buffer}.
 
 @defun pop-to-buffer buffer-or-name &optional action norecord
 This function makes @var{buffer-or-name} the current buffer and
@@ -1743,10 +1619,6 @@ on a different graphical frame, that frame is given input focus if
 possible (@pxref{Input Focus}).  The return value is the buffer that
 was switched to.
 
-This function uses @code{display-buffer} to display the buffer, so all
-the variables affecting @code{display-buffer} will affect it as well.
-@xref{Choosing Window}.
-
 If @var{buffer-or-name} is @code{nil}, it defaults to the buffer
 returned by @code{other-buffer} (@pxref{The Buffer List}).  If
 @var{buffer-or-name} is a string that is not the name of any existing
@@ -1775,8 +1647,8 @@ used as a subroutine by many functions and commands, including
 Buffers}).
 
 @cindex display action
-@cindex action function, for display-buffer
-@cindex action alist, for display-buffer
+@cindex action function, for @code{display-buffer}
+@cindex action alist, for @code{display-buffer}
   This command performs several complex steps to find a window to
 display in.  These steps are described by means of @dfn{display
 actions}, which have the form @code{(@var{function} . @var{alist})}.
@@ -1815,6 +1687,11 @@ The variable @code{display-buffer-overriding-action}.
 The user option @code{display-buffer-alist}.
 
 @item
+A special action for handling @code{special-display-buffer-names} and
+@code{special-display-regexps}, if either of those variables is
+non-@code{nil}.  @xref{Choosing Window Options}.
+
+@item
 The @var{action} argument.
 
 @item
@@ -1886,10 +1763,9 @@ This function tries to ``display'' @var{buffer} by finding a window
 that is already displaying it.
 
 If @var{alist} has a non-@code{nil} @code{inhibit-same-window} entry,
-the selected window is not eligible for reuse.
-
-If @var{alist} contains a @code{reusable-frames} entry, its value
-determines which frames to search for a reusable window:
+the selected window is not eligible for reuse.  If @var{alist}
+contains a @code{reusable-frames} entry, its value determines which
+frames to search for a reusable window:
 
 @itemize @bullet
 @item
@@ -1910,17 +1786,28 @@ normally searches just the selected frame; however, if either the
 variable @code{display-buffer-reuse-frames} or the variable
 @code{pop-up-frames} is non-@code{nil}, it searches all frames on the
 current terminal.  @xref{Choosing Window Options}.
+
+If this function chooses a window on another frame, it makes that
+frame visible and raises it if necessary.
 @end defun
 
 @defun display-buffer-pop-up-frame buffer alist
 This function creates a new frame, and displays the buffer in that
-frame's window.
+frame's window.  It actually performs the frame creation by calling
+the function specified in @code{pop-up-frame-function}
+(@pxref{Choosing Window Options}).
 @end defun
 
 @defun display-buffer-pop-up-window buffer alist
 This function tries to display @var{buffer} by splitting the largest
-or least recently-used window.  It uses @code{split-window-sensibly}
-as a subroutine (@pxref{Choosing Window Options}).
+or least recently-used window (typically one on the selected frame).
+It actually performs the split by calling the function specified in
+@code{split-window-preferred-function} (@pxref{Choosing Window
+Options}).
+
+It can fail if no window splitting can be performed for some reason
+(e.g. if there is just one frame and it has an @code{unsplittable}
+frame parameter; @pxref{Buffer Parameters}).
 @end defun
 
 @defun display-buffer-use-some-window buffer alist
@@ -1937,142 +1824,108 @@ The behavior of the standard display actions of @code{display-buffer}
 options.
 
 @defopt display-buffer-reuse-frames
-If this variable is non-@code{nil}, @code{display-buffer} searches
-visible and iconified frames for a window displaying
-@var{buffer-or-name}.  If there is such a window, @code{display-buffer}
-makes that window's frame visible and raises it if necessary, and
-returns the window.  If there is no such window or
-@code{display-buffer-reuse-frames} is @code{nil}, the behavior of
-@code{display-buffer} is determined by the variables described next.
+If the value of this variable is non-@code{nil}, @code{display-buffer}
+may search all frames on the current terminal when looking for a
+window already displaying the specified buffer.  The default is
+@code{nil}.  This variable is consulted by the action function
+@code{display-buffer-reuse-window} (@pxref{Display Action Functions}).
 @end defopt
 
 @defopt pop-up-windows
-This variable specifies whether @code{display-buffer} is allowed to
-split (@pxref{Splitting Windows}) an existing window.  If this variable
-is non-@code{nil}, @code{display-buffer} tries to split the largest or
-least recently used window on the selected frame.  (If the selected
-frame is a minibuffer-only frame, @code{display-buffer} tries to split a
-window on another frame instead.)  If this variable is @code{nil} or the
-variable @code{pop-up-frames} (see below) is non-@code{nil},
-@code{display-buffer} does not split any window.
+If the value of this variable is non-@code{nil}, @code{display-buffer}
+is allowed to split an existing window to make a new window for
+displaying in.  This is the default.
+
+This variable is provided mainly for backward compatibility.  It is
+obeyed by @code{display-buffer} via a special mechanism in
+@code{display-buffer-fallback-action}, which only calls the action
+function @code{display-buffer-pop-up-window} (@pxref{Display Action
+Functions}) when the value is @code{nil}.  It is not consulted by
+@code{display-buffer-pop-up-window} itself, which the user may specify
+directly in @code{display-buffer-alist} etc.
 @end defopt
 
 @defopt split-window-preferred-function
-This variable must specify a function with one argument, which is a
-window.  The @code{display-buffer} routines will call this function with
-one or more candidate windows when they look for a window to split.  The
-function is expected to split that window and return the new window.  If
-the function returns @code{nil}, this means that the argument window
-cannot (or shall not) be split.
-
-The default value of @code{split-window-preferred-function} is the
-function @code{split-window-sensibly} described below.  If you
-customize this option, bear in mind that the @code{display-buffer}
-routines may call your function up to two times when trying to split a
-window.  The argument of the first call is the largest window on the
-chosen frame (as returned by @code{get-largest-window}).  If that call
-fails to return a live window, your function is called a second time
-with the least recently used window on that frame (as returned by
-@code{get-lru-window}).
-
-The function specified by this option may try to split any other window
-instead of the argument window.  Note that the window selected at the
-time @code{display-buffer} was invoked is still selected when your
-function is called.  Hence, you can split the selected window (instead
-of the largest or least recently used one) by simply ignoring the window
-argument in the body of your function.  You can even choose to not split
-any window as long as the return value of your function specifies a live
-window or @code{nil}, but you are not encouraged to do so
-unconditionally.  If you want @code{display-buffer} to never split any
-windows, set @code{pop-up-windows} to @code{nil}.
+This variable specifies a function for splitting a window, in order to
+make a new window for displaying a buffer.  It is used by the
+@code{display-buffer-pop-up-window} action function to actually split
+the window (@pxref{Display Action Functions}).
+
+The default value is @code{split-window-sensibly}, which is documented
+below.  The value must be a function that takes one argument, a
+window, and return either a new window (which is used to display the
+desired buffer) or @code{nil} (which means the splitting failed).
 @end defopt
 
 @defun split-window-sensibly window
-This function takes a window as argument and tries to split that window
-in a suitable way.  The two variables described next are useful for
-tuning the behavior of this function.
+This function tries to split @code{window}, and return the newly
+created window.  If @code{window} cannot be split, it returns
+@code{nil}.
+
+This function obeys the usual rules that determine when a window may
+be split (@pxref{Splitting Windows}).  It first tries to split by
+placing the new window below, subject to the restriction imposed by
+@code{split-height-threshold} (see below) in addition to any other
+restrictions.  If that fails, it tries to split by placing the new
+window to the right, subject to @code{split-width-threshold} (see
+below).  If that fails, and the window is the only window on its
+frame, this function again tries to split and place the new window
+below, disregarding @code{split-height-threshold}.  If this fails as
+well, this function gives up and returns @code{nil}.
 @end defun
 
 @defopt split-height-threshold
-This variable specifies whether @code{split-window-sensibly} may split
-windows vertically.  If it is an integer, @code{split-window-sensibly}
-tries to vertically split a window only if it has at least this many
-lines.  If the window has less lines, splitting fails, or the value of
-this variable is @code{nil}, @code{split-window-sensibly} will try to
-split the window horizontally, subject to restrictions of
-@code{split-width-threshold} (see below).  If splitting horizontally
-fails too and the window is the only window on its frame,
-@code{split-window-sensibly} will try to split the window vertically
-disregarding the value of @code{split-height-threshold}.  If this fails
-as well, @code{split-window-sensibly} returns @code{nil}.
-
-@code{split-window-sensibly} does not split vertically a window whose
-height is fixed (@pxref{Resizing Windows}).  Also, it vertically splits
-a window only if the space taken up by that window can accommodate two
-windows one above the other that are both at least
-@code{window-min-height} lines tall.  Moreover, if the window that shall
-be split has a mode line, @code{split-window-sensibly} does not split
-the window unless the new window can accommodate a mode line too.
+This variable, used by @code{split-window-sensibly}, specifies whether
+to split the window placing the new window below.  If it is an
+integer, that means to split only if the original window has at least
+that many lines.  If it is @code{nil}, that means not to split this
+way.
 @end defopt
 
 @defopt split-width-threshold
-This variable specifies whether @code{split-window-sensibly} may split
-windows horizontally.  If it is an integer, @code{split-window-sensibly}
-tries to horizontally split a window only if it has at least this many
-columns.  If it is @code{nil}, @code{split-window-sensibly} will not
-split the window horizontally.  (It still might split the window
-vertically, though, see above.)
-
-@code{split-window-sensibly} does not split horizontally a window if
-that window's width is fixed (@pxref{Resizing Windows}).  Also, it
-horizontally splits a window only if the space that window takes up can
-accommodate two windows side by side that are both at least
-@code{window-min-width} columns wide.
+This variable, used by @code{split-window-sensibly}, specifies whether
+to split the window placing the new window to the right.  If the value
+is an integer, that means to split only if the original window has at
+least that many columns.  If the value is @code{nil}, that means not
+to split this way.
 @end defopt
 
-@defopt even-window-heights
-This variable specifies whether @code{display-buffer} should even out
-window heights if the buffer gets displayed in an existing window, above
-or beneath another window.  If @code{even-window-heights} is
-non-@code{nil}, the default, window heights will be evened out.  If
-either of the involved window has fixed height (@pxref{Resizing
-Windows}) or @code{even-window-heights} is @code{nil}, the original
-window heights will be left alone.
-@end defopt
-
-@c Emacs 19 feature
 @defopt pop-up-frames
-This variable specifies whether @code{display-buffer} should make new
-frames.  If it is non-@code{nil}, @code{display-buffer} looks for a
-window already displaying @var{buffer-or-name} on any visible or
-iconified frame.  If it finds such a window, it makes that window's
-frame visible and raises it if necessary, and returns the window.
-Otherwise it makes a new frame, unless the variable's value is
-@code{graphic-only} and the selected frame is not on a graphic display.
-@xref{Frames}, for more information.
-
-Note that the value of @code{pop-up-windows} does not matter if
-@code{pop-up-frames} is non-@code{nil}.  If @code{pop-up-frames} is
-@code{nil}, then @code{display-buffer} either splits a window or reuses
-one.
+If the value of this variable is non-@code{nil}, that means
+@code{display-buffer} may display buffers by making new frames.  The
+default is @code{nil}.
+
+A non-@code{nil} value also means that when @code{display-buffer} is
+looking for a window already displaying @var{buffer-or-name}, it can
+search any visible or iconified frame, not just the selected frame.
+
+This variable is provided mainly for backward compatibility.  It is
+obeyed by @code{display-buffer} via a special mechanism in
+@code{display-buffer-fallback-action}, which calls the action function
+@code{display-buffer-pop-up-frame} (@pxref{Display Action Functions})
+if the value is non-@code{nil}.  (This is done before attempting to
+split a window.)  This variable is not consulted by
+@code{display-buffer-pop-up-frame} itself, which the user may specify
+directly in @code{display-buffer-alist} etc.
 @end defopt
 
-@c Emacs 19 feature
 @defopt pop-up-frame-function
-This variable specifies how to make a new frame if @code{pop-up-frames}
-is non-@code{nil}.
-
-The value of this variable must be a function of no arguments.  When
-@code{display-buffer} makes a new frame, it does so by calling that
-function, which should return a frame.  The default value of this
-variable is a function that creates a frame using the parameters
-specified by @code{pop-up-frame-alist} described next.
+This variable specifies a function for creating a new frame, in order
+to make a new window for displaying a buffer.  It is used by the
+@code{display-buffer-pop-up-frame} action function (@pxref{Display
+Action Functions}).
+
+The value should be a function that takes no arguments and returns a
+frame, or @code{nil} if no frame could be created.  The default value
+is a function that creates a frame using the parameters specified by
+@code{pop-up-frame-alist} (see below).
 @end defopt
 
 @defopt pop-up-frame-alist
-This variable holds an alist specifying frame parameters used by the
-default value of @code{pop-up-frame-function} for making new frames.
-@xref{Frame Parameters}, for more information about frame parameters.
+This variable holds an alist of frame parameters (@pxref{Frame
+Parameters}), which is used by the default function in
+@code{pop-up-frame-function} to make a new frame.  The default is
+@code{nil}.
 @end defopt
 
 @defopt special-display-buffer-names
@@ -2193,12 +2046,6 @@ This variable takes precedence over all the other options described
 above.
 @end defopt
 
-If all options described above fail to produce a suitable window,
-@code{display-buffer} tries to reuse an existing window.  As a last
-resort, it will try to display @var{buffer-or-name} on a separate frame.
-In that case, the value of @code{pop-up-frames} is disregarded.
-
-
 @node Window History
 @section Window History
 @cindex window history
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 924f3501bfa..43d9ba1b1e6 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,19 @@
+2011-11-20  Glenn Morris  <rgm@gnu.org>
+
+        * gnus.texi (Group Information):
+        Remove gnus-group-fetch-faq, command deleted 2010-09-24.
+
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * gnus-coding.texi (Gnus Maintenance Guide):
+        Rename from "Gnus Maintainance Guide".
+
+        * ede.texi (ede-compilation-program, ede-compiler, ede-linker):
+        * eieio.texi (Customizing):
+        * gnus.texi (Article Washing):
+        * gnus-news.texi:
+        * sem-user.texi (Smart Jump): Fix typos.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * org.texi (Agenda commands, Exporting Agenda Views): Fix typos.
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index 374158c2c78..0eb20d01324 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -1357,7 +1357,7 @@ specifies the casing of one word or word fragment. Comments may be
 included, separated from the word by a space.
 
 If the word starts with an asterisk (@key{*}), it defines the casing
-af a word fragment (or ``substring''); part of a word between two
+as a word fragment (or ``substring''); part of a word between two
 underscores or word boundary.
 
 For example:
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index 2e66c78a3cb..ecf4c7e47b2 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -156,7 +156,7 @@ the point is normally left after that skeleton is inserted (@pxref{Using
 Skeletons}).  The point (@pxref{(emacs)Point}) is left at the next
 interesting spot in the skeleton instead.
 
-  A negative prefix means to do something similar with that many precedingly
+  A negative prefix means to do something similar with that many previously
 marked interregions (@pxref{(emacs)Mark}).  In the simplest case, if you type
 @kbd{M--} just before issuing the skeleton command, that will wrap the
 skeleton around the current region, just like a positive argument would have
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 5a1ee872a2b..290b120ea80 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -90,7 +90,7 @@
 This file documents Calc, the GNU Emacs calculator.
 @end ifinfo
 @ifnotinfo
-This file documents Calc, the GNU Emacs calculator, included with 
+This file documents Calc, the GNU Emacs calculator, included with
 GNU Emacs @value{EMACSVER}.
 @end ifnotinfo
 
@@ -324,7 +324,7 @@ need to know.
 @c @cindex Marginal notes
 Every Calc keyboard command is listed in the Calc Summary, and also
 in the Key Index.  Algebraic functions, @kbd{M-x} commands, and
-variables also have their own indices.  
+variables also have their own indices.
 @c @texline Each
 @c @infoline In the printed manual, each
 @c paragraph that is referenced in the Key or Function Index is marked
@@ -338,7 +338,7 @@ the @kbd{h i} key sequence.  Outside of the Calc window, you can press
 command @kbd{C-x * t} will jump to the Tutorial and start Calc if
 necessary.  Pressing @kbd{h s} or @kbd{C-x * s} will take you directly
 to the Calc Summary.  Within Calc, you can also go to the part of the
-manual describing any Calc key, function, or variable using 
+manual describing any Calc key, function, or variable using
 @w{@kbd{h k}}, @kbd{h f}, or @kbd{h v}, respectively.  @xref{Help Commands}.
 
 @ifnottex
@@ -437,12 +437,12 @@ Delete, and Space keys.
 then the command to operate on the numbers.
 
 @noindent
-Type @kbd{2 @key{RET} 3 + Q} to compute 
+Type @kbd{2 @key{RET} 3 + Q} to compute
 @texline @math{\sqrt{2+3} = 2.2360679775}.
 @infoline the square root of 2+3, which is 2.2360679775.
 
 @noindent
-Type @kbd{P 2 ^} to compute 
+Type @kbd{P 2 ^} to compute
 @texline @math{\pi^2 = 9.86960440109}.
 @infoline the value of `pi' squared, 9.86960440109.
 
@@ -461,14 +461,14 @@ conventional ``algebraic'' notation.  To enter an algebraic formula,
 use the apostrophe key.
 
 @noindent
-Type @kbd{' sqrt(2+3) @key{RET}} to compute 
+Type @kbd{' sqrt(2+3) @key{RET}} to compute
 @texline @math{\sqrt{2+3}}.
 @infoline the square root of 2+3.
 
 @noindent
-Type @kbd{' pi^2 @key{RET}} to enter 
+Type @kbd{' pi^2 @key{RET}} to enter
 @texline @math{\pi^2}.
-@infoline `pi' squared.  
+@infoline `pi' squared.
 To evaluate this symbolic formula as a number, type @kbd{=}.
 
 @noindent
@@ -526,10 +526,10 @@ the upper-leftmost @samp{1} and set the mark, then move to just after
 the lower-right @samp{8} and press @kbd{C-x * r}.
 
 @noindent
-Type @kbd{v t} to transpose this 
+Type @kbd{v t} to transpose this
 @texline @math{3\times2}
-@infoline 3x2 
-matrix into a 
+@infoline 3x2
+matrix into a
 @texline @math{2\times3}
 @infoline 2x3
 matrix.  Type @w{@kbd{v u}} to unpack the rows into two separate
@@ -605,7 +605,7 @@ there are Quick mode, Keypad mode, and Embedded mode.
 
 @noindent
 On most systems, you can type @kbd{C-x *} to start the Calculator.
-The key sequence @kbd{C-x *} is bound to the command @code{calc-dispatch}, 
+The key sequence @kbd{C-x *} is bound to the command @code{calc-dispatch},
 which can be rebound if convenient (@pxref{Customizing Calc}).
 
 When you press @kbd{C-x *}, Emacs waits for you to press a second key to
@@ -1154,9 +1154,9 @@ its initial state:  Empty stack, and initial mode settings.
 @noindent
 Calc was originally started as a two-week project to occupy a lull
 in the author's schedule.  Basically, a friend asked if I remembered
-the value of 
+the value of
 @texline @math{2^{32}}.
-@infoline @expr{2^32}.  
+@infoline @expr{2^32}.
 I didn't offhand, but I said, ``that's easy, just call up an
 @code{xcalc}.''  @code{Xcalc} duly reported that the answer to our
 question was @samp{4.294967e+09}---with no way to see the full ten
@@ -1213,7 +1213,7 @@ algebra system for microcomputers.
 Many people have contributed to Calc by reporting bugs and suggesting
 features, large and small.  A few deserve special mention:  Tim Peters,
 who helped develop the ideas that led to the selection commands, rewrite
-rules, and many other algebra features; 
+rules, and many other algebra features;
 @texline Fran\c{c}ois
 @infoline Francois
 Pinard, who contributed an early prototype of the Calc Summary appendix
@@ -1226,7 +1226,7 @@ Randal Schwartz, who suggested the @code{calc-eval} function; Juha
 Sarlin, who first worked out how to split Calc into quickly-loading
 parts; Bob Weiner, who helped immensely with the Lucid Emacs port; and
 Robert J. Chassell, who suggested the Calc Tutorial and exercises as
-well as many other things.  
+well as many other things.
 
 @cindex Bibliography
 @cindex Knuth, Art of Computer Programming
@@ -1472,9 +1472,9 @@ Here's the first exercise:  What will the keystrokes @kbd{1 @key{RET} 2
 multiplication.)  Figure it out by hand, then try it with Calc to see
 if you're right.  @xref{RPN Answer 1, 1}. (@bullet{})
 
-(@bullet{}) @strong{Exercise 2.}  Compute 
+(@bullet{}) @strong{Exercise 2.}  Compute
 @texline @math{(2\times4) + (7\times9.4) + {5\over4}}
-@infoline @expr{2*4 + 7*9.5 + 5/4} 
+@infoline @expr{2*4 + 7*9.5 + 5/4}
 using the stack.  @xref{RPN Answer 2, 2}. (@bullet{})
 
 The @key{DEL} key is called Backspace on some keyboards.  It is
@@ -1889,7 +1889,7 @@ intermediate results of a calculation as you go along.  You can
 accomplish this in Calc by performing your calculation as a series
 of algebraic entries, using the @kbd{$} sign to tie them together.
 In an algebraic formula, @kbd{$} represents the number on the top
-of the stack.  Here, we perform the calculation 
+of the stack.  Here, we perform the calculation
 @texline @math{\sqrt{2\times4+1}},
 @infoline @expr{sqrt(2*4+1)},
 which on a traditional calculator would be done by pressing
@@ -2149,7 +2149,7 @@ key.  If you type a prefix key by accident, you can press @kbd{C-g}
 to cancel it.  (In fact, you can press @kbd{C-g} to cancel almost
 anything in Emacs.)  To get help on a prefix key, press that key
 followed by @kbd{?}.  Some prefixes have several lines of help,
-so you need to press @kbd{?} repeatedly to see them all.  
+so you need to press @kbd{?} repeatedly to see them all.
 You can also type @kbd{h h} to see all the help at once.
 
 Try pressing @kbd{t ?} now.  You will see a line of the form,
@@ -2550,13 +2550,13 @@ angle is measured in degrees.  For example,
 
 @noindent
 The shift-@kbd{S} command computes the sine of an angle.  The sine
-of 45 degrees is 
+of 45 degrees is
 @texline @math{\sqrt{2}/2};
-@infoline @expr{sqrt(2)/2}; 
+@infoline @expr{sqrt(2)/2};
 squaring this yields @expr{2/4 = 0.5}.  However, there has been a slight
-roundoff error because the representation of 
+roundoff error because the representation of
 @texline @math{\sqrt{2}/2}
-@infoline @expr{sqrt(2)/2} 
+@infoline @expr{sqrt(2)/2}
 wasn't exact.  The @kbd{c 1} command is a handy way to clean up numbers
 in this case; it temporarily reduces the precision by one digit while it
 re-rounds the number on the top of the stack.
@@ -2595,9 +2595,9 @@ either radians or degrees, depending on the current angular mode.
 @end smallexample
 
 @noindent
-Here we compute the Inverse Sine of 
+Here we compute the Inverse Sine of
 @texline @math{\sqrt{0.5}},
-@infoline @expr{sqrt(0.5)}, 
+@infoline @expr{sqrt(0.5)},
 first in radians, then in degrees.
 
 Use @kbd{c d} and @kbd{c r} to convert a number from radians to degrees
@@ -2783,9 +2783,9 @@ logarithm).  These can be modified by the @kbd{I} (inverse) and
 @kbd{H} (hyperbolic) prefix keys.
 
 Let's compute the sine and cosine of an angle, and verify the
-identity 
+identity
 @texline @math{\sin^2x + \cos^2x = 1}.
-@infoline @expr{sin(x)^2 + cos(x)^2 = 1}.  
+@infoline @expr{sin(x)^2 + cos(x)^2 = 1}.
 We'll arbitrarily pick @mathit{-64} degrees as a good value for @expr{x}.
 With the angular mode set to degrees (type @w{@kbd{m d}}), do:
 
@@ -2806,7 +2806,7 @@ You can of course do these calculations to any precision you like.)
 Remember, @kbd{f h} is the @code{calc-hypot}, or square-root of sum
 of squares, command.
 
-Another identity is 
+Another identity is
 @texline @math{\displaystyle\tan x = {\sin x \over \cos x}}.
 @infoline @expr{tan(x) = sin(x) / cos(x)}.
 @smallexample
@@ -2871,7 +2871,7 @@ the top two stack elements right after the @kbd{U U}, then a pair of
 A similar identity is supposed to hold for hyperbolic sines and cosines,
 except that it is the @emph{difference}
 @texline @math{\cosh^2x - \sinh^2x}
-@infoline @expr{cosh(x)^2 - sinh(x)^2} 
+@infoline @expr{cosh(x)^2 - sinh(x)^2}
 that always equals one.  Let's try to verify this identity.
 
 @smallexample
@@ -2993,7 +2993,7 @@ factorial function defined in terms of Euler's Gamma function
 @end smallexample
 
 @noindent
-Here we verify the identity 
+Here we verify the identity
 @texline @math{n! = \Gamma(n+1)}.
 @infoline @expr{@var{n}!@: = gamma(@var{n}+1)}.
 
@@ -3283,11 +3283,11 @@ rows in the matrix is different from the number of elements in the
 vector.
 
 (@bullet{}) @strong{Exercise 1.}  Use @samp{*} to sum along the rows
-of the above 
+of the above
 @texline @math{2\times3}
-@infoline 2x3 
+@infoline 2x3
 matrix to get @expr{[6, 15]}.  Now use @samp{*} to sum along the columns
-to get @expr{[5, 7, 9]}. 
+to get @expr{[5, 7, 9]}.
 @xref{Matrix Answer 1, 1}. (@bullet{})
 
 @cindex Identity matrix
@@ -3432,7 +3432,7 @@ the matrix and vector.  If we multiplied in the other order, Calc would
 assume the vector was a row vector in order to make the dimensions
 come out right, and the answer would be incorrect.  If you
 don't feel safe letting Calc take either interpretation of your
-vectors, use explicit 
+vectors, use explicit
 @texline @math{N\times1}
 @infoline Nx1
 or
@@ -3482,9 +3482,9 @@ on the left by the transpose of @expr{A}:
 @tex
 $A^T A \, X = A^T B$, where $A^T$ is the transpose \samp{trn(A)}.
 @end tex
-Now 
+Now
 @texline @math{A^T A}
-@infoline @expr{trn(A)*A} 
+@infoline @expr{trn(A)*A}
 is a square matrix so a solution is possible.  It turns out that the
 @expr{X} vector you compute in this way will be a ``least-squares''
 solution, which can be regarded as the ``closest'' solution to the set
@@ -3577,9 +3577,9 @@ other a plain number.)  In the final step, we take the square root
 of each element.
 
 (@bullet{}) @strong{Exercise 1.}  Compute a vector of powers of two
-from 
+from
 @texline @math{2^{-4}}
-@infoline @expr{2^-4} 
+@infoline @expr{2^-4}
 to @expr{2^4}.  @xref{List Answer 1, 1}. (@bullet{})
 
 You can also @dfn{reduce} a binary operator across a vector.
@@ -3780,9 +3780,9 @@ $$ m = {N \sum x y - \sum x \sum y  \over
 @end tex
 
 @noindent
-where 
+where
 @texline @math{\sum x}
-@infoline @expr{sum(x)} 
+@infoline @expr{sum(x)}
 represents the sum of all the values of @expr{x}.  While there is an
 actual @code{sum} function in Calc, it's easier to sum a vector using a
 simple reduction.  First, let's compute the four different sums that
@@ -3883,9 +3883,9 @@ $$ b = {\sum y - m \sum x \over N} $$
 @end group
 @end smallexample
 
-Let's ``plot'' this straight line approximation, 
+Let's ``plot'' this straight line approximation,
 @texline @math{y \approx m x + b},
-@infoline @expr{m x + b}, 
+@infoline @expr{m x + b},
 and compare it with the original data.
 
 @smallexample
@@ -3959,7 +3959,7 @@ Next, let's add the line we got from our least-squares fit.
 (If you are reading this tutorial on-line while running Calc, typing
 @kbd{g a} may cause the tutorial to disappear from its window and be
 replaced by a buffer named @samp{*Gnuplot Commands*}.  The tutorial
-will reappear when you terminate GNUPLOT by typing @kbd{g q}.) 
+will reappear when you terminate GNUPLOT by typing @kbd{g q}.)
 @end ifinfo
 
 @smallexample
@@ -4138,7 +4138,7 @@ command to enable multi-line display of vectors.)
 @c [fix-ref Numerical Solutions]
 (@bullet{}) @strong{Exercise 8.}  Compute a list of values of Bessel's
 @texline @math{J_1(x)}
-@infoline @expr{J1} 
+@infoline @expr{J1}
 function @samp{besJ(1,x)} for @expr{x} from 0 to 5 in steps of 0.25.
 Find the value of @expr{x} (from among the above set of values) for
 which @samp{besJ(1,x)} is a maximum.  Use an ``automatic'' method,
@@ -4150,7 +4150,7 @@ of thing automatically; @pxref{Numerical Solutions}.)
 @cindex Digits, vectors of
 (@bullet{}) @strong{Exercise 9.}  You are given an integer in the range
 @texline @math{0 \le N < 10^m}
-@infoline @expr{0 <= N < 10^m} 
+@infoline @expr{0 <= N < 10^m}
 for @expr{m=12} (i.e., an integer of less than
 twelve digits).  Convert this integer into a vector of @expr{m}
 digits, each in the range from 0 to 9.  In vector-of-digits notation,
@@ -4164,12 +4164,12 @@ to try is 25129925999.  @xref{List Answer 9, 9}. (@bullet{})
 happened?  How would you do this test?  @xref{List Answer 10, 10}. (@bullet{})
 
 (@bullet{}) @strong{Exercise 11.}  The area of a circle of radius one
-is @cpi{}.  The area of the 
+is @cpi{}.  The area of the
 @texline @math{2\times2}
 @infoline 2x2
 square that encloses that circle is 4.  So if we throw @var{n} darts at
 random points in the square, about @cpiover{4} of them will land inside
-the circle.  This gives us an entertaining way to estimate the value of 
+the circle.  This gives us an entertaining way to estimate the value of
 @cpi{}.  The @w{@kbd{k r}}
 command picks a random number between zero and the value on the stack.
 We could get a random floating-point number between @mathit{-1} and 1 by typing
@@ -4183,12 +4183,12 @@ points lie inside the unit circle.  Hint:  Use the @kbd{v b} command.
 another way to calculate @cpi{}.  Say you have an infinite field
 of vertical lines with a spacing of one inch.  Toss a one-inch matchstick
 onto the field.  The probability that the matchstick will land crossing
-a line turns out to be 
+a line turns out to be
 @texline @math{2/\pi}.
-@infoline @expr{2/pi}.  
+@infoline @expr{2/pi}.
 Toss 100 matchsticks to estimate @cpi{}.  (If you want still more fun,
 the probability that the GCD (@w{@kbd{k g}}) of two large integers is
-one turns out to be 
+one turns out to be
 @texline @math{6/\pi^2}.
 @infoline @expr{6/pi^2}.
 That provides yet another way to estimate @cpi{}.)
@@ -4488,7 +4488,7 @@ a 60% chance that the result is correct within 0.59 degrees.
 @cindex Torus, volume of
 (@bullet{}) @strong{Exercise 7.}  The volume of a torus (a donut shape) is
 @texline @math{2 \pi^2 R r^2}
-@infoline @w{@expr{2 pi^2 R r^2}} 
+@infoline @w{@expr{2 pi^2 R r^2}}
 where @expr{R} is the radius of the circle that
 defines the center of the tube and @expr{r} is the radius of the tube
 itself.  Suppose @expr{R} is 20 cm and @expr{r} is 4 cm, each known to
@@ -4569,7 +4569,7 @@ In this last step, Calc has divided by 5 modulo 24; i.e., it has found a
 new number which, when multiplied by 5 modulo 24, produces the original
 number, 21.  If @var{m} is prime and the divisor is not a multiple of
 @var{m}, it is always possible to find such a number.  For non-prime
-@var{m} like 24, it is only sometimes possible. 
+@var{m} like 24, it is only sometimes possible.
 
 @smallexample
 @group
@@ -4587,7 +4587,7 @@ that arises in the second one.
 
 @cindex Fermat, primality test of
 (@bullet{}) @strong{Exercise 10.}  A theorem of Pierre de Fermat
-says that 
+says that
 @texline @w{@math{x^{n-1} \bmod n = 1}}
 @infoline @expr{x^(n-1) mod n = 1}
 if @expr{n} is a prime number and @expr{x} is an integer less than
@@ -4615,9 +4615,9 @@ of day on the stack as an HMS/modulo form.
 This calculation tells me it is six hours and 22 minutes until midnight.
 
 (@bullet{}) @strong{Exercise 11.}  A rule of thumb is that one year
-is about 
+is about
 @texline @math{\pi \times 10^7}
-@infoline @w{@expr{pi * 10^7}} 
+@infoline @w{@expr{pi * 10^7}}
 seconds.  What time will it be that many seconds from right now?
 @xref{Types Answer 11, 11}. (@bullet{})
 
@@ -5093,18 +5093,18 @@ One way to do it is again with vector mapping and reduction:
 @end smallexample
 
 (@bullet{}) @strong{Exercise 3.}  Find the integral from 1 to @expr{y}
-of 
+of
 @texline @math{x \sin \pi x}
-@infoline @w{@expr{x sin(pi x)}} 
+@infoline @w{@expr{x sin(pi x)}}
 (where the sine is calculated in radians).  Find the values of the
 integral for integers @expr{y} from 1 to 5.  @xref{Algebra Answer 3,
 3}. (@bullet{})
 
 Calc's integrator can do many simple integrals symbolically, but many
 others are beyond its capabilities.  Suppose we wish to find the area
-under the curve 
+under the curve
 @texline @math{\sin x \ln x}
-@infoline @expr{sin(x) ln(x)} 
+@infoline @expr{sin(x) ln(x)}
 over the same range of @expr{x}.  If you entered this formula and typed
 @kbd{a i x @key{RET}} (don't bother to try this), Calc would work for a
 long time but would be unable to find a solution.  In fact, there is no
@@ -5242,10 +5242,10 @@ $$ h (f(a) + f(a+h) + f(a+2h) + f(a+3h) + \cdots
 \afterdisplay
 @end tex
 
-Compute the integral from 1 to 2 of 
+Compute the integral from 1 to 2 of
 @texline @math{\sin x \ln x}
-@infoline @expr{sin(x) ln(x)} 
-using Simpson's rule with 10 slices.  
+@infoline @expr{sin(x) ln(x)}
+using Simpson's rule with 10 slices.
 @xref{Algebra Answer 4, 4}. (@bullet{})
 
 Calc has a built-in @kbd{a I} command for doing numerical integration.
@@ -5396,7 +5396,7 @@ having to retype it.
 
 To edit a variable, type @kbd{s e} and the variable name, use regular
 Emacs editing commands as necessary, then type @kbd{C-c C-c} to store
-the edited value back into the variable. 
+the edited value back into the variable.
 You can also use @w{@kbd{s e}} to create a new variable if you wish.
 
 Notice that the first time you use each rule, Calc puts up a ``compiling''
@@ -5780,7 +5780,7 @@ in @samp{a + 1} for @samp{x} in the defining formula.
 @tindex Si
 (@bullet{}) @strong{Exercise 1.}  The ``sine integral'' function
 @texline @math{{\rm Si}(x)}
-@infoline @expr{Si(x)} 
+@infoline @expr{Si(x)}
 is defined as the integral of @samp{sin(t)/t} for
 @expr{t = 0} to @expr{x} in radians.  (It was invented because this
 integral has no solution in terms of basic functions; if you give it
@@ -5857,9 +5857,9 @@ the following functions:
 
 @enumerate
 @item
-Compute 
+Compute
 @texline @math{\displaystyle{\sin x \over x}},
-@infoline @expr{sin(x) / x}, 
+@infoline @expr{sin(x) / x},
 where @expr{x} is the number on the top of the stack.
 
 @item
@@ -5923,15 +5923,15 @@ key if you have one, makes a copy of the number in level 2.)
 @cindex Golden ratio
 @cindex Phi, golden ratio
 A fascinating property of the Fibonacci numbers is that the @expr{n}th
-Fibonacci number can be found directly by computing 
+Fibonacci number can be found directly by computing
 @texline @math{\phi^n / \sqrt{5}}
 @infoline @expr{phi^n / sqrt(5)}
-and then rounding to the nearest integer, where 
+and then rounding to the nearest integer, where
 @texline @math{\phi} (``phi''),
-@infoline @expr{phi}, 
-the ``golden ratio,'' is 
+@infoline @expr{phi},
+the ``golden ratio,'' is
 @texline @math{(1 + \sqrt{5}) / 2}.
-@infoline @expr{(1 + sqrt(5)) / 2}. 
+@infoline @expr{(1 + sqrt(5)) / 2}.
 (For convenience, this constant is available from the @code{phi}
 variable, or the @kbd{I H P} command.)
 
@@ -5946,19 +5946,19 @@ variable, or the @kbd{I H P} command.)
 
 @cindex Continued fractions
 (@bullet{}) @strong{Exercise 5.}  The @dfn{continued fraction}
-representation of 
+representation of
 @texline @math{\phi}
-@infoline @expr{phi} 
-is 
+@infoline @expr{phi}
+is
 @texline @math{1 + 1/(1 + 1/(1 + 1/( \ldots )))}.
 @infoline @expr{1 + 1/(1 + 1/(1 + 1/( ...@: )))}.
 We can compute an approximate value by carrying this however far
-and then replacing the innermost 
+and then replacing the innermost
 @texline @math{1/( \ldots )}
-@infoline @expr{1/( ...@: )} 
+@infoline @expr{1/( ...@: )}
 by 1.  Approximate
 @texline @math{\phi}
-@infoline @expr{phi} 
+@infoline @expr{phi}
 using a twenty-term continued fraction.
 @xref{Programming Answer 5, 5}. (@bullet{})
 
@@ -6056,9 +6056,9 @@ survive past the @kbd{Z '} command.
 The @dfn{Bernoulli numbers} are a sequence with the interesting
 property that all of the odd Bernoulli numbers are zero, and the
 even ones, while difficult to compute, can be roughly approximated
-by the formula 
+by the formula
 @texline @math{\displaystyle{2 n! \over (2 \pi)^n}}.
-@infoline @expr{2 n!@: / (2 pi)^n}.  
+@infoline @expr{2 n!@: / (2 pi)^n}.
 Let's write a keyboard macro to compute (approximate) Bernoulli numbers.
 (Calc has a command, @kbd{k b}, to compute exact Bernoulli numbers, but
 this command is very slow for large @expr{n} since the higher Bernoulli
@@ -6166,7 +6166,7 @@ Z`                      ;; calc-kbd-push     (Save local values)
 0                       ;; calc digits       (Push a zero onto the stack)
 st                      ;; calc-store-into   (Store it in the following variable)
 1                       ;; calc quick variable  (Quick variable q1)
-1                       ;; calc digits       (Initial value for the loop) 
+1                       ;; calc digits       (Initial value for the loop)
 TAB                     ;; calc-roll-down    (Swap initial and final)
 Z(                      ;; calc-kbd-for      (Begin the "for" loop)
 &                       ;; calc-inv          (Take the reciprocal)
@@ -6193,10 +6193,10 @@ Press @kbd{C-c C-c} to finish editing and return to the Calculator.
 
 The @file{edmacro} package defines a handy @code{read-kbd-macro} command
 which reads the current region of the current buffer as a sequence of
-keystroke names, and defines that sequence on the @kbd{X} 
+keystroke names, and defines that sequence on the @kbd{X}
 (and @kbd{C-x e}) key.  Because this is so useful, Calc puts this
 command on the @kbd{C-x * m} key.  Try reading in this macro in the
-following form:  Press @kbd{C-@@} (or @kbd{C-@key{SPC}}) at 
+following form:  Press @kbd{C-@@} (or @kbd{C-@key{SPC}}) at
 one end of the text below, then type @kbd{C-x * m} at the other.
 
 @example
@@ -6230,12 +6230,12 @@ $$ x_{\rm new} = x - {f(x) \over f^{\prime}(x)} $$
 where @expr{f'(x)} is the derivative of @expr{f}.  The @expr{x}
 values will quickly converge to a solution, i.e., eventually
 @texline @math{x_{\rm new}}
-@infoline @expr{new_x} 
+@infoline @expr{new_x}
 and @expr{x} will be equal to within the limits
 of the current precision.  Write a program which takes a formula
 involving the variable @expr{x}, and an initial guess @expr{x_0},
 on the stack, and produces a value of @expr{x} for which the formula
-is zero.  Use it to find a solution of 
+is zero.  Use it to find a solution of
 @texline @math{\sin(\cos x) = 0.5}
 @infoline @expr{sin(cos(x)) = 0.5}
 near @expr{x = 4.5}.  (Use angles measured in radians.)  Note that
@@ -6245,12 +6245,12 @@ method when it is able.  @xref{Programming Answer 8, 8}. (@bullet{})
 @cindex Digamma function
 @cindex Gamma constant, Euler's
 @cindex Euler's gamma constant
-(@bullet{}) @strong{Exercise 9.}  The @dfn{digamma} function 
+(@bullet{}) @strong{Exercise 9.}  The @dfn{digamma} function
 @texline @math{\psi(z) (``psi'')}
 @infoline @expr{psi(z)}
-is defined as the derivative of 
+is defined as the derivative of
 @texline @math{\ln \Gamma(z)}.
-@infoline @expr{ln(gamma(z))}.  
+@infoline @expr{ln(gamma(z))}.
 For large values of @expr{z}, it can be approximated by the infinite sum
 
 @ifnottex
@@ -6267,9 +6267,9 @@ $$
 @end tex
 
 @noindent
-where 
+where
 @texline @math{\sum}
-@infoline @expr{sum} 
+@infoline @expr{sum}
 represents the sum over @expr{n} from 1 to infinity
 (or to some limit high enough to give the desired accuracy), and
 the @code{bern} function produces (exact) Bernoulli numbers.
@@ -6277,27 +6277,27 @@ While this sum is not guaranteed to converge, in practice it is safe.
 An interesting mathematical constant is Euler's gamma, which is equal
 to about 0.5772.  One way to compute it is by the formula,
 @texline @math{\gamma = -\psi(1)}.
-@infoline @expr{gamma = -psi(1)}.  
+@infoline @expr{gamma = -psi(1)}.
 Unfortunately, 1 isn't a large enough argument
 for the above formula to work (5 is a much safer value for @expr{z}).
-Fortunately, we can compute 
+Fortunately, we can compute
 @texline @math{\psi(1)}
-@infoline @expr{psi(1)} 
-from 
+@infoline @expr{psi(1)}
+from
 @texline @math{\psi(5)}
-@infoline @expr{psi(5)} 
-using the recurrence 
+@infoline @expr{psi(5)}
+using the recurrence
 @texline @math{\psi(z+1) = \psi(z) + {1 \over z}}.
-@infoline @expr{psi(z+1) = psi(z) + 1/z}.  
-Your task:  Develop a program to compute 
+@infoline @expr{psi(z+1) = psi(z) + 1/z}.
+Your task:  Develop a program to compute
 @texline @math{\psi(z)};
-@infoline @expr{psi(z)}; 
+@infoline @expr{psi(z)};
 it should ``pump up'' @expr{z}
 if necessary to be greater than 5, then use the above summation
 formula.  Use looping commands to compute the sum.  Use your function
-to compute 
+to compute
 @texline @math{\gamma}
-@infoline @expr{gamma} 
+@infoline @expr{gamma}
 to twelve decimal places.  (Calc has a built-in command
 for Euler's constant, @kbd{I P}, which you can use to check your answer.)
 @xref{Programming Answer 9, 9}. (@bullet{})
@@ -6470,7 +6470,7 @@ This section includes answers to all the exercises in the Calc tutorial.
 @noindent
 @kbd{1 @key{RET} 2 @key{RET} 3 @key{RET} 4 + * -}
 
-The result is 
+The result is
 @texline @math{1 - (2 \times (3 + 4)) = -13}.
 @infoline @expr{1 - (2 * (3 + 4)) = -13}.
 
@@ -6481,9 +6481,9 @@ The result is
 @texline @math{2\times4 + 7\times9.5 + {5\over4} = 75.75}
 @infoline @expr{2*4 + 7*9.5 + 5/4 = 75.75}
 
-After computing the intermediate term 
+After computing the intermediate term
 @texline @math{2\times4 = 8},
-@infoline @expr{2*4 = 8}, 
+@infoline @expr{2*4 = 8},
 you can leave that result on the stack while you compute the second
 term.  With both of these results waiting on the stack you can then
 compute the final term, then press @kbd{+ +} to add everything up.
@@ -6790,7 +6790,7 @@ Dividing two integers that are larger than the current precision may
 give a floating-point result that is inaccurate even when rounded
 down to an integer.  Consider @expr{123456789 / 2} when the current
 precision is 6 digits.  The true answer is @expr{61728394.5}, but
-with a precision of 6 this will be rounded to 
+with a precision of 6 this will be rounded to
 @texline @math{12345700.0/2.0 = 61728500.0}.
 @infoline @expr{12345700.@: / 2.@: = 61728500.}.
 The result, when converted to an integer, will be off by 106.
@@ -6900,18 +6900,18 @@ Type @kbd{d N} to return to Normal display mode afterwards.
 @subsection Matrix Tutorial Exercise 3
 
 @noindent
-To solve 
+To solve
 @texline @math{A^T A \, X = A^T B},
-@infoline @expr{trn(A) * A * X = trn(A) * B}, 
+@infoline @expr{trn(A) * A * X = trn(A) * B},
 first we compute
 @texline @math{A' = A^T A}
-@infoline @expr{A2 = trn(A) * A} 
-and 
+@infoline @expr{A2 = trn(A) * A}
+and
 @texline @math{B' = A^T B};
-@infoline @expr{B2 = trn(A) * B}; 
-now, we have a system 
+@infoline @expr{B2 = trn(A) * B};
+now, we have a system
 @texline @math{A' X = B'}
-@infoline @expr{A2 * X = B2} 
+@infoline @expr{A2 * X = B2}
 which we can solve using Calc's @samp{/} command.
 
 @ifnottex
@@ -6942,7 +6942,7 @@ $$
 The first step is to enter the coefficient matrix.  We'll store it in
 quick variable number 7 for later reference.  Next, we compute the
 @texline @math{B'}
-@infoline @expr{B2} 
+@infoline @expr{B2}
 vector.
 
 @smallexample
@@ -6958,9 +6958,9 @@ vector.
 @end smallexample
 
 @noindent
-Now we compute the matrix 
+Now we compute the matrix
 @texline @math{A'}
-@infoline @expr{A2} 
+@infoline @expr{A2}
 and divide.
 
 @smallexample
@@ -6979,16 +6979,16 @@ and divide.
 (The actual computed answer will be slightly inexact due to
 round-off error.)
 
-Notice that the answers are similar to those for the 
+Notice that the answers are similar to those for the
 @texline @math{3\times3}
 @infoline 3x3
-system solved in the text.  That's because the fourth equation that was 
+system solved in the text.  That's because the fourth equation that was
 added to the system is almost identical to the first one multiplied
 by two.  (If it were identical, we would have gotten the exact same
-answer since the 
+answer since the
 @texline @math{4\times3}
 @infoline 4x3
-system would be equivalent to the original 
+system would be equivalent to the original
 @texline @math{3\times3}
 @infoline 3x3
 system.)
@@ -7064,7 +7064,7 @@ $$ m \times x + b \times 1 = y $$
 \afterdisplay
 @end tex
 
-Thus we want a 
+Thus we want a
 @texline @math{19\times2}
 @infoline 19x2
 matrix with our @expr{x} vector as one column and
@@ -7083,12 +7083,12 @@ we combine the two columns to form our @expr{A} matrix.
 @end smallexample
 
 @noindent
-Now we compute 
+Now we compute
 @texline @math{A^T y}
-@infoline @expr{trn(A) * y} 
-and 
+@infoline @expr{trn(A) * y}
+and
 @texline @math{A^T A}
-@infoline @expr{trn(A) * A} 
+@infoline @expr{trn(A) * A}
 and divide.
 
 @smallexample
@@ -7114,9 +7114,9 @@ and divide.
 @end group
 @end smallexample
 
-Since we were solving equations of the form 
+Since we were solving equations of the form
 @texline @math{m \times x + b \times 1 = y},
-@infoline @expr{m*x + b*1 = y}, 
+@infoline @expr{m*x + b*1 = y},
 these numbers should be @expr{m} and @expr{b}, respectively.  Sure
 enough, they agree exactly with the result computed using @kbd{V M} and
 @kbd{V R}!
@@ -7177,9 +7177,9 @@ then raise the number to that power.)
 @subsection List Tutorial Exercise 4
 
 @noindent
-A number @expr{j} is a divisor of @expr{n} if 
+A number @expr{j} is a divisor of @expr{n} if
 @texline @math{n \mathbin{\hbox{\code{\%}}} j = 0}.
-@infoline @samp{n % j = 0}.  
+@infoline @samp{n % j = 0}.
 The first step is to get a vector that identifies the divisors.
 
 @smallexample
@@ -7248,9 +7248,9 @@ so that the mapping operation works; no prime factor will ever be
 zero, so adding zeros on the left and right is safe.  From then on
 the job is pretty straightforward.
 
-Incidentally, Calc provides the 
+Incidentally, Calc provides the
 @texline @dfn{M@"obius} @math{\mu}
-@infoline @dfn{Moebius mu} 
+@infoline @dfn{Moebius mu}
 function which is zero if and only if its argument is square-free.  It
 would be a much more convenient way to do the above test in practice.
 
@@ -7282,7 +7282,7 @@ exercise and type @kbd{1 -} to subtract one from all the elements.
 The numbers down the lefthand edge of the list we desire are called
 the ``triangular numbers'' (now you know why!).  The @expr{n}th
 triangular number is the sum of the integers from 1 to @expr{n}, and
-can be computed directly by the formula 
+can be computed directly by the formula
 @texline @math{n (n+1) \over 2}.
 @infoline @expr{n * (n+1) / 2}.
 
@@ -7378,7 +7378,7 @@ A way to isolate the maximum value is to compute the maximum using
 
 @noindent
 It's a good idea to verify, as in the last step above, that only
-one value is equal to the maximum.  (After all, a plot of 
+one value is equal to the maximum.  (After all, a plot of
 @texline @math{\sin x}
 @infoline @expr{sin(x)}
 might have many points all equal to the maximum value, 1.)
@@ -7650,12 +7650,12 @@ return to full-sized display of vectors.
 This problem can be made a lot easier by taking advantage of some
 symmetries.  First of all, after some thought it's clear that the
 @expr{y} axis can be ignored altogether.  Just pick a random @expr{x}
-component for one end of the match, pick a random direction 
+component for one end of the match, pick a random direction
 @texline @math{\theta},
 @infoline @expr{theta},
-and see if @expr{x} and 
+and see if @expr{x} and
 @texline @math{x + \cos \theta}
-@infoline @expr{x + cos(theta)} 
+@infoline @expr{x + cos(theta)}
 (which is the @expr{x} coordinate of the other endpoint) cross a line.
 The lines are at integer coordinates, so this happens when the two
 numbers surround an integer.
@@ -7670,9 +7670,9 @@ In fact, since the field of lines is infinite we can choose the
 coordinates 0 and 1 for the lines on either side of the leftmost
 endpoint.  The rightmost endpoint will be between 0 and 1 if the
 match does not cross a line, or between 1 and 2 if it does.  So:
-Pick random @expr{x} and 
+Pick random @expr{x} and
 @texline @math{\theta},
-@infoline @expr{theta}, 
+@infoline @expr{theta},
 compute
 @texline @math{x + \cos \theta},
 @infoline @expr{x + cos(theta)},
@@ -8997,7 +8997,7 @@ Each of these functions can be computed using the stack, or using
 algebraic entry, whichever way you prefer:
 
 @noindent
-Computing 
+Computing
 @texline @math{\displaystyle{\sin x \over x}}:
 @infoline @expr{sin(x) / x}:
 
@@ -9068,7 +9068,7 @@ C-x ( ' [0, 1; 1, 1] ^ ($-1) * [1, 1] @key{RET} v u @key{DEL} C-x )
 
 @noindent
 This program is quite efficient because Calc knows how to raise a
-matrix (or other value) to the power @expr{n} in only 
+matrix (or other value) to the power @expr{n} in only
 @texline @math{\log_2 n}
 @infoline @expr{log(n,2)}
 steps.  For example, this program can compute the 1000th Fibonacci
@@ -9122,7 +9122,7 @@ harmonic number is 4.02.
 
 @noindent
 The first step is to compute the derivative @expr{f'(x)} and thus
-the formula 
+the formula
 @texline @math{\displaystyle{x - {f(x) \over f'(x)}}}.
 @infoline @expr{x - f(x)/f'(x)}.
 
@@ -9239,12 +9239,12 @@ method (among others) to look for numerical solutions to any equation.
 @noindent
 The first step is to adjust @expr{z} to be greater than 5.  A simple
 ``for'' loop will do the job here.  If @expr{z} is less than 5, we
-reduce the problem using 
+reduce the problem using
 @texline @math{\psi(z) = \psi(z+1) - 1/z}.
 @infoline @expr{psi(z) = psi(z+1) - 1/z}.  We go
-on to compute 
+on to compute
 @texline @math{\psi(z+1)},
-@infoline @expr{psi(z+1)}, 
+@infoline @expr{psi(z+1)},
 and remember to add back a factor of @expr{-1/z} when we're done.  This
 step is repeated until @expr{z > 5}.
 
@@ -9283,7 +9283,7 @@ are exactly equal, not just equal to within the current precision.)
 @end group
 @end smallexample
 
-Now we compute the initial part of the sum:  
+Now we compute the initial part of the sum:
 @texline @math{\ln z - {1 \over 2z}}
 @infoline @expr{ln(z) - 1/2z}
 minus the adjustment factor.
@@ -9326,9 +9326,9 @@ up the value of @expr{2 n}.  (Calc does have a summation command,
 @end group
 @end smallexample
 
-This is the value of 
+This is the value of
 @texline @math{-\gamma},
-@infoline @expr{- gamma}, 
+@infoline @expr{- gamma},
 with a slight bit of roundoff error.  To get a full 12 digits, let's use
 a higher precision:
 
@@ -9361,9 +9361,9 @@ C-x )
 
 @noindent
 Taking the derivative of a term of the form @expr{x^n} will produce
-a term like 
+a term like
 @texline @math{n x^{n-1}}.
-@infoline @expr{n x^(n-1)}.  
+@infoline @expr{n x^(n-1)}.
 Taking the derivative of a constant
 produces zero.  From this it is easy to see that the @expr{n}th
 derivative of a polynomial, evaluated at @expr{x = 0}, will equal the
@@ -9652,7 +9652,7 @@ still exists and is updated silently.  @xref{Trail Commands}.
 @mindex @null
 @end ignore
 In most installations, the @kbd{C-x * c} key sequence is a more
-convenient way to start the Calculator.  Also, @kbd{C-x * *} 
+convenient way to start the Calculator.  Also, @kbd{C-x * *}
 is a synonym for @kbd{C-x * c} unless you last used Calc
 in its Keypad mode.
 
@@ -9908,9 +9908,9 @@ additional notes from the summary that apply to this command.
 The @kbd{h f} (@code{calc-describe-function}) command looks up an
 algebraic function or a command name in the Calc manual.  Enter an
 algebraic function name to look up that function in the Function
-Index or enter a command name beginning with @samp{calc-} to look it 
+Index or enter a command name beginning with @samp{calc-} to look it
 up in the Command Index.  This command will also look up operator
-symbols that can appear in algebraic formulas, like @samp{%} and 
+symbols that can appear in algebraic formulas, like @samp{%} and
 @samp{=>}.
 
 @kindex h v
@@ -10038,7 +10038,7 @@ During numeric entry, the only editing key available is @key{DEL}.
 @cindex Formulas, entering
 The @kbd{'} (@code{calc-algebraic-entry}) command can be used to enter
 calculations in algebraic form.  This is accomplished by typing the
-apostrophe key, ', followed by the expression in standard format:  
+apostrophe key, ', followed by the expression in standard format:
 
 @example
 ' 2+3*4 @key{RET}.
@@ -10047,7 +10047,7 @@ apostrophe key, ', followed by the expression in standard format:
 @noindent
 This will compute
 @texline @math{2+(3\times4) = 14}
-@infoline @expr{2+(3*4) = 14} 
+@infoline @expr{2+(3*4) = 14}
 and push it on the stack.  If you wish you can
 ignore the RPN aspect of Calc altogether and simply enter algebraic
 expressions in this way.  You may want to use @key{DEL} every so often to
@@ -10453,9 +10453,9 @@ is greater than this, it will recompute @cpi{} using a series
 approximation.  This value will not need to be recomputed ever again
 unless you raise the precision still further.  Many operations such as
 logarithms and sines make use of similarly cached values such as
-@cpiover{4} and 
+@cpiover{4} and
 @texline @math{\ln 2}.
-@infoline @expr{ln(2)}.  
+@infoline @expr{ln(2)}.
 The visible effect of caching is that
 high-precision computations may seem to do extra work the first time.
 Other things cached include powers of two (for the binary arithmetic
@@ -10612,10 +10612,10 @@ form).  The numerator and denominator always use the same radix.
 A floating-point number or @dfn{float} is a number stored in scientific
 notation.  The number of significant digits in the fractional part is
 governed by the current floating precision (@pxref{Precision}).  The
-range of acceptable values is from 
+range of acceptable values is from
 @texline @math{10^{-3999999}}
-@infoline @expr{10^-3999999} 
-(inclusive) to 
+@infoline @expr{10^-3999999}
+(inclusive) to
 @texline @math{10^{4000000}}
 @infoline @expr{10^4000000}
 (exclusive), plus the corresponding negative values and zero.
@@ -10666,7 +10666,7 @@ and displayed in any radix just like integers and fractions.  Since a
 float that is entered in a radix other that 10 will be converted to
 decimal, the number that Calc stores may not be exactly the number that
 was entered, it will be the closest decimal approximation given the
-current precison.  The notation @samp{@var{radix}#@var{ddd}.@var{ddd}}
+current precision.  The notation @samp{@var{radix}#@var{ddd}.@var{ddd}}
 is a floating-point number whose digits are in the specified radix.
 Note that the @samp{.}  is more aptly referred to as a ``radix point''
 than as a decimal point in this case.  The number @samp{8#123.4567} is
@@ -10690,18 +10690,18 @@ polar.  The default format is rectangular, displayed in the form
 Rectangular complex numbers can also be displayed in @samp{@var{a}+@var{b}i}
 notation; @pxref{Complex Formats}.
 
-Polar complex numbers are displayed in the form 
+Polar complex numbers are displayed in the form
 @texline `@tfn{(}@var{r}@tfn{;}@math{\theta}@tfn{)}'
 @infoline `@tfn{(}@var{r}@tfn{;}@var{theta}@tfn{)}'
-where @var{r} is the nonnegative magnitude and 
+where @var{r} is the nonnegative magnitude and
 @texline @math{\theta}
-@infoline @var{theta} 
-is the argument or phase angle.  The range of 
+@infoline @var{theta}
+is the argument or phase angle.  The range of
 @texline @math{\theta}
-@infoline @var{theta} 
+@infoline @var{theta}
 depends on the current angular mode (@pxref{Angular Modes}); it is
 generally between @mathit{-180} and @mathit{+180} degrees or the equivalent range
-in radians. 
+in radians.
 
 Complex numbers are entered in stages using incomplete objects.
 @xref{Incomplete Objects}.
@@ -10742,9 +10742,9 @@ really mean is that @expr{1 / x}, as @expr{x} becomes larger and
 larger, becomes arbitrarily close to zero.  So you can imagine
 that if @expr{x} got ``all the way to infinity,'' then @expr{1 / x}
 would go all the way to zero.  Similarly, when they say that
-@samp{exp(inf) = inf}, they mean that 
+@samp{exp(inf) = inf}, they mean that
 @texline @math{e^x}
-@infoline @expr{exp(x)} 
+@infoline @expr{exp(x)}
 grows without bound as @expr{x} grows.  The symbol @samp{-inf} likewise
 stands for an infinitely negative real value; for example, we say that
 @samp{exp(-inf) = 0}.  You can have an infinity pointing in any
@@ -10839,7 +10839,7 @@ of its elements.
 @end ignore
 @tindex vec
 Algebraic functions for building vectors include @samp{vec(a, b, c)}
-to build @samp{[a, b, c]}, @samp{cvec(a, n, m)} to build an 
+to build @samp{[a, b, c]}, @samp{cvec(a, n, m)} to build an
 @texline @math{n\times m}
 @infoline @var{n}x@var{m}
 matrix of @samp{a}s, and @samp{index(n)} to build a vector of integers
@@ -11184,9 +11184,9 @@ there is no solution to this equation (which can happen only when
 division is left in symbolic form.  Other operations, such as square
 roots, are not yet supported for modulo forms.  (Note that, although
 @w{`@tfn{(}@var{a} @tfn{mod} @var{M}@tfn{)^.5}'} will compute a ``modulo square root''
-in the sense of reducing 
+in the sense of reducing
 @texline @math{\sqrt a}
-@infoline @expr{sqrt(a)} 
+@infoline @expr{sqrt(a)}
 modulo @expr{M}, this is not a useful definition from the
 number-theoretical point of view.)
 
@@ -11220,11 +11220,11 @@ The algebraic function @samp{makemod(a, m)} builds the modulo form
 @cindex Standard deviations
 An @dfn{error form} is a number with an associated standard
 deviation, as in @samp{2.3 +/- 0.12}.  The notation
-@texline `@var{x} @tfn{+/-} @math{\sigma}' 
-@infoline `@var{x} @tfn{+/-} sigma' 
+@texline `@var{x} @tfn{+/-} @math{\sigma}'
+@infoline `@var{x} @tfn{+/-} sigma'
 stands for an uncertain value which follows
 a normal or Gaussian distribution of mean @expr{x} and standard
-deviation or ``error'' 
+deviation or ``error''
 @texline @math{\sigma}.
 @infoline @expr{sigma}.
 Both the mean and the error can be either numbers or
@@ -11235,7 +11235,7 @@ regular number by the Calculator.
 
 All arithmetic and transcendental functions accept error forms as input.
 Operations on the mean-value part work just like operations on regular
-numbers.  The error part for any function @expr{f(x)} (such as 
+numbers.  The error part for any function @expr{f(x)} (such as
 @texline @math{\sin x}
 @infoline @expr{sin(x)})
 is defined by the error of @expr{x} times the derivative of @expr{f}
@@ -11267,35 +11267,35 @@ Consult a good text on error analysis for a discussion of the proper use
 of standard deviations.  Actual errors often are neither Gaussian-distributed
 nor uncorrelated, and the above formulas are valid only when errors
 are small.  As an example, the error arising from
-@texline `@tfn{sin(}@var{x} @tfn{+/-} @math{\sigma}@tfn{)}' 
-@infoline `@tfn{sin(}@var{x} @tfn{+/-} @var{sigma}@tfn{)}' 
-is 
-@texline `@math{\sigma} @tfn{abs(cos(}@var{x}@tfn{))}'.  
-@infoline `@var{sigma} @tfn{abs(cos(}@var{x}@tfn{))}'.  
+@texline `@tfn{sin(}@var{x} @tfn{+/-} @math{\sigma}@tfn{)}'
+@infoline `@tfn{sin(}@var{x} @tfn{+/-} @var{sigma}@tfn{)}'
+is
+@texline `@math{\sigma} @tfn{abs(cos(}@var{x}@tfn{))}'.
+@infoline `@var{sigma} @tfn{abs(cos(}@var{x}@tfn{))}'.
 When @expr{x} is close to zero,
 @texline @math{\cos x}
-@infoline @expr{cos(x)} 
-is close to one so the error in the sine is close to 
+@infoline @expr{cos(x)}
+is close to one so the error in the sine is close to
 @texline @math{\sigma};
 @infoline @expr{sigma};
-this makes sense, since 
+this makes sense, since
 @texline @math{\sin x}
-@infoline @expr{sin(x)} 
+@infoline @expr{sin(x)}
 is approximately @expr{x} near zero, so a given error in @expr{x} will
 produce about the same error in the sine.  Likewise, near 90 degrees
 @texline @math{\cos x}
-@infoline @expr{cos(x)} 
+@infoline @expr{cos(x)}
 is nearly zero and so the computed error is
 small:  The sine curve is nearly flat in that region, so an error in @expr{x}
-has relatively little effect on the value of 
+has relatively little effect on the value of
 @texline @math{\sin x}.
-@infoline @expr{sin(x)}.  
+@infoline @expr{sin(x)}.
 However, consider @samp{sin(90 +/- 1000)}.  The cosine of 90 is zero, so
 Calc will report zero error!  We get an obviously wrong result because
 we have violated the small-error approximation underlying the error
 analysis.  If the error in @expr{x} had been small, the error in
 @texline @math{\sin x}
-@infoline @expr{sin(x)} 
+@infoline @expr{sin(x)}
 would indeed have been negligible.
 
 @ignore
@@ -11402,14 +11402,14 @@ contain zero inside them Calc is forced to give the result,
 
 While it may seem that intervals and error forms are similar, they are
 based on entirely different concepts of inexact quantities.  An error
-form 
-@texline `@var{x} @tfn{+/-} @math{\sigma}' 
-@infoline `@var{x} @tfn{+/-} @var{sigma}' 
+form
+@texline `@var{x} @tfn{+/-} @math{\sigma}'
+@infoline `@var{x} @tfn{+/-} @var{sigma}'
 means a variable is random, and its value could
-be anything but is ``probably'' within one 
-@texline @math{\sigma} 
-@infoline @var{sigma} 
-of the mean value @expr{x}. An interval 
+be anything but is ``probably'' within one
+@texline @math{\sigma}
+@infoline @var{sigma}
+of the mean value @expr{x}. An interval
 `@tfn{[}@var{a} @tfn{..@:} @var{b}@tfn{]}' means a
 variable's value is unknown, but guaranteed to lie in the specified
 range.  Error forms are statistical or ``average case'' approximations;
@@ -11641,7 +11641,7 @@ the C-style ``if'' operator @samp{a?b:c} [@code{if}];
 @samp{=>} [@code{evalto}].
 
 Note that, unlike in usual computer notation, multiplication binds more
-strongly than division:  @samp{a*b/c*d} is equivalent to 
+strongly than division:  @samp{a*b/c*d} is equivalent to
 @texline @math{a b \over c d}.
 @infoline @expr{(a*b)/(c*d)}.
 
@@ -11858,13 +11858,13 @@ next higher level. For example, with @samp{10 20 30 40 50} on the
 stack and the point on the line containing @samp{30}, @kbd{C-x C-t}
 creates @samp{10 20 40 30 50}.  More generally, @kbd{C-x C-t} acts on
 the stack objects determined by the current point (and mark) similar
-to how the text-mode command @code{transpose-lines} acts on 
+to how the text-mode command @code{transpose-lines} acts on
 lines.  With argument @var{n}, @kbd{C-x C-t} will move the stack object
 at the level above the current point and move it past N other objects;
 for example, with @samp{10 20 30 40 50} on the stack and the point on
-the line containing @samp{30}, @kbd{C-u 2 C-x C-t} creates 
+the line containing @samp{30}, @kbd{C-u 2 C-x C-t} creates
 @samp{10 40 20 30 50}. With an argument of 0, @kbd{C-x C-t} will switch
-the stack objects at the levels determined by the point and the mark. 
+the stack objects at the levels determined by the point and the mark.
 
 @node Editing Stack Entries, Trail Commands, Stack Manipulation, Stack and Trail
 @section Editing Stack Entries
@@ -12056,7 +12056,7 @@ the stack contains the arguments and the result: @samp{2 3 5}.
 With the exception of keyboard macros, this works for all commands that
 take arguments off the stack. (To avoid potentially unpleasant behavior,
 a @kbd{K} prefix before a keyboard macro will be ignored.  A @kbd{K}
-prefix called @emph{within} the keyboard macro will still take effect.)  
+prefix called @emph{within} the keyboard macro will still take effect.)
 As another example, @kbd{K a s} simplifies a formula, pushing the
 simplified version of the formula onto the stack after the original
 formula (rather than replacing the original formula).  Note that you
@@ -12064,7 +12064,7 @@ could get the same effect by typing @kbd{@key{RET} a s}, copying the
 formula and then simplifying the copy. One difference is that for a very
 large formula the time taken to format the intermediate copy in
 @kbd{@key{RET} a s} could be noticeable; @kbd{K a s} would avoid this
-extra work. 
+extra work.
 
 Even stack manipulation commands are affected.  @key{TAB} works by
 popping two values and pushing them back in the opposite order,
@@ -12155,7 +12155,7 @@ discussion of the @code{calc-settings-file} variable; @pxref{Customizing Calc}.
 If the file name you give is your user init file (typically
 @file{~/.emacs}), @kbd{m F} will not automatically load the new file.  This
 is because your user init file may contain other things you don't want
-to reread.  You can give 
+to reread.  You can give
 a numeric prefix argument of 1 to @kbd{m F} to force it to read the
 file no matter what.  Conversely, an argument of @mathit{-1} tells
 @kbd{m F} @emph{not} to read the new file.  An argument of 2 or @mathit{-2}
@@ -12274,7 +12274,7 @@ corresponding base command (@code{calc-sin} in this case).
 @pindex calc-option
 The @kbd{O} key (@code{calc-option}) sets another flag, the
 @dfn{Option Flag}, which also can alter the subsequent Calc command in
-various ways. 
+various ways.
 
 The Inverse, Hyperbolic and Option flags apply only to the next
 Calculator command, after which they are automatically cleared.  (They
@@ -12366,7 +12366,7 @@ result cannot be expressed as an integer.  In some cases you would
 rather get an exact fractional answer.  One way to accomplish this is
 to use the @kbd{:} (@code{calc-fdiv}) [@code{fdiv}] command, which
 divides the two integers on the top of the stack to produce a fraction:
-@kbd{6 @key{RET} 4 :} produces @expr{3:2} even though 
+@kbd{6 @key{RET} 4 :} produces @expr{3:2} even though
 @kbd{6 @key{RET} 4 /} produces @expr{1.5}.
 
 @kindex m f
@@ -13155,11 +13155,11 @@ represent the integer and no more.  The @kbd{d z} (@code{calc-leading-zeros})
 command causes integers to be padded out with leading zeros according to the
 current binary word size.  (@xref{Binary Functions}, for a discussion of
 word size.)  If the absolute value of the word size is @expr{w}, all integers
-are displayed with at least enough digits to represent 
+are displayed with at least enough digits to represent
 @texline @math{2^w-1}
-@infoline @expr{(2^w)-1} 
+@infoline @expr{(2^w)-1}
 in the current radix.  (Larger integers will still be displayed in their
-entirety.) 
+entirety.)
 
 @cindex Two's complements
 Calc can display @expr{w}-bit integers using two's complement
@@ -13181,7 +13181,7 @@ the integers from @expr{0} to
 are represented by themselves and the integers from
 @texline @math{-2^{w-1}}
 @infoline @expr{-2^(w-1)}
-to @expr{-1} are represented by the integers from 
+to @expr{-1} are represented by the integers from
 @texline @math{2^{w-1}}
 @infoline @expr{2^(w-1)}
 to @expr{2^w-1} (the integer @expr{k} is represented by @expr{k+2^w}).
@@ -13190,7 +13190,7 @@ Calc will display a two's complement integer by the radix (either
 representation (including any leading zeros necessary to include all
 @expr{w} bits).  In a two's complement display mode, numbers that
 are not displayed in two's complement notation (i.e., that aren't
-integers from  
+integers from
 @texline @math{-2^{w-1}}
 @infoline @expr{-2^(w-1)}
 to
@@ -14095,13 +14095,13 @@ the @samp{$} sign has the same meaning it always does in algebraic
 formulas (a reference to an existing entry on the stack).
 
 Complex numbers are displayed as in @samp{3 + 4i}.  Fractions and
-quotients are written using @code{\over} in @TeX{} mode (as in 
+quotients are written using @code{\over} in @TeX{} mode (as in
 @code{@{a \over b@}}) and @code{\frac} in La@TeX{} mode (as in
 @code{\frac@{a@}@{b@}});  binomial coefficients are written with
 @code{\choose} in @TeX{} mode (as in @code{@{a \choose b@}}) and
 @code{\binom} in La@TeX{} mode (as in @code{\binom@{a@}@{b@}}).
 Interval forms are written with @code{\ldots}, and error forms are
-written with @code{\pm}. Absolute values are written as in 
+written with @code{\pm}. Absolute values are written as in
 @samp{|x + 1|}, and the floor and ceiling functions are written with
 @code{\lfloor}, @code{\rfloor}, etc. The words @code{\left} and
 @code{\right} are ignored when reading formulas in @TeX{} and La@TeX{}
@@ -14114,10 +14114,10 @@ and La@TeX{} have special names (like @code{\sin}) will use curly braces
 instead of parentheses for very simple arguments.  During input, curly
 braces and parentheses work equally well for grouping, but when the
 document is formatted the curly braces will be invisible.  Thus the
-printed result is 
+printed result is
 @texline @math{\sin{2 x}}
-@infoline @expr{sin 2x} 
-but 
+@infoline @expr{sin 2x}
+but
 @texline @math{\sin(2 + x)}.
 @infoline @expr{sin(2 + x)}.
 
@@ -14131,7 +14131,7 @@ italic letters in the printed document.  If you invoke @kbd{d T} or
 @kbd{d L} with a positive numeric prefix argument, names of more than
 one character will instead be enclosed in a protective commands that
 will prevent them from being typeset in the math italics; they will be
-written @samp{\hbox@{@var{name}@}} in @TeX{} mode and 
+written @samp{\hbox@{@var{name}@}} in @TeX{} mode and
 @samp{\text@{@var{name}@}} in La@TeX{} mode.  The
 @samp{\hbox@{ @}} and @samp{\text@{ @}} notations are ignored during
 reading.  If you use a negative prefix argument, such function names are
@@ -14143,7 +14143,7 @@ any @TeX{} mode.)
 
 During reading, text of the form @samp{\matrix@{ ...@: @}} is replaced
 by @samp{[ ...@: ]}.  The same also applies to @code{\pmatrix} and
-@code{\bmatrix}.  In La@TeX{} mode this also applies to 
+@code{\bmatrix}.  In La@TeX{} mode this also applies to
 @samp{\begin@{matrix@} ... \end@{matrix@}},
 @samp{\begin@{bmatrix@} ... \end@{bmatrix@}},
 @samp{\begin@{pmatrix@} ... \end@{pmatrix@}}, as well as
@@ -14151,12 +14151,12 @@ by @samp{[ ...@: ]}.  The same also applies to @code{\pmatrix} and
 The symbol @samp{&} is interpreted as a comma,
 and the symbols @samp{\cr} and @samp{\\} are interpreted as semicolons.
 During output, matrices are displayed in @samp{\matrix@{ a & b \\ c & d@}}
-format in @TeX{} mode and in 
+format in @TeX{} mode and in
 @samp{\begin@{pmatrix@} a & b \\ c & d \end@{pmatrix@}} format in
 La@TeX{} mode; you may need to edit this afterwards to change to your
 preferred matrix form.  If you invoke @kbd{d T} or @kbd{d L} with an
 argument of 2 or -2, then matrices will be displayed in two-dimensional
-form, such as 
+form, such as
 
 @example
 \begin@{pmatrix@}
@@ -14300,25 +14300,25 @@ in Calc, @TeX{}, La@TeX{} and @dfn{eqn} (described in the next section):
 @example
 Calc      TeX           LaTeX         eqn
 ----      ---           -----         ---
-acute     \acute        \acute        
-Acute                   \Acute        
+acute     \acute        \acute
+Acute                   \Acute
 bar       \bar          \bar          bar
 Bar                     \Bar
-breve     \breve        \breve        
-Breve                   \Breve        
-check     \check        \check        
-Check                   \Check        
+breve     \breve        \breve
+Breve                   \Breve
+check     \check        \check
+Check                   \Check
 dddot                   \dddot
 ddddot                  \ddddot
 dot       \dot          \dot          dot
 Dot                     \Dot
 dotdot    \ddot         \ddot         dotdot
-DotDot                  \Ddot         
+DotDot                  \Ddot
 dyad                                  dyad
-grave     \grave        \grave        
-Grave                   \Grave        
+grave     \grave        \grave
+Grave                   \Grave
 hat       \hat          \hat          hat
-Hat                     \Hat          
+Hat                     \Hat
 Prime                                 prime
 tilde     \tilde        \tilde        tilde
 Tilde                   \Tilde
@@ -14363,7 +14363,7 @@ reading is:
 
 Note that, because these symbols are ignored, reading a @TeX{} or
 La@TeX{} formula into Calc and writing it back out may lose spacing and
-font information. 
+font information.
 
 Also, the ``discretionary multiplication sign'' @samp{\*} is read
 the same as @samp{*}.
@@ -14542,7 +14542,7 @@ are treated the same as curly braces: @samp{sqrt "1+x"} is equivalent to
 of quotes in @dfn{eqn}, but it is good enough for most uses.
 
 Accent codes (@samp{@var{x} dot}) are handled by treating them as
-function calls (@samp{dot(@var{x})}) internally.  
+function calls (@samp{dot(@var{x})}) internally.
 @xref{TeX and LaTeX Language Modes}, for a table of these accent
 functions.  The @code{prime} accent is treated specially if it occurs on
 a variable or function name: @samp{f prime prime @w{( x prime )}} is
@@ -14572,7 +14572,7 @@ if the matrix justification mode so specifies.
 The @kbd{d Y} (@code{calc-yacas-language}) command selects the
 conventions of Yacas, a free computer algebra system.  While the
 operators and functions in Yacas are similar to those of Calc, the names
-of built-in functions in Yacas are capitalized.  The Calc formula 
+of built-in functions in Yacas are capitalized.  The Calc formula
 @samp{sin(2 x)}, for example, is entered and displayed @samp{Sin(2 x)}
 in Yacas mode,  and `@samp{arcsin(x^2)} is @samp{ArcSin(x^2)} in Yacas
 mode.  Complex numbers are written  are written @samp{3 + 4 I}.
@@ -14581,9 +14581,9 @@ The standard special constants are written @code{Pi}, @code{E},
 represents both @code{inf} and @code{uinf}, and @code{Undefined}
 represents @code{nan}.
 
-Certain operators on functions, such as @code{D} for differentiation 
+Certain operators on functions, such as @code{D} for differentiation
 and @code{Integrate} for integration, take a prefix form in Yacas.  For
-example, the derivative of @w{@samp{e^x sin(x)}} can be computed with 
+example, the derivative of @w{@samp{e^x sin(x)}} can be computed with
 @w{@samp{D(x) Exp(x)*Sin(x)}}.
 
 Other notable differences between Yacas and standard Calc expressions
@@ -14602,7 +14602,7 @@ use square brackets.  If, for example, @samp{A} represents the list
 The @kbd{d X} (@code{calc-maxima-language}) command selects the
 conventions of Maxima, another free computer algebra system.  The
 function names in Maxima are similar, but not always identical, to Calc.
-For example, instead of @samp{arcsin(x)}, Maxima will use 
+For example, instead of @samp{arcsin(x)}, Maxima will use
 @samp{asin(x)}.  Complex numbers are written @samp{3 + 4 %i}.  The
 standard special constants are written @code{%pi},  @code{%e},
 @code{%i}, @code{%phi} and @code{%gamma}.  In Maxima,  @code{inf} means
@@ -14610,8 +14610,8 @@ the same as in Calc, but @code{infinity} represents Calc's @code{uinf}.
 
 Underscores as well as percent signs are allowed in function and
 variable names in Maxima mode.  The underscore again is equivalent to
-the @samp{#} in Normal mode, and the percent sign is equivalent to 
-@samp{o'o}.  
+the @samp{#} in Normal mode, and the percent sign is equivalent to
+@samp{o'o}.
 
 Maxima uses square brackets for lists and vectors, and matrices are
 written as calls to the function @code{matrix}, given the row vectors of
@@ -14629,7 +14629,7 @@ conventions of Giac, another free computer algebra system.  The function
 names in Giac are similar to Maxima.  Complex numbers are written
 @samp{3 + 4 i}.  The standard special constants in Giac are the same as
 in Calc, except that @code{infinity} represents both Calc's @code{inf}
-and @code{uinf}. 
+and @code{uinf}.
 
 Underscores are allowed in function and variable names in Giac mode.
 Brackets are used for subscripts.  In Giac, indexing of lists begins at
@@ -15786,9 +15786,9 @@ Command is @kbd{m p}.
 @item
 Matrix/Scalar mode.  Default value is @mathit{-1}.  Value is 0 for Scalar
 mode, @mathit{-2} for Matrix mode, @mathit{-3} for square Matrix mode,
-or @var{N} for  
+or @var{N} for
 @texline @math{N\times N}
-@infoline @var{N}x@var{N} 
+@infoline @var{N}x@var{N}
 Matrix mode.  Command is @kbd{m v}.
 
 @item
@@ -16178,7 +16178,7 @@ whereas @w{@samp{[-2 ..@: 3] ^ 2}} is @samp{[0 ..@: 9]}.
 @mindex @null
 @end ignore
 @tindex /
-The @kbd{/} (@code{calc-divide}) command divides two numbers.  
+The @kbd{/} (@code{calc-divide}) command divides two numbers.
 
 When combining multiplication and division in an algebraic formula, it
 is good style to use parentheses to distinguish between possible
@@ -16187,7 +16187,7 @@ interpretations; the expression @samp{a/b*c} should be written
 parentheses, Calc will interpret @samp{a/b*c} as @samp{a/(b*c)}, since
 in algebraic entry Calc gives division a lower precedence than
 multiplication. (This is not standard across all computer languages, and
-Calc may change the precedence depending on the language mode being used.  
+Calc may change the precedence depending on the language mode being used.
 @xref{Language Modes}.)  This default ordering can be changed by setting
 the customizable variable @code{calc-multiplication-has-precedence} to
 @code{nil} (@pxref{Customizing Calc}); this will give multiplication and
@@ -16373,7 +16373,7 @@ all the arguments.)
 The @kbd{f M} (@code{calc-mant-part}) [@code{mant}] function extracts
 the ``mantissa'' part @expr{m} of its floating-point argument; @kbd{f X}
 (@code{calc-xpon-part}) [@code{xpon}] extracts the ``exponent'' part
-@expr{e}.  The original number is equal to 
+@expr{e}.  The original number is equal to
 @texline @math{m \times 10^e},
 @infoline @expr{m * 10^e},
 where @expr{m} is in the interval @samp{[1.0 ..@: 10.0)} except that
@@ -16406,9 +16406,9 @@ floating-point numbers, the change is by one unit in the last place.
 For example, incrementing @samp{12.3456} when the current precision
 is 6 digits yields @samp{12.3457}.  If the current precision had been
 8 digits, the result would have been @samp{12.345601}.  Incrementing
-@samp{0.0} produces 
+@samp{0.0} produces
 @texline @math{10^{-p}},
-@infoline @expr{10^-p}, 
+@infoline @expr{10^-p},
 where @expr{p} is the current
 precision.  These operations are defined only on integers and floats.
 With numeric prefix arguments, they change the number by @expr{n} units.
@@ -16852,7 +16852,7 @@ The last two arguments default to zero if omitted.
 The @kbd{t J} (@code{calc-julian}) [@code{julian}] command converts
 a date form into a Julian day count, which is the number of days
 since noon (GMT) on Jan 1, 4713 BC.  A pure date is converted to an
-integer Julian count representing noon of that day.  A date/time form 
+integer Julian count representing noon of that day.  A date/time form
 is converted to an exact floating-point Julian count, adjusted to
 interpret the date form in the current time zone but the Julian
 day count in Greenwich Mean Time.  A numeric prefix argument allows
@@ -17294,12 +17294,12 @@ With no arguments, @code{calc-time-zone} or @samp{tzone()} will by
 default get the time zone and daylight saving information from the
 calendar (@pxref{Daylight Saving,Calendar/Diary,The Calendar and the Diary,
 emacs,The GNU Emacs Manual}).  To use a different time zone, or if the
-calendar does not give the desired result, you can set the Calc variable 
+calendar does not give the desired result, you can set the Calc variable
 @code{TimeZone} (which is by default @code{nil}) to an appropriate
 time zone name.  (The easiest way to do this is to edit the
 @code{TimeZone} variable using Calc's @kbd{s T} command, then use the
 @kbd{s p} (@code{calc-permanent-variable}) command to save the value of
-@code{TimeZone} permanently.)  
+@code{TimeZone} permanently.)
 If the time zone given by @code{TimeZone} is a generalized time zone,
 e.g., @code{EGT}, Calc examines the date being converted to tell whether
 to use standard or daylight saving time.  But if the current time zone
@@ -17311,12 +17311,12 @@ from the calendar.
 
 The @kbd{t J} and @code{t U} commands with no numeric prefix
 arguments do the same thing as @samp{tzone()}; namely, use the
-information from the calendar if @code{TimeZone} is @code{nil}, 
+information from the calendar if @code{TimeZone} is @code{nil},
 otherwise use the time zone given by @code{TimeZone}.
 
 @vindex math-daylight-savings-hook
 @findex math-std-daylight-savings
-When Calc computes the daylight saving information itself (i.e., when 
+When Calc computes the daylight saving information itself (i.e., when
 the @code{TimeZone} variable is set), it will by default consider
 daylight saving time to begin at 2 a.m.@: on the second Sunday of March
 (for years from 2007 on) or on the last Sunday in April (for years
@@ -17392,7 +17392,7 @@ falls in this hour results in a time value for the following hour,
 from 3 a.m.@: to 4 a.m.  At the end of daylight saving time, the
 hour from 1 a.m.@: to 2 a.m.@: repeats itself; converting a date/time
 form that falls in this hour results in a time value for the first
-manifestation of that time (@emph{not} the one that occurs one hour 
+manifestation of that time (@emph{not} the one that occurs one hour
 later).
 
 If @code{math-daylight-savings-hook} is @code{nil}, then the
@@ -17995,12 +17995,12 @@ particular, negative arguments are converted to positive integers modulo
 @expr{2^w} by all binary functions.
 
 If the word size is negative, binary operations produce twos-complement
-integers from 
+integers from
 @texline @math{-2^{-w-1}}
-@infoline @expr{-(2^(-w-1))} 
-to 
+@infoline @expr{-(2^(-w-1))}
+to
 @texline @math{2^{-w-1}-1}
-@infoline @expr{2^(-w-1)-1} 
+@infoline @expr{2^(-w-1)-1}
 inclusive.  Either mode accepts inputs in any range; the sign of
 @expr{w} affects only the results produced.
 
@@ -18182,13 +18182,13 @@ flag keys must be used to get some of these functions from the keyboard.
 One miscellaneous command is shift-@kbd{P} (@code{calc-pi}), which pushes
 the value of @cpi{} (at the current precision) onto the stack.  With the
 Hyperbolic flag, it pushes the value @expr{e}, the base of natural logarithms.
-With the Inverse flag, it pushes Euler's constant 
+With the Inverse flag, it pushes Euler's constant
 @texline @math{\gamma}
-@infoline @expr{gamma} 
+@infoline @expr{gamma}
 (about 0.5772).  With both Inverse and Hyperbolic, it
-pushes the ``golden ratio'' 
+pushes the ``golden ratio''
 @texline @math{\phi}
-@infoline @expr{phi} 
+@infoline @expr{phi}
 (about 1.618).  (At present, Euler's constant is not available
 to unlimited precision; Calc knows only the first 100 digits.)
 In Symbolic mode, these commands push the
@@ -18266,7 +18266,7 @@ The @kbd{H L} (@code{calc-log10}) [@code{log10}] command computes the common
 (base-10) logarithm of a number.  (With the Inverse flag [@code{exp10}],
 it raises ten to a given power.)  Note that the common logarithm of a
 complex number is computed by taking the natural logarithm and dividing
-by 
+by
 @texline @math{\ln10}.
 @infoline @expr{ln(10)}.
 
@@ -18278,7 +18278,7 @@ by
 The @kbd{B} (@code{calc-log}) [@code{log}] command computes a logarithm
 to any base.  For example, @kbd{1024 @key{RET} 2 B} produces 10, since
 @texline @math{2^{10} = 1024}.
-@infoline @expr{2^10 = 1024}.  
+@infoline @expr{2^10 = 1024}.
 In certain cases like @samp{log(3,9)}, the result
 will be either @expr{1:2} or @expr{0.5} depending on the current Fraction
 mode setting.  With the Inverse flag [@code{alog}], this command is
@@ -18300,11 +18300,11 @@ integer arithmetic is used; otherwise, this is equivalent to
 @tindex expm1
 The @kbd{f E} (@code{calc-expm1}) [@code{expm1}] command computes
 @texline @math{e^x - 1},
-@infoline @expr{exp(x)-1}, 
+@infoline @expr{exp(x)-1},
 but using an algorithm that produces a more accurate
-answer when the result is close to zero, i.e., when 
+answer when the result is close to zero, i.e., when
 @texline @math{e^x}
-@infoline @expr{exp(x)} 
+@infoline @expr{exp(x)}
 is close to one.
 
 @kindex f L
@@ -18312,7 +18312,7 @@ is close to one.
 @tindex lnp1
 The @kbd{f L} (@code{calc-lnp1}) [@code{lnp1}] command computes
 @texline @math{\ln(x+1)},
-@infoline @expr{ln(x+1)}, 
+@infoline @expr{ln(x+1)},
 producing a more accurate answer when @expr{x} is close to zero.
 
 @node Trigonometric and Hyperbolic Functions, Advanced Math Functions, Logarithmic Functions, Scientific Functions
@@ -18515,9 +18515,9 @@ The @kbd{f g} (@code{calc-gamma}) [@code{gamma}] command computes the Euler
 gamma function.  For positive integer arguments, this is related to the
 factorial function:  @samp{gamma(n+1) = fact(n)}.  For general complex
 arguments the gamma function can be defined by the following definite
-integral:  
+integral:
 @texline @math{\Gamma(a) = \int_0^\infty t^{a-1} e^t dt}.
-@infoline @expr{gamma(a) = integ(t^(a-1) exp(t), t, 0, inf)}.  
+@infoline @expr{gamma(a) = integ(t^(a-1) exp(t), t, 0, inf)}.
 (The actual implementation uses far more efficient computational methods.)
 
 @kindex f G
@@ -18549,7 +18549,7 @@ integral:
 @tindex gammaG
 The @kbd{f G} (@code{calc-inc-gamma}) [@code{gammaP}] command computes
 the incomplete gamma function, denoted @samp{P(a,x)}.  This is defined by
-the integral, 
+the integral,
 @texline @math{P(a,x) = \left( \int_0^x t^{a-1} e^t dt \right) / \Gamma(a)}.
 @infoline @expr{gammaP(a,x) = integ(t^(a-1) exp(t), t, 0, x) / gamma(a)}.
 This implies that @samp{gammaP(a,inf) = 1} for any @expr{a} (see the
@@ -18583,7 +18583,7 @@ You can obtain these using the \kbd{H f G} [\code{gammag}] and
 The @kbd{f b} (@code{calc-beta}) [@code{beta}] command computes the
 Euler beta function, which is defined in terms of the gamma function as
 @texline @math{B(a,b) = \Gamma(a) \Gamma(b) / \Gamma(a+b)},
-@infoline @expr{beta(a,b) = gamma(a) gamma(b) / gamma(a+b)}, 
+@infoline @expr{beta(a,b) = gamma(a) gamma(b) / gamma(a+b)},
 or by
 @texline @math{B(a,b) = \int_0^1 t^{a-1} (1-t)^{b-1} dt}.
 @infoline @expr{beta(a,b) = integ(t^(a-1) (1-t)^(b-1), t, 0, 1)}.
@@ -18606,7 +18606,7 @@ un-normalized version [@code{betaB}].
 @tindex erf
 @tindex erfc
 The @kbd{f e} (@code{calc-erf}) [@code{erf}] command computes the
-error function 
+error function
 @texline @math{\hbox{erf}(x) = {2 \over \sqrt{\pi}} \int_0^x e^{-t^2} dt}.
 @infoline @expr{erf(x) = 2 integ(exp(-(t^2)), t, 0, x) / sqrt(pi)}.
 The complementary error function @kbd{I f e} (@code{calc-erfc}) [@code{erfc}]
@@ -18784,9 +18784,9 @@ The @kbd{k r} (@code{calc-random}) [@code{random}] command produces
 random numbers of various sorts.
 
 Given a positive numeric prefix argument @expr{M}, it produces a random
-integer @expr{N} in the range 
+integer @expr{N} in the range
 @texline @math{0 \le N < M}.
-@infoline @expr{0 <= N < M}.  
+@infoline @expr{0 <= N < M}.
 Each possible value @expr{N} appears with equal probability.
 
 With no numeric prefix argument, the @kbd{k r} command takes its argument
@@ -18794,17 +18794,17 @@ from the stack instead.  Once again, if this is a positive integer @expr{M}
 the result is a random integer less than @expr{M}.  However, note that
 while numeric prefix arguments are limited to six digits or so, an @expr{M}
 taken from the stack can be arbitrarily large.  If @expr{M} is negative,
-the result is a random integer in the range 
+the result is a random integer in the range
 @texline @math{M < N \le 0}.
 @infoline @expr{M < N <= 0}.
 
 If the value on the stack is a floating-point number @expr{M}, the result
-is a random floating-point number @expr{N} in the range 
+is a random floating-point number @expr{N} in the range
 @texline @math{0 \le N < M}
 @infoline @expr{0 <= N < M}
-or 
+or
 @texline @math{M < N \le 0},
-@infoline @expr{M < N <= 0}, 
+@infoline @expr{M < N <= 0},
 according to the sign of @expr{M}.
 
 If @expr{M} is zero, the result is a Gaussian-distributed random real
@@ -18812,14 +18812,14 @@ number; the distribution has a mean of zero and a standard deviation
 of one.  The algorithm used generates random numbers in pairs; thus,
 every other call to this function will be especially fast.
 
-If @expr{M} is an error form 
+If @expr{M} is an error form
 @texline @math{m} @code{+/-} @math{\sigma}
-@infoline @samp{m +/- s} 
-where @var{m} and 
+@infoline @samp{m +/- s}
+where @var{m} and
 @texline @math{\sigma}
-@infoline @var{s} 
+@infoline @var{s}
 are both real numbers, the result uses a Gaussian distribution with mean
-@var{m} and standard deviation 
+@var{m} and standard deviation
 @texline @math{\sigma}.
 @infoline @var{s}.
 
@@ -18932,9 +18932,9 @@ generators that are typically used to implement @code{random}.
 
 If @code{RandSeed} contains an integer, Calc uses this integer to
 seed an ``additive congruential'' method (Knuth's algorithm 3.2.2A,
-computing 
+computing
 @texline @math{X_{n-55} - X_{n-24}}.
-@infoline @expr{X_n-55 - X_n-24}).  
+@infoline @expr{X_n-55 - X_n-24}).
 This method expands the seed
 value into a large table which is maintained internally; the variable
 @code{RandSeed} is changed from, e.g., 42 to the vector @expr{[42]}
@@ -18970,18 +18970,18 @@ value.
 To create a random floating-point number with precision @var{p}, Calc
 simply creates a random @var{p}-digit integer and multiplies by
 @texline @math{10^{-p}}.
-@infoline @expr{10^-p}.  
+@infoline @expr{10^-p}.
 The resulting random numbers should be very clean, but note
 that relatively small numbers will have few significant random digits.
 In other words, with a precision of 12, you will occasionally get
-numbers on the order of 
+numbers on the order of
 @texline @math{10^{-9}}
-@infoline @expr{10^-9} 
-or 
+@infoline @expr{10^-9}
+or
 @texline @math{10^{-10}},
-@infoline @expr{10^-10}, 
+@infoline @expr{10^-10},
 but those numbers will only have two or three random digits since they
-correspond to small integers times 
+correspond to small integers times
 @texline @math{10^{-12}}.
 @infoline @expr{10^-12}.
 
@@ -19032,7 +19032,7 @@ numbers.
 @tindex egcd
 The @kbd{k E} (@code{calc-extended-gcd}) [@code{egcd}] command computes
 the GCD of two integers @expr{x} and @expr{y} and returns a vector
-@expr{[g, a, b]} where 
+@expr{[g, a, b]} where
 @texline @math{g = \gcd(x,y) = a x + b y}.
 @infoline @expr{g = gcd(x,y) = a x + b y}.
 
@@ -19119,11 +19119,11 @@ functions.
 @tindex stir1
 @tindex stir2
 The @kbd{k s} (@code{calc-stirling-number}) [@code{stir1}] command
-computes a Stirling number of the first 
+computes a Stirling number of the first
 @texline kind@tie{}@math{n \brack m},
 @infoline kind,
 given two integers @expr{n} and @expr{m} on the stack.  The @kbd{H k s}
-[@code{stir2}] command computes a Stirling number of the second 
+[@code{stir2}] command computes a Stirling number of the second
 @texline kind@tie{}@math{n \brace m}.
 @infoline kind.
 These are the number of @expr{m}-cycle permutations of @expr{n} objects,
@@ -19202,7 +19202,7 @@ analogously finds the next prime less than a given number.
 @pindex calc-totient
 @tindex totient
 The @kbd{k t} (@code{calc-totient}) [@code{totient}] command computes the
-Euler ``totient'' 
+Euler ``totient''
 @texline function@tie{}@math{\phi(n)},
 @infoline function,
 the number of integers less than @expr{n} which
@@ -19277,7 +19277,7 @@ recover the original arguments but substitute a new value for @expr{x}.)
 @tindex ltpc
 The @samp{utpc(x,v)} function uses the chi-square distribution with
 @texline @math{\nu}
-@infoline @expr{v} 
+@infoline @expr{v}
 degrees of freedom.  It is the probability that a model is
 correct if its chi-square statistic is @expr{x}.
 
@@ -19293,10 +19293,10 @@ correct if its chi-square statistic is @expr{x}.
 @end ignore
 @tindex ltpf
 The @samp{utpf(F,v1,v2)} function uses the F distribution, used in
-various statistical tests.  The parameters 
+various statistical tests.  The parameters
 @texline @math{\nu_1}
-@infoline @expr{v1} 
-and 
+@infoline @expr{v1}
+and
 @texline @math{\nu_2}
 @infoline @expr{v2}
 are the degrees of freedom in the numerator and denominator,
@@ -19314,9 +19314,9 @@ respectively, used in computing the statistic @expr{F}.
 @end ignore
 @tindex ltpn
 The @samp{utpn(x,m,s)} function uses a normal (Gaussian) distribution
-with mean @expr{m} and standard deviation 
+with mean @expr{m} and standard deviation
 @texline @math{\sigma}.
-@infoline @expr{s}.  
+@infoline @expr{s}.
 It is the probability that such a normal-distributed random variable
 would exceed @expr{x}.
 
@@ -19347,20 +19347,20 @@ Poisson random events will occur.
 @end ignore
 @tindex ltpt
 The @samp{utpt(t,v)} function uses the Student's ``t'' distribution
-with 
+with
 @texline @math{\nu}
-@infoline @expr{v} 
+@infoline @expr{v}
 degrees of freedom.  It is the probability that a
 t-distributed random variable will be greater than @expr{t}.
-(Note:  This computes the distribution function 
+(Note:  This computes the distribution function
 @texline @math{A(t|\nu)}
 @infoline @expr{A(t|v)}
-where 
+where
 @texline @math{A(0|\nu) = 1}
-@infoline @expr{A(0|v) = 1} 
-and 
+@infoline @expr{A(0|v) = 1}
+and
 @texline @math{A(\infty|\nu) \to 0}.
-@infoline @expr{A(inf|v) -> 0}.  
+@infoline @expr{A(inf|v) -> 0}.
 The @code{UTPT} operation on the HP-48 uses a different definition which
 returns half of Calc's value:  @samp{UTPT(t,v) = .5*utpt(t,v)}.)
 
@@ -19670,7 +19670,7 @@ prefix, if specified, must match the size of the vector.  If the value on
 the stack is a scalar, it is used for each element on the diagonal, and
 the prefix argument is required.
 
-To build a constant square matrix, e.g., a 
+To build a constant square matrix, e.g., a
 @texline @math{3\times3}
 @infoline 3x3
 matrix filled with ones, use @kbd{0 M-3 v d 1 +}, i.e., build a zero
@@ -19911,7 +19911,7 @@ command.
 With the Hyperbolic flag, @kbd{H v l} [@code{mdims}] computes a vector
 of the dimensions of a vector, matrix, or higher-order object.  For
 example, @samp{mdims([[a,b,c],[d,e,f]])} returns @samp{[2, 3]} since
-its argument is a 
+its argument is a
 @texline @math{2\times3}
 @infoline 2x3
 matrix.
@@ -19945,17 +19945,17 @@ If the number of columns does not evenly divide the number of elements
 in the vector, the last row will be short and the result will not be
 suitable for use as a matrix.  For example, with the matrix
 @samp{[[1, 2], @w{[3, 4]}]} on the stack, @kbd{v a 4} produces
-@samp{[[1, 2, 3, 4]]} (a 
+@samp{[[1, 2, 3, 4]]} (a
 @texline @math{1\times4}
 @infoline 1x4
-matrix), @kbd{v a 1} produces @samp{[[1], [2], [3], [4]]} (a 
+matrix), @kbd{v a 1} produces @samp{[[1], [2], [3], [4]]} (a
 @texline @math{4\times1}
 @infoline 4x1
-matrix), @kbd{v a 2} produces @samp{[[1, 2], [3, 4]]} (the original 
+matrix), @kbd{v a 2} produces @samp{[[1, 2], [3, 4]]} (the original
 @texline @math{2\times2}
 @infoline 2x2
 matrix), @w{@kbd{v a 3}} produces @samp{[[1, 2, 3], [4]]} (not a
-matrix), and @kbd{v a 0} produces the flattened list 
+matrix), and @kbd{v a 0} produces the flattened list
 @samp{[1, 2, @w{3, 4}]}.
 
 @cindex Sorting data
@@ -20040,9 +20040,9 @@ If no prefix is given, then you will be prompted for a vector which
 will be used to determine the bins. (If a positive integer is given at
 this prompt, it will be still treated as if it were given as a
 prefix.)  Each bin will consist of the interval of numbers closest to
-the corresponding number of this new vector; if the vector 
-@expr{[a, b, c, ...]} is entered at the prompt, the bins will be 
-@expr{(-inf, (a+b)/2]}, @expr{((a+b)/2, (b+c)/2]}, etc.  The result of 
+the corresponding number of this new vector; if the vector
+@expr{[a, b, c, ...]} is entered at the prompt, the bins will be
+@expr{(-inf, (a+b)/2]}, @expr{((a+b)/2, (b+c)/2]}, etc.  The result of
 this command will be a vector counting how many elements of the
 original vector are in each bin.
 
@@ -20313,10 +20313,10 @@ and only if it is in both of the input sets.  Thus if the input
 sets are disjoint, i.e., if they share no common elements, the result
 will be the empty vector @samp{[]}.  Note that the characters @kbd{V}
 and @kbd{^} were chosen to be close to the conventional mathematical
-notation for set 
+notation for set
 @texline union@tie{}(@math{A \cup B})
 @infoline union
-and 
+and
 @texline intersection@tie{}(@math{A \cap B}).
 @infoline intersection.
 
@@ -20432,7 +20432,7 @@ the same set.  The set may include positive infinity, but must
 not include any negative numbers.  The input is interpreted as a
 set of integers in the sense of @kbd{V F} (@code{vfloor}).  Beware
 that a simple input like @samp{[100]} can result in a huge integer
-representation 
+representation
 @texline (@math{2^{100}}, a 31-digit integer, in this case).
 @infoline (@expr{2^100}, a 31-digit integer, in this case).
 
@@ -20544,10 +20544,10 @@ plus or minus infinity.
 @cindex Mean of data values
 The @kbd{u M} (@code{calc-vector-mean}) [@code{vmean}] command
 computes the average (arithmetic mean) of the data values.
-If the inputs are error forms 
+If the inputs are error forms
 @texline @math{x \pm \sigma},
-@infoline @samp{x +/- s}, 
-this is the weighted mean of the @expr{x} values with weights 
+@infoline @samp{x +/- s},
+this is the weighted mean of the @expr{x} values with weights
 @texline @math{1 /\sigma^2}.
 @infoline @expr{1 / s^2}.
 @tex
@@ -20558,9 +20558,9 @@ If the inputs are not error forms, this is simply the sum of the
 values divided by the count of the values.
 
 Note that a plain number can be considered an error form with
-error 
+error
 @texline @math{\sigma = 0}.
-@infoline @expr{s = 0}.  
+@infoline @expr{s = 0}.
 If the input to @kbd{u M} is a mixture of
 plain numbers and error forms, the result is the mean of the
 plain numbers, ignoring all values with non-zero errors.  (By the
@@ -20662,7 +20662,7 @@ for a vector of numbers simply by using the @kbd{A} command.
 @cindex Standard deviation
 @cindex Sample statistics
 The @kbd{u S} (@code{calc-vector-sdev}) [@code{vsdev}] command
-computes the standard 
+computes the standard
 @texline deviation@tie{}@math{\sigma}
 @infoline deviation
 of the data values.  If the values are error forms, the errors are used
@@ -20677,9 +20677,9 @@ $$ \sigma^2 = {1 \over N - 1} \sum (x_i - \mu)^2 $$
 This function also applies to distributions.  The standard deviation
 of a single error form is simply the error part.  The standard deviation
 of a continuous interval happens to equal the difference between the
-limits, divided by 
+limits, divided by
 @texline @math{\sqrt{12}}.
-@infoline @expr{sqrt(12)}.  
+@infoline @expr{sqrt(12)}.
 The standard deviation of an integer interval is the same as the
 standard deviation of a vector of those integers.
 
@@ -20714,7 +20714,7 @@ population standard deviation of the equivalent vector of integers.
 The @kbd{H u S} (@code{calc-vector-variance}) [@code{vvar}] and
 @kbd{H I u S} (@code{calc-vector-pop-variance}) [@code{vpvar}]
 commands compute the variance of the data values.  The variance
-is the 
+is the
 @texline square@tie{}@math{\sigma^2}
 @infoline square
 of the standard deviation, i.e., the sum of the
@@ -20738,7 +20738,7 @@ The functions in this section take two arguments, which must be
 vectors of equal size.  The vectors are each flattened in the same
 way as by the single-variable statistical functions.  Given a numeric
 prefix argument of 1, these functions instead take one object from
-the stack, which must be an 
+the stack, which must be an
 @texline @math{N\times2}
 @infoline Nx2
 matrix of data values.  Once again, variable names can be used in place
@@ -20996,7 +20996,7 @@ be prompted for the number of arguments to use.
 If any argument to @kbd{V M} is a matrix, the operator is normally mapped
 across all elements of the matrix.  For example, given the matrix
 @expr{[[1, -2, 3], [-4, 5, -6]]}, @kbd{V M A} takes six absolute values to
-produce another 
+produce another
 @texline @math{3\times2}
 @infoline 3x2
 matrix, @expr{[[1, 2, 3], [4, 5, 6]]}.
@@ -21612,8 +21612,8 @@ entire four-term sum.
 @pindex calc-break-selections
 The @kbd{j b} (@code{calc-break-selections}) command controls a mode
 in which the ``deep structure'' of these associative formulas shows
-through.  Calc actually stores the above formulas as 
-@samp{((a + b) - c) + d} and @samp{x * (y * z)}.  (Note that for certain 
+through.  Calc actually stores the above formulas as
+@samp{((a + b) - c) + d} and @samp{x * (y * z)}.  (Note that for certain
 obscure reasons, by default Calc treats multiplication as
 right-associative.)  Once you have enabled @kbd{j b} mode, selecting
 with the cursor on the @samp{-} sign would only select the @samp{a + b -
@@ -22098,7 +22098,7 @@ of a quotient you can call it with a zero prefix: @kbd{C-u 0 j *}.  For
 example, if the formula on the stack is @samp{1 / (sqrt(a) + 1)}, you may
 wish to eliminate the square root in the denominator by multiplying
 the top and bottom by @samp{sqrt(a) - 1}.  If you did this simply by using
-a simple @kbd{j *} command, you would get 
+a simple @kbd{j *} command, you would get
 @samp{(sqrt(a)-1)/ (sqrt(a) (sqrt(a) - 1) + sqrt(a) - 1)}.  Instead,
 you would probably want to use @kbd{C-u 0 j *}, which would expand the
 bottom and give you the desired result @samp{(sqrt(a)-1)/(a-1)}.  More
@@ -22405,7 +22405,7 @@ The most basic default simplification is the evaluation of functions.
 For example, @expr{2 + 3} is evaluated to @expr{5}, and @expr{@tfn{sqrt}(9)}
 is evaluated to @expr{3}.  Evaluation does not occur if the arguments
 to a function are somehow of the wrong type @expr{@tfn{tan}([2,3,4])}),
-range (@expr{@tfn{tan}(90)}), or number (@expr{@tfn{tan}(3,5)}), 
+range (@expr{@tfn{tan}(90)}), or number (@expr{@tfn{tan}(3,5)}),
 or if the function name is not recognized (@expr{@tfn{f}(5)}), or if
 Symbolic mode (@pxref{Symbolic Mode}) prevents evaluation
 (@expr{@tfn{sqrt}(2)}).
@@ -22452,7 +22452,7 @@ Arithmetic operators like @kbd{+} and @kbd{*} always take two
 arguments in Calc's internal form.  Sums and products of three or
 more terms are arranged by the associative law of algebra into
 a left-associative form for sums, @expr{((a + b) + c) + d}, and
-(by default) a right-associative form for products, 
+(by default) a right-associative form for products,
 @expr{a * (b * (c * d))}.  Formulas like @expr{(a + b) + (c + d)} are
 rearranged to left-associative form, though this rarely matters since
 Calc's algebra commands are designed to hide the inner structure of sums
@@ -22533,7 +22533,7 @@ The product @expr{a (b + c)} is distributed over the sum only if
 rewritten to @expr{a (c - b)}.
 
 The distributive law of products and powers is used for adjacent
-terms of the product: @expr{x^a x^b} goes to 
+terms of the product: @expr{x^a x^b} goes to
 @texline @math{x^{a+b}}
 @infoline @expr{x^(a+b)}
 where @expr{a} is a number, or an implicit 1 (as in @expr{x}),
@@ -22544,9 +22544,9 @@ If the sum of the powers is zero, the product is simplified to
 @expr{1} or to @samp{idn(1)} if Matrix mode is enabled.
 
 The product of a negative power times anything but another negative
-power is changed to use division:  
+power is changed to use division:
 @texline @math{x^{-2} y}
-@infoline @expr{x^(-2) y} 
+@infoline @expr{x^(-2) y}
 goes to @expr{y / x^2} unless Matrix mode is
 in effect and neither @expr{x} nor @expr{y} are scalar (in which
 case it is considered unsafe to rearrange the order of the terms).
@@ -22568,13 +22568,13 @@ The quotient @expr{x / 0} is left unsimplified or changed to an
 infinite quantity, as directed by the current infinite mode.
 @xref{Infinite Mode}.
 
-The expression 
+The expression
 @texline @math{a / b^{-c}}
-@infoline @expr{a / b^(-c)} 
+@infoline @expr{a / b^(-c)}
 is changed to @expr{a b^c}, where @expr{-c} is any negative-looking
-power.  Also, @expr{1 / b^c} is changed to 
+power.  Also, @expr{1 / b^c} is changed to
 @texline @math{b^{-c}}
-@infoline @expr{b^(-c)} 
+@infoline @expr{b^(-c)}
 for any power @expr{c}.
 
 Also, @expr{(-a) / b} and @expr{a / (-b)} go to @expr{-(a/b)};
@@ -22614,22 +22614,22 @@ are distributed to @expr{a^c b^c}, @expr{a^c / b^c} only if @expr{c}
 is an integer, or if either @expr{a} or @expr{b} are nonnegative
 real numbers.  Powers of powers @expr{(a^b)^c} are simplified to
 @texline @math{a^{b c}}
-@infoline @expr{a^(b c)} 
+@infoline @expr{a^(b c)}
 only when @expr{c} is an integer and @expr{b c} also
 evaluates to an integer.  Without these restrictions these simplifications
 would not be safe because of problems with principal values.
-(In other words, 
+(In other words,
 @texline @math{((-3)^{1/2})^2}
-@infoline @expr{((-3)^1:2)^2} 
+@infoline @expr{((-3)^1:2)^2}
 is safe to simplify, but
 @texline @math{((-3)^2)^{1/2}}
-@infoline @expr{((-3)^2)^1:2} 
+@infoline @expr{((-3)^2)^1:2}
 is not.)  @xref{Declarations}, for ways to inform Calc that your
 variables satisfy these requirements.
 
 As a special case of this rule, @expr{@tfn{sqrt}(x)^n} is simplified to
 @texline @math{x^{n/2}}
-@infoline @expr{x^(n/2)} 
+@infoline @expr{x^(n/2)}
 only for even integers @expr{n}.
 
 If @expr{a} is known to be real, @expr{b} is an even integer, and
@@ -22642,13 +22642,13 @@ for any negative-looking expression @expr{-a}.
 
 Square roots @expr{@tfn{sqrt}(x)} generally act like one-half powers
 @texline @math{x^{1:2}}
-@infoline @expr{x^1:2} 
+@infoline @expr{x^1:2}
 for the purposes of the above-listed simplifications.
 
-Also, note that 
+Also, note that
 @texline @math{1 / x^{1:2}}
-@infoline @expr{1 / x^1:2} 
-is changed to 
+@infoline @expr{1 / x^1:2}
+is changed to
 @texline @math{x^{-1:2}},
 @infoline @expr{x^(-1:2)},
 but @expr{1 / @tfn{sqrt}(x)} is left alone.
@@ -22660,9 +22660,9 @@ but @expr{1 / @tfn{sqrt}(x)} is left alone.
 Generic identity matrices (@pxref{Matrix Mode}) are simplified by the
 following rules:  @expr{@tfn{idn}(a) + b} to @expr{a + b} if @expr{b}
 is provably scalar, or expanded out if @expr{b} is a matrix;
-@expr{@tfn{idn}(a) + @tfn{idn}(b)} to @expr{@tfn{idn}(a + b)}; 
-@expr{-@tfn{idn}(a)} to @expr{@tfn{idn}(-a)}; @expr{a @tfn{idn}(b)} to 
-@expr{@tfn{idn}(a b)} if @expr{a} is provably scalar, or to @expr{a b} 
+@expr{@tfn{idn}(a) + @tfn{idn}(b)} to @expr{@tfn{idn}(a + b)};
+@expr{-@tfn{idn}(a)} to @expr{@tfn{idn}(-a)}; @expr{a @tfn{idn}(b)} to
+@expr{@tfn{idn}(a b)} if @expr{a} is provably scalar, or to @expr{a b}
 if @expr{a} is provably non-scalar;  @expr{@tfn{idn}(a) @tfn{idn}(b)} to
 @expr{@tfn{idn}(a b)}; analogous simplifications for quotients involving
 @code{idn}; and @expr{@tfn{idn}(a)^n} to @expr{@tfn{idn}(a^n)} where
@@ -22683,7 +22683,7 @@ The expression @expr{@tfn{abs}(-x)} changes to @expr{@tfn{abs}(x)}.
 The expression @expr{@tfn{abs}(@tfn{abs}(x))} changes to
 @expr{@tfn{abs}(x)};  in fact, @expr{@tfn{abs}(x)} changes to @expr{x} or
 @expr{-x} if @expr{x} is provably nonnegative or nonpositive
-(@pxref{Declarations}). 
+(@pxref{Declarations}).
 
 While most functions do not recognize the variable @code{i} as an
 imaginary number, the @code{arg} function does handle the two cases
@@ -22693,7 +22693,7 @@ The expression @expr{@tfn{conj}(@tfn{conj}(x))} simplifies to @expr{x}.
 Various other expressions involving @code{conj}, @code{re}, and
 @code{im} are simplified, especially if some of the arguments are
 provably real or involve the constant @code{i}.  For example,
-@expr{@tfn{conj}(a + b i)} is changed to 
+@expr{@tfn{conj}(a + b i)} is changed to
 @expr{@tfn{conj}(a) - @tfn{conj}(b) i},  or to @expr{a - b i} if @expr{a}
 and @expr{b} are known to be real.
 
@@ -22836,7 +22836,7 @@ several ways.  (Note that these will be left unevaluated only in
 Symbolic mode.)  First, square integer or rational factors are
 pulled out so that @expr{@tfn{sqrt}(8)} is rewritten as
 @texline @math{2\,@tfn{sqrt}(2)}.
-@infoline @expr{2 sqrt(2)}.  
+@infoline @expr{2 sqrt(2)}.
 Conceptually speaking this implies factoring the argument into primes
 and moving pairs of primes out of the square root, but for reasons of
 efficiency Calc only looks for primes up to 29.
@@ -22879,7 +22879,7 @@ declared to be an integer.
 Trigonometric functions are simplified in several ways.  Whenever a
 products of two trigonometric functions can be replaced by a single
 function, the replacement is made; for example,
-@expr{@tfn{tan}(x) @tfn{cos}(x)} is simplified to @expr{@tfn{sin}(x)}. 
+@expr{@tfn{tan}(x) @tfn{cos}(x)} is simplified to @expr{@tfn{sin}(x)}.
 Reciprocals of trigonometric functions are replaced by their reciprocal
 function; for example, @expr{1/@tfn{sec}(x)} is simplified to
 @expr{@tfn{cos}(x)}.  The corresponding simplifications for the
@@ -22887,7 +22887,7 @@ hyperbolic functions are also handled.
 
 Trigonometric functions of their inverse functions are
 simplified. The expression @expr{@tfn{sin}(@tfn{arcsin}(x))} is
-simplified to @expr{x}, and similarly for @code{cos} and @code{tan}.  
+simplified to @expr{x}, and similarly for @code{cos} and @code{tan}.
 Trigonometric functions of inverses of different trigonometric
 functions can also be simplified, as in @expr{@tfn{sin}(@tfn{arccos}(x))}
 to @expr{@tfn{sqrt}(1 - x^2)}.
@@ -22905,30 +22905,30 @@ No simplifications for inverse trigonometric and hyperbolic
 functions are known, except for negative arguments of @code{arcsin},
 @code{arctan}, @code{arcsinh}, and @code{arctanh}.  Note that
 @expr{@tfn{arcsin}(@tfn{sin}(x))} can @emph{not} safely change to
-@expr{x}, since this only correct within an integer multiple of 
+@expr{x}, since this only correct within an integer multiple of
 @texline @math{2 \pi}
-@infoline @expr{2 pi} 
+@infoline @expr{2 pi}
 radians or 360 degrees.  However, @expr{@tfn{arcsinh}(@tfn{sinh}(x))} is
 simplified to @expr{x} if @expr{x} is known to be real.
 
 Several simplifications that apply to logarithms and exponentials
-are that @expr{@tfn{exp}(@tfn{ln}(x))}, 
+are that @expr{@tfn{exp}(@tfn{ln}(x))},
 @texline @tfn{e}@math{^{\ln(x)}},
-@infoline @expr{e^@tfn{ln}(x)}, 
+@infoline @expr{e^@tfn{ln}(x)},
 and
 @texline @math{10^{{\rm log10}(x)}}
-@infoline @expr{10^@tfn{log10}(x)} 
+@infoline @expr{10^@tfn{log10}(x)}
 all reduce to @expr{x}.  Also, @expr{@tfn{ln}(@tfn{exp}(x))}, etc., can
 reduce to @expr{x} if @expr{x} is provably real.  The form
 @expr{@tfn{exp}(x)^y} is simplified to @expr{@tfn{exp}(x y)}.  If @expr{x}
-is a suitable multiple of 
-@texline @math{\pi i} 
+is a suitable multiple of
+@texline @math{\pi i}
 @infoline @expr{pi i}
 (as described above for the trigonometric functions), then
 @expr{@tfn{exp}(x)} or @expr{e^x} will be expanded.  Finally,
 @expr{@tfn{ln}(x)} is simplified to a form involving @code{pi} and
 @code{i} where @expr{x} is provably negative, positive imaginary, or
-negative imaginary. 
+negative imaginary.
 
 The error functions @code{erf} and @code{erfc} are simplified when
 their arguments are negative-looking or are calls to the @code{conj}
@@ -23006,18 +23006,18 @@ values of @expr{x} in a certain range; outside that range, values
 are folded down to the 360-degree range that the inverse trigonometric
 functions always produce.
 
-Powers of powers @expr{(x^a)^b} are simplified to 
+Powers of powers @expr{(x^a)^b} are simplified to
 @texline @math{x^{a b}}
 @infoline @expr{x^(a b)}
 for all @expr{a} and @expr{b}.  These results will be valid only
-in a restricted range of @expr{x}; for example, in 
+in a restricted range of @expr{x}; for example, in
 @texline @math{(x^2)^{1:2}}
 @infoline @expr{(x^2)^1:2}
 the powers cancel to get @expr{x}, which is valid for positive values
 of @expr{x} but not for negative or complex values.
 
 Similarly, @expr{@tfn{sqrt}(x^a)} and @expr{@tfn{sqrt}(x)^a} are both
-simplified (possibly unsafely) to 
+simplified (possibly unsafely) to
 @texline @math{x^{a/2}}.
 @infoline @expr{x^(a/2)}.
 
@@ -23027,7 +23027,7 @@ Forms like @expr{@tfn{sqrt}(1 - sin(x)^2)} are simplified to, e.g.,
 
 Arguments of square roots are partially factored to look for
 squared terms that can be extracted.  For example,
-@expr{@tfn{sqrt}(a^2 b^3 + a^3 b^2)} simplifies to 
+@expr{@tfn{sqrt}(a^2 b^3 + a^3 b^2)} simplifies to
 @expr{a b @tfn{sqrt}(a+b)}.
 
 The simplifications of @expr{@tfn{ln}(@tfn{exp}(x))},
@@ -23093,9 +23093,9 @@ number for an answer, then the quotient simplifies to that number.
 
 For powers and square roots, the ``unsafe'' simplifications
 @expr{(a b)^c} to @expr{a^c b^c}, @expr{(a/b)^c} to @expr{a^c / b^c},
-and @expr{(a^b)^c} to 
+and @expr{(a^b)^c} to
 @texline @math{a^{b c}}
-@infoline @expr{a^(b c)} 
+@infoline @expr{a^(b c)}
 are done if the powers are real numbers.  (These are safe in the context
 of units because all numbers involved can reasonably be assumed to be
 real.)
@@ -23108,12 +23108,12 @@ according to the previous paragraph.  For example, @samp{acre^1.5}
 is simplified by noting that @expr{1.5 = 3:2}, that @samp{acre}
 is defined in terms of @samp{m^2}, and that the 2 in the power of
 @code{m} is a multiple of 2 in @expr{3:2}.  Thus, @code{acre^1.5} is
-replaced by approximately 
+replaced by approximately
 @texline @math{(4046 m^2)^{1.5}}
-@infoline @expr{(4046 m^2)^1.5}, 
-which is then changed to 
+@infoline @expr{(4046 m^2)^1.5},
+which is then changed to
 @texline @math{4046^{1.5} \, (m^2)^{1.5}},
-@infoline @expr{4046^1.5 (m^2)^1.5}, 
+@infoline @expr{4046^1.5 (m^2)^1.5},
 then to @expr{257440 m^3}.
 
 The functions @code{float}, @code{frac}, @code{clean}, @code{abs},
@@ -23401,7 +23401,7 @@ answer!
 
 If you use the @code{deriv} function directly in an algebraic formula,
 you can write @samp{deriv(f,x,x0)} which represents the derivative
-of @expr{f} with respect to @expr{x}, evaluated at the point 
+of @expr{f} with respect to @expr{x}, evaluated at the point
 @texline @math{x=x_0}.
 @infoline @expr{x=x0}.
 
@@ -23441,7 +23441,7 @@ respect to a prompted-for variable.  The integrator is not guaranteed to
 work for all integrable functions, but it is able to integrate several
 large classes of formulas.  In particular, any polynomial or rational
 function (a polynomial divided by a polynomial) is acceptable.
-(Rational functions don't have to be in explicit quotient form, however; 
+(Rational functions don't have to be in explicit quotient form, however;
 @texline @math{x/(1+x^{-2})}
 @infoline @expr{x/(1+x^-2)}
 is not strictly a quotient of polynomials, but it is equivalent to
@@ -23472,7 +23472,7 @@ integral $\int_a^b f(x) \, dx$.
 
 Please note that the current implementation of Calc's integrator sometimes
 produces results that are significantly more complex than they need to
-be.  For example, the integral Calc finds for 
+be.  For example, the integral Calc finds for
 @texline @math{1/(x+\sqrt{x^2+1})}
 @infoline @expr{1/(x+sqrt(x^2+1))}
 is several times more complicated than the answer Mathematica
@@ -23480,11 +23480,11 @@ returns for the same input, although the two forms are numerically
 equivalent.  Also, any indefinite integral should be considered to have
 an arbitrary constant of integration added to it, although Calc does not
 write an explicit constant of integration in its result.  For example,
-Calc's solution for 
+Calc's solution for
 @texline @math{1/(1+\tan x)}
-@infoline @expr{1/(1+tan(x))} 
+@infoline @expr{1/(1+tan(x))}
 differs from the solution given in the @emph{CRC Math Tables} by a
-constant factor of  
+constant factor of
 @texline @math{\pi i / 2}
 @infoline @expr{pi i / 2},
 due to a different choice of constant of integration.
@@ -23544,9 +23544,9 @@ in your @code{IntegRules}.
 @tindex Ei
 As a more serious example, the expression @samp{exp(x)/x} cannot be
 integrated in terms of the standard functions, so the ``exponential
-integral'' function 
+integral'' function
 @texline @math{{\rm Ei}(x)}
-@infoline @expr{Ei(x)} 
+@infoline @expr{Ei(x)}
 was invented to describe it.
 We can get Calc to do this integral in terms of a made-up @code{Ei}
 function by adding the rule @samp{[integtry(exp(x)/x, x) := Ei(x)]}
@@ -23717,18 +23717,18 @@ form @expr{X = 0}.
 
 This command also works for inequalities, as in @expr{y < 3x + 6}.
 Some inequalities cannot be solved where the analogous equation could
-be; for example, solving 
+be; for example, solving
 @texline @math{a < b \, c}
-@infoline @expr{a < b c} 
+@infoline @expr{a < b c}
 for @expr{b} is impossible
 without knowing the sign of @expr{c}.  In this case, @kbd{a S} will
-produce the result 
+produce the result
 @texline @math{b \mathbin{\hbox{\code{!=}}} a/c}
-@infoline @expr{b != a/c} 
+@infoline @expr{b != a/c}
 (using the not-equal-to operator) to signify that the direction of the
-inequality is now unknown.  The inequality 
+inequality is now unknown.  The inequality
 @texline @math{a \le b \, c}
-@infoline @expr{a <= b c} 
+@infoline @expr{a <= b c}
 is not even partially solved.  @xref{Declarations}, for a way to tell
 Calc that the signs of the variables in a formula are in fact known.
 
@@ -24186,13 +24186,13 @@ value of the variable which minimizes the formula's value, along
 with the minimum value itself.
 
 Note that this command looks for a @emph{local} minimum.  Many functions
-have more than one minimum; some, like 
+have more than one minimum; some, like
 @texline @math{x \sin x},
-@infoline @expr{x sin(x)}, 
+@infoline @expr{x sin(x)},
 have infinitely many.  In fact, there is no easy way to define the
-``global'' minimum of 
+``global'' minimum of
 @texline @math{x \sin x}
-@infoline @expr{x sin(x)} 
+@infoline @expr{x sin(x)}
 but Calc can still locate any particular local minimum
 for you.  Calc basically goes downhill from the initial guess until it
 finds a point at which the function's value is greater both to the left
@@ -24271,7 +24271,7 @@ to be determined.  For a typical set of measured data there will be
 no single @expr{m} and @expr{b} that exactly fit the data; in this
 case, Calc chooses values of the parameters that provide the closest
 possible fit.  The model formula can be entered in various ways after
-the key sequence @kbd{a F} is pressed.  
+the key sequence @kbd{a F} is pressed.
 
 If the letter @kbd{P} is pressed after @kbd{a F} but before the model
 description is entered, the data as well as the model formula will be
@@ -24319,7 +24319,7 @@ the @dfn{parameters} of the model.
 
 The @kbd{a F} command takes the data set to be fitted from the stack.
 By default, it expects the data in the form of a matrix.  For example,
-for a linear or polynomial fit, this would be a 
+for a linear or polynomial fit, this would be a
 @texline @math{2\times N}
 @infoline 2xN
 matrix where the first row is a list of @expr{x} values and the second
@@ -24327,10 +24327,10 @@ row has the corresponding @expr{y} values.  For the multilinear fit
 shown above, the matrix would have four rows (@expr{x_1}, @expr{x_2},
 @expr{x_3}, and @expr{y}, respectively).
 
-If you happen to have an 
+If you happen to have an
 @texline @math{N\times2}
 @infoline Nx2
-matrix instead of a 
+matrix instead of a
 @texline @math{2\times N}
 @infoline 2xN
 matrix, just press @kbd{v t} first to transpose the matrix.
@@ -24425,13 +24425,13 @@ $$ \chi^2 = \sum_{i=1}^N (y_i - (a + b x_i))^2 $$
 which is clearly zero if @expr{a + b x} exactly fits all data points,
 and increases as various @expr{a + b x_i} values fail to match the
 corresponding @expr{y_i} values.  There are several reasons why the
-summand is squared, one of them being to ensure that 
+summand is squared, one of them being to ensure that
 @texline @math{\chi^2 \ge 0}.
 @infoline @expr{chi^2 >= 0}.
 Least-squares fitting simply chooses the values of @expr{a} and @expr{b}
-for which the error 
+for which the error
 @texline @math{\chi^2}
-@infoline @expr{chi^2} 
+@infoline @expr{chi^2}
 is as small as possible.
 
 Other kinds of models do the same thing but with a different model
@@ -24593,9 +24593,9 @@ contain error forms.  The data values must either all include errors
 or all be plain numbers.  Error forms can go anywhere but generally
 go on the numbers in the last row of the data matrix.  If the last
 row contains error forms
-@texline `@var{y_i}@w{ @tfn{+/-} }@math{\sigma_i}', 
-@infoline `@var{y_i}@w{ @tfn{+/-} }@var{sigma_i}', 
-then the 
+@texline `@var{y_i}@w{ @tfn{+/-} }@math{\sigma_i}',
+@infoline `@var{y_i}@w{ @tfn{+/-} }@var{sigma_i}',
+then the
 @texline @math{\chi^2}
 @infoline @expr{chi^2}
 statistic is now,
@@ -24617,9 +24617,9 @@ the fitting operation.
 
 If there are error forms on other rows of the data matrix, all the
 errors for a given data point are combined; the square root of the
-sum of the squares of the errors forms the 
+sum of the squares of the errors forms the
 @texline @math{\sigma_i}
-@infoline @expr{sigma_i} 
+@infoline @expr{sigma_i}
 used for the data point.
 
 Both @kbd{a F} and @kbd{H a F} can accept error forms in the input
@@ -24627,19 +24627,19 @@ matrix, although if you are concerned about error analysis you will
 probably use @kbd{H a F} so that the output also contains error
 estimates.
 
-If the input contains error forms but all the 
+If the input contains error forms but all the
 @texline @math{\sigma_i}
-@infoline @expr{sigma_i} 
+@infoline @expr{sigma_i}
 values are the same, it is easy to see that the resulting fitted model
-will be the same as if the input did not have error forms at all 
+will be the same as if the input did not have error forms at all
 @texline (@math{\chi^2}
 @infoline (@expr{chi^2}
-is simply scaled uniformly by 
+is simply scaled uniformly by
 @texline @math{1 / \sigma^2},
-@infoline @expr{1 / sigma^2}, 
+@infoline @expr{1 / sigma^2},
 which doesn't affect where it has a minimum).  But there @emph{will} be
 a difference in the estimated errors of the coefficients reported by
-@kbd{H a F}. 
+@kbd{H a F}.
 
 Consult any text on statistical modeling of data for a discussion
 of where these error estimates come from and how they should be
@@ -24671,18 +24671,18 @@ will have length @expr{M = d+1} with the constant term first.
 The covariance matrix @expr{C} computed from the fit.  This is
 an @var{m}x@var{m} symmetric matrix; the diagonal elements
 @texline @math{C_{jj}}
-@infoline @expr{C_j_j} 
-are the variances 
+@infoline @expr{C_j_j}
+are the variances
 @texline @math{\sigma_j^2}
-@infoline @expr{sigma_j^2} 
+@infoline @expr{sigma_j^2}
 of the parameters.  The other elements are covariances
-@texline @math{\sigma_{ij}^2} 
-@infoline @expr{sigma_i_j^2} 
+@texline @math{\sigma_{ij}^2}
+@infoline @expr{sigma_i_j^2}
 that describe the correlation between pairs of parameters.  (A related
-set of numbers, the @dfn{linear correlation coefficients} 
+set of numbers, the @dfn{linear correlation coefficients}
 @texline @math{r_{ij}},
 @infoline @expr{r_i_j},
-are defined as 
+are defined as
 @texline @math{\sigma_{ij}^2 / \sigma_i \, \sigma_j}.)
 @infoline @expr{sigma_i_j^2 / sigma_i sigma_j}.)
 
@@ -24693,35 +24693,35 @@ will instead be an empty vector; this is always the case for the
 polynomial and multilinear fits described so far.
 
 @item
-The value of 
+The value of
 @texline @math{\chi^2}
-@infoline @expr{chi^2} 
+@infoline @expr{chi^2}
 for the fit, calculated by the formulas shown above.  This gives a
 measure of the quality of the fit; statisticians consider
 @texline @math{\chi^2 \approx N - M}
-@infoline @expr{chi^2 = N - M} 
+@infoline @expr{chi^2 = N - M}
 to indicate a moderately good fit (where again @expr{N} is the number of
 data points and @expr{M} is the number of parameters).
 
 @item
 A measure of goodness of fit expressed as a probability @expr{Q}.
 This is computed from the @code{utpc} probability distribution
-function using 
+function using
 @texline @math{\chi^2}
-@infoline @expr{chi^2} 
+@infoline @expr{chi^2}
 with @expr{N - M} degrees of freedom.  A
 value of 0.5 implies a good fit; some texts recommend that often
 @expr{Q = 0.1} or even 0.001 can signify an acceptable fit.  In
-particular, 
+particular,
 @texline @math{\chi^2}
-@infoline @expr{chi^2} 
+@infoline @expr{chi^2}
 statistics assume the errors in your inputs
 follow a normal (Gaussian) distribution; if they don't, you may
 have to accept smaller values of @expr{Q}.
 
 The @expr{Q} value is computed only if the input included error
 estimates.  Otherwise, Calc will report the symbol @code{nan}
-for @expr{Q}.  The reason is that in this case the 
+for @expr{Q}.  The reason is that in this case the
 @texline @math{\chi^2}
 @infoline @expr{chi^2}
 value has effectively been used to estimate the original errors
@@ -24763,7 +24763,7 @@ Power law.  @mathit{a x^b y^c}.
 @item q
 Quadratic.  @mathit{a + b (x-c)^2 + d (x-e)^2}.
 @item g
-Gaussian.  
+Gaussian.
 @texline @math{{a \over b \sqrt{2 \pi}} \exp\left( -{1 \over 2} \left( x - c \over b \right)^2 \right)}.
 @infoline @mathit{(a / b sqrt(2 pi)) exp(-0.5*((x-c)/b)^2)}.
 @item s
@@ -24788,7 +24788,7 @@ the parameter values from the vector that is placed in the trail.)
 
 All models except Gaussian, logistics, Hubbert and polynomials can
 generalize as shown to any number of independent variables.  Also, all
-the built-in models except for the logistic and Hubbert curves have an 
+the built-in models except for the logistic and Hubbert curves have an
 additive or multiplicative parameter shown as @expr{a} in the above table
 which can be replaced by zero or one, as appropriate, by typing @kbd{h}
 before the model key.
@@ -24893,9 +24893,9 @@ form @samp{arcsin(y) = a t + b}.  The @code{arcsin} function always
 returns results in the range from @mathit{-90} to 90 degrees (or the
 equivalent range in radians).  Suppose you had data that you
 believed to represent roughly three oscillations of a sine wave,
-so that the argument of the sine might go from zero to 
+so that the argument of the sine might go from zero to
 @texline @math{3\times360}
-@infoline @mathit{3*360} 
+@infoline @mathit{3*360}
 degrees.
 The above model would appear to be a good way to determine the
 true frequency and phase of the sine wave, but in practice it
@@ -24955,18 +24955,18 @@ ln(y) = ln(a) + b ln(x)
 @end example
 
 @noindent
-which matches the desired form with 
+which matches the desired form with
 @texline @math{Y = \ln(y)},
-@infoline @expr{Y = ln(y)}, 
+@infoline @expr{Y = ln(y)},
 @texline @math{A = \ln(a)},
 @infoline @expr{A = ln(a)},
-@expr{F = 1}, @expr{B = b}, and 
+@expr{F = 1}, @expr{B = b}, and
 @texline @math{G = \ln(x)}.
-@infoline @expr{G = ln(x)}.  
+@infoline @expr{G = ln(x)}.
 Calc thus computes the logarithms of your @expr{y} and @expr{x} values,
-does a linear fit for @expr{A} and @expr{B}, then solves to get 
-@texline @math{a = \exp(A)} 
-@infoline @expr{a = exp(A)} 
+does a linear fit for @expr{A} and @expr{B}, then solves to get
+@texline @math{a = \exp(A)}
+@infoline @expr{a = exp(A)}
 and @expr{b = B}.
 
 Another interesting example is the ``quadratic'' model, which can
@@ -25015,7 +25015,7 @@ from the list of parameters when you answer the variables prompt.
 
 A last desperate step would be to use the general-purpose
 @code{minimize} function rather than @code{fit}.  After all, both
-functions solve the problem of minimizing an expression (the 
+functions solve the problem of minimizing an expression (the
 @texline @math{\chi^2}
 @infoline @expr{chi^2}
 sum) by adjusting certain parameters in the expression.  The @kbd{a F}
@@ -25026,9 +25026,9 @@ command can do the same thing by brute force.
 A compromise would be to pick out a few parameters without which the
 fit is linearizable, and use @code{minimize} on a call to @code{fit}
 which efficiently takes care of the rest of the parameters.  The thing
-to be minimized would be the value of 
+to be minimized would be the value of
 @texline @math{\chi^2}
-@infoline @expr{chi^2} 
+@infoline @expr{chi^2}
 returned as the fifth result of the @code{xfit} function:
 
 @smallexample
@@ -25086,13 +25086,13 @@ of the sum of the squares of the errors.  It then changes @expr{x}
 and @expr{y} to be plain numbers, and makes @expr{z} into an error
 form with this combined error.  The @expr{Y(x,y,z)} part of the
 linearized model is evaluated, and the result should be an error
-form.  The error part of that result is used for 
+form.  The error part of that result is used for
 @texline @math{\sigma_i}
-@infoline @expr{sigma_i} 
-for the data point.  If for some reason @expr{Y(x,y,z)} does not return 
-an error form, the combined error from @expr{z} is used directly for 
+@infoline @expr{sigma_i}
+for the data point.  If for some reason @expr{Y(x,y,z)} does not return
+an error form, the combined error from @expr{z} is used directly for
 @texline @math{\sigma_i}.
-@infoline @expr{sigma_i}.  
+@infoline @expr{sigma_i}.
 Finally, @expr{z} is also stripped of its error
 for use in computing @expr{F(x,y,z)}, @expr{G(x,y,z)} and so on;
 the righthand side of the linearized model is computed in regular
@@ -25104,7 +25104,7 @@ depends only on the dependent variable @expr{z}, and in fact is
 often simply equal to @expr{z}.  For common cases like polynomials
 and multilinear models, the combined error is simply used as the
 @texline @math{\sigma}
-@infoline @expr{sigma} 
+@infoline @expr{sigma}
 for the data point with no further ado.)
 
 @tex
@@ -25481,7 +25481,7 @@ this would be a division by zero.  But at @expr{k = k_0}, this
 formula works out to the indeterminate form @expr{0 / 0}, which
 Calc will not assume is zero.  Better would be to use
 @samp{(k != k_0) ? 1/(k-k_0) : 0}; the @samp{? :} operator does
-an ``if-then-else'' test:  This expression says, ``if 
+an ``if-then-else'' test:  This expression says, ``if
 @texline @math{k \ne k_0},
 @infoline @expr{k != k_0},
 then @expr{1/(k-k_0)}, else zero.''  Now the formula @expr{1/(k-k_0)}
@@ -26496,16 +26496,16 @@ f(a b) := a f(b) :: real(a)]} is stored in variable @samp{linearF},
 then the rule set @samp{[f(0) := 0, import(linearF)]} will apply
 all three rules.  It is possible to modify the imported rules
 slightly:  @samp{import(x, v1, x1, v2, x2, @dots{})} imports
-the rule set @expr{x} with all occurrences of 
+the rule set @expr{x} with all occurrences of
 @texline @math{v_1},
-@infoline @expr{v1}, 
-as either a variable name or a function name, replaced with 
+@infoline @expr{v1},
+as either a variable name or a function name, replaced with
 @texline @math{x_1}
-@infoline @expr{x1} 
-and so on.  (If 
+@infoline @expr{x1}
+and so on.  (If
 @texline @math{v_1}
-@infoline @expr{v1} 
-is used as a function name, then 
+@infoline @expr{v1}
+is used as a function name, then
 @texline @math{x_1}
 @infoline @expr{x1}
 must be either a function name itself or a @w{@samp{< >}} nameless
@@ -27609,7 +27609,7 @@ the keyboard macro @kbd{' tri($) @key{RET}} to make a command that applies
 @code{tri} to the value on the top of the stack.  @xref{Programming}.
 
 @cindex Quaternions
-The following rule set, contributed by 
+The following rule set, contributed by
 @texline Fran\c cois
 @infoline Francois
 Pinard, implements @dfn{quaternions}, a generalization of the concept of
@@ -27764,9 +27764,9 @@ equivalent temperature on the Fahrenheit scale.
 While many of Calc's conversion factors are exact, some are necessarily
 approximate.  If Calc is in fraction mode (@pxref{Fraction Mode}), then
 unit conversions will try to give exact, rational conversions, but it
-isn't always possible.  Given @samp{55 mph} in fraction mode, typing 
-@kbd{u c m/s @key{RET}} produces  @samp{15367:625 m/s}, for example, 
-while typing @kbd{u c au/yr @key{RET}} produces 
+isn't always possible.  Given @samp{55 mph} in fraction mode, typing
+@kbd{u c m/s @key{RET}} produces  @samp{15367:625 m/s}, for example,
+while typing @kbd{u c au/yr @key{RET}} produces
 @samp{5.18665819999e-3 au/yr}.
 
 If the units you request are inconsistent with the original units, the
@@ -27994,7 +27994,7 @@ defined by the @TeX{} typesetting system:  @samp{72.27 texpt = 1 in}.
 Other units used by @TeX{} are available; they are @code{texpc} (a pica),
 @code{texbp} (a ``big point'', equal to a standard point which is larger
 than the point used by @TeX{}), @code{texdd} (a Didot point),
-@code{texcc} (a Cicero) and @code{texsp} (a scaled @TeX{} point, 
+@code{texcc} (a Cicero) and @code{texsp} (a scaled @TeX{} point,
 all dimensions representable in @TeX{} are multiples of this value).
 
 When Calc is using the @TeX{} or La@TeX{} language mode (@pxref{TeX
@@ -28131,17 +28131,17 @@ The units @code{dB} (decibels) and @code{Np} (nepers) are logarithmic
 units which are manipulated differently than standard units.  Calc
 provides commands to work with these logarithmic units.
 
-Decibels and nepers are used to measure power quantities as well as 
+Decibels and nepers are used to measure power quantities as well as
 field quantities (quantities whose squares are proportional to power);
 these two types of quantities are handled slightly different from each
 other.  By default the Calc commands work as if power quantities are
 being used; with the @kbd{H} prefix the Calc commands work as if field
 quantities are being used.
 
-The decibel level of a power 
+The decibel level of a power
 @infoline @math{P1},
 @texline @math{P_1},
-relative to a reference power 
+relative to a reference power
 @infoline @math{P0},
 @texline @math{P_0},
 is defined to be
@@ -28151,10 +28151,10 @@ is defined to be
 one-tenth of a bel. The bel, named after Alexander Graham Bell, was
 considered to be too large of a unit and was effectively replaced by
 the decibel.)  If @math{F} is a field quantity with power
-@math{P=k F^2}, then a reference quantity of 
+@math{P=k F^2}, then a reference quantity of
 @infoline @math{F0}
 @texline @math{F_0}
-would correspond to a power of 
+would correspond to a power of
 @infoline @math{P0=k F0^2}.
 @texline @math{P_{0}=kF_{0}^2}.
 If
@@ -28163,7 +28163,7 @@ If
 then
 
 @ifnottex
-@example 
+@example
 10 log10(P1/P0) = 10 log10(F1^2/F0^2) = 20 log10(F1/F0).
 @end example
 @end ifnottex
@@ -28175,42 +28175,42 @@ $$ 10 \log_{10}(P_1/P_0) = 10 \log_{10}(F_1^2/F_0^2) = 20
 @noindent
 In order to get the same decibel level regardless of whether a field
 quantity or the corresponding power quantity is used,  the decibel
-level of a field quantity 
+level of a field quantity
 @infoline @math{F1},
-@texline @math{F_1}, 
-relative to a reference 
+@texline @math{F_1},
+relative to a reference
 @infoline @math{F0},
-@texline @math{F_0}, 
+@texline @math{F_0},
 is defined as
 @infoline @math{20 log10(F1/F0) dB}.
 @texline @math{20 \log_{10}(F_{1}/F_{0}) {\rm dB}}.
-For example, the decibel value of a sound pressure level of 
+For example, the decibel value of a sound pressure level of
 @infoline @math{60 uPa}
 @texline @math{60 \mu{\rm Pa}}
-relative to 
+relative to
 @infoline @math{20 uPa}
 @texline @math{20 \mu{\rm Pa}}
-(the threshhold of human hearing) is 
+(the threshold of human hearing) is
 @infoline @math{20 log10(60 uPa/ 20 uPa) dB = 20 log10(3) dB},
 @texline  @math{20 \log_{10}(60 \mu{\rm Pa}/20 \mu{\rm Pa}) {\rm dB} = 20 \log_{10}(3) {\rm dB}},
-which is about 
+which is about
 @infoline @math{9.54 dB}.
 @texline @math{9.54 {\rm dB}}.
 Note that in taking the ratio, the original units cancel and so these
-logarithmic units are dimensionless. 
+logarithmic units are dimensionless.
 
 Nepers (named after John Napier, who is credited with inventing the
 logarithm) are similar to bels except they use natural logarithms instead
-of common logarithms.  The neper level of a power 
+of common logarithms.  The neper level of a power
 @infoline @math{P1},
 @texline @math{P_1},
-relative to a reference power 
+relative to a reference power
 @infoline @math{P0},
 @texline @math{P_0},
 is
 @infoline @math{(1/2) ln(P1/P0) Np}.
 @texline @math{(1/2) \ln(P_1/P_0) {\rm Np}}.
-The neper level of a field 
+The neper level of a field
 @infoline @math{F1},
 @texline @math{F_1},
 relative to a reference field
@@ -28223,13 +28223,13 @@ is
 @vindex calc-lu-power-reference
 @vindex calc-lu-field-reference
 For power quantities, Calc uses
-@infoline @math{1 mW} 
+@infoline @math{1 mW}
 @texline @math{1 {\rm mW}}
-as the default reference quantity; this default can be changed by changing 
+as the default reference quantity; this default can be changed by changing
 the value of the customizable variable
 @code{calc-lu-power-reference} (@pxref{Customizing Calc}).
-For field quantities, Calc uses 
-@infoline @math{20 uPa} 
+For field quantities, Calc uses
+@infoline @math{20 uPa}
 @texline @math{20 \mu{\rm Pa}}
 as the default reference quantity; this is the value used in acoustics
 which is where decibels are commonly encountered.  This default can be
@@ -28247,9 +28247,9 @@ command computes the power quantity corresponding to a given number of
 logarithmic units. With the capital @kbd{O} prefix, @kbd{O l q}, the
 reference level will be read from the top of the stack. (In an
 algebraic formula, @code{lupquant} can be given an optional second
-argument which will be used for the reference level.) For example, 
-@code{20 dB @key{RET} l q} will return @code{100 mW}; 
-@code{20 dB @key{RET} 4 W @key{RET} O l q} will return @code{400 W}.   
+argument which will be used for the reference level.) For example,
+@code{20 dB @key{RET} l q} will return @code{100 mW};
+@code{20 dB @key{RET} 4 W @key{RET} O l q} will return @code{400 W}.
 The @kbd{H l q} [@code{lufquant}] command behaves like @kbd{l q} but
 computes field quantities instead of power quantities.
 
@@ -28288,13 +28288,13 @@ the reference level can be given as an optional second argument.
 @tindex lufdiv
 The sum of two power or field quantities doesn't correspond to the sum
 of the corresponding decibel or neper levels.  If the powers
-corresponding to decibel levels 
-@infoline @math{D1} 
-@texline @math{D_1} 
-and 
-@infoline @math{D2} 
-@texline @math{D_2} 
-are added, the corresponding decibel level ``sum'' will be 
+corresponding to decibel levels
+@infoline @math{D1}
+@texline @math{D_1}
+and
+@infoline @math{D2}
+@texline @math{D_2}
+are added, the corresponding decibel level ``sum'' will be
 
 @ifnottex
 @example
@@ -28338,7 +28338,7 @@ $$ D + 10 \log_{10}(N) {\rm dB},$$
 
 @noindent
 if a field quantity is multiplied by @math{N} the corresponding decibel level
-will be 
+will be
 
 @ifnottex
 @example
@@ -28375,31 +28375,31 @@ operating on notes.
 Scientific pitch notation refers to a note by giving a letter
 A through G, possibly followed by a flat or sharp) with a subscript
 indicating an octave number.  Each octave starts with C and ends with
-B and 
+B and
 @c increasing each note by a semitone will result
 @c in the sequence @expr{C}, @expr{C} sharp, @expr{D}, @expr{E} flat, @expr{E},
 @c @expr{F}, @expr{F} sharp, @expr{G}, @expr{A} flat, @expr{A}, @expr{B}
-@c flat and @expr{B}.  
+@c flat and @expr{B}.
 the octave numbered 0 was chosen to correspond to the lowest
 audible frequency.  Using this system, middle C (about 261.625 Hz)
 corresponds to the note @expr{C} in octave 4 and is denoted
 @expr{C_4}.  Any frequency can be described by giving a note plus an
 offset in cents (where a cent is a ratio of frequencies so that a
-semitone consists of 100 cents). 
+semitone consists of 100 cents).
 
 The midi note number system assigns numbers to notes so that
 @expr{C_(-1)} corresponds to the midi note number 0 and @expr{G_9}
 corresponds to the midi note number 127.   A midi controller can have
 up to 128 keys and each midi note number from  0 to 127 corresponds to
-a possible key. 
+a possible key.
 
 @kindex l s
 @pindex calc-spn
 @tindex spn
 The @kbd{l s} (@code{calc-spn}) [@code{spn}] command converts either
 a frequency or a midi number to scientific pitch notation.  For
-example, @code{500 Hz} gets converted to 
-@code{B_4 + 21.3094853649 cents} and @code{84} to @code{C_6}. 
+example, @code{500 Hz} gets converted to
+@code{B_4 + 21.3094853649 cents} and @code{84} to @code{C_6}.
 
 
 @kindex l m
@@ -28464,7 +28464,7 @@ The @kbd{s s} (@code{calc-store}) command stores the value at the top of
 the stack into a specified variable.  It prompts you to enter the
 name of the variable.  If you press a single digit, the value is stored
 immediately in one of the ``quick'' variables @code{q0} through
-@code{q9}.  Or you can enter any variable name.  
+@code{q9}.  Or you can enter any variable name.
 
 @kindex s t
 @pindex calc-store-into
@@ -28554,12 +28554,12 @@ and @kbd{s ]} which decrease or increase a variable by one.
 All the arithmetic stores accept the Inverse prefix to reverse the
 order of the operands.  If @expr{v} represents the contents of the
 variable, and @expr{a} is the value drawn from the stack, then regular
-@w{@kbd{s -}} assigns 
+@w{@kbd{s -}} assigns
 @texline @math{v \coloneq v - a},
-@infoline @expr{v := v - a}, 
+@infoline @expr{v := v - a},
 but @kbd{I s -} assigns
 @texline @math{v \coloneq a - v}.
-@infoline @expr{v := a - v}.  
+@infoline @expr{v := a - v}.
 While @kbd{I s *} might seem pointless, it is
 useful if matrix multiplication is involved.  Actually, all the
 arithmetic stores use formulas designed to behave usefully both
@@ -28668,7 +28668,7 @@ magic property is preserved, however, when a variable is copied with
 @kindex s k
 @pindex calc-copy-special-constant
 If one of the ``special constants'' is redefined (or undefined) so that
-it no longer has its magic property, the property can be restored with 
+it no longer has its magic property, the property can be restored with
 @kbd{s k} (@code{calc-copy-special-constant}).  This command will prompt
 for a special constant and a variable to store it in, and so a special
 constant can be stored in any variable.  Here, the special constant that
@@ -28850,7 +28850,7 @@ explicitly naming them in an @kbd{s p} command.)
 The @kbd{s i} (@code{calc-insert-variables}) command writes
 the values of all Calc variables into a specified buffer.
 The variables are written with the prefix @code{var-} in the form of
-Lisp @code{setq} commands 
+Lisp @code{setq} commands
 which store the values in string form.  You can place these commands
 in your Calc init file (or @file{.emacs}) if you wish, though in this case it
 would be easier to use @kbd{s p @key{RET}}.  (Note that @kbd{s i}
@@ -29159,9 +29159,9 @@ In the first case, ``x'' and ``y'' are each vectors (not necessarily of
 the same length); either or both may instead be interval forms.  The
 ``z'' value must be a matrix with the same number of rows as elements
 in ``x'', and the same number of columns as elements in ``y''.  The
-result is a surface plot where 
+result is a surface plot where
 @texline @math{z_{ij}}
-@infoline @expr{z_ij} 
+@infoline @expr{z_ij}
 is the height of the point
 at coordinate @expr{(x_i, y_j)} on the surface.  The 3D graph will
 be displayed from a certain default viewpoint; you can change this
@@ -29270,9 +29270,9 @@ that don't have common ``x'' values.  (Of course, the range of ``x''
 values covered by all the curves ought to be roughly the same if
 they are to look nice on the same graph.)
 
-For example, to plot 
+For example, to plot
 @texline @math{\sin n x}
-@infoline @expr{sin(n x)} 
+@infoline @expr{sin(n x)}
 for integers @expr{n}
 from 1 to 5, you could use @kbd{v x} to create a vector of integers
 (@expr{n}), then @kbd{V M '} or @kbd{V M $} to map @samp{sin(n x)}
@@ -29510,8 +29510,8 @@ available for any device.
 The @kbd{g S} (@code{calc-graph-point-style}) command similarly turns
 the symbols at the data points on or off, or sets the point style.
 If you turn both lines and points off, the data points will show as
-tiny dots.  If the ``y'' values being plotted contain error forms and 
-the connecting lines are turned off, then this command will also turn 
+tiny dots.  If the ``y'' values being plotted contain error forms and
+the connecting lines are turned off, then this command will also turn
 the error bars on or off.
 
 @cindex @code{LineStyles} variable
@@ -29563,7 +29563,7 @@ terminals with no special graphics facilities.  It writes a crude
 picture of the graph composed of characters like @code{-} and @code{|}
 to a buffer called @samp{*Gnuplot Trail*}, which Calc then displays.
 The graph is made the same size as the Emacs screen, which on most
-dumb terminals will be 
+dumb terminals will be
 @texline @math{80\times24}
 @infoline 80x24
 characters.  The graph is displayed in
@@ -29820,7 +29820,7 @@ difference.)
 @pindex calc-prepend-to-register
 @pindex calc-append-to-register
 @cindex Registers
-An alternative to killing and yanking stack entries is using 
+An alternative to killing and yanking stack entries is using
 registers in Calc.  Saving stack entries in registers is like
 saving text in normal Emacs registers; although, like Calc's kill
 commands, register commands always operate on whole stack
@@ -29935,7 +29935,7 @@ separately as a matrix element.  If a line contained
 would correctly split the line into two error forms.
 
 @xref{Matrix Functions}, to see how to pull the matrix apart into its
-constituent rows and columns.  (If it is a 
+constituent rows and columns.  (If it is a
 @texline @math{1\times1}
 @infoline 1x1
 matrix, just hit @kbd{v u} (@code{calc-unpack}) twice.)
@@ -30273,7 +30273,7 @@ same limit as last time.
 
 @key{INV GCD} computes the LCM (least common multiple) function.
 
-@key{INV FACT} is the gamma function.  
+@key{INV FACT} is the gamma function.
 @texline @math{\Gamma(x) = (x-1)!}.
 @infoline @expr{gamma(x) = (x-1)!}.
 
@@ -30490,7 +30490,7 @@ Similarly, Calc will use @TeX{} language for @code{tex-mode},
 @code{plain-tex-mode} and @code{context-mode}, C language for
 @code{c-mode} and @code{c++-mode}, FORTRAN language for
 @code{fortran-mode} and @code{f90-mode}, Pascal for @code{pascal-mode},
-and eqn for @code{nroff-mode} (@pxref{Customizing Calc}).  
+and eqn for @code{nroff-mode} (@pxref{Customizing Calc}).
 These can be overridden with Calc's mode
 changing commands (@pxref{Mode Settings in Embedded Mode}).  If no
 suitable language is available, Calc will continue with its current language.
@@ -30670,13 +30670,13 @@ version.
 
 Plain formulas are preceded and followed by @samp{%%%} signs
 by default.  This notation has the advantage that the @samp{%}
-character begins a comment in @TeX{} and La@TeX{}, so if your formula is 
+character begins a comment in @TeX{} and La@TeX{}, so if your formula is
 embedded in a @TeX{} or La@TeX{} document its plain version will be
 invisible in the final printed copy.  Certain major modes have different
-delimiters to ensure that the ``plain'' version will be 
-in a comment for those modes, also.  
+delimiters to ensure that the ``plain'' version will be
+in a comment for those modes, also.
 See @ref{Customizing Embedded Mode} to see how to change the ``plain''
-formula delimiters. 
+formula delimiters.
 
 There are several notations which Calc's parser for ``big''
 formatted formulas can't yet recognize.  In particular, it can't
@@ -31178,7 +31178,7 @@ We would have to go down to the other formula and press @kbd{C-x * u}
 on it in order to get it to notice the new annotation.
 
 Two more mode-recording modes selectable by @kbd{m R} are available
-which are also available outside of Embedded mode.  
+which are also available outside of Embedded mode.
 (@pxref{General Mode Commands}.) They are @code{Save},  in which mode
 settings are recorded permanently in your Calc init file (the file given
 by the variable @code{calc-settings-file}, typically @file{~/.emacs.d/calc.el})
@@ -31195,11 +31195,11 @@ for @code{Save} have no effect.
 
 @noindent
 You can modify Embedded mode's behavior by setting various Lisp
-variables described here.  These variables are customizable 
+variables described here.  These variables are customizable
 (@pxref{Customizing Calc}), or you can use @kbd{M-x set-variable}
 or @kbd{M-x edit-options} to adjust a variable on the fly.
 (Another possibility would be to use a file-local variable annotation at
-the end of the file; 
+the end of the file;
 @pxref{File Variables, , Local Variables in Files, emacs, the Emacs manual}.)
 Many of the variables given mentioned here can be set to depend on the
 major mode of the editing buffer (@pxref{Customizing Calc}).
@@ -31334,7 +31334,7 @@ Calc never scans for this string; Calc always looks for the
 annotation itself.  But this is the string that is inserted before
 the opening bracket when Calc adds an annotation on its own.
 The default is @code{"% "}, but may be different for different major
-modes. 
+modes.
 
 @vindex calc-embedded-close-mode
 The @code{calc-embedded-close-mode} variable is a string which
@@ -31459,7 +31459,7 @@ without its key binding, type @kbd{M-x} and enter a function name.  (The
 (If the command you give implies a function, the function will be saved,
 and if the function has any display formats, those will be saved, but
 not the other way around:  Saving a function will not save any commands
-or key bindings associated with the function.) 
+or key bindings associated with the function.)
 
 @kindex Z E
 @pindex calc-user-define-edit
@@ -31542,7 +31542,7 @@ Once you have bound your keyboard macro to a key, you can use
 @cindex Keyboard macros, editing
 The @kbd{Z E} (@code{calc-user-define-edit}) command on a key that has
 been defined by a keyboard macro tries to use the @code{edmacro} package
-edit the macro.  Type @kbd{C-c C-c} to finish editing and update 
+edit the macro.  Type @kbd{C-c C-c} to finish editing and update
 the definition stored on the key, or, to cancel the edit, kill the
 buffer with @kbd{C-x k}.
 The special characters @code{RET}, @code{LFD}, @code{TAB}, @code{SPC},
@@ -31552,7 +31552,7 @@ sequences, written in all uppercase, as must the prefixes @code{C-} and
 copied verbatim into the keyboard macro.  Basically, the notation is the
 same as is used in all of this manual's examples, except that the manual
 takes some liberties with spaces: When we say @kbd{' [1 2 3] @key{RET}},
-we take it for granted that it is clear we really mean 
+we take it for granted that it is clear we really mean
 @kbd{' [1 @key{SPC} 2 @key{SPC} 3] @key{RET}}.
 
 @kindex C-x * m
@@ -31823,7 +31823,7 @@ prompt for the @kbd{Z #} command; it will not play any role in any
 subsequent calculations.)  This command allows your keyboard macros to
 accept numbers or formulas as interactive input.
 
-As an example, 
+As an example,
 @kbd{2 @key{RET} "Power: " @key{RET} Z # 3 @key{RET} ^} will prompt for
 input with ``Power: '' in the minibuffer, then return 2 to the provided
 power.  (The response to the prompt that's given, 3 in this example,
@@ -31900,7 +31900,7 @@ The third prompt is for an algebraic function name.  The default is to
 use the same name as the command name but without the @samp{calc-}
 prefix.  (If this is of the form @samp{User-m}, the hyphen is removed so
 it won't be taken for a minus sign in algebraic formulas.)
-This is the name you will use if you want to enter your 
+This is the name you will use if you want to enter your
 new function in an algebraic formula.  Suppose we enter @kbd{yow @key{RET}}.
 Then the new function can be invoked by pushing two numbers on the
 stack and typing @kbd{z m} or @kbd{x spam}, or by entering the algebraic
@@ -32695,7 +32695,7 @@ same thing with a single division by 512.
 @end ignore
 @tindex mysin
 A somewhat limited sine function could be defined as follows, using the
-well-known Taylor series expansion for 
+well-known Taylor series expansion for
 @texline @math{\sin x}:
 @infoline @samp{sin(x)}:
 
@@ -35241,7 +35241,7 @@ to use a different prefix, you can put
 @end example
 
 @noindent
-in your .emacs file.  
+in your .emacs file.
 (@xref{Key Bindings,,Customizing Key Bindings,emacs,
 The GNU Emacs Manual}, for more information on binding keys.)
 A convenient way to start Calc is with @kbd{C-x * *}; to make it equally
@@ -35269,7 +35269,7 @@ to see how regular expressions work.
 @defvar calc-settings-file
 The variable @code{calc-settings-file} holds the file name in
 which commands like @kbd{m m} and @kbd{Z P} store ``permanent''
-definitions.  
+definitions.
 If @code{calc-settings-file} is not your user init file (typically
 @file{~/.emacs}) and if the variable @code{calc-loaded-settings-file} is
 @code{nil}, then Calc will automatically load your settings file (if it
@@ -35314,7 +35314,7 @@ enabled, it will try to use the current major mode to
 determine what language should be used.  (This can be overridden using
 Calc's mode changing commands, @xref{Mode Settings in Embedded Mode}.)
 The variable @code{calc-language-alist} consists of a list of pairs of
-the form  @code{(@var{MAJOR-MODE} . @var{LANGUAGE})}; for example, 
+the form  @code{(@var{MAJOR-MODE} . @var{LANGUAGE})}; for example,
 @code{(latex-mode . latex)} is one such pair.  If Calc embedded is
 activated in a buffer whose major mode is @var{MAJOR-MODE}, it will set itself
 to use the language @var{LANGUAGE}.
@@ -35342,7 +35342,7 @@ what formulas @kbd{C-x * a} will activate in a buffer.  It is a
 regular expression, and when activating embedded formulas with
 @kbd{C-x * a}, it will tell Calc that what follows is a formula to be
 activated.  (Calc also uses other patterns to find formulas, such as
-@samp{=>} and @samp{:=}.)  
+@samp{=>} and @samp{:=}.)
 
 The default pattern is @code{"%Embed\n\\(% .*\n\\)*"}, which checks
 for @samp{%Embed} followed by any number of lines beginning with
@@ -35367,7 +35367,7 @@ It consists of a list of pairs of the form @code{(@var{MAJOR-MODE} .
     (texinfo-mode . "@@c Embed\n\\(@@c .*\n\\)*"))
 @end example
 Any major modes added to @code{calc-embedded-announce-formula-alist}
-should also be added to @code{calc-embedded-open-close-plain-alist} 
+should also be added to @code{calc-embedded-open-close-plain-alist}
 and @code{calc-embedded-open-close-mode-alist}.
 @end defvar
 
@@ -35378,7 +35378,7 @@ See @ref{Customizing Embedded Mode}.@*
 The variables @code{calc-embedded-open-formula} and
 @code{calc-embedded-close-formula} control the region that Calc will
 activate as a formula when Embedded mode is entered with @kbd{C-x * e}.
-They are regular expressions; 
+They are regular expressions;
 Calc normally scans backward and forward in the buffer for the
 nearest text matching these regular expressions to be the ``formula
 delimiters''.
@@ -35403,7 +35403,7 @@ The variable @code{calc-embedded-open-close-formula-alist} is used to
 set @code{calc-embedded-open-formula} and
 @code{calc-embedded-close-formula} to different regular
 expressions depending on the major mode of the editing buffer.
-It consists of a list of lists of the form 
+It consists of a list of lists of the form
 @code{(@var{MAJOR-MODE}  @var{OPEN-FORMULA-REGEXP}
 @var{CLOSE-FORMULA-REGEXP})}, and its default value is
 @code{nil}.
@@ -35422,7 +35422,7 @@ The default value of @code{calc-embedded-word-regexp} is
 The variable @code{calc-embedded-word-regexp-alist} is used to
 set @code{calc-embedded-word-regexp} to a different regular
 expression depending on the major mode of the editing buffer.
-It consists of a list of lists of the form 
+It consists of a list of lists of the form
 @code{(@var{MAJOR-MODE}  @var{WORD-REGEXP})}, and its default value is
 @code{nil}.
 @end defvar
@@ -35437,8 +35437,8 @@ formulas.  Note that these are actual strings, not regular
 expressions, because Calc must be able to write these string into a
 buffer as well as to recognize them.
 
-The default string for @code{calc-embedded-open-plain} is 
-@code{"%%% "}, note the trailing space.  The default string for 
+The default string for @code{calc-embedded-open-plain} is
+@code{"%%% "}, note the trailing space.  The default string for
 @code{calc-embedded-close-plain} is @code{" %%%\n"}, without
 the trailing newline here, the first line of a Big mode formula
 that followed might be shifted over with respect to the other lines.
@@ -35447,7 +35447,7 @@ The variable @code{calc-embedded-open-close-plain-alist} is used to
 set @code{calc-embedded-open-plain} and
 @code{calc-embedded-close-plain} to different strings
 depending on the major mode of the editing buffer.
-It consists of a list of lists of the form 
+It consists of a list of lists of the form
 @code{(@var{MAJOR-MODE}  @var{OPEN-PLAIN-STRING}
 @var{CLOSE-PLAIN-STRING})}, and its default value is
 @example
@@ -35490,7 +35490,7 @@ The variable @code{calc-embedded-open-close-new-formula-alist} is used to
 set @code{calc-embedded-open-new-formula} and
 @code{calc-embedded-close-new-formula} to different strings
 depending on the major mode of the editing buffer.
-It consists of a list of lists of the form 
+It consists of a list of lists of the form
 @code{(@var{MAJOR-MODE}  @var{OPEN-NEW-FORMULA-STRING}
 @var{CLOSE-NEW-FORMULA-STRING})}, and its default value is
 @code{nil}.
@@ -35508,7 +35508,7 @@ necessary to add them to user-written annotations.
 
 The default value of @code{calc-embedded-open-mode} is @code{"% "}
 and the default value of @code{calc-embedded-close-mode} is
-@code{"\n"}.  
+@code{"\n"}.
 If you change the value of @code{calc-embedded-close-mode}, it is a good
 idea still to end with a newline so that mode annotations will appear on
 lines by themselves.
@@ -35517,7 +35517,7 @@ The variable @code{calc-embedded-open-close-mode-alist} is used to
 set @code{calc-embedded-open-mode} and
 @code{calc-embedded-close-mode} to different strings
 expressions depending on the major mode of the editing buffer.
-It consists of a list of lists of the form 
+It consists of a list of lists of the form
 @code{(@var{MAJOR-MODE}  @var{OPEN-MODE-STRING}
 @var{CLOSE-MODE-STRING})}, and its default value is
 @example
@@ -35548,7 +35548,7 @@ units.
 
 The default value of @code{calc-lu-power-reference} is @code{"mW"}
 and the default value of @code{calc-lu-field-reference} is
-@code{"20 uPa"}.  
+@code{"20 uPa"}.
 @end defvar
 
 @defvar calc-note-threshold
@@ -35564,15 +35564,15 @@ The default value of @code{calc-note-threshold} is 1.
 @defvarx calc-selected-face
 @defvarx calc-nonselected-face
 See @ref{Displaying Selections}.@*
-The variable @code{calc-highlight-selections-with-faces} 
+The variable @code{calc-highlight-selections-with-faces}
 determines how selected sub-formulas are distinguished.
-If @code{calc-highlight-selections-with-faces} is nil, then 
+If @code{calc-highlight-selections-with-faces} is nil, then
 a selected sub-formula is distinguished either by changing every
 character not part of the sub-formula with a dot or by changing every
-character in the sub-formula with a @samp{#} sign.  
+character in the sub-formula with a @samp{#} sign.
 If @code{calc-highlight-selections-with-faces} is t,
 then a selected sub-formula is distinguished either by displaying the
-non-selected portion of the formula with @code{calc-nonselected-face} 
+non-selected portion of the formula with @code{calc-nonselected-face}
 or by displaying the selected sub-formula with
 @code{calc-nonselected-face}.
 @end defvar
@@ -36651,9 +36651,9 @@ input data set.  Each entry may be a single value or a vector of values.
 
 @c 20
 @item
-With a prefix argument of 1, take a single 
+With a prefix argument of 1, take a single
 @texline @var{n}@math{\times2}
-@infoline @mathit{@var{N}x2} 
+@infoline @mathit{@var{N}x2}
 matrix from the stack instead of two separate data vectors.
 
 @c 21
@@ -36754,7 +36754,7 @@ Variable name may be a single digit or a full name.
 
 @c 30
 @item
-Editing occurs in a separate buffer.  Press @kbd{C-c C-c} (or 
+Editing occurs in a separate buffer.  Press @kbd{C-c C-c} (or
 @key{LFD}, or in some cases @key{RET}) to finish the edit, or kill the
 buffer with @kbd{C-x k} to cancel the edit.  The @key{LFD} key prevents evaluation
 of the result of the edit.
@@ -36854,7 +36854,7 @@ to evaluate variables.
 @item
 The variable is replaced by the formula shown on the right.  The
 Inverse flag reverses the order of the operands, e.g., @kbd{I s - x}
-assigns 
+assigns
 @texline @math{x \coloneq a-x}.
 @infoline @expr{x := a-x}.
 
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 55c2c4c0ae8..d5f403e5cdb 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -912,7 +912,7 @@ construct, should the point start inside it.  If @ccmode fails to find
 function beginnings or ends inside the current declaration scope, it
 will search the enclosing scopes.  If you want @ccmode to recognize
 functions only at the top level@footnote{this was @ccmode{}'s
-behavior prior to version 5.32.}, set @code{c-defun-tatic} to
+behavior prior to version 5.32.}, set @code{c-defun-tactic} to
 @code{t}.
 
 These functions are analogous to the Emacs built-in commands
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 79c7ada3b0b..88b068ccd5b 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -332,7 +332,7 @@ Example:
 @code{method}, @code{signal}, and @code{property} elements.  Unlike
 properties, which can change their values during lifetime of a D-Bus
 object, annotations are static.  Often they are used for code
-generators of D-Bus langugae bindings.  Example:
+generators of D-Bus language bindings.  Example:
 
 @example
 <annotation name="de.berlios.Pinot.GetStatistics" value="pinotDBus"/>
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index 99530e6356d..a026c63e25b 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -476,7 +476,7 @@ in your @code{dired-mode-hook}.
 This Dired-X feature is obsolete as of Emacs 24.1.  The standard Emacs
 directory local variables mechanism (@pxref{Directory
 Variables,,,emacs,The Gnu Emacs manual}) replaces it.  For an example of
-the new mechanims, @pxref{Omitting Variables}.
+the new mechanisms, @pxref{Omitting Variables}.
 
 When Dired visits a directory, it looks for a file whose name is the
 value of variable @code{dired-local-variables-file} (default: @file{.dired}).
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 55dc7f9a822..f8d757c2d87 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -3526,7 +3526,7 @@ use the same autoconf form.
 @item :objectextention
 Type: @code{string}
 
-A string which is the extention used for object files.
+A string which is the extension used for object files.
 For example, C code uses .o on unix, and Emacs Lisp uses .elc.
 @refill
 
@@ -3634,7 +3634,7 @@ it's rule definition.
 @item :objectextention
 Type: @code{string}
 
-A string which is the extention used for object files.
+A string which is the extension used for object files.
 For example, C code uses .o on unix, and Emacs Lisp uses .elc.
 @refill
 
@@ -3782,7 +3782,7 @@ it's rule definition.
 @item :objectextention
 Type: @code{string}
 
-A string which is the extention used for object files.
+A string which is the extension used for object files.
 For example, C code uses .o on unix, and Emacs Lisp uses .elc.
 @refill
 
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index 8ee40288fe0..7b4945027d3 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -1212,9 +1212,9 @@ This method does nothing by default, but that may change in the future.
 This would be the best way to make your objects persistent when using
 in-place editing.
 
-@section Widget extention
+@section Widget extension
 
-When widgets are being created, one new widget extention has been added,
+When widgets are being created, one new widget extension has been added,
 called the @code{:slotofchoices}.  When this occurs in a widget
 definition, all elements after it are removed, and the slot is specifies
 is queried and converted into a series of constants.
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index d2705155887..b0090f0fb84 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -61,7 +61,7 @@ developing GNU and promoting software freedom.''
 @node Top, What is Eshell?, (dir), (dir)
 @top Eshell
 
-Eshell is a shell-like command interpretor
+Eshell is a shell-like command interpreter
 implemented in Emacs Lisp.  It invokes no external processes except for
 those requested by the user.  It is intended to be a functional
 replacement for command shells such as @command{bash}, @command{zsh},
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 262c3d734fe..15c9232d4b6 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -627,7 +627,7 @@ translations of the reference card into several languages; look for
 files named @file{etc/refcards/@var{lang}-refcard.*}, where @var{lang}
 is a two-letter code of the language.  For example, the German version
 of the reference card is in the files @file{etc/refcards/de-refcard.tex}
-and @file{etc/recards/de-refcard.pdf}.
+and @file{etc/refcards/de-refcard.pdf}.
 
 @item
 There are many other commands in Emacs for getting help and
diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi
index ab9c0232d3d..a79c68f0123 100644
--- a/doc/misc/gnus-coding.texi
+++ b/doc/misc/gnus-coding.texi
@@ -1,7 +1,7 @@
 \input texinfo
 
 @setfilename gnus-coding
-@settitle Gnus Coding Style and Maintainance Guide
+@settitle Gnus Coding Style and Maintenance Guide
 @syncodeindex fn cp
 @syncodeindex vr cp
 @syncodeindex pg cp
@@ -45,7 +45,7 @@ license to the document, as described in section 6 of the license.
 
 @ifnottex
 @node Top
-@top Gnus Coding Style and Maintainance Guide
+@top Gnus Coding Style and Maintenance Guide
 This manual describes @dots{}
 
 @insertcopying 
@@ -53,7 +53,7 @@ This manual describes @dots{}
 
 @menu
 * Gnus Coding Style:: Gnus Coding Style
-* Gnus Maintainance Guide:: Gnus Maintainance Guide
+* Gnus Maintenance Guide:: Gnus Maintenance Guide
 @end menu
 
 @c @ref{Gnus Reference Guide, ,Gnus Reference Guide, gnus, The Gnus Newsreader}
@@ -250,8 +250,8 @@ Emacs 20.7 and up.
 XEmacs 21.1 and up.
 @end itemize
 
-@node Gnus Maintainance Guide
-@chapter Gnus Maintainance Guide
+@node Gnus Maintenance Guide
+@chapter Gnus Maintenance Guide
 
 @section Stable and development versions
 
diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi
index 62c1663508b..612ea14e2cf 100644
--- a/doc/misc/gnus-news.texi
+++ b/doc/misc/gnus-news.texi
@@ -107,7 +107,7 @@ EasyPG is included in Emacs 23 and available separately as well.
 @itemize @bullet
 
 @item
-Symbols like @code{gcc-self} now has the same presedence rules in
+Symbols like @code{gcc-self} now have the same precedence rules in
 @code{gnus-parameters} as other ``real'' variables: The last match
 wins instead of the first match.
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index a3a93c6ef61..f099dfd36d0 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -4491,23 +4491,6 @@ news.
 @table @kbd
 
 
-@item H f
-@kindex H f (Group)
-@findex gnus-group-fetch-faq
-@vindex gnus-group-faq-directory
-@cindex FAQ
-@cindex ange-ftp
-Try to fetch the @acronym{FAQ} for the current group
-(@code{gnus-group-fetch-faq}).  Gnus will try to get the @acronym{FAQ}
-from @code{gnus-group-faq-directory}, which is usually a directory on
-a remote machine.  This variable can also be a list of directories.
-In that case, giving a prefix to this command will allow you to choose
-between the various sites.  @code{ange-ftp} (or @code{efs}) will be
-used for fetching the file.
-
-If fetching from the first site is unsuccessful, Gnus will attempt to go
-through @code{gnus-group-faq-directory} and try to open them one by one.
-
 @item H d
 @itemx C-c C-d
 @c @icon{gnus-group-describe-group}
@@ -8992,7 +8975,7 @@ apostrophe or quotation mark, then try this wash.
 Translate many non-@acronym{ASCII} characters into their
 @acronym{ASCII} equivalents (@code{gnus-article-treat-non-ascii}).
 This is mostly useful if you're on a terminal that has a limited font
-and does't show accented characters, ``advanced'' punctuation, and the
+and doesn't show accented characters, ``advanced'' punctuation, and the
 like.  For instance, @samp{»} is tranlated into @samp{>>}, and so on.
 
 @item W Y f
@@ -21228,7 +21211,7 @@ features (inspired by the Google search input language):
 AND, OR, and NOT are supported, and parentheses can be used to control
 operator precedence, e.g. (emacs OR xemacs) AND linux. Note that
 operators must be written with all capital letters to be
-recognised. Also preceding a term with a - sign is equivalent to NOT
+recognized. Also preceding a term with a - sign is equivalent to NOT
 term.
 
 @item Automatic AND queries
@@ -21273,7 +21256,7 @@ Gmane queries follow a simple query language:
 AND, OR, NOT (or AND NOT), and XOR are supported, and brackets can be
 used to control operator precedence, e.g. (emacs OR xemacs) AND linux.
 Note that operators must be written with all capital letters to be
-recognised.
+recognized.
 
 @item Required and excluded terms
 + and - can be used to require or exclude terms, e.g. football -american
@@ -25471,7 +25454,7 @@ Write @code{spam-check-blackbox} if Blackbox can check incoming mail.
 
 Write @code{spam-blackbox-register-routine} and
 @code{spam-blackbox-unregister-routine} using the bogofilter
-register/unregister routines as a start, or other restister/unregister
+register/unregister routines as a start, or other register/unregister
 routines more appropriate to Blackbox, if Blackbox can
 register/unregister spam and ham.
 
@@ -30030,7 +30013,7 @@ this:
 @subsection Score File Syntax
 
 Score files are meant to be easily parseable, but yet extremely
-mallable.  It was decided that something that had the same read syntax
+malleable.  It was decided that something that had the same read syntax
 as an Emacs Lisp list would fit that spec.
 
 Here's a typical score file:
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 48d0028e452..4d828f69bbd 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -2120,7 +2120,7 @@ follows this line--} by default.
 
 @item message-directory
 @vindex message-directory
-Directory used by many mailey things.  The default is @file{~/Mail/}.
+Directory used by many mailish things.  The default is @file{~/Mail/}.
 All other mail file variables are derived from @code{message-directory}.
 
 @item message-auto-save-directory
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index cc925906c28..34a4ba4f8f3 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -15533,7 +15533,7 @@ chapter about publishing.
 @i{Jambunathan K} contributed the OpenDocumentText exporter.
 @item
 @i{Sebastien Vauban} reported many issues with LaTeX and BEAMER export and
-enabled source code highlighling in Gnus.
+enabled source code highlighting in Gnus.
 @item
 @i{Stefan Vollmar} organized a video-recorded talk at the
 Max-Planck-Institute for Neurology.  He also inspired the creation of a
diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi
index 7a363523aa6..28d1cdb6eb8 100644
--- a/doc/misc/sem-user.texi
+++ b/doc/misc/sem-user.texi
@@ -880,7 +880,7 @@ command, like this:
 @end example
 @end defun
 
-These commands are often more accurate than than the @code{find-tag}
+These commands are often more accurate than the @code{find-tag}
 command (@pxref{Tags,,,emacs,Emacs manual}), because the Semantic
 Analyzer is context-sensitive.
 
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index ad6159feb1a..55b60937fb6 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -421,7 +421,7 @@ local variables, and tag lists in scope for various reasons, such as
 C++ using statements.
 
 @item semanticdb-typecache.el
-The typecache is part of @code{semanticdb}, but is used primarilly by
+The typecache is part of @code{semanticdb}, but is used primarily by
 the analyzer to look up datatypes and complex names.  The typecache is
 bound across source files and builds a master lookup table for data
 type names.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 0accc6fac43..e6b0f4fa235 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3180,7 +3180,7 @@ names:
  '("^/xy" . "@trampfn{ssh, news, news.my.domain, /opt/news/etc/}"))
 @end lisp
 
-This shortens the file openening command to @kbd{C-x C-f /xy
+This shortens the file opening command to @kbd{C-x C-f /xy
 @key{RET}}.  The disadvantage is, again, that you cannot edit the file
 name, because the expansion happens after entering the file name only.
 
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 1db595b3175..64479f7987f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-20  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.3.1.
+
+        * NEWS, MH-E-NEWS: Update for MH-E release 8.3.1.
+
 2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
 
         * MAILINGLISTS: Fix typo.
@@ -1413,7 +1419,7 @@
 
 2008-02-01  Kenichi Handa  <handa@m17n.org>
 
-        * HELLO: Remove non-unicode character from Tibetan text.
+        * HELLO: Remove non-Unicode character from Tibetan text.
 
 2008-02-01  Miles Bader  <miles@gnu.org>
 
@@ -4107,7 +4113,7 @@
 
 2002-02-01  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
-        * gnus.xpm: Remove garbages.
+        * gnus.xpm: Remove garbage.
 
 2002-01-27  Pavel Janík  <Pavel@Janik.cz>
 
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 04084b58488..14d2a22e9f9 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1279,7 +1279,7 @@ in XEmacs.
 ** The module system has again changed a lot.  You can now customize
   the variable `erc-modules' and define once and for all which
   extension modules you want to use.  This unfortunately may require
-  you to change your current erc initialisation code a bit, if you
+  you to change your current erc initialization code a bit, if you
   have some existing customizations.  On the other hand, this change
   makes the configuration of extension modules a lot easier for new
   users.  In theory, you should be able to configure all aspects of
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 2e93b5c3f42..4ab75dcfc45 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -3,6 +3,11 @@
 Copyright (C) 2001-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
+* Changes in MH-E 8.3.1
+
+This version of MH-E fixes typos in the documentation and is packaged
+with GNU Emacs 24.1
+
 * Changes in MH-E 8.3
 
 In 2010, the version control system (VCS) of Emacs was upgraded from
@@ -27,8 +32,6 @@ from SourceForge and explicitly load MH-E will have to be change their
 `load-path' to "/path/to/mh-e/emacs/trunk/lisp/mh-e" instead. Note the
 addition of "trunk."
 
-This version of MH-E is packaged with GNU Emacs 24.1
-
 ** Bug Fixes in MH-E 8.3
 
 *** Make mh-showing a legitimate minor mode
@@ -2666,7 +2669,7 @@ consistent mnemonics were realized that should make it easier to
 remember key bindings.
 
 Added new sub-keymaps for folder commands, sequence commands,
-extraction commands, and digest commands which begin with with F, S,
+extraction commands, and digest commands which begin with F, S,
 X, and D, respectively. These sub-keymaps allowed some consistency
 (e.g., especially with l(ist) and k(ill)).
 
diff --git a/etc/NEWS b/etc/NEWS
index 8b08707c274..b9192c72b5e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -147,7 +147,7 @@ then the equivalent line in ~/.authinfo would be
 
 **** The variable `smtpmail-starttls-credentials' has been removed.
 
-If you had that set, then then you need to put
+If you had that set, then you need to put
 
   machine smtp.whatever.foo port 25 key "~/.my_smtp_tls.key" cert "~/.my_smtp_tls.cert"
 
@@ -417,7 +417,7 @@ of the window will resize all windows in the same combination as well.
 
 +++
 *** New commands `maximize-window' and `minimize-window'.
-These maximize and minize the size of a window within its frame.
+These maximize and minimize the size of a window within its frame.
 
 +++
 *** New commands `switch-to-prev-buffer' and `switch-to-next-buffer'.
@@ -709,7 +709,7 @@ consult.
 
 ** The Landmark game is now invoked with `landmark', not `lm'.
 
-** MH-E has been upgraded to MH-E version 8.3.
+** MH-E has been upgraded to MH-E version 8.3.1.
 See MH-E-NEWS for details.
 
 ** Modula-2 mode provides auto-indentation.
@@ -1126,7 +1126,7 @@ state before the last buffer display operation in that window.
 
 +++
 *** The new option `frame-auto-hide-function' lets you choose between
-iconfying or deleting a frame when burying a buffer shown in a dedicated
+iconifying or deleting a frame when burying a buffer shown in a dedicated
 frame or quitting a window showing a buffer in a frame of its own.
 
 ** Completion
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index b1da9122934..dc9922ed989 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -775,7 +775,7 @@ to the value of `minibuffer-help-form'.
 
 `help-form' is expected at all times to contain either `nil'
 or an expression to be executed when C-h is typed (overriding
-teh definition of C-h as a command).  `minibuffer-help-form'
+the definition of C-h as a command).  `minibuffer-help-form'
 can be used to provide a different default way of handling
 C-h while in the minibuffer.
 
@@ -1382,7 +1382,7 @@ Changes in Emacs 15
  specify the tag table file name initially, or to switch
  to a new tag table.
 
-* If truncate-partial-width-windows is non-nil (as it intially is),
+* If truncate-partial-width-windows is non-nil (as it initially is),
  all windows less than the full screen width (that is,
  made by side-by-side splitting) truncate lines rather than continuing
  them.
@@ -1870,7 +1870,7 @@ Changes in Emacs 1.9
 
 * The variable global-minor-modes is used to display
  strings in the mode line of all buffers.  It should be
- a list of elements thaht are conses whose cdrs are strings
+ a list of elements that are conses whose cdrs are strings
  to be displayed.  This complements the variable
  minor-modes, which has the same effect but has a separate
  value in each buffer.
@@ -2019,7 +2019,7 @@ Changes in Emacs 1.6
 * save-buffers-kill-emacs is now on C-x C-c
  while C-x C-z does suspend-emacs.  This is to make
  C-x C-c like the normal Unix meaning of C-c
- and C-x C-z linke the normal Unix meaning of C-z.
+ and C-x C-z like the normal Unix meaning of C-z.
 
 * M-ESC (eval-expression) is now a disabled command by default.
  This prevents users who type ESC ESC accidentally from
@@ -2423,7 +2423,7 @@ Changes in Emacs 1.1
  or show the text or subheadings under each heading line
  independently.  Hidden text or subheadings are invisibly
  attached to the end of the preceding heading line, so that
- if you kill the hading line and yank it back elsewhere
+ if you kill the heading line and yank it back elsewhere
  all the invisible lines accompany it.
 
   All editing commands treat hidden outline-mode lines
diff --git a/etc/NEWS.18 b/etc/NEWS.18
index 6bf854d8b33..820103e3110 100644
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@@ -519,7 +519,7 @@ exist to customize these feature for different Lisp implementations.
 
 ** C-x p now disabled.
 
-The command C-x p, a nonrecomended command which narrows to the current
+The command C-x p, a nonrecommended command which narrows to the current
 page, is now initially disabled like C-x n.
 
 * Dealing with files.
@@ -1303,7 +1303,7 @@ changing the file's uid or gid.
 
 The default value of this variable is `nil', because usually it is
 useful to have the uid of a file change according to who edited it
-last.  I recommend thet this variable be left normally `nil' and
+last.  I recommend that this variable be left normally `nil' and
 changed with a local variables list in those particular files where
 the uid needs to be preserved.
 
@@ -1620,4 +1620,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 Local variables:
 mode: text
 end:
-
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 6c1c5483809..16a9d9dc4cb 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -1828,7 +1828,7 @@ c-fill-paragraph's behavior.
 containing an open brace just after a case/default label.
 
 *** New variable, c-progress-interval, which controls minibuffer update
-message displays during long re-indention.  This is a new feature
+message displays during long re-indentation.  This is a new feature
 which prints percentage complete messages at specified intervals.
 
 ** Makefile mode changes.
@@ -4288,7 +4288,7 @@ filename completion in comint mode apply, together with a variable
 controlling whether to restrict possible completions to only files
 that are executable (`shell-command-execonly').
 
-The input history is initialised from the file name given in the
+The input history is initialized from the file name given in the
 variable `shell-input-ring-file-name'--normally `.history' in your
 home directory.
 
@@ -5484,7 +5484,7 @@ non-nil.
 ** M-x revert-buffer no longer offers to revert from a recent auto-save
 file unless you give it a prefix argument.  Otherwise it always
 reverts from the real file regardless of whether there has been an
-auto-save since thenm.  (Reverting from the auto-save file is no longer
+auto-save since then.  (Reverting from the auto-save file is no longer
 very useful now that the undo capacity is larger.)
 
 ** M-x recover-file no longer turns off Auto Save mode when it reads
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index c3c54d8bb01..c018567c40d 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -1678,7 +1678,7 @@ current file, or you can use C-x v r RET to get an update for an
 entire directory tree.
 
 The new user option `vc-cvs-use-edit' indicates whether VC should call
-"cvs edit" to make files writeable; it defaults to `t'.  (This option
+"cvs edit" to make files writable; it defaults to `t'.  (This option
 is only meaningful if the CVSREAD variable is set, or if files are
 "watched" by other developers.)
 
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 3920f59fefa..5e95e40b04c 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -1275,7 +1275,7 @@ coding system.
 of a file.
 
 *** New command `ucs-insert' inserts a character specified by its
-unicode.
+Unicode code point or character name.
 
 *** New command quail-show-key shows what key (or key sequence) to type
 in the current input method to input a character at point.
@@ -3356,7 +3356,7 @@ contracts or expands the line under the cursor.
 *** The new commands `speedbar-expand-line-descendants' and
 `speedbar-contract-line-descendants', bound to `[' and `]'
 respectively, expand and contract the line under cursor with all of
-its descendents.
+its descendants.
 
 *** The new user option `speedbar-use-tool-tips-flag', if non-nil,
 means to display tool-tips for speedbar items.
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 3a222d50d4c..9b8909d794a 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -843,7 +843,7 @@ shared with older Emacsen.
 
 *** There is a new charset implementation with many new charsets.
 See M-x list-character-sets.  New charsets can be defined conveniently
-as tables of unicodes.
+as tables of Unicode code points.
 
 *** There are new language environments for Chinese-GBK,
 Chinese-GB18030, Khmer, Bengali, Punjabi, Gujarati, Oriya, Telugu,
@@ -1837,7 +1837,7 @@ for the list of extra keys that are available.
 
 ** BDF fonts no longer supported on MS-Windows.
 The font backend was completely rewritten for this release.  The focus
-on Windows has been getting acceptable performance and full unicode
+on Windows has been getting acceptable performance and full Unicode
 support, including complex script shaping for native Windows fonts.  A
 rewrite of the BDF font support has not happened due to lack of time
 and developers.  If demand still exists for such a backend even with
diff --git a/etc/THE-GNU-PROJECT b/etc/THE-GNU-PROJECT
index 80dde864901..f3d554e45bf 100644
--- a/etc/THE-GNU-PROJECT
+++ b/etc/THE-GNU-PROJECT
@@ -762,7 +762,7 @@
    Those of us who value free software for freedom's sake will stay with
    free software anyway. We will manage to get work done without the
    patented features. But those who value free software because they
-   expect it to be techically superior are likely to call it a failure
+   expect it to be technically superior are likely to call it a failure
    when a patent holds it back. Thus, while it is useful to talk about the
    practical effectiveness of the "cathedral" model of development (1),
    and the reliability and power of some free software, we must not stop
diff --git a/etc/TODO b/etc/TODO
index aa06f73ee94..f9d37c4b965 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -205,7 +205,7 @@ of the scroll bar itself.  That depends on to what extent toolkit
 scroll bars are extensible.
 
 ** Provide user-friendly ways to list all available font families,
-   list fonts, display a font as a sample, etc.  [fx is looking at
+  list fonts, display a font as a sample, etc.  [fx is looking at
   multilingual font selection for the Unicode branch of Emacs.]
 
 ** Provide a convenient way to select a color with the mouse.
@@ -635,7 +635,7 @@ up on top of all others
 
 *** Other / Low Priority:
 
-**** Better recognition of unicode scripts / Greek / composition.
+**** Better recognition of Unicode scripts / Greek / composition.
 
 **** Undo for color-drag face customization.
 
diff --git a/etc/gnus/news-server.ast b/etc/gnus/news-server.ast
index 432f71a50f0..df0bab4519b 100644
--- a/etc/gnus/news-server.ast
+++ b/etc/gnus/news-server.ast
@@ -7,7 +7,7 @@
 @validate (or (assistant-validate-connect-to-server server port) (y-or-n-p "Do you want to use the server anyway, although you can't confirm it's valid?"))
 @result gnus-select-method (list 'nntp server (list 'nntp-server port))
 @text
-Usenet news is usually read from your Internet service prodider's news
+Usenet news is usually read from your Internet service provider's news
 server.  If you don't know the name of this server, contact your ISP.
 
 As a guess, the name of the server might be news.yourisp.com.
@@ -61,4 +61,3 @@ Password: @variable{user-name}
 @c End:
 
 @c arch tag is missing
-
diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt
index b296f9dc515..d3dad33a5a2 100644
--- a/etc/srecode/test.srt
+++ b/etc/srecode/test.srt
@@ -81,7 +81,7 @@ template gapsomething :blank
 ----
 
 template inlinetext
-"Insert text that has no nelines"
+"Insert text that has no newlines"
 ----
  *In the middle* 
 ----
diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el
index 55b07e6eaef..b06678636c7 100644
--- a/etc/themes/manoj-dark-theme.el
+++ b/etc/themes/manoj-dark-theme.el
@@ -37,7 +37,7 @@
 ;; (blueish) or mail (greenish), have states (large number of under
 ;; messages, normal, and empty). The large number unread groups have
 ;; highest luminance (appear brighter), and the empty one have lower
-;; luminance (appear greyer), but have the same chroma and saturation.
+;; luminance (appear grayer), but have the same chroma and saturation.
 ;; Sub states and group priorities are rendered using a color series
 ;; which has constant luminance and saturation, and vary in hue by a
 ;; constant separation -- so all the related groups have the same
@@ -53,7 +53,7 @@
 
 ;; In the message itself, quoted mail messages from different people
 ;; are color coordinated, with high contrast between citations that are
-;; close to each other in the heirarchy, so it is less likely that one
+;; close to each other in the hierarchy, so it is less likely that one
 ;; misunderstands who said what in a long conversation.
 
 ;; The following scheme covers programming languages, Gnus, Erc, mail,
diff --git a/leim/CXTERM-DIC/CCDOSPY.tit b/leim/CXTERM-DIC/CCDOSPY.tit
index 8c67c3bdfac..97dfe89f1a1 100644
--- a/leim/CXTERM-DIC/CCDOSPY.tit
+++ b/leim/CXTERM-DIC/CCDOSPY.tit
@@ -2,7 +2,7 @@
 # Header added for Emacs
 #
 # This file is included in the directory contrib/clients/cxterm of the
-# distribution of X11R6.  As the file itself does't contain copyright
+# distribution of X11R6.  As the file itself doesn't contain copyright
 # and license notices, the following statements in the section 6 of
 # the file .../cxterm/README covers it.
 #
diff --git a/leim/CXTERM-DIC/PY-b5.tit b/leim/CXTERM-DIC/PY-b5.tit
index 72c20fe70ca..7a8d68aa755 100644
--- a/leim/CXTERM-DIC/PY-b5.tit
+++ b/leim/CXTERM-DIC/PY-b5.tit
@@ -2,7 +2,7 @@
 # Header added for Emacs
 #
 # This file is included in the directory contrib/clients/cxterm of the
-# distribution of X11R6.  As the file itself does't contain copyright
+# distribution of X11R6.  As the file itself doesn't contain copyright
 # and license notices, the following statements in the section 6 of
 # the file .../cxterm/README covers it.
 #
diff --git a/leim/CXTERM-DIC/SW.tit b/leim/CXTERM-DIC/SW.tit
index a30dcf01090..5e8fadfba42 100644
--- a/leim/CXTERM-DIC/SW.tit
+++ b/leim/CXTERM-DIC/SW.tit
@@ -2,7 +2,7 @@
 # Header added for Emacs
 #
 # This file is included in the directory contrib/clients/cxterm of the
-# distribution of X11R6.  As the file itself does't contain copyright
+# distribution of X11R6.  As the file itself doesn't contain copyright
 # and license notices, the following statements in the section 6 of
 # the file .../cxterm/README covers it.
 #
diff --git a/leim/CXTERM-DIC/TONEPY.tit b/leim/CXTERM-DIC/TONEPY.tit
index 4b97ce8f0b1..ddba1d378d1 100644
--- a/leim/CXTERM-DIC/TONEPY.tit
+++ b/leim/CXTERM-DIC/TONEPY.tit
@@ -2,7 +2,7 @@
 # Header added for Emacs
 #
 # This file is included in the directory contrib/clients/cxterm of the
-# distribution of X11R6.  As the file itself does't contain copyright
+# distribution of X11R6.  As the file itself doesn't contain copyright
 # and license notices, the following statements in the section 6 of
 # the file .../cxterm/README covers it.
 #
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 75dde2bcd18..ed8aec0b16d 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * quail/hangul.el (hangul-character): Fix typo.
+
 2011-09-27  Jambunathan K  <kjambunathan@gmail.com>
 
         * quail/indian.el (quail-tamil-itrans-misc-table): Delete it.
diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 88be0a3b7d0..eb5a0a00ade 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -608,7 +608,7 @@
 ;; layout.  In fact, Microsoft shipped for a while a layout that was lacking
 ;; two characters, precisely the "GHE_WITH_UPTURN" and the apostrophe.  The
 ;; latest versions of Windows software do have the "GHE_WITH_UPTURN" in the
-;; ukrainian keyborad layout but the apostrophe is still not there, whereas
+;; ukrainian keyboard layout but the apostrophe is still not there, whereas
 ;; there is one letter, "Cyrillic_YO", not used in ukrainian.  Ukrainians
 ;; normally replace the "Cyrillic_YO" by the apostrophe sign and live
 ;; happily with this little change.  [See "ukrainian-computer" below.]
diff --git a/leim/quail/hangul.el b/leim/quail/hangul.el
index 660e7763626..d3071d628e0 100644
--- a/leim/quail/hangul.el
+++ b/leim/quail/hangul.el
@@ -112,7 +112,7 @@
 
 (defun hangul-character (cho jung jong)
   "Convert CHO, JUNG, JONG to the precomposed `Hangul Syllables' character.
-CHO, JUNG, JONG are relative indices in `Hangul Compatibility Jamo' of unicode.
+CHO, JUNG, JONG are relative indices in `Hangul Compatibility Jamo' of Unicode.
 Return a zero-length string if the conversion fails."
   (or
    (decode-char
diff --git a/leim/quail/ipa.el b/leim/quail/ipa.el
index 559841e8905..4c15be2bf42 100644
--- a/leim/quail/ipa.el
+++ b/leim/quail/ipa.el
@@ -183,7 +183,7 @@ incorrectly, as separate from the modified glyphs.")
          "Ëš"]) ;; +Unexploded modifier                 U+02DA
  ("<r>" "ʳ")   ;; +Rhotacized modifier                 U+02B3
  ("<w>" "Ê·")   ;; +Labialized modifier                 U+02B7
- ("<?>" "ʱ")   ;; +Murmured modififer                  U+02B1
+ ("<?>" "ʱ")   ;; +Murmured modifier                   U+02B1
 
  ("b<trl>" "Ê™")        ;; Bilabial trill                       U+0299
  ("b`" "É“")    ;; Bilabial implosive                   U+0253
@@ -465,8 +465,8 @@ displays them, incorrectly, as separate from the modified glyphs.")
  ("_}" "Ìš")    ;; No audible release                   U+031A
  ;; ` is alternatively; retroflexion in consonants
  ("`" "Ëž")     ;; Rhotacization in vowels              U+02DE
- ("_~" "̃")    ;; Nasalisation                         U+0303
- ("~" "̃")     ;; Nasalisation                         U+0303
+ ("_~" "̃")    ;; Nasalization                         U+0303
+ ("~" "̃")     ;; Nasalization                         U+0303
  ("_A" "̘")    ;; Advanced tongue root                 U+0318
  ("_a" "̺")    ;; Apical                               U+033A
  ("_B" "�")    ;; Extra low tone                       U+030F
diff --git a/leim/quail/sgml-input.el b/leim/quail/sgml-input.el
index 3b569879404..a8c335afa33 100644
--- a/leim/quail/sgml-input.el
+++ b/leim/quail/sgml-input.el
@@ -916,7 +916,7 @@ E.g.: &aacute; -> á"
   ("&theta;" ?\θ) ;; GREEK SMALL LETTER THETA
   ("&Theta;" ?\Θ) ;; GREEK CAPITAL LETTER THETA
   ("&thetas;" ?\θ) ;; GREEK SMALL LETTER THETA
-  ("&thetasyLsymbol;" ?\Ï‘) ;; GREEK THETA SYMBOL
+  ("&thetasym;" ?\Ï‘) ;; GREEK THETA SYMBOL
   ("&thetav;" ?\Ï‘) ;; GREEK THETA SYMBOL
   ("&THgr;" ?\Θ) ;; GREEK CAPITAL LETTER THETA
   ("&thgr;" ?\θ) ;; GREEK SMALL LETTER THETA
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d043f41962e..983754eb1c3 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -2032,7 +2032,7 @@
         * etags.c [ETAGS_REGEXPS]: Now is unconditionally defined.
         [LONG_OPTIONS]: Changed to NO_LONG_OPTIONS, which is undefined.
         (Objc_suffixes): Suggest using --lang=c for full help.
-        (C_entries): Initialise savetoken to 0 to shut up the compiler.
+        (C_entries): Initialize savetoken to 0 to shut up the compiler.
 
 2006-07-20  Andreas Schwab  <schwab@suse.de>
 
@@ -2738,7 +2738,7 @@
         (add_regex, regex_tag_multiline, readline): Use it.
         (main): Free some global structures.
         (fdesc): New member `written'.
-        (readline, process_file): Initialise it.
+        (readline, process_file): Initialize it.
         (put_entries): Set it.
         (main): Use it to create entries for files without tags.
         (total_size_of_entries): Do not count invalid tags.
@@ -2849,7 +2849,7 @@
         (find_entries): Rewind unconditionally.
         (find_entries): Do not call language functions directly, now calls
         itself.
-        (find_entries): Do general initialisations here.
+        (find_entries): Do general initializations here.
         (CNL_SAVE_DEFINEDEF, C_entries, LOOP_ON_INPUT_LINES, F_getit)
         (Ada_getit, Pascal_functions, Pascal_functions)
         (prolog_skip_comment): Do not do them here.
@@ -3085,7 +3085,7 @@
         (TeX_commands): Name tags.  Correction of old disabled code.
 
         * etags.c (curfiledir, curtagfname): New global variables.
-        (process_file): Initialise them.
+        (process_file): Initialize them.
         (readline): Canonicalize the name found in #line directive.
 
 2002-03-06  Jason Rumney  <jasonr@gnu.org>
@@ -3175,7 +3175,7 @@
         (L_getit): Simplify by using get_tag.
         (Perl_functions, Postscript_functions, erlang_attribute): Use the
         modified LOOKING_AT.
-        (notinname): Remove '[' and added ')' to the recognised chars.
+        (notinname): Remove '[' and added ')' to the recognized chars.
         (LOOKING_AT, get_tag, PHP_functions): Use notinname.
         (Ada_getit, Ada_funcs, Python_functions, Scheme_functions):
         Clarified, using strneq or notinname.
@@ -3242,7 +3242,7 @@
         (Scheme_functions, Texinfo_nodes): Use it.
         (Perl_functions): Use strneq.
         (prolog_pred): Rename to prolog_pr.
-        (prolog_pr): Recognise Prolog rules in addition to predicates.
+        (prolog_pr): Recognize Prolog rules in addition to predicates.
         [ETAGS_REGEXPS] [!HAVE_CONFIG_H] [__CYGWIN__]: Prevent
         unmodified compile, as Cygwin's regex.h is incompatible with us.
         [!HAVE_CONFIG_H] [!__STDC__]: #define const as the empty string.
@@ -3516,7 +3516,7 @@
         * etags.c (enum sym_type): New label st_C_template.
         (gperf input): Use it for switching to C++ from C.
         (consider_token): Do it.
-        (C_entries): Initialise typdefcblev to quiet compilers.
+        (C_entries): Initialize typdefcblev to quiet compilers.
         [!HAVE_CONFIG_H] [!__STDC__]: #define static as nothing.
 
 2001-02-22  Andrew Innes  <andrewi@gnu.org>
@@ -3967,7 +3967,7 @@
 
         * etags.c (C_entries, consider_token): C++ `operator' now is
         tagged in most cases.
-        As before, :: is not recognised if surrounded by spaces.
+        As before, :: is not recognized if surrounded by spaces.
 
         * etags.c (relative_filename): Account for DOS file names such
         that is impossible to make one relative to another.
@@ -4576,7 +4576,7 @@
         * etags.c (C_entries): Use "." instead of "::" for Java.
         (consider_token): is_func renamed to is_func_or_var.
         (C_entries): is_func renamed to funorvar.
-        (C_entries): Initialise tok.named.
+        (C_entries): Initialize tok.named.
         (sym_type, C_stab_entry, consider_token): st_C_ignore is used to
         get rid of "import", "package" and "friend".
         (fvdef): Rename from funcdef.  Also some constants renamed.
@@ -4630,7 +4630,7 @@
         (lang_names): Add Java.
         (sym_type): Add st_C_javastruct for Java.
         (C_stab_entry): Add `extends' and `implements' keywords.
-        (consider_token, C_entries): Recognise Java structures.
+        (consider_token, C_entries): Recognize Java structures.
 
 1997-05-12  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
 
@@ -4678,7 +4678,7 @@
 
         * etags.c (xnew): Add support for debugging with chkmalloc.
         (error): Use this instead of printf whenever possible.
-        (main): Only call xnew after having initialised progname.
+        (main): Only call xnew after having initialized progname.
         (substitute): Bad memory corruption error corrected.
 
 1997-04-08  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
@@ -5596,8 +5596,8 @@
 
 1995-02-22  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (C_entries): token_saved removed.  Initialise tok.valid and
-        savetok.valid.  Mark token as valid when it is initialised.
+        * etags.c (C_entries): token_saved removed.  Initialize tok.valid and
+        savetok.valid.  Mark token as valid when it is initialized.
         (make_tag): Make token only if token is valid and reset validity.
         (CNL_SAVE_DEFINEDEF): Test for savetok.valid instead of token_saved.
         (TOKEN): Add a new member: valid.
@@ -5609,15 +5609,15 @@
 
 1995-02-14  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (C_entries): Initialise the new members of TOKEN.
+        * etags.c (C_entries): Initialize the new members of TOKEN.
         (C_entries): Do not allocate a new space for each token found by
         consider_token.  Let make_tag do that instead.
         (make_tag): Since now TOKEN has memory of where it is taken from,
         this new macro substitutes both make_tag_from_new_lb and
         make_tag_from_oth_lb.  All callers changed.
         (TOKEN): Add linepos and buffer members.
-        (main): Initialise token_str.
-        (lang_extensions): Recognise .c++ and .h++ as C++ file suffixes.
+        (main): Initialize token_str.
+        (lang_extensions): Recognize .c++ and .h++ as C++ file suffixes.
         (token_str): New global variable used by C_entries.
 
 1995-02-07  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
@@ -5626,7 +5626,7 @@
 
 1995-02-01  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (pfnote): Initialise been_warned in the node.
+        * etags.c (pfnote): Initialize been_warned in the node.
         (C_entries): Remove a speed hack for the sake of clarity.
 
 1995-01-18  Francesco Potortì  (pot@cnuce.cnr.it)
@@ -5911,8 +5911,8 @@
 
 1994-09-29  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (C_entries): Recognise typedef of ANSI style functions.
-        (C_entries): Recognise #define inside a struct.
+        * etags.c (C_entries): Recognize typedef of ANSI style functions.
+        (C_entries): Recognize #define inside a struct.
         (C_entries): ANSI tells that preprocessor commands do not have to
         start on the first column.
         (print_help): Documentation corrected for -d and -D.
@@ -6026,7 +6026,7 @@
 
 1994-07-08  Dave Love  (d.love@dl.ac.uk)
 
-        * etags.c (takeprec): Recognise `character*(*) function'.
+        * etags.c (takeprec): Recognize `character*(*) function'.
 
 1994-07-08  Francesco Potortì  (pot@cnuce.cnr.it)
 
@@ -6219,7 +6219,7 @@
         TeX_functions, Prolog_functions.
         (inf): No more a global variable.
         (C_entries): Take 2nd parameter `inf' instead of using the global one.
-        (find_entries): Add the cp1 var for optimisation.
+        (find_entries): Add the cp1 var for optimization.
         (find_entries): Add more suffixes for assembler files.
         (Asm_funcs): Now finds labels even without an ending colon.
 
@@ -6247,7 +6247,7 @@
         functions added to compute filenames in tags files.
         (process_file): Filenames in tags file are relative to the
         directory where the tags file is (useful with the -o option).
-        (main): Initialise the outfiledir var.
+        (main): Initialize the outfiledir var.
         (TYPEDST): Add the `tignore' value.
         (C_entries): Corrected various small bugs.
 
@@ -6553,7 +6553,7 @@
 
 1993-09-20  Francesco Potortì  (pot@fly)
 
-        * etags.c (C_entries): is_func is initialised here instead of in
+        * etags.c (C_entries): is_func is initialized here instead of in
         consider_token for the sake of the yacc rules section.
         (C_entries): Now class, struct, enum, union and typedef produce
         named tags.
@@ -6607,7 +6607,7 @@
 
 1993-08-04  Francesco Potortì  (pot@spiff.gnu.ai.mit.edu)
 
-        * etags.c (L_isdef, L_isquote, L_getit): Small optimisations.
+        * etags.c (L_isdef, L_isquote, L_getit): Small optimizations.
         (L_funcs): The (foo::defmumble stuff now should work.
         (consider_token): Function returned random value--corrected.
         (C_entries): Corrected == versus = typo.
@@ -6629,7 +6629,7 @@
         (C_entries, consider_token): Make use of fignore.
         (consider_token): Reset funcdef when next_token_is_func: when in
         ctags mode makes DEFVAR and others work better.
-        (L_isquote): Function that recognises the "(quote" string.
+        (L_isquote): Function that recognizes the "(quote" string.
         (L_getit): Ignore quoting via "'" or "(quote".  Useful for defalias.
 
 1993-07-29  Paul Eggert  (eggert@twinsun.com)
@@ -6976,7 +6976,7 @@
         (TOKEN): Member linestart removed.
         (linepos, prev_linepos, lb1): Deleted.
         (main): Call initbuffer on lbs array instead of lb1.
-        (init): Remove the initialisation of the logical _gd array.
+        (init): Remove the initialization of the logical _gd array.
         (find_entries): A .sa suffix means assembler file.
         (C_create_stab): "auto", "void", "extern", "static" are st_C_typespec.
         All C state machines rewritten.
diff --git a/lib-src/etags.c b/lib-src/etags.c
index b739e8f00c5..30d90e9d911 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -326,7 +326,7 @@ typedef struct regexp
   struct re_pattern_buffer *pat; /* the compiled pattern */
   struct re_registers regs;     /* re registers */
   bool error_signaled;          /* already signaled for this regexp */
-  bool force_explicit_name;     /* do not allow implict tag name */
+  bool force_explicit_name;     /* do not allow implicit tag name */
   bool ignore_case;             /* ignore case when matching */
   bool multi_line;              /* do a multi-line match on the whole file */
 } regexp;
@@ -1862,10 +1862,10 @@ find_entries (FILE *inf)
 
   assert (parser != NULL);
 
-  /* Generic initialisations before reading from file. */
+  /* Generic initializations before reading from file. */
   linebuffer_setlen (&filebuf, 0); /* reset the file buffer */
 
-  /* Generic initialisations before parsing file with readline. */
+  /* Generic initializations before parsing file with readline. */
   lineno = 0;                  /* reset global line number */
   charno = 0;                  /* reset global char number */
   linecharno = 0;              /* reset global char number of line start */
@@ -1895,7 +1895,7 @@ find_entries (FILE *inf)
  *  4. the character, if any, immediately after NAME in LINESTART must
  *     also be a character in NONAM.
  *
- * The implementation uses the notinname() macro, which recognises the
+ * The implementation uses the notinname() macro, which recognizes the
  * characters stored in the string `nonam'.
  * etags.el needs to use the same characters that are in NONAM.
  */
@@ -3057,7 +3057,7 @@ make_C_tag (int isfun)
     make_tag (token_name.buffer, token_name.len, isfun, token.line,
               token.offset+token.length+1, token.lineno, token.linepos);
   else if (DEBUG)
-    {                             /* this branch is optimised away if !DEBUG */
+    {                             /* this branch is optimized away if !DEBUG */
       make_tag (concat ("INVALID TOKEN:-->", token_name.buffer, ""),
                 token_name.len + 17, isfun, token.line,
                 token.offset+token.length+1, token.lineno, token.linepos);
@@ -3304,7 +3304,7 @@ C_entries (int c_ext, FILE *inf)
                   if (c == ':' && *lp == ':' && begtoken (lp[1]))
                     /* This handles :: in the middle,
                        but not at the beginning of an identifier.
-                       Also, space-separated :: is not recognised. */
+                       Also, space-separated :: is not recognized. */
                     {
                       if (c_ext & C_AUTO) /* automatic detection of C++ */
                         c_ext = (c_ext | C_PLPL) & ~C_AUTO;
@@ -5900,7 +5900,7 @@ regex_tag_multiline (void)
       if (!rp->multi_line)
         continue;               /* skip normal regexps */
 
-      /* Generic initialisations before parsing file from memory. */
+      /* Generic initializations before parsing file from memory. */
       lineno = 1;               /* reset global line number */
       charno = 0;               /* reset global char number */
       linecharno = 0;           /* reset global char number of line start */
diff --git a/lib/sha256.c b/lib/sha256.c
index c125542248b..4dbb5e91291 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -51,7 +51,7 @@ static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
 
 /*
   Takes a pointer to a 256 bit block of data (eight 32 bit ints) and
-  intializes it to the start constants of the SHA256 algorithm.  This
+  initializes it to the start constants of the SHA256 algorithm.  This
   must be called before using hash in the call to sha256_hash
 */
 void
diff --git a/lib/sha512.c b/lib/sha512.c
index c0bed95758f..5c2e3ab9f81 100644
--- a/lib/sha512.c
+++ b/lib/sha512.c
@@ -58,7 +58,7 @@ static const unsigned char fillbuf[128] = { 0x80, 0 /* , 0, 0, ...  */ };
 
 /*
   Takes a pointer to a 512 bit block of data (eight 64 bit ints) and
-  intializes it to the start constants of the SHA512 algorithm.  This
+  initializes it to the start constants of the SHA512 algorithm.  This
   must be called before using hash in the call to sha512_hash
 */
 void
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45a115ec566..37ecd3e6852 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,177 @@
+2011-11-22  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmailmm.el (test-rmail-mime-handler)
+        (test-rmail-mime-bulk-handler)
+        (test-rmail-mime-multipart-handler): Move tests to test/ directory.
+
+2011-11-21  Juri Linkov  <juri@jurta.org>
+
+        * 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>
+
+        * emacs-lisp/cl-indent.el (common-lisp-loop-part-indentation):
+        Tell the caller that the next line needs recomputation, even
+        though it doesn't start a sexp (bug#10094).
+
+2011-11-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/autoload.el (autoload-generate-file-autoloads): Simplify.
+
+2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc/pcvs-util.el (cvs-pop-to-buffer-same-frame):
+        Use force-same-window.
+
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * descr-text.el (describe-char-unicode-data):
+        * json.el (json-string-escape):
+        * mail/footnote.el (footnote-unicode-string, footnote-unicode-regexp)
+        (Footnote-unicode, Footnote-style-p):
+        * net/ntlm.el (ntlm-get-password-hashes): Fix typos.
+
+2011-11-20  Chong Yidong  <cyd@gnu.org>
+
+        * window.el (replace-buffer-in-windows): Restore interactive spec.
+
+2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * electric.el (electric-indent-mode): Fix last change (too optimistic).
+
+        * emacs-lisp/bytecomp.el: Silence obsolete warnings more reliably.
+        (byte-compile-global-not-obsolete-vars): New var.
+        (byte-compile-check-variable, byte-compile-make-obsolete-variable):
+        Use it.
+        (byte-compile-warn-obsolete): Align text with the one in *Help*.
+
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/cwarn.el (cwarn-is-enabled, cwarn-font-lock-keywords):
+        * progmodes/pascal.el (electric-pascal-equal):
+        * textmodes/reftex-dcr.el (reftex-view-crossref-from-bibtex):
+        * xml.el (xml-substitute-special): Fix typos.
+
+2011-11-20  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmail.el (rmail-enable-mime-composing): Make it a defcustom.
+        (rmail-insert-mime-forwarded-message-function, rmail-mime-feature):
+        Doc fixes.
+        (rmail-decode-mime-charset): Mark as obsolete.
+
+        * mail/rmailsum.el (rmail-message-regexp-p-1):
+        * mail/rmail.el (rmail-search-message, rmail-forward, rmail-resend):
+        Before using mime functions, check they are set.  (Bug#10077)
+
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-finder-find-node): Use `package--builtins' instead
+        of `package-alist'.  Use node names formed by the pattern "Keyword "
+        and the keyword name.
+
+2011-11-19  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * progmodes/sh-script.el (sh-assignment-regexp): Add entry for
+        bash.
+
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-hide-note-references): Add `:set' tag to `defcustom'
+        that calls `revert-buffer' on all Info buffers.  (Bug#9915)
+        (Info-revert-find-node): Remove let-bindings `old-buffer-name',
+        `old-history', `old-history-forward'.  Add let-binding
+        `window-selected'.  Remove calls to `kill-buffer',
+        `switch-to-buffer' and `Info-mode'.  Set `Info-current-file' to nil
+        before calling `Info-find-node', so `Info-find-node-2' will reread
+        the Info file.  Restore window positions only when `window-selected'
+        is non-nil.
+
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-lazy-highlight-new-loop):
+        Remove condition `(not isearch-error)'.  (Bug#9918)
+
+        * misearch.el (multi-isearch-search-fun): Add condition
+        `(not bound)' to ignore lazy-highlighting search.
+        Add the search-failed message "end of multi" when the end of
+        multi-sequence is reached.  Uncapitalize the search-failed
+        message "Repeat for next buffer".
+
+        * info.el (Info-search): Add the search-failed message
+        "end of the manual" when the end of the manual is reached
+        in Isearch mode.
+
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-find-node-2, Info-select-node, Info-history-find-node):
+        Use non-destructive `remove' instead of `delete' because
+        `Info-history-list' stored to `Info-isearch-initial-history-list' in
+        `Info-isearch-start' might need to be restored in `Info-isearch-end'.
+
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-edit-string): Let-bind `history-add-new-input'
+        to nil instead of binding `search-ring' and `regexp-search-ring'.
+        (Bug#9185)
+
+2011-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (line-move): Force movement by logical lines for any
+        hscrolled window, not only when auto-hscroll-mode is on.
+        (line-move-visual): Update doc string to that effect.  (Bug#10076)
+
+2011-11-19  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * language/european.el (macintosh): Define as alias for mac-roman.
+
+2011-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/rmailmm.el (rmail-mime-display-header)
+        (rmail-mime-display-tagline, rmail-mime-display-body): New defsubsts.
+        (rmail-mime-entity-segment, rmail-mime-toggle-raw)
+        (rmail-mime-toggle-hidden, rmail-mime-insert-text)
+        (rmail-mime-insert-bulk, rmail-mime-insert-multipart)
+        (rmail-mime-insert, rmail-mime-insert-tagline): Use them instead
+        of a raw aref.
+        (rmail-mime-entity-segment): To get past the tagline, move forward
+        2 more lines, to account for the 2 empty lines that precede and
+        follow the line with the buttons.
+        (rmail-mime-update-tagline): Move one more line, to get past the
+        empty line that follows the buttons in the tagline.  (Bug#9520)
+
+2011-11-19  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-max-delta-1, window-min-delta-1)
+        (window-min-size-1, window-state-get-1, window-state-put-1)
+        (window-state-put-2): Use "window--" prefix.
+
+2011-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/smie.el: Improve warnings and conflict detection.
+        (smie-warning-count): New var.
+        (smie-set-prec2tab): Use it.
+        (smie-bnf->prec2): Improve warnings.  Add docstring.
+        (smie-bnf--closer-alist): Rename from smie-bnf-closer-alist.
+        (smie-bnf--set-class): New function.
+        (smie-bnf--classify): Rename from smie-bnf-classify.  Rewrite to fix
+        corner case.
+
+        * progmodes/compile.el: Obey compilation-first-column in dest buffer.
+        (compilation-error-properties, compilation-move-to-column):
+        Handle compilation-first-column while in the target buffer.
+
+        * progmodes/cc-engine.el (c-remove-stale-state-cache-backwards):
+        Don't hardcode point-min==1.
+
+        * eshell/esh-cmd.el (eshell-do-eval): Handle `setq' (bug#9907).
+        (eshell-rewrite-for-command): Remove workaround.
+        (eshell-do-pipelines, eshell-do-pipelines-synchronously)
+        (eshell-do-eval, eshell-exec-lisp): Avoid gratuitous setq.
+        * eshell/esh-util.el (eshell-condition-case, eshell-for): Use declare.
+
+        * files-x.el (modify-file-local-variable): Obey commenting conventions.
+
 2011-11-17  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/autoload.el (autoload-generate-file-autoloads):
@@ -2914,7 +3088,7 @@
         more people.
 
         * cus-edit.el (custom-file): When running under emacs -q, always
-        refuse to save the customisations, even if the .emacs file doesn't
+        refuse to save the customizations, even if the .emacs file doesn't
         exist.
 
         * info.el: Remove the `Info-beginning-of-buffer' function
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 0cf64cf36e9..cb1d1af577b 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -374,7 +374,7 @@
         the function is advised in cc-defs.  However, that advice
         doesn't help if the autoloads are updated in an old (X)Emacs
         with this version of CC Mode, but I believe it's unlikely that
-        anyone does that when CC Mode isn't distributed with with it.
+        anyone does that when CC Mode isn't distributed with it.
 
         * progmodes/cc-defs.el (add-to-list): Add advice to get the
         optional third append argument in older (X)Emacsen.
@@ -1036,13 +1036,13 @@
 
 2003-06-29  Nick Roberts  <nick@nick.uklinux.net>
 
-        * gdb-ui.el (gdb-display-number-end): Don't re-initialise local
+        * gdb-ui.el (gdb-display-number-end): Don't re-initialize local
         variables to preserve array slices.
         (gdb-array-slice): Rename gdb-mouse-array-slice.
         (gdb-array-slice): Interactive function bound to "\r" for text
         terminals.
         (gdb-view-source): Rename gdb-view-source-function.
-        Set uninitialised variables (defvars) to nil.
+        Set uninitialized variables (defvars) to nil.
 
 2003-06-29  Kai Großjohann  <kai.grossjohann@gmx.net>
 
@@ -2016,7 +2016,7 @@
 2003-05-28  Andreas Schwab  <schwab@suse.de>
 
         * descr-text.el (describe-char): Use `char' instead of
-        `(char-after)'.  Fix display of unicode.
+        `(char-after)'.  Fix display of Unicode.
 
 2003-05-28  Nick Roberts  <nick@nick.uklinux.net>
 
@@ -2149,7 +2149,7 @@
 
 2003-05-25  Kevin Ryde  <user42@zip.com.au>
 
-        * info-look.el (autoconf-mode setups): Recognise AH_ and AU_ entries
+        * info-look.el (autoconf-mode setups): Recognize AH_ and AU_ entries
         in "(autoconf)Autoconf Macro Index".  Add "(autoconf)M4 Macro Index"
         and "(autoconf)Autotest Macro Index".  Remove duplicate copy of
         "(automake)Macro and Variable Index".  Keep automake after all
@@ -2429,8 +2429,8 @@
 2003-05-21  Dave Love  <fx@gnu.org>
 
         * descr-text.el (unicodedata-file): New.
-        (unicode-data): New (adapted from unicode branch).
-        (describe-char): Use it.  Print char's unicode differently.
+        (unicode-data): New (adapted from Unicode branch).
+        (describe-char): Use it.  Print char's Unicode code point differently.
         Avoid elements with null cadr when formatting list.  Clarify error
         message when used in Help buffer.
         (button): Require when compiling.
@@ -2440,7 +2440,7 @@
 
         * gdb-ui.el (gud-gdba-command-name): Use -noasync option for Gdb
         with MS windows.
-        (gdb-display-end): Only make buffer writeable temporarily.
+        (gdb-display-end): Only make buffer writable temporarily.
         Move "View" submenu up one level.
 
 2003-05-21  Nick Roberts  <nick@nick.uklinux.net>
@@ -9827,7 +9827,7 @@
         (uniquify-delay-rationalize-file-buffer-names): Remove useless check.
         (kill-buffer-hook): Don't change globally.
 
-2002-09-27  Stefan Monnier  <monnier@cs.yale.edu>.
+2002-09-27  Stefan Monnier  <monnier@cs.yale.edu>
 
         * calc/calc.el (calc-bug-address, calc-scan-for-dels, calc-stack)
         (calc-stack-top, calc-always-load-extensions)
@@ -11680,7 +11680,7 @@
 2002-08-27  Francesco Potortì  <pot@gnu.org>
 
         * net/ange-ftp.el (ange-ftp-skip-msgs): Skip the 530 response
-        given by vsFTPd when accessed with a kerberised FTP client.
+        given by vsFTPd when accessed with a kerberized FTP client.
 
 2002-08-27  Richard M. Stallman  <rms@gnu.org>
 
@@ -14917,7 +14917,7 @@
 
 2002-05-14  Francesco Potortì  <pot@gnu.org>
 
-        * shell.el (shell-mode): Make second part of initialisation
+        * shell.el (shell-mode): Make second part of initialization
         depend on whether comint-input-ring is empty, rather than depend
         on it being nil.
 
@@ -17991,7 +17991,7 @@
         * international/ucs-tables.el (ucs-unify-8859, ucs-fragment-8859):
         Use unify-8859-on-decoding-mode.
         (unify-8859-on-decoding-mode): Also set translation-table-for-input.
-        (ucs-insert): Give an error if the unicode char can't be created.
+        (ucs-insert): Give an error if the Unicode char can't be created.
 
         * pcvs-parse.el (cvs-parse-table): Be a bit more lenient.
         (cvs-parse-status): Handle the "used to have a conflict" marker.
@@ -19206,7 +19206,7 @@
         * language/cyril-util.el (cyrillic-encode-koi8-r-char)
         (cyrillic-encode-alternativnyj-char): Get translation tables from
         symbol properties, not as variables.
-        (standard-display-cyrillic-translit): Include unicodes.
+        (standard-display-cyrillic-translit): Include Unicode characters.
 
 2002-02-06  Kim F. Storm  <storm@cua.dk>
 
@@ -20778,7 +20778,7 @@
         * Makefile.in (distclean): Remove Makefile in the build
         directory, not in the source directory.
 
-2001-12-21  Simon Josefsson  <jas@extundo.com>.
+2001-12-21  Simon Josefsson  <jas@extundo.com>
 
         * mail/smtpmail.el (smtpmail-send-queued-mail):
         Use with-temp-buffer instead of find-file-noselect, and bind
@@ -22669,7 +22669,7 @@
 
         Suggested by Kalle Olavi Niemitalo <kon@iki.fi>:
 
-        * vc-hooks.el (vc-error-occured): Backquotified.
+        * vc-hooks.el (vc-error-occurred): Backquotified.
         (vc-file-prop-obarray): Use prime length for better efficiency.
 
         * vc.el (vc-clear-context): Fill obarray with 0, not nil.
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index 08bd70926b4..c80091e4657 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -6884,7 +6884,7 @@
 
 2004-05-22  Richard M. Stallman  <rms@gnu.org>
 
-        * textmodes/paragraphs.el (sentence-end): Match unicode curly quotes
+        * textmodes/paragraphs.el (sentence-end): Match Unicode curly quotes
         as a close quote.
 
         * textmodes/bibtex.el: Use assoc-string, not assoc-ignore-case.
@@ -7074,7 +7074,7 @@
 2004-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * descr-text.el (describe-char-unicode-data)
-        (describe-char-unicodedata-file): Re-enable the unicode code now that
+        (describe-char-unicodedata-file): Re-enable the Unicode code now that
         the licensing issues have been cleared in the unicode-4 license.
         (describe-text-properties-1): Remove unused `overlay' var.
         (describe-char): Remove unused var `buffer'.
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index e916db64f05..1660009aba7 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -1741,8 +1741,8 @@
 
         * outline.el (hide-sublevels): Keep empty last line, if available.
 
-        * buff-menu.el (list-buffers-noselect): Use explicit unicode code
-        rather than the corresponding unicode char, to make the code
+        * buff-menu.el (list-buffers-noselect): Use explicit Unicode code
+        rather than the corresponding Unicode char, to make the code
         more readable.
 
 2007-02-19  Juanma Barranquero  <lekktu@gmail.com>
@@ -2823,7 +2823,7 @@
 2007-01-01  Alan Mackenzie  <acm@muc.de>
 
         * progmodes/cc-engine.el (c-guess-basic-syntax, case 5N):
-        Check the format of c-state-cache is valid for an optimisation before
+        Check the format of c-state-cache is valid for an optimization before
         using it.
 
         * progmodes/cc-engine.el (c-guess-basic-syntax): New case 5Q "we
@@ -2840,11 +2840,11 @@
         * progmodes/cc-cmds.el (c-context-line-break): Don't indent the
         new line after an escaped EOL in a string.
 
-        * progmodes/cc-engine.el (c-forward-label): Recognise "foo:" as a
+        * progmodes/cc-engine.el (c-forward-label): Recognize "foo:" as a
         label when it directly follows "else", "do", ....
 
         * progmodes/cc-engine.el (c-backward-<>-arglist): Tolerate empty
-        angle brackets (as seen in "explicit specialisations" of C++
+        angle brackets (as seen in "explicit specializations" of C++
         templates).
 
         * progmodes/cc-vars.el (c-indentation-style): Mention c-file-style
@@ -2871,7 +2871,7 @@
         * progmodes/cc-cmds.el (c-electric-slash): Extend the handling of
         clean-up comment-close-slash also to work when there's a comment
         terminator on the line.
-        (c-beginning-of-defun, c-end-of-defun): Refactor and optimise
+        (c-beginning-of-defun, c-end-of-defun): Refactor and optimize
         these for large arg - only take account of top level {..}, except
         for initial and final adjustments.  M-- C-M-[ae] now go to the
         right defuns when the starting point is between defuns.  They use
@@ -3257,7 +3257,7 @@
 
 2006-12-17  Alan Mackenzie  <acm@muc.de>
 
-        * emacs-lisp/lisp.el (beginning-of-defun-raw): Optimise (for
+        * emacs-lisp/lisp.el (beginning-of-defun-raw): Optimize (for
         speed) the case when open-paren-in-column-0-is-defun-start is nil.
         Based on code by Martin Rudalics.
 
@@ -4124,7 +4124,7 @@
 2006-11-15  Simon Marshall  <simon@gnu.org>
 
         * progmodes/cc-fonts.el (c-font-lock-declarators): Use c-at-toplevel-p
-        to recognise "T t()" as a function declaration, rather than a
+        to recognize "T t()" as a function declaration, rather than a
         variable instantiation, iff at the top-level or inside a class
         declaration.  Suggested by Feng Li <fengli@gmail.com>.
 
@@ -8722,7 +8722,7 @@
 
         * progmodes/gdb-ui.el (gdb-same-frame): New option.
         (gud-old-arrow, gdb-frame-begin, gdb-printing): New variables.
-        (gdb-init-1): Initialise them.
+        (gdb-init-1): Initialize them.
         (gdb-starting): Reset gdb-printing.
         (gdb-starting): Save value of gud-overlay-arrow-position.
         (gdb-frame-begin): Set gdb-frame-begin, gdb-printing.
@@ -10937,7 +10937,7 @@
 
 2006-04-10  Nick Roberts  <nickrob@snap.net.nz>
 
-        * progmodes/gdb-ui.el (gdb-init-1): Re-initialise gdb-main-file to nil.
+        * progmodes/gdb-ui.el (gdb-init-1): Re-initialize gdb-main-file to nil.
         (gdb-get-version): Make it work for pre "interpreter mi" (GDB 5.3?).
         (gdb-setup-windows): Put something in source window if we can't find
         the source file.
@@ -16153,7 +16153,7 @@
         much cruft in cc-awk.el, cc-cmds.el and cc-engine.el to clear out.
         * progmodes/cc-cmds.el:
         (c-ascertain-adjacent-literal): In the backwards direction, now
-        recognises AWK regexp delimiters as string delimiters.
+        recognizes AWK regexp delimiters as string delimiters.
         (c-after-statement-terminator-p): Adapt for virtual semicolons;
         check more rigorously for "end of macro".
         (c-back-over-illiterals, c-forward-over-illiterals): Adapt for
@@ -16280,7 +16280,7 @@
 
         * progmodes/cc-cmds.el, cc-styles.el, cc-vars.el: New variables
         c-string-par-start/separate c-sentence-end-with-esc-eol,
-        initialised in c-setup-paragraph-variables, used in string
+        initialized in c-setup-paragraph-variables, used in string
         scanning subroutines of c-beginning-of-statement.
 
         * progmodes/cc-cmds.el (c-electric-brace): Don't delete a comment
@@ -22315,7 +22315,7 @@
         * ibuf-ext.el (ibuffer-auto-update-changed):
         Use `frame-or-buffer-changed-p' to check whether we need to update.
         (ibuffer-auto-mode): Don't advise `get-buffer-create' and
-        `kill-buffer'.  Initialise `ibuffer-auto-buffers-changed'
+        `kill-buffer'.  Initialize `ibuffer-auto-buffers-changed'
         as a `frame-or-buffer-changed-p' state vector instead.
 
 2005-08-27  Romain Francoise  <romain@orebokech.com>
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index 319cdb14b9b..bfe0f4a7a51 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -36,7 +36,7 @@
 2008-02-01  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * ps-print.el: Some face attributes (like :strike-through) were not
-        being recognised.  Reported by Leo <sdl.web@gmail.com>.
+        being recognized.  Reported by Leo <sdl.web@gmail.com>.
         (ps-print-version): New version 7.3.2.
         (ps-screen-to-bit-face): Fix code.  Call ps-face-strikeout-p,
         ps-face-overline-p and ps-face-box-p functions.
@@ -315,7 +315,7 @@
         * language/ethio-util.el:
         * international/characters.el: Use utf-8 rather than utf-8-emacs
         since it works as well and has the advantage of working with
-        non-unicode versions of Emacs.
+        non-Unicode versions of Emacs.
 
         * international/encoded-kb.el (encoded-kbd-setup-display): Use the new
         multi-tty code, which includes the previous local change.
@@ -1171,7 +1171,7 @@
 
         * international/encoded-kb.el (encoded-kbd-self-insert-charset)
         (encoded-kbd-self-insert-utf-8, encoded-kbd-setup-keymap)
-        (encoded-kbd-mode): Adjust code merged from trunk for unicode branch.
+        (encoded-kbd-mode): Adjust code merged from trunk for Unicode branch.
 
 2008-02-01  Kenichi Handa  <handa@m17n.org>
 
@@ -1668,7 +1668,7 @@
 2008-02-01  Kenichi Handa  <handa@m17n.org>
 
         * international/fontset.el: Enable the default fontset to use
-        unicode fonts for ASCII characters.
+        Unicode fonts for ASCII characters.
         (x-decompose-font-name): Don't try to resolve PATTERN by
         x-resolve-font-name.
         (x-complement-fontset-spec): Never prepend an ASCII font.
@@ -2331,9 +2331,9 @@
         New coding systems.
         ("Chinese-GBK"): New environment.
 
-        * language/thai-util.el: Remove redundant unicodes in category-setting.
-
-        * language/lao-util.el: Remove redundant unicodes in category-setting.
+        * language/thai-util.el:
+        * language/lao-util.el: Remove redundant Unicode characters
+        in category-setting.
 
         * international/mule-conf.el (japanese-jisx0213-1)
         (japanese-jisx0213-2): Add unify-map.
@@ -2358,7 +2358,8 @@
 
         * language/cyril-util.el (cyrillic-encode-koi8-r-char)
         (cyrillic-encode-alternativnyj-char): Fix.
-        (standard-display-cyrillic-translit): Remove redundant unicodes.
+        (standard-display-cyrillic-translit):
+        Remove redundant Unicode characters.
 
 2008-02-01  Dave Love  <fx@gnu.org>
 
@@ -2417,7 +2418,7 @@
         lengths of the pair.
 
         * international/characters.el: Add Vietnamese category to
-        equivalent unicodes.
+        equivalent Unicode characters.
 
 2008-02-01  Dave Love  <fx@gnu.org>
 
@@ -2518,7 +2519,7 @@
         (print-designation): Partial re-write.
         (describe-coding-system): Deal with iso-2022 designations, flags.
         Fix shift_jis case.
-        (describe-char-after): Use characterp.  Print explicit unicode.
+        (describe-char-after): Use characterp.  Print explicit Unicode code point.
         Remove some obsolete code.
         (print-coding-system-briefly): Fix printing aliases.
         (print-coding-system): Use coding-system-aliases.
@@ -2587,7 +2588,7 @@
 
         * Makefile.in: Cancel the 2008-02-01 change of mine.
 
-        * international/fontset.el: Add setting for unicode font at the
+        * international/fontset.el: Add setting for Unicode font at the
         end of the default fontset.
 
 2008-02-01  Dave Love  <fx@gnu.org>
@@ -2742,7 +2743,7 @@
 
         * international/ja-dic-utl.el (skkdic-jisx0208-hiragana-block):
         Fix the initial value to specify character range of
-        japanese-jisx0208, not unicode.
+        japanese-jisx0208, not Unicode.
 
         * international/characters.el: Set syntax/category for
         japanese-jisx0208.
@@ -4137,7 +4138,7 @@
 2008-01-14  Alan Mackenzie  <acm@muc.de>
 
         * progmodes/cc-engine.el (c-guess-basic-syntax): Prevent a macro
-        call inside a struct being recognised as a K&R argument.
+        call inside a struct being recognized as a K&R argument.
 
 2008-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -6265,7 +6266,7 @@
         delete .elc files.
 
         * nxml/char-name/unicode: Move to etc/nxml/.
-        * nxml/nxml-uchnm.el (top-level): Adapt for moved unicode files.
+        * nxml/nxml-uchnm.el (top-level): Adapt for moved Unicode files.
 
         * nxml/nxml-enc.el (xmltok-get-declared-encoding-position):
         Declare as a function.
@@ -12544,7 +12545,7 @@
         a weird set-buffer&prog1 combination.
 
         * emacs-lisp/byte-opt.el (byte-optimize-if): Move `progn' out of the
-        test so as to optimise cases where the `progn's result is constant.
+        test so as to optimize cases where the `progn's result is constant.
 
 2007-08-23  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
@@ -13845,7 +13846,7 @@
 2007-07-24  Alan Mackenzie  <acm@muc.de>
 
         * emacs-lisp/bytecomp.el (byte-compile-from-buffer):
-        Initialise byte-compile-unresolved-functions before rather than
+        Initialize byte-compile-unresolved-functions before rather than
         after a compilation.
         (byte-compile-unresolved-functions): Amplify doc string.
 
@@ -14943,7 +14944,7 @@
 2007-07-05  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
         * Makefile.in (bootstrap-prepare): When copying from
-        ldefs-boot.el, make sure loaddefs.el is writeable.
+        ldefs-boot.el, make sure loaddefs.el is writable.
 
         (bootstrap-prepare): Make $(lisp)/ps-print.el
         and $(lisp)/emacs-lisp/cl-loaddefs.el writable, as well.
@@ -15910,14 +15911,14 @@
 2007-06-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * textmodes/css-mode.el (css-navigation-syntax-table):
-        Use set-char-table-range so it also works in the unicode branch.
+        Use set-char-table-range so it also works in the Unicode branch.
 
 2007-06-08  Nick Roberts  <nickrob@snap.net.nz>
 
         * help-mode.el (help-xref-forward-stack)
         (help-xref-stack-forward-item, help-forward-label): New variables.
         (help-forward): New button type.
-        (help-setup-xref): Initialise help-xref-forward-stack.
+        (help-setup-xref): Initialize help-xref-forward-stack.
         (help-make-xrefs): Add forward button, if appropriate.
         (help-xref-go-back): Push item on forward stack.
         (help-xref-go-forward, help-go-forward): New functions.
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index cd91dfad28c..0348a0141a2 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -30,7 +30,7 @@
 2009-06-19  Kenichi Handa  <handa@m17n.org>
 
         * international/fontset.el (setup-default-fontset): Add a spec of
-        non-OTF unicode font for Thai.
+        non-OTF Unicode font for Thai.
 
         * fringe.el: Add coding: utf-8 cookie.
 
@@ -8483,7 +8483,7 @@
 
 2008-07-31  Chong Yidong  <cyd@stupidchicken.com>
 
-        * Makefile.in: Avoid maintainer warning for autogenerated unicode
+        * Makefile.in: Avoid maintainer warning for autogenerated Unicode
         files.
 
         * apropos.el (apropos-symbol): Don't set button skip by default.
@@ -13629,7 +13629,7 @@
         (completion-emacs22-try-completion): Place cursor after the /, as was
         done in Emacs-22's minibuffer-complete-word.
         Fix bug reported by David Hansen <david.hansen@gmx.net>.
-        (completion-emacs22-try-completion): Merge all mergeable text rather
+        (completion-emacs22-try-completion): Merge all mergable text rather
         than just /.
         (completion-pcm--delim-wild-regex): New var.
         (completion-pcm-word-delimiters): New custom.
@@ -14189,7 +14189,7 @@
 2008-04-19  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gdb-thread-indicator): New variable.
-        (gdb-init-1): Initialise it.
+        (gdb-init-1): Initialize it.
         (gdb-annotation-rules): New entry for "new-thread".
         (gdb-thread-identification): New function to customize
         mode-line-buffer-identification.
@@ -15994,11 +15994,11 @@
 2008-04-02  Alan Mackenzie  <acm@muc.de>
 
         * progmodes/cc-cmds.el (c-defun-name, c-cpp-define-name):
-        New optimised functions to get the name of the current defun/macro.
+        New optimized functions to get the name of the current defun/macro.
 
         * add-log.el (add-log-current-defun): Move the functionality which
         gets the current function name for C like modes to cc-cmds.el,
-        thus optimising for speed.
+        thus optimizing for speed.
 
 2008-04-02  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -16095,10 +16095,10 @@
         covering IPA (previously Latin), Phonetic Extensions and
         Phonetic Extensions Supplement (both previously unassigned).
 
-        * international/fontset.el (setup-default-fontset): Use unicode fonts
+        * international/fontset.el (setup-default-fontset): Use Unicode fonts
         that cover bopomofo script for bopomofo.
         Likewise for braille and mathematical.
-        Use unicode scripts that cover the phonetic script for IPA.
+        Use Unicode scripts that cover the phonetic script for IPA.
 
 2008-04-01  Johan Bockgård  <bojohan@gnu.org>
 
@@ -19392,7 +19392,7 @@
         * progmodes/cc-mode.el (c-basic-common-init): C and ObjC now use
         syntax-table text properties.
         (c-common-init): Call language specific before/after-change
-        functions at mode initialisation.
+        functions at mode initialization.
         (c-new-BEG, c-new-END, c-old-BOM, c-old-EOM): New variables.
         (c-extend-region-for-CPP, c-neutralize-CPP-line)
         (c-neutralize-syntax-in-CPP): New functions.
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index ddd8ad7e7ff..04133f17364 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -2790,13 +2790,13 @@
         * net/tramp-gw.el:
         * net/tramp-imap.el:
         * net/tramp-sh.el:
-        * net/tramp-smb.el: Add tramp-autoload cookie for initialisation
+        * net/tramp-smb.el: Add tramp-autoload cookie for initialization
         code of `tramp-default-method-alist' and `tramp-default-user-alist'.
 
 2010-12-29  Karl Fogel  <kfogel@red-bean.com>
 
         * saveplace.el (save-place-alist-to-file): Save list sorted and
-        pretty-printed, so that it is mergeable by line-based text merging,
+        pretty-printed, so that it is mergable by line-based text merging,
         as suggested by Iain Dalton <iain.dalton {_AT_} gmail.com>.
 
 2010-12-28  Ken Manheimer  <ken.manheimer@gmail.com>
@@ -5376,7 +5376,7 @@
 
 2010-10-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * newcomment.el (comment-dwim): Fix the intentation in the doc string.
+        * newcomment.el (comment-dwim): Fix the indentation in the doc string.
 
 2010-10-21  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -7632,7 +7632,7 @@
         (post-self-insert-hook): Use it.
 
         * emacs-lisp/pcase.el (pcase-split-memq):
-        Fix overenthusiastic optimisation.
+        Fix overenthusiastic optimization.
         (pcase-u1): Handle the case of a lambda pred.
 
 2010-08-31  Kenichi Handa  <handa@m17n.org>
@@ -9381,7 +9381,7 @@
 
         Fix an indentation bug:
 
-        * progmodes/cc-mode.el (c-common-init): Initialise c-new-BEG/END.
+        * progmodes/cc-mode.el (c-common-init): Initialize c-new-BEG/END.
         (c-neutralize-syntax-in-and-mark-CPP): c-new-BEG/END: Take account
         of existing values.
 
@@ -13225,7 +13225,7 @@
 2010-02-04  Michael Albinus  <michael.albinus@gmx.de>
 
         * dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call
-        `dired-uncache' for every elemnt which is an absolute file name.
+        `dired-uncache' for every element which is an absolute file name.
 
         * net/tramp.el (tramp-handle-dired-uncache): When DIR is not a
         directory, handle its directory component.
@@ -14596,7 +14596,7 @@
 2009-12-05  Kevin Ryde  <user42@zip.com.au>
 
         * textmodes/sgml-mode.el (sgml-lexical-context):
-        Recognise comment-start-skip to comment-end-skip as comment (Bug#4781).
+        Recognize comment-start-skip to comment-end-skip as comment (Bug#4781).
 
 2009-12-05  Juri Linkov  <juri@jurta.org>
 
diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index 36046562653..65005a4ba47 100644
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -1960,7 +1960,7 @@
         window for it.
 
         * terminal.el (te-filter):
-        Save/restore point from te-saved-point to minimise the lossage
+        Save/restore point from te-saved-point to minimize the lossage
         vandals can inflict.
 
 1987-01-09  Richard M. Stallman  (rms@prep)
@@ -2190,7 +2190,7 @@
 1986-12-15  Richard Mlynarik  (mly@prep)
 
         * fortran.el:
-        Initialise fortran-mode-abbrev-table correctly.
+        Initialize fortran-mode-abbrev-table correctly.
 
         * fortran.el:
         fortran-comment-indent-char should be a character (a fixnum), not
@@ -3788,7 +3788,7 @@
 
 1986-06-17  Richard M. Stallman  (rms@prep)
 
-        * nroff-mode.el: Add elements to nrofff-brace-table.
+        * nroff-mode.el: Add elements to nroff-brace-table.
 
 1986-06-16  Richard M. Stallman  (rms@prep)
 
@@ -4008,4 +4008,3 @@ See ChangeLog.1 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index 8cafac2c0c4..2b384d79169 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -1905,7 +1905,7 @@
 
         * Makefile: Created.  This exists mainly so developers elsewhere
         can unlock the lisp files to accept an update tar, then relock
-        them without locking the few that should stay writeable.
+        them without locking the few that should stay writable.
 
         * solar.el, ange-ftp.el: Corrected Keywords header
 
diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4
index f9407ce20d8..b2cdc634f84 100644
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@@ -2462,7 +2462,7 @@
 1994-03-03  Simon Marshall  (Simon.Marshall@mail.esrin.esa.it)
 
         * cmuscheme.el (inferior-scheme-mode): Removed unnecessary
-        initialisation of comint-input-sentinel.
+        initialization of comint-input-sentinel.
 
         * shell.el (shell-dynamic-complete-functions): New variable.
         (shell-mode): Use it to set comint-dynamic-complete-functions.
@@ -4958,7 +4958,7 @@
 1993-11-08  Simon Marshall  (Simon.Marshall@mail.esrin.esa.it)
 
         * comint.el (comint-preinput-scroll-to-bottom): Added
-        comint-magic-space to list of commands recognised as inserting.
+        comint-magic-space to list of commands recognized as inserting.
 
         * comint.el (comint-output-filter): Corrected check for killed
         buffer.
@@ -5202,7 +5202,7 @@
 
         * comint.el (comint-last-output-start): New variable to record
         where most recent process output started from.
-        (comint-mode): Initialise it.
+        (comint-mode): Initialize it.
         (comint-output-filter): Set it.
 
         * comint.el (comint-previous-matching-input-string): Moved to
@@ -5220,7 +5220,7 @@
         they move within the buffer rather than do input.
 
         * comint.el (comint-send-input, comint-after-pmark-p)
-        (comint-kill-input, comint-proc-query): Removed serialisation of
+        (comint-kill-input, comint-proc-query): Removed serialization of
         obtaining the process mark's marker-position.
 
         * comint.el, shell.el: Commented out comint/shell-load-hooks.
@@ -8952,4 +8952,3 @@ See ChangeLog.3 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index 2d61f464a29..b536f7f1b66 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -475,8 +475,8 @@
         * viper.el (vip-put-back, vip-Put-back): Now emulate Vi's behavior
         more closely.
 
-        * viper.el (vip-line): No longer not bombs out.
-        (vip-exec-shift) now preserves the point.
+        * viper.el (vip-line): No longer bombs out.
+        (vip-exec-shift): Now preserves the point.
 
         * viper.el: Fixed the behavior of the Vi commands M, L, G, yw, dg, etc.
 
@@ -2880,7 +2880,7 @@
 
 1995-03-02  Simon Marshall  <simon@duality.gnu.ai.mit.edu>
 
-        * font-lock.el (font-lock-maximum-decoration) New variable.
+        * font-lock.el (font-lock-maximum-decoration): New variable.
         (font-lock-after-fontify-buffer-hook): New variable.
         (font-lock-fontify-buffer): Run it after fontifying.
         (font-lock-thing-lock-cleanup): New function to turn things off.
@@ -4133,7 +4133,7 @@
 
         * startup.el (command-line-1): Handle -f with kbd macro.
 
-        * msb.el (mouse-select-buffer) Handle an aborted selection.
+        * msb.el (mouse-select-buffer): Handle an aborted selection.
 
 1995-01-11  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -4522,7 +4522,7 @@
         * gud.el (gdb): Correct tbreak doc string.
         (gud-mode): Define a Gud menu.
         (gdb): Set debugger-specific menu entries.
-        (sdb) (dbx) (xdb): Likewise.
+        (sdb, dbx, xdb): Likewise.
 
 1994-12-22  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -6165,7 +6165,7 @@
 
 1994-10-05  Simon Marshall  <Simon.Marshall@mail.esrin.esa.it>
 
-        * comint.el (comint-check-proc): Recognise `open'.
+        * comint.el (comint-check-proc): Recognize `open'.
         (comint-exec): Use open-network-stream if command is a cons pair.
 
         * font-lock.el (compilation-mode-font-lock-keywords,
@@ -6861,7 +6861,7 @@
         (Man-mode-map): Changed the meanings of ",", ".", "q".  Added new
         keys ">", "<", "k".
         (Man-page-mode-string): Function deleted.
-        (Man-init-defvars): New function used for initialising the system
+        (Man-init-defvars): New function used for initializing the system
         and environment dependent variables Man-fontify-manpage-flag,
         Man-uses-untabify, Man-sed-script, Man-filter-list.
         (Man-delete-trailing-newlines): Function deleted.
@@ -6954,7 +6954,7 @@
 
 1994-09-19  Francesco Potortì  <pot@cnuce.cnr.it>
 
-        * rlogin.el (rlogin): Recognise the `-l user' option to rlogin and
+        * rlogin.el (rlogin): Recognize the `-l user' option to rlogin and
         let comint and ange-ftp know about the correct home directory.
 
 1994-09-19  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
@@ -8114,9 +8114,9 @@
         Modified to work with remote and compressed files.
 
         * ediff.el (ediff-read-file-name, ediff-buffers): Better defaults.
-        (ediff-read-file-name) Handle OS/2.
+        (ediff-read-file-name): Handle OS/2.
 
-        * ediff.el (ediff-forward-word-function) New function.
+        * ediff.el (ediff-forward-word-function): New function.
         (ediff-wordify-function): Variable deleted.
         (ediff-toggle-regexp-match, ediff-hide-regexp-matches): New functions.
         (ediff-focus-on-regexp-matches): New function.
@@ -8813,7 +8813,7 @@
         (gnus-uu-ask-to-save-file): New function.
 
         * gnus-uu.el (gnus-uu-interactive-set-up-windows): New function.
-        (gnus-uu-interactive-scan-directory) New function.
+        (gnus-uu-interactive-scan-directory): New function.
         (gnus-uu-interactive-rescan-directory): New function.
         (gnus-uu-ignore-files-by-name, gnus-uu-ignore-files-by-type): New vars.
         (gnus-uu-interactive-execute): Change directory to work dir before
@@ -9280,4 +9280,3 @@ See ChangeLog.4 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 7ba9261ccf0..42c9df84876 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -1491,9 +1491,9 @@
 
 1996-04-16  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
 
-        * vc.el (vc-comment-ring): Initialise using make-ring.
-        (vc-clear-context): Initialise vc-comment-ring using make-ring.
-        (vc-finish-logentry): Don't initialise vc-comment-ring here.
+        * vc.el (vc-comment-ring): Initialize using make-ring.
+        (vc-clear-context): Initialize vc-comment-ring using make-ring.
+        (vc-finish-logentry): Don't initialize vc-comment-ring here.
 
 1996-04-15  Eric Ding  <ericding@mit.edu>
 
@@ -3055,7 +3055,7 @@
         (font-lock-mode): Use them.  Doc fix.
         Don't make font-lock-fontified buffer local here.
         (font-lock-set-defaults): Do it here.
-        (font-lock-compile-keyword): New function.  Recognise `eval' keywords.
+        (font-lock-compile-keyword): New function.  Recognize `eval' keywords.
         (font-lock-compile-keywords): Use it.
         (global-font-lock-mode): New command for Global Font Lock mode.
         (font-lock-global-modes): New variable.
@@ -8038,4 +8038,3 @@ See ChangeLog.5 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 6d3d41a5a5c..7aca1b521a2 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -5516,7 +5516,7 @@
 1999-04-08  Andre Spiegel  <spiegel@inf.fu-berlin.de>
 
         * vc.el (vc-backend-revert): For CVS files that were made
-        writeable with "cvs edit", call "cvs unedit" to undo that.
+        writable with "cvs edit", call "cvs unedit" to undo that.
 
 1999-04-08  Dave Love  <fx@gnu.org>
 
@@ -6259,7 +6259,7 @@
         * sql.el: Added keywords from `finder-by-keyword'.
         (sql-mode): Made sql-buffer a local variable, changed the
         documentation: removed instructions to add *.sql files to
-        auto-mode-alist, added documentation for having mutliple SQL
+        auto-mode-alist, added documentation for having multiple SQL
         buffers sending their stuff to different SQLi buffers, each
         running a different process.
         (sql-postgres): Quoted *SQL* in doc string.
@@ -6270,7 +6270,7 @@
         (sql-sybase): Quoted *SQL* in doc string, added comma.
         (sql-oracle): Likewise.
         (sql-interactive-mode): Added extensive documentation for having
-        mutliple SQL buffers sending their stuff to different SQLi
+        multiple SQL buffers sending their stuff to different SQLi
         buffers, each running a different process.
         (sql-buffer): Changed doc from *SQL* to SQLi.
         (sql-get-login): Doc fix.
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 4f867c24561..538f3f1d401 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -40,7 +40,7 @@
 2001-10-17  Francesco Potortì  <pot@gnu.org>
 
         * comint.el (comint-password-prompt-regexp): Make it less
-        restrictive, letting comint recognise OpenSSH2 passphrase prompts.
+        restrictive, letting comint recognize OpenSSH2 passphrase prompts.
 
 2001-10-17  John Wiegley  <johnw@gnu.org>
 
@@ -8638,7 +8638,7 @@
 2000-11-15  Gerd Moellmann  <gerd@gnu.org>
 
         * faces.el (face-set-after-frame-default):
-        If `inhibit-default-face-x-resources' is bound, don't intialize the
+        If `inhibit-default-face-x-resources' is bound, don't initialize the
         default face from X resources.
 
 2000-11-15  Eli Zaretskii  <eliz@is.elta.co.il>
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 3c2871594fc..dfd9adad2a7 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -1623,7 +1623,7 @@ We return the item-widget corresponding to the item at point."
 
       (set-buffer-modified-p was-modified)
       (goto-char steady-point)
-      ;; must null the marker or the buffer gets clogged with impedence:
+      ;; must null the marker or the buffer gets clogged with impedance:
       (set-marker steady-point nil)
 
       item-widget)))
diff --git a/lisp/allout.el b/lisp/allout.el
index 8cbdbee7303..e701d9685a1 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -170,7 +170,7 @@ respective allout-mode keybinding variables, `allout-command-prefix',
   ;; the function value keymap of allout-mode-map is used in
   ;; minor-mode-map-alist - update it:
   (fset allout-mode-map allout-mode-map-value))
-;;;_  * intialize the mode map:
+;;;_  * initialize the mode map:
 ;; ensure that allout-mode-map has some setting even if allout-mode hasn't
 ;; been invoked:
 (allout-compose-and-institute-keymap)
@@ -612,7 +612,7 @@ headers look like comments in the programming language.  It will also use
 the comment-start string, with an '_' appended, for `allout-primary-bullet'.
 
 String values are used as literals, not regular expressions, so
-do not escape any regulare-expression characters.
+do not escape any regular-expression characters.
 
 Value t means to first check for assoc value in `allout-mode-leaders'
 alist, then use comment-start string, if any, then use default (`.').
@@ -825,7 +825,7 @@ formatted copy."
 (defcustom allout-encrypt-unencrypted-on-saves t
   "If non-nil, topics pending encryption are encrypted during buffer saves.
 
-This provents file-system exposure of un-encrypted contents of
+This prevents file-system exposure of un-encrypted contents of
 items marked for encryption.
 
 When non-nil, if the topic currently being edited is decrypted,
@@ -2283,7 +2283,7 @@ If topic has no offspring, then the next sibling with offspring will
 determine whether or not this one is determined to be aberrant.
 
 If true, then the allout-recent-* settings are calibrated on the
-offspring that qaulifies it as aberrant, ie with depth that
+offspring that qualifies it as aberrant, ie with depth that
 exceeds the topic by more than one."
 
   ;; This is most clearly understood when considering standard-prefix-leader
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 817aaff55ca..f70025e9d3f 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -77,7 +77,7 @@
 ;;   M-x global-auto-revert-mode RET
 ;;
 ;; To activate Global Auto-Revert Mode every time Emacs is started
-;; customise the option `global-auto-revert-mode' or the following
+;; customize the option `global-auto-revert-mode' or the following
 ;; line could be added to your ~/.emacs:
 ;;   (global-auto-revert-mode 1)
 ;;
diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el
index 20b4a9db5e2..44354f0822f 100644
--- a/lisp/calc/calc-bin.el
+++ b/lisp/calc/calc-bin.el
@@ -291,7 +291,7 @@ the size of a Calc bignum digit.")
           (if (eq (car-safe b) 'mod)
               (if (equal mod (nth 2 b))
                   (setq b (nth 1 b))
-                (math-reject-arg b "*Inconsistent modulos"))))
+                (math-reject-arg b "*Inconsistent modulus"))))
       (setq mod (nth 2 b)
             b (nth 1 b)))
     (if (Math-messy-integerp mod)
@@ -303,9 +303,9 @@ the size of a Calc bignum digit.")
           (if w
               (if (/= w bits)
                   (calc-record-why
-                   "*Warning: Modulo inconsistent with word size"))
+                   "*Warning: Modulus inconsistent with word size"))
             (setq w bits))
-        (calc-record-why "*Warning: Modulo is not a power of 2"))
+        (calc-record-why "*Warning: Modulus is not a power of 2"))
       (math-make-mod (if b
                          (funcall f a b w)
                        (funcall f a w))
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index db86c08422e..6d034927ae0 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -260,13 +260,13 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C).
                                                       (length msg)) 32)
                                       "  [?=MORE]")
                             ""))))))))
-  
+
 
 
 
 ;;;; Stack and buffer management.
 
-;; The variable calc-last-why-command is set in calc-do-handly-whys
+;; The variable calc-last-why-command is set in calc-do-handle-whys
 ;; and used in calc-why (in calc-stuff.el).
 (defvar calc-last-why-command)
 
diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el
index e16c26eaa19..97d955eb07d 100644
--- a/lisp/calc/calc-poly.el
+++ b/lisp/calc/calc-poly.el
@@ -419,7 +419,7 @@
         (list 'frac 1 denom))
     1))
 
-;;; Compute the GCD of two monovariate polynomial lists.
+;;; Compute the GCD of two univariate polynomial lists.
 ;;; Knuth section 4.6.1, algorithm C.
 (defun math-poly-gcd-coefs (u v)
   (let ((d (math-poly-gcd (math-poly-gcd-list u)
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 60a84bdff35..626d2462b4f 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1235,7 +1235,8 @@ Used by `calc-user-invocation'.")
         (glob (current-global-map))
         (loc (current-local-map)))
     (or (input-pending-p) (message "%s" prompt))
-    (let ((key (calc-read-key t)))
+    (let ((key (calc-read-key t))
+          (input-method-function nil))
       (calc-unread-command (cdr key))
       (unwind-protect
           (progn
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 1b980b3b1fa..d161602bec0 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -147,7 +147,7 @@ See the documentation for the function `diary-list-sexp-entries'."
 Nil means there are no comments.  The diary does not display
 parts of entries that are inside comments.  You can use comments
 for whatever you like, e.g. for meta-data that packages such as
-`appt.el' can use.  Comments may not span mutliple lines, and there
+`appt.el' can use.  Comments may not span multiple lines, and there
 can be only one comment on any line.
 See also `diary-comment-end'."
   :version "24.1"
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index b0c7f125982..de232c25e3f 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -61,14 +61,14 @@
 ;;
 ;;      The TODO list file has a special format and some auxiliary
 ;;      information, which will be added by the todo-show function if
-;;      it attempts to visit an un-initialised file.  Hence it is
+;;      it attempts to visit an un-initialized file.  Hence it is
 ;;      recommended to use the todo-show function for the first time,
-;;      in order to initialise the file, but it is not necessary
+;;      in order to initialize the file, but it is not necessary
 ;;      afterwards.
 ;;
 ;;      As these commands are quite long to type, I would recommend
 ;;      the addition of two bindings to your to your global keymap.  I
-;;      personally have the following in my initialisation file:
+;;      personally have the following in my initialization file:
 ;;
 ;;          (global-set-key "\C-ct" 'todo-show)  ; switch to TODO buffer
 ;;          (global-set-key "\C-ci" 'todo-insert-item) ; insert new item
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index e5969a3c291..788bf71845f 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,27 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * cedet-cscope.el (cedet-cscope-version-check):
+        * cedet-global.el (cedet-global-min-version)
+        (cedet-gnu-global-version-check):
+        * cedet.el (cedet-version):
+        * data-debug.el (data-debug-prev, data-debug-contract-current-line):
+        * ede.el (ede-buffer-belongs-to-project-p, ede-auto-add-to-target)
+        (ede-new, ede-invoke-method, project-edit-file-target, project-rescan)
+        (ede-add-project-to-global-list, ede-map-all-subprojects):
+        * inversion.el (inversion-check-version):
+        * mode-local.el (mode-local-map-file-buffers, define-child-mode)
+        (define-overloadable-function):
+        * pulse.el (pulse-flag, pulse):
+        * semantic.el (semantic-elapsed-time, semantic-parse-region)
+        (navigate-menu):
+        * ede/proj-comp.el (ede-compilation-program):
+        * semantic/debug.el (semantic-debug-parser-go)
+        (semantic-debug-parser-fail, semantic-debug-parser-quit)
+        (semantic-debug-parser-abort):
+        * semantic/idle.el (semantic-idle-core-handler):
+        * semantic/bovine/debug.el (semantic-bovine-debug-error-frame):
+        Fix typos.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * semantic/lex.el (semantic-lex-tokens):
diff --git a/lisp/cedet/cedet-cscope.el b/lisp/cedet/cedet-cscope.el
index 74892533ab6..71942698c5f 100644
--- a/lisp/cedet/cedet-cscope.el
+++ b/lisp/cedet/cedet-cscope.el
@@ -135,8 +135,8 @@ the error code."
 
 (defun cedet-cscope-version-check (&optional noerror)
   "Check the version of the installed CScope command.
-If optional programatic argument NOERROR is non-nil, then
-instead of throwing an error if CScope isn't available, then
+If optional programmatic argument NOERROR is non-nil,
+then instead of throwing an error if CScope isn't available,
 return nil."
   (interactive)
   (require 'inversion)
diff --git a/lisp/cedet/cedet-files.el b/lisp/cedet/cedet-files.el
index ae037028bf7..6f40ee7030f 100644
--- a/lisp/cedet/cedet-files.el
+++ b/lisp/cedet/cedet-files.el
@@ -83,7 +83,7 @@ specific conversions during tests."
           (setq file (concat driveletter ":"
                              (substring file (match-end 1))))))
 
-      ;; Handle the \\file\name nomenclature on some windows boxes.
+      ;; Handle the \\file\name nomenclature on some Windows boxes.
       (when (string-match "^!" file)
         (setq file (concat "//" (substring file 1)))))
     file))
diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el
index d2a9794ec81..aa18c0d2f42 100644
--- a/lisp/cedet/cedet-global.el
+++ b/lisp/cedet/cedet-global.el
@@ -27,7 +27,7 @@
 (declare-function inversion-check-version "inversion")
 
 (defvar cedet-global-min-version "5.0"
-  "Minimum version of GNU global required.")
+  "Minimum version of GNU Global required.")
 
 (defcustom cedet-global-command "global"
   "Command name for the GNU Global executable."
@@ -131,8 +131,8 @@ If a default starting DIR is not specified, the current buffer's
 
 (defun cedet-gnu-global-version-check (&optional noerror)
   "Check the version of the installed GNU Global command.
-If optional programatic argument NOERROR is non-nil, then
-instead of throwing an error if Global isn't available, then
+If optional programmatic argument NOERROR is non-nil,
+then instead of throwing an error if Global isn't available,
 return nil."
   (interactive)
   (require 'inversion)
diff --git a/lisp/cedet/cedet-idutils.el b/lisp/cedet/cedet-idutils.el
index e071265c143..ee8e432ddd9 100644
--- a/lisp/cedet/cedet-idutils.el
+++ b/lisp/cedet/cedet-idutils.el
@@ -84,7 +84,7 @@ Note: Scope is not yet supported."
 
 (defun cedet-idutils-fnid-call (flags)
   "Call ID Utils fnid with the list of FLAGS.
-Return the created buffer with with program output."
+Return the created buffer with program output."
   (let ((b (get-buffer-create "*CEDET fnid*"))
         (cd default-directory)
         )
@@ -112,7 +112,7 @@ Return the created buffer with with program output."
 
 (defun cedet-idutils-mkid-call (flags)
   "Call ID Utils mkid with the list of FLAGS.
-Return the created buffer with with program output."
+Return the created buffer with program output."
   (let ((b (get-buffer-create "*CEDET mkid*"))
         (cd default-directory)
         )
@@ -163,8 +163,8 @@ the error code."
 
 (defun cedet-idutils-version-check (&optional noerror)
   "Check the version of the installed ID Utils command.
-If optional programatic argument NOERROR is non-nil, then
-instead of throwing an error if Global isn't available, then
+If optional programmatic argument NOERROR is non-nil,
+then instead of throwing an error if Global isn't available,
 return nil."
   (interactive)
   (require 'inversion)
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index d7645bc97ed..9ccf74de27a 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -75,7 +75,7 @@
 This is used by `semantic-mode' and `global-ede-mode'.")
 
 (defun cedet-version ()
-  "Display all active versions of CEDET and Dependent packages.
+  "Display all active versions of CEDET and dependent packages.
 
 The PACKAGE column is the name of a given package from CEDET.
 
@@ -85,7 +85,7 @@ See `cedet-packages' for details.
 FILE VERSION is the version number found in the source file
 for the specified PACKAGE.
 
-LOADED VERSION is the version of PACKAGE current loaded in Emacs
+LOADED VERSION is the version of PACKAGE currently loaded in Emacs
 memory and (presumably) running in this Emacs instance.  Value is X
 if the package has not been loaded."
   (interactive)
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index e50e9993af0..329d1c608c2 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -916,7 +916,7 @@ If PARENT is non-nil, it is somehow related as a parent to thing."
   (skip-chars-forward " *-><[]" (point-at-eol)))
 
 (defun data-debug-prev ()
-  "Go to the next line in the Ddebug buffer."
+  "Go to the previous line in the Ddebug buffer."
   (interactive)
   (forward-line -1)
   (beginning-of-line)
@@ -972,7 +972,7 @@ Do nothing if already expanded."
 
 (defun data-debug-contract-current-line ()
   "Contract the current line (if possible).
-Do nothing if already expanded."
+Do nothing if already contracted."
   (when (and (data-debug-current-line-expanded-p)
              ;; Don't contract if the current line is not expandable.
              (get-text-property (point) 'ddebug-function))
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 987351a25e0..741e1ffbe5f 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -214,7 +214,7 @@ Argument LIST-O-O is the list of objects to choose from."
     (and obj (obj-of-class-p obj ede-target))))
 
 (defun ede-buffer-belongs-to-project-p ()
-  "Return non-nil if this buffer belongs to at least one target."
+  "Return non-nil if this buffer belongs to at least one project."
   (if (or (null ede-object) (consp ede-object)) nil
     (obj-of-class-p ede-object ede-project)))
 
@@ -243,7 +243,7 @@ Argument MENU-DEF is the menu definition to use."
               ede-obj (if (listp ede-object) ede-object (list ede-object)))
         ;; First, collect the build items from the project
         (setq newmenu (append newmenu (ede-menu-items-build obj t)))
-        ;; Second, Declare the current target menu items
+        ;; Second, declare the current target menu items
         (if (and ede-obj (ede-menu-obj-of-class-p ede-target))
             (while ede-obj
               (setq newmenu (append newmenu
@@ -264,7 +264,7 @@ Argument MENU-DEF is the menu definition to use."
           (setq targets (cdr targets)))
         ;; Fourth, build sub projects.
         ;; -- nerp
-        ;; Fifth, Add make distribution
+        ;; Fifth, add make distribution
         (append newmenu (list [ "Make distribution" ede-make-dist t ]))
         )))))
 
@@ -512,7 +512,7 @@ an EDE controlled project."
   "Look for a target that wants to own the current file.
 Follow the preference set with `ede-auto-add-method' and get the list
 of objects with the `ede-want-file-p' method."
-  (if ede-object (error "Ede-object already defined for %s" (buffer-name)))
+  (if ede-object (error "ede-object already defined for %s" (buffer-name)))
   (if (or (eq ede-auto-add-method 'never)
           (ede-ignore-file (buffer-file-name)))
       nil
@@ -566,7 +566,7 @@ Argument FILE is the file or directory to load a project from."
     (ede-load-project-file (file-name-directory file))))
 
 (defun ede-new (type &optional name)
-  "Create a new project starting of project type TYPE.
+  "Create a new project starting from project type TYPE.
 Optional argument NAME is the name to give this project."
   (interactive
    (list (completing-read "Project Type: "
@@ -642,7 +642,7 @@ Optional argument NAME is the name to give this project."
 
 (defun ede-invoke-method (sym &rest args)
   "Invoke method SYM on the current buffer's project object.
-ARGS are additional arguments to pass to method sym."
+ARGS are additional arguments to pass to method SYM."
   (if (not ede-object)
       (error "Cannot invoke %s for %s" (symbol-name sym)
              (buffer-name)))
@@ -815,7 +815,7 @@ Argument FNND is an argument."
   (error "remove-file not supported by %s" (object-name ot)))
 
 (defmethod project-edit-file-target ((ot ede-target))
-  "Edit the target OT associated w/ this file."
+  "Edit the target OT associated with this file."
   (find-file (oref (ede-current-project) file)))
 
 (defmethod project-new-target ((proj ede-project) &rest args)
@@ -857,7 +857,7 @@ Argument COMMAND is the command to use for compiling the target."
   (error "Dist-files is not supported by %s" (object-name this)))
 
 (defmethod project-rescan ((this ede-project))
-  "Rescan the EDE proj project THIS."
+  "Rescan the EDE project THIS."
   (error "Rescanning a project is not supported by %s" (object-name this)))
 
 (defun ede-ecb-project-paths ()
@@ -879,7 +879,7 @@ On success, return the added project."
   (when (not proj)
     (error "No project created to add to master list"))
   (when (not (eieio-object-p proj))
-    (error "Attempt to add Non-object to master project list"))
+    (error "Attempt to add non-object to master project list"))
   (when (not (obj-of-class-p proj ede-project-placeholder))
     (error "Attempt to add a non-project to the ede projects list"))
   (add-to-list 'ede-projects proj)
@@ -1157,7 +1157,7 @@ See also `ede-map-all-subprojects'."
   (mapcar proc (oref this subproj)))
 
 (defmethod ede-map-all-subprojects ((this ede-project) allproc)
-  "For object THIS, execute PROC on THIS and  all subprojects.
+  "For object THIS, execute PROC on THIS and all subprojects.
 This function also applies PROC to sub-sub projects.
 See also `ede-map-subprojects'."
   (apply 'append
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index 7efe534a640..69570771546 100644
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -43,7 +43,7 @@
 ;;
 ;; Customization:
 ;;
-;; Since these projects are all so increadibly generic, a user will
+;; Since these projects are all so incredibly generic, a user will
 ;; need to configure some aspects of the project by hand.  In order to
 ;; enable this without configuring the project objects directly (which
 ;; are auto-generated) a special ede-generic-config object is defined to
@@ -359,7 +359,7 @@ the new configuration."
 (defun ede-generic-new-autoloader (internal-name external-name
                                                  projectfile class)
   "Add a new EDE Autoload instance for identifying a generic project.
-INTERNAL-NAME is a long name that identifies thsi project type.
+INTERNAL-NAME is a long name that identifies this project type.
 EXTERNAL-NAME is a shorter human readable name to describe the project.
 PROJECTFILE is a file name that identifies a project of this type to EDE, such as
 a Makefile, or SConstruct file.
diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el
index 05290158189..ae503e836d8 100644
--- a/lisp/cedet/ede/pconf.el
+++ b/lisp/cedet/ede/pconf.el
@@ -82,7 +82,7 @@ don't do it.  A value of nil means to just do it.")
                       (directory-file-name
                        (ede-subproject-relative-path sp top-level-project-local)))))
             (when (string= dir "./") (setq dir ""))
-            ;; Use concat, because expand-file-name removes the relativeness.
+            ;; Use concat, because expand-file-name removes the relativity.
             (concat dir "Makefile") )))))
     ;;
     ;; NOTE TO SELF.  TURN THIS INTO THE OFFICIAL LIST
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index ae5796e042b..84bf8ebf1a0 100644
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -97,8 +97,8 @@ use the same autoconf form.")
    (objectextention :initarg :objectextention
                     :type string
                     :documentation
-                    "A string which is the extention used for object files.
-For example, C code uses .o on unix, and Emacs Lisp uses .elc.")
+                    "A string which is the extension used for object files.
+For example, C code uses .o on Unix, and Emacs Lisp uses .elc.")
    )
   "A program used to compile or link a program via a Makefile.
 Contains everything needed to output code into a Makefile, or autoconf
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 40e6165251c..79022be6a5f 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -584,7 +584,7 @@ Converts all symbols into the objects to be used."
       link)))
 
 
-;;; Target type specific autogenerating gobbldegook.
+;;; Target type specific autogenerating gobbledygook.
 ;;
 
 (defun ede-proj-makefile-type (&optional proj)
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index 316309092e7..033a486f1a7 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -284,7 +284,7 @@ buffer being in order to provide a smart default target type."
                 (progn (forward-line -1)
                        (end-of-line)
                        (insert "\n"))
-              ;; If the above search fails, thats ok.  We'd just want to be at
+              ;; If the above search fails, that's ok.  We'd just want to be at
               ;; point-min anyway.
               )
             (makefile-insert-macro (car (cdr (cdr ntype))))))
diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el
index 065ac6d0559..53639b19a96 100644
--- a/lisp/cedet/inversion.el
+++ b/lisp/cedet/inversion.el
@@ -216,14 +216,14 @@ not an indication of new features or bug fixes."
         )))
 
 (defun inversion-check-version (version incompatible-version
-                                        minimum &rest reserved)
+                                minimum &rest reserved)
   "Check that a given version meets the minimum requirement.
 VERSION, INCOMPATIBLE-VERSION and MINIMUM are of similar format to
 return entries of `inversion-decode-version', or a classic version
 string.  INCOMPATIBLE-VERSION can be nil.
 RESERVED arguments are kept for a later use.
 Return:
-- nil if everything is ok
+- nil if everything is ok.
 - 'outdated if VERSION is less than MINIMUM.
 - 'incompatible if VERSION is not backward compatible with MINIMUM.
 - t if the check failed."
@@ -374,7 +374,7 @@ Return nil when VERSION-STRING was not found."
       (with-temp-buffer
         ;; The 3000 is a bit arbitrary, but should cut down on
         ;; fileio as version info usually is at the very top
-        ;; of a file.  AFter a long commentary could be bad.
+        ;; of a file.  After a long commentary could be bad.
         (insert-file-contents-literally file nil 0 3000)
         (goto-char (point-min))
         (when (re-search-forward (format tag package 'version) nil t)
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index 0e7657642c2..511a3cd1d8b 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -36,7 +36,7 @@
 ;;
 ;; You should use a mode-local variable or override to allow extension
 ;; only if you expect a mode author to provide that extension.  If a
-;; user might wish to customize a give variable or function then
+;; user might wish to customize a given variable or function then
 ;; the existing customization mechanism should be used.
 
 ;; To Do:
@@ -55,7 +55,7 @@
 FUNCTION does not have arguments; when it is entered `current-buffer'
 is the currently selected file buffer.
 If optional argument PREDICATE is non nil, only select file buffers
-for which the function PREDICATE return non-nil.
+for which the function PREDICATE returns non-nil.
 If optional argument BUFFERS is non-nil, it is a list of buffers to
 walk through.  It defaults to `buffer-list'."
   (dolist (b (or buffers (buffer-list)))
@@ -146,7 +146,7 @@ local variables have been defined."
   (mode-local-map-mode-buffers #'activate-mode-local-bindings mode))
 
 (defmacro define-child-mode (mode parent &optional docstring)
-  "Make major mode MODE inherits behavior from PARENT mode.
+  "Make major mode MODE inherit behavior from PARENT mode.
 DOCSTRING is optional and not used.
 To work properly, this should be put after PARENT mode local variables
 definition."
@@ -523,11 +523,11 @@ See also the function `define-overload'."
       result)))
 
 (defmacro define-overloadable-function (name args docstring &rest body)
-  "Define a new function, as with `defun' which can be overloaded.
+  "Define a new function, as with `defun', which can be overloaded.
 NAME is the name of the function to create.
 ARGS are the arguments to the function.
 DOCSTRING is a documentation string to describe the function.  The
-docstring will automatically had details about its overload symbol
+docstring will automatically have details about its overload symbol
 appended to the end.
 BODY is code that would be run when there is no override defined.  The
 default is to call the function `NAME-default' with the appropriate
diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index 74dc1ecde31..4929feb0302 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -36,7 +36,7 @@
 ;;
 ;; `pulse-momentary-highlight-one-line' - Pulse a single line at POINT.
 ;; `pulse-momentary-highlight-region' - Pulse a region.
-;; `pulse-momentary-highlight-overlay' - Pulse an overlay
+;; `pulse-momentary-highlight-overlay' - Pulse an overlay.
 ;;      These three functions will just blink the specified area if
 ;;      the version of Emacs you are using doesn't support pulsing.
 ;;
@@ -65,7 +65,7 @@ background color.
 If the value is nil, highlight with an unchanging color until a
 key is pressed.
 If the value is `never', do no coloring at all.
-Any other value means to the default pulsing behavior.
+Any other value means to do the default pulsing behavior.
 
 If `pulse-flag' is non-nil, but `pulse-available-p' is nil, then
 this flag is ignored."
@@ -77,7 +77,7 @@ this flag is ignored."
      (:background "#AAAA33"))
     (((class color) (background light))
      (:background "#FFFFAA")))
-  "*Face used at beginning of a highight."
+  "*Face used at beginning of a highlight."
   :group 'pulse)
 
 (defface pulse-highlight-face
@@ -163,7 +163,7 @@ Return t if there is more drift to do, nil if completed."
 
 (defun pulse (&optional face)
   "Pulse the colors on our highlight face.
-If optional FACE is provide, reset the face to FACE color,
+If optional FACE is provided, reset the face to FACE color,
 instead of `pulse-highlight-start-face'.
 Be sure to call `pulse-reset-face' after calling pulse."
   (unwind-protect
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 639b46ad2cf..3ffb6baee9f 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -344,7 +344,7 @@ to use Semantic, and `semantic-init-hook' is run."
     ;; don't go along for the ride.
     (add-hook 'clone-indirect-buffer-hook 'semantic-clear-toplevel-cache
               nil t)
-    ;; Specify that this function has done it's work.  At this point
+    ;; Specify that this function has done its work.  At this point
     ;; we can consider that semantic is active in this buffer.
     (setq semantic-new-buffer-fcn-was-run t)
     ;; Here are some buffer local variables we can initialize ourselves
@@ -378,7 +378,7 @@ Do not set this yourself.  Call `semantic-debug'.")
 
 (defun semantic-elapsed-time (start end)
   "Copied from elp.el.  Was `elp-elapsed-time'.
-Argument START and END bound the time being calculated."
+Arguments START and END bound the time being calculated."
   (float-time (time-subtract end start)))
 
 (defun bovinate (&optional clear)
@@ -431,7 +431,7 @@ will be silently ignored.
 
 Optional arguments:
 NONTERMINAL is the rule to start parsing at.
-DEPTH specifies the lexical depth to descend for parser that use
+DEPTH specifies the lexical depth to descend for parsers that use
 lexical analysis as their first step.
 RETURNONERROR specifies that parsing should stop on the first
 unmatched syntax encountered.  When nil, parsing skips the syntax,
@@ -960,7 +960,7 @@ Throw away all the old tags, and recreate the tag database."
     '("--"))
   (define-key navigate-menu [senator-go-to-up-reference]
     '(menu-item "Parent Tag" senator-go-to-up-reference
-                :help "Navigate up one reference by tag."))
+                :help "Navigate up one reference by tag"))
   (define-key navigate-menu [senator-next-tag]
     '(menu-item "Next Tag" senator-next-tag
                 :help "Go to the next tag"))
@@ -971,7 +971,7 @@ Throw away all the old tags, and recreate the tag database."
   ;; Top level menu items:
   (define-key cedet-menu-map [semantic-force-refresh]
     '(menu-item "Reparse Buffer" semantic-force-refresh
-                :help "Force a full reparse of the current buffer."
+                :help "Force a full reparse of the current buffer"
                 :visible semantic-mode))
   (define-key cedet-menu-map [semantic-edit-menu]
     `(menu-item "Edit Tags" ,edit-menu
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 43e998b852e..ae199703c80 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -161,7 +161,7 @@ be just a string in some circumstances.")
 (defclass semantic-analyze-context-return (semantic-analyze-context)
   () ; No extra data.
   "Analysis class for return data.
-Return data methods identify the requred type by the return value
+Return data methods identify the required type by the return value
 of the parent function.")
 
 ;;; METHODS
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index d8b004df1bd..686113c23e2 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -344,7 +344,7 @@ Uses known macro tables in SPP to determine what block to skip."
                  (string= sym "0"))
             (and ifdef (not (semantic-lex-spp-symbol-p sym)))
             (and ifndef (semantic-lex-spp-symbol-p sym)))
-        ;; The if indecates to skip this preprocessor section
+        ;; The if indicates to skip this preprocessor section.
         (let ((pt nil))
           ;; (message "%s %s yes" ift sym)
           (beginning-of-line)
@@ -650,7 +650,7 @@ as for the parent."
                 (setq depth 0)
 
                 ;; This is a copy of semantic-parse-region-default where we
-                ;; are doing something special with the lexication of the
+                ;; are doing something special with the lexing of the
                 ;; contents of the semantic-list token.  Stuff not used by C
                 ;; removed.
                 (let ((tokstream
@@ -954,7 +954,7 @@ now.
                              (nth 1 (car names)) ; name
                              "typedef"
                              (semantic-tag-type-members tag)
-                             ;; parent is just tbe name of what
+                             ;; parent is just the name of what
                              ;; is passed down as a tag.
                              (list
                               (semantic-tag-name
@@ -1591,7 +1591,7 @@ DO NOT return the list of tags encompassing point."
         (setq tagreturn (cons (semantic-tag-type (car (semanticdb-find-result-nth tmp idx))) tagreturn))
         (setq idx (1+ idx)))
       )
-    ;; Use the encompased types around point to also look for using statements.
+    ;; Use the encompassed types around point to also look for using statements.
     ;;(setq tagreturn (cons "bread_name" tagreturn))
     (while (cdr tagsaroundpoint)  ; don't search the last one
       (setq tmp (semantic-find-tags-by-class 'using (semantic-tag-components (car tagsaroundpoint))))
diff --git a/lisp/cedet/semantic/bovine/debug.el b/lisp/cedet/semantic/bovine/debug.el
index 9ca7409e335..684db1e7bbf 100644
--- a/lisp/cedet/semantic/bovine/debug.el
+++ b/lisp/cedet/semantic/bovine/debug.el
@@ -114,7 +114,7 @@ LEXTOKEN, is a token returned by the lexer which is being matched."
               :documentation
               "An error condition caught in an action.")
    )
-  "Debugger frame representaion of a lisp error thrown during parsing.")
+  "Debugger frame representation of a lisp error thrown during parsing.")
 
 (defun semantic-create-bovine-debug-error-frame (condition)
   "Create an error frame for bovine debugger.
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index 2151e9ef53b..98f744dca6e 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -863,7 +863,7 @@ fields and such to, but that is for some other day."
 In Emacs Lisp, a prototype for something may start (autoload ...).
 This is certainly not expected if this is used to display a summary.
 Make up something else.  When we go to write something that needs
-a real Emacs Lisp protype, we can fix it then."
+a real Emacs Lisp prototype, we can fix it then."
   (let ((class (semantic-tag-class tag))
         (name (semantic-format-tag-name tag parent color))
         )
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 41a569564d0..aaec4cb30ff 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1025,7 +1025,7 @@ Output must be in semanticdb Find result format."
   ((obj semantic-collector-abstract) prefix)
   "For OBJ, do whatepsace completion based on PREFIX.
 This implies that if there are two completions, one matching
-the test \"preifx\\>\", and one not, the one matching the full
+the test \"prefix\\>\", and one not, the one matching the full
 word version of PREFIX will be chosen, and that text returned.
 This function requires that `semantic-collector-calculate-completions'
 has been run first."
@@ -1478,7 +1478,7 @@ one in the source buffer."
          (tag (cdr nt))
          (table (car nt))
         )
-    ;; If we fail to normalize, resete.
+    ;; If we fail to normalize, reset.
     (when (not tag) (setq table rtable tag rtag))
     ;; Do the focus.
     (let ((buf (or (semantic-tag-buffer tag)
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 35aef5d16ef..4d5d8f35f51 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -675,7 +675,7 @@ Included databases are filtered based on `semanticdb-find-default-throttle'."
      ;;
      ;; NOTE: Not used if EDE is active!
      ((and (semanticdb-find-throttle-active-p 'project)
-           ;; And dont do this if it is a system include.  Not supported by all languages,
+           ;; And don't do this if it is a system include.  Not supported by all languages,
            ;; but when it is, this is a nice fast way to skip this step.
            (not (semantic-tag-include-system-p includetag))
            ;; Don't do this if we have an EDE project.
diff --git a/lisp/cedet/semantic/db-javascript.el b/lisp/cedet/semantic/db-javascript.el
index 213216cee1a..e662290340d 100644
--- a/lisp/cedet/semantic/db-javascript.el
+++ b/lisp/cedet/semantic/db-javascript.el
@@ -137,7 +137,7 @@ Create one of our special tables that can act as an intermediary."
 
 (defmethod semanticdb-get-tags ((table semanticdb-table-javascript ))
   "Return the list of tags belonging to TABLE."
-  ;; NOTE: Omniscient databases probably don't want to keep large tabes
+  ;; NOTE: Omniscient databases probably don't want to keep large tables
   ;;       lolly-gagging about.  Keep internal Emacs tables empty and
   ;;       refer to alternate databases when you need something.
   semanticdb-javascript-tags)
@@ -151,7 +151,7 @@ local variable."
 
 ;;; Usage
 ;;
-;; Unlike other tables, an omniscent database does not need to
+;; Unlike other tables, an omniscient database does not need to
 ;; be associated with a path.  Use this routine to always add ourselves
 ;; to a search list.
 (define-mode-local-override semanticdb-find-translate-path javascript-mode
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index a4c4bd99f26..7d23ad17009 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -368,7 +368,7 @@ a master list."
                   (semanticdb-typecache-merge-streams
                    incstream
                    ;; Getting the cache from this table will also cause this
-                   ;; file to update its cache from its decendents.
+                   ;; file to update its cache from its descendants.
                    ;;
                    ;; In theory, caches are only built for most includes
                    ;; only once (in the loop before this one), so this ends
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index c9013ed8c90..3d2128db29a 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -636,7 +636,7 @@ The file associated with OBJ does not need to be in a buffer."
   (when (featurep 'semantic/lex-spp)
     (oset table lexical-table (semantic-lex-spp-save-table)))
 
-  ;; Incremental parser doesn't mokey around with this.
+  ;; Incremental parser doesn't monkey around with this.
   (oset table unmatched-syntax semantic-unmatched-syntax-cache)
 
   ;; Synchronize the index
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index ecab73a80dc..45b807df12b 100644
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -519,22 +519,22 @@ down to your parser later."
   )
 
 (defmethod semantic-debug-parser-go ((parser semantic-debug-parser))
-  "Continue executiong in this PARSER until the next breakpoint."
+  "Continue execution in this PARSER until the next breakpoint."
   (setq semantic-debug-user-command 'go)
   )
 
 (defmethod semantic-debug-parser-fail ((parser semantic-debug-parser))
-  "Continue executiong in this PARSER until the next breakpoint."
+  "Continue execution in this PARSER until the next breakpoint."
   (setq semantic-debug-user-command 'fail)
   )
 
 (defmethod semantic-debug-parser-quit ((parser semantic-debug-parser))
-  "Continue executiong in this PARSER until the next breakpoint."
+  "Continue execution in this PARSER until the next breakpoint."
   (setq semantic-debug-user-command 'quit)
   )
 
 (defmethod semantic-debug-parser-abort ((parser semantic-debug-parser))
-  "Continue executiong in this PARSER until the next breakpoint."
+  "Continue execution in this PARSER until the next breakpoint."
   (setq semantic-debug-user-command 'abort)
   )
 
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index 4ac2733a34f..a2c8c5efd40 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -392,7 +392,7 @@ See `semantic-edits-change-leaf-tag' for details on parents."
               ;; There are no tags left, and all tags originally
               ;; found are encompassed by the change.  Setup our list
               ;; from the cache
-              (setq list-to-search semantic--buffer-cache);; We have a tag ouside the list.  Check for
+              (setq list-to-search semantic--buffer-cache);; We have a tag outside the list.  Check for
             ;; We know we have a parent because it would
             ;; completely cover the change.  A tag can only
             ;; do that if it is a parent after we get here.
@@ -549,7 +549,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
                       ;; is not the first change for this
                       ;; iteration, and it starts before the end
                       ;; of current parse region, then it is
-                      ;; encompased within the bounds of tags
+                      ;; encompassed within the bounds of tags
                       ;; modified by the previous iteration's
                       ;; change.
                       (< (semantic-overlay-start (car changes))
@@ -649,7 +649,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
                     parent-tag (aref tmp 2))
               ;; We can calculate parse begin/end by checking
               ;; out what is in TAGS.  The one near start is
-              ;; always first.  Make sure the reprase includes
+              ;; always first.  Make sure the reparse includes
               ;; the `whitespace' around the snarfed tags.
               ;; Since cache-list is positioned properly, use it
               ;; to find that boundary.
@@ -707,7 +707,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
       ;; since that is how the multi-tag parser works.  Grab
       ;; the reparse symbol from the first of the returned tags.
       ;;
-      ;; Feb '06 - If repase-symbol is nil, then they are top level
+      ;; Feb '06 - If reparse-symbol is nil, then they are top level
       ;;     tags.  (I'm guessing.)  Is this right?
       (setq reparse-symbol
             (semantic--tag-get-property (car (or tags cache-list))
diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el
index ca3015c5941..479044ec518 100644
--- a/lisp/cedet/semantic/fw.el
+++ b/lisp/cedet/semantic/fw.el
@@ -251,7 +251,7 @@ later installation should be done in MODE hook."
 
 (defmacro semantic-exit-on-input (symbol &rest forms)
   "Using SYMBOL as an argument to `throw', execute FORMS.
-If FORMS includes a call to `semantic-thow-on-input', then
+If FORMS includes a call to `semantic-throw-on-input', then
 if a user presses any key during execution, this form macro
 will exit with the value passed to `semantic-throw-on-input'.
 If FORMS completes, then the return value is the same as `progn'."
diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el
index 137759d46ac..a7d150ec4a9 100644
--- a/lisp/cedet/semantic/html.el
+++ b/lisp/cedet/semantic/html.el
@@ -126,7 +126,7 @@ html parser.  PNT is the new point to set."
 NAME is the name of this section.
 MEMBERS is a list of semantic tags representing the elements that make
 up this section.
-LEVEL is the levelling level.
+LEVEL is the leveling level.
 START and END define the location of data described by the tag."
   (let ((anchorp (eq level 11)))
     (append (semantic-tag name
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index b49d1db1ad5..6761a7f532b 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -245,7 +245,7 @@ And also manages services that depend on tag values."
         ;; services.  Stop on keypress.
 
         ;; NOTE ON COMMENTED SAFE HERE
-        ;; We used to not execute the services if the buffer wsa
+        ;; 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
         ;; if there was a problem.
@@ -254,11 +254,11 @@ And also manages services that depend on tag values."
           (save-excursion
             (semantic-throw-on-input 'idle-queue)
             (when semantic-idle-scheduler-verbose-flag
-              (message "IDLE: execture service %s..." service))
+              (message "IDLE: execute service %s..." service))
             (semantic-safe (format "Idle Service Error %s: %%S" service)
               (funcall service))
             (when semantic-idle-scheduler-verbose-flag
-              (message "IDLE: execture service %s...done" service))
+              (message "IDLE: execute service %s...done" service))
             )))
         ;;)
       ;; Finally loop over remaining buffers, trying to update them as
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index 033c34e1b83..7566c08f13a 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -368,7 +368,7 @@ Optional argument PARENT is a tag parent of STREAM."
                      semantic-imenu-expandable-tag-classes)
                children
                )
-          ;; to keep an homogeneous menu organisation, type menu items
+          ;; to keep an homogeneous menu organization, type menu items
           ;; always have a sub-menu with at least the *definition*
           ;; item (even if the tag has no type components)
           (progn
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index 8009a257a7b..03a3f1b0cb1 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -1067,7 +1067,7 @@ of type `spp-macro-undef' is to be created."
 ;;
 ;; These analyzers help a language define how include files
 ;; are identified.  These are ONLY for languages that perform
-;; an actual textual includesion, and not for imports.
+;; an actual textual inclusion, and not for imports.
 ;;
 ;; This section is supposed to allow the macros from the headers to be
 ;; added to the local dynamic macro table, but that hasn't been
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index 4da3be98f37..fca367ecb8c 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -1362,11 +1362,11 @@ Return either a paren token or a semantic list token depending on
     ))
 
 (define-lex-simple-regex-analyzer semantic-lex-open-paren
-  "Detect and create an open parenthisis token."
+  "Detect and create an open parenthesis token."
   "\\s(" 'open-paren 0  (setq semantic-lex-current-depth (1+ semantic-lex-current-depth)))
 
 (define-lex-simple-regex-analyzer semantic-lex-close-paren
-  "Detect and create a close paren token."
+  "Detect and create a close parenthesis token."
   "\\s)" 'close-paren 0 (setq semantic-lex-current-depth (1- semantic-lex-current-depth)))
 
 (define-lex-regex-analyzer semantic-lex-string
diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el
index d9a3ede360d..8c3d6c17cf4 100644
--- a/lisp/cedet/semantic/sb.el
+++ b/lisp/cedet/semantic/sb.el
@@ -87,7 +87,7 @@ Restore the old current buffer when completed."
 ;;    @ type
 ;;    = default value
 ;;
-;;  +> keywrd Type
+;;  +> keyword Type
 ;;   +> type part
 ;;
 ;;  +>  -> click to see additional information
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 16deb245527..ea4903c70ea 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -303,7 +303,7 @@ are from nesting data types."
                    (miniscope (semantic-scope-cache "mini"))
                    ptag)
 
-              ;; Find the next entry in the refereneced type for
+              ;; Find the next entry in the referenced type for
               ;; our function, and append to return list till our
               ;; returnlist is empty.
               (while snlist
diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index a09928c7dfc..ce3500f83e1 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -24,7 +24,7 @@
 ;; Provide a simple user facing API to finding symbol references.
 ;;
 ;; This UI is the base of some refactoring tools.  For any refactor,
-;; the user will execture [FIXME what?] `semantic-symref' in a tag.
+;; the user will execute `semantic-symref' in a tag.
 ;; Once that data is collected, the output will be listed in a buffer.
 ;; In the output buffer, the user can then initiate different
 ;; refactoring operations.
@@ -103,7 +103,7 @@ Display the references in`semantic-symref-results-mode'."
     (when (not res) (error "No references found"))
     (semantic-symref-result-get-tags res t)
     (message "Gathering References...done")
-    ;; Build a refrences buffer.
+    ;; Build a references buffer.
     (let ((buff (get-buffer-create
                  (format "*Symref %s" str)))
           )
diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el
index d118d9b6203..86fa382a766 100644
--- a/lisp/cedet/semantic/tag-file.el
+++ b/lisp/cedet/semantic/tag-file.el
@@ -125,7 +125,7 @@ Depends on `semantic-dependency-include-path' for searching.  Always searches
           (tag-fname nil))
       (cond ((semantic-tag-in-buffer-p tag)
              ;; If the tag has an overlay and buffer associated with it,
-             ;; switch to that buffer so that we get the right override metohds.
+             ;; switch to that buffer so that we get the right override methods.
              (set-buffer (semantic-tag-buffer tag)))
             ((semantic-tag-file-name tag)
              ;; If it didn't have a buffer, but does have a file
diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el
index cf3f5b603c8..f8538ef7901 100644
--- a/lisp/cedet/semantic/tag.el
+++ b/lisp/cedet/semantic/tag.el
@@ -919,7 +919,7 @@ That is the value of the attribute `:system-flag'."
   "Return a filename representation of TAG.
 The default action is to return the `semantic-tag-name'.
 Some languages do not use full filenames in their include statements.
-Override this method to translate the code represenation
+Override this method to translate the code representation
 into a filename.  (A relative filename if necessary.)
 
 See `semantic-dependency-tag-file' to expand an include
@@ -1162,7 +1162,7 @@ This function is for internal use only."
        (semantic-tag-components-with-overlays tag)))))
 
 (defun semantic--tag-unlink-cache-from-buffer ()
-  "Convert all tags in the current cache to use overlay proxys.
+  "Convert all tags in the current cache to use overlay proxies.
 This function is for internal use only."
   (require 'semantic)
   (semantic--tag-unlink-list-from-buffer
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index c2f080ce75b..78d5569c2a7 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -262,7 +262,7 @@ can handle the @menu environment.")
       (let ((parenthetical (semantic-up-context-default))
             )
         (when (not parenthetical)
-          ;; We are in parenthises.  Are they the types of parens
+          ;; We are in parentheses.  Are they the types of parens
           ;; belonging to a texinfo construct?
           (forward-word -1)
           (when (looking-at "@\\w+{")
@@ -483,7 +483,7 @@ that start with that symbol."
 ;; This section provides specialized access into texinfo files.
 ;; Because texinfo files often directly refer to functions and programs
 ;; it is useful to access the texinfo file from the C code for document
-;; maintainance.
+;; maintenance.
 (defun semantic-texi-associated-files (&optional buffer)
   "Find texinfo files associated with BUFFER."
   (save-excursion
diff --git a/lisp/cedet/semantic/wisent/javat-wy.el b/lisp/cedet/semantic/wisent/javat-wy.el
index 38c19387440..4470b87a1f1 100644
--- a/lisp/cedet/semantic/wisent/javat-wy.el
+++ b/lisp/cedet/semantic/wisent/javat-wy.el
@@ -669,7 +669,7 @@ It ignores whitespaces, newlines and comments."
   wisent-java-tags-wy--<symbol>-regexp-analyzer
   wisent-java-tags-wy--<punctuation>-string-analyzer
   wisent-java-tags-wy--<block>-block-analyzer
-  ;; In theory, unicode chars should be turned into normal chars
+  ;; In theory, Unicode chars should be turned into normal chars
   ;; and then combined into regular ascii keywords and text.  This
   ;; analyzer just keeps these things from making the lexer go boom.
   wisent-java-tags-wy--<unicode>-regexp-analyzer
diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index 1f52e9eb3b6..c73033ce0ac 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -43,7 +43,7 @@
 ;; The 'r' prefix means raw, i.e., normal backslash substitutions are
 ;; to be suppressed.  For example, r"01\n34" is a string with six
 ;; characters 0, 1, \, n, 3 and 4.  The 'u' prefix means the following
-;; string is a unicode.
+;; string is Unicode.
 (defconst wisent-python-string-re
   (concat (regexp-opt '("r" "u" "ur" "R" "U" "UR" "Ur" "uR") t)
           "?['\"]")
diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el
index f392379347a..11d84e96f41 100644
--- a/lisp/cedet/srecode/ctxt.el
+++ b/lisp/cedet/srecode/ctxt.el
@@ -64,7 +64,7 @@ Some useful context values used by the provided srecode templates are:
      \"comment\"  - In a comment in a block of code
      -- these items show up at the end of the context list. --
      \"public\", \"protected\", \"private\" -
-                  In or near a section of public/pritected/private entries.
+                  In or near a section of public/protected/private entries.
   \"code\" - In a block of code.
      \"string\" - In a string in a block of code
      \"comment\"  - In a comment in a block of code
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 62ceff82448..1575ce7ae3b 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -437,7 +437,7 @@ The root dictionary is usually for a current or active insertion."
 ;;; COMPOUND VALUE METHODS
 ;;
 ;; Compound values must provide at least the toString method
-;; for use in converting the compound value into sometehing insertable.
+;; for use in converting the compound value into something insertable.
 
 (defmethod srecode-compound-toString ((cp srecode-dictionary-compound-value)
                                       function
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index caf1ddebdb2..e25905ead83 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -122,7 +122,7 @@ RESULT is a string."
     ("read" . "Reads from")
     ("reset" . "Resets the parameters and returns")
     ("scan" . "Scans the ")
-    ("setup\\|init\\(iallize\\)?" . "Initializes the ")
+    ("setup\\|init\\(ialize\\)?" . "Initializes the ")
     ("select" . "Chooses the ")
     ("send" . "Sends a")
     ("re?c\\(v\\|ieves?\\)" . "Receives a ")
@@ -698,7 +698,7 @@ allocating something based on its type."
                                  (cdr (car al)))))
             (setq al nil)))
       (setq al (cdr al)))
-    ;; add tailers to names which are obviously returning something.
+    ;; add trailers to names which are obviously returning something.
     (if tailit
         (progn
           (setq al srecode-document-autocomment-return-last-alist)
diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el
index d9765ebd449..b947c63f4dd 100644
--- a/lisp/cedet/srecode/find.el
+++ b/lisp/cedet/srecode/find.el
@@ -238,7 +238,7 @@ Optional argument HASH is the hash table to fill in."
            (tabs (when mt (oref mt :tables)))
            )
       (while tabs
-        ;; Exclude templates for a perticular application.
+        ;; Exclude templates for a particular application.
         (when (and (not (oref (car tabs) :application))
                    (srecode-template-table-in-project-p (car tabs)))
           (maphash (lambda (key temp)
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 9fbfc5dc042..60f277b2c9f 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -946,7 +946,7 @@ with the dictionaries found in the dictionary."
 ;; It will first insert the included template, then insert the embedded
 ;; template wherever the $^$ in the included template was.
 ;;
-;; Since it uses dual inheretance, it will magically get the end-matching
+;; Since it uses dual inheritance, it will magically get the end-matching
 ;; behavior of #, with the including feature of >.
 ;;
 (defclass srecode-template-inserter-include-wrap (srecode-template-inserter-include srecode-template-inserter-section-start)
diff --git a/lisp/color.el b/lisp/color.el
index 5b67eb58a63..487e280dd59 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -28,7 +28,7 @@
 ;; complements, and computing CIEDE2000 color distances.
 ;;
 ;; Supported color representations include RGB (red, green, blue), HSV
-;; (hue, saturation, value), HSL (hue, saturation, luminence), sRGB,
+;; (hue, saturation, value), HSL (hue, saturation, luminance), sRGB,
 ;; CIE XYZ, and CIE L*a*b* color components.
 
 ;;; Code:
diff --git a/lisp/comint.el b/lisp/comint.el
index f25293ff3ac..c0b02e5a230 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1980,7 +1980,7 @@ Make backspaces delete the previous character."
               ;; The point should float after any insertion we do.
               (saved-point (copy-marker (point) t)))
 
-          ;; We temporarly remove any buffer narrowing, in case the
+          ;; We temporarily remove any buffer narrowing, in case the
           ;; process mark is outside of the restriction
           (save-restriction
             (widen)
@@ -2568,7 +2568,7 @@ This command is like `M-.' in bash."
            ;; First usage; initialize to a marker
            (setq comint-insert-previous-argument-last-start-pos
                  (make-marker)))))
-  ;; Make sure we're not in the prompt, and add a beginning space if necess.
+  ;; Make sure we're not in the prompt, and add a beginning space if necessary.
   (if (<= (point) (comint-line-beginning-position))
       (comint-bol)
     (just-one-space))
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index c175bd7c3c7..8b7fa89a19b 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -221,7 +221,7 @@ At the time of writing it is at the URL
                  file))
 
 (defun describe-char-unicode-data (char)
-  "Return a list of Unicode data for unicode CHAR.
+  "Return a list of Unicode data for Unicode CHAR.
 Each element is a list of a property description and the property value.
 The list is null if CHAR isn't found in `describe-char-unicodedata-file'.
 This function is semi-obsolete.  Use `get-char-code-property'."
diff --git a/lisp/dframe.el b/lisp/dframe.el
index 93d9e7948cf..b1eb2d636b9 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -82,7 +82,7 @@
 ;;       c) If successful (your -frame variable has a value), call
 ;;          timer setup if applicable.
 ;;   your-frame-reposition- -- Function to call from after-create-hook to
-;;     reposition your frame with `dframe-repsoition-frame'.
+;;     reposition your frame with `dframe-reposition-frame'.
 ;;   your-mode -- Set up the major mode of the buffer for your app.
 ;;     Set these variables: dframe-track-mouse-function,
 ;;                          dframe-help-echo-function,
@@ -96,7 +96,7 @@
 ;;   dframe-track-mouse, dframe-help-echo-function --
 ;;    These variables need to be set to functions that display info
 ;;    based on the mouse's position.
-;;   Text propert 'help-echo, set to `dframe-help-echo', which will
+;;   Text property 'help-echo, set to `dframe-help-echo', which will
 ;;    call `dframe-help-echo-function'.
 ;;   Have a `-click' function, it can call `dframe-quick-mouse' for
 ;;    positioning.  If the variable `dframe-power-click' is non-nil,
@@ -136,7 +136,7 @@ This is nil for terminals, since updating a frame in a terminal
 is not useful to the user.")
 
 (defcustom dframe-update-speed
-  (if (featurep 'xemacs) 2              ; 1 is too obrusive in XEmacs
+  (if (featurep 'xemacs) 2              ; 1 is too obtrusive in XEmacs
     1)
   "Idle time in seconds needed before dframe will update itself.
 Updates occur to allow dframe to display directory information
@@ -726,7 +726,7 @@ who requested the timer.  NULL-ON-ERROR is ignored."
   (if timeout
       (add-to-list 'dframe-client-functions fn)
     (setq dframe-client-functions (delete fn dframe-client-functions)))
-  ;; Now decided what to do about the timout.
+  ;; Now decided what to do about the timeout.
   (if (or
        ;; We have a timer, restart the timer with the new time.
        timeout
diff --git a/lisp/dired.el b/lisp/dired.el
index e88ebc83b33..32a7f749681 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -704,7 +704,7 @@ Don't use that together with FILTER."
 
 (defun dired-file-name-at-point ()
   "Try to get a file name at point in the current dired buffer.
-This hook is inteneded to be put in `file-name-at-point-functions'."
+This hook is intended to be put in `file-name-at-point-functions'."
   (let ((filename (dired-get-filename nil t)))
     (when filename
       (if (file-directory-p filename)
diff --git a/lisp/electric.el b/lisp/electric.el
index 69acb773648..657b577bb1e 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -260,15 +260,23 @@ reindentation is triggered whenever you insert a character listed
 in `electric-indent-chars'."
   :global t
   :group 'electricity
-  (if electric-indent-mode
-      (add-hook 'post-self-insert-hook
-                #'electric-indent-post-self-insert-function
-                ;; post-self-insert-hooks interact in non-trivial ways.
-                ;; It turns out that electric-indent-mode generally works
-                ;; better last.
-                'append)
-    (remove-hook 'post-self-insert-hook
-                 #'electric-indent-post-self-insert-function)))
+  (if (not electric-indent-mode)
+      (remove-hook 'post-self-insert-hook
+                   #'electric-indent-post-self-insert-function)
+    ;; post-self-insert-hooks interact in non-trivial ways.
+    ;; It turns out that electric-indent-mode generally works better if run
+    ;; late, but still before blink-paren.
+    (add-hook 'post-self-insert-hook
+              #'electric-indent-post-self-insert-function
+              'append)
+    ;; FIXME: Ugly!
+    (let ((bp (memq #'blink-paren-post-self-insert-function
+                    (default-value 'post-self-insert-hook))))
+      (when (memq #'electric-indent-post-self-insert-function bp)
+        (setcar bp #'electric-indent-post-self-insert-function)
+        (setcdr bp (cons #'blink-paren-post-self-insert-function
+                         (delq #'electric-indent-post-self-insert-function
+                               (cdr bp))))))))
 
 ;; Electric pairing.
 
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 8527bc9e640..976848e155d 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -1608,7 +1608,7 @@
 ;; fii
 ;;
 ;; Now we advise `fii' to use an optional second argument that controls the
-;; amount of incrementation. A list following the (optional) position
+;; amount of incrementing. A list following the (optional) position
 ;; argument of the advice will be interpreted as an argument list
 ;; specification. This means you cannot specify an empty argument list, and
 ;; why would you want to anyway?
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index b3ac23b2b76..df98271832a 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -512,15 +512,7 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE
 
           (when output-start
             (let ((secondary-autoloads-file-buf
-                   (if (local-variable-p 'generated-autoload-file)
-                       (current-buffer))))
-              ;; Ignore a buffer-local setting if it points to the
-              ;; global value.  Otherwise we end up writing a mix of md5s
-              ;; and time-stamps to the global file.  (Bug#10049)
-              (and secondary-autoloads-file-buf
-                   outfile
-                   (not otherbuf)
-                   (setq secondary-autoloads-file-buf nil))
+                   (if otherbuf (current-buffer))))
               (with-current-buffer (marker-buffer output-start)
                 (save-excursion
                   ;; Insert the section-header line which lists the file name
diff --git a/lisp/emacs-lisp/avl-tree.el b/lisp/emacs-lisp/avl-tree.el
index e8b7a1f9a8b..9ecd4e12020 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -206,7 +206,7 @@ Return t if the height of the tree has shrunk."
 
 Return cons cell (SHRUNK . DATA), where SHRUNK is t if the
 height of the tree has shrunk and nil otherwise, and DATA is
-the releted data."
+the related data."
   (let ((br (avl-tree--node-branch root branch)))
     (cond
      ;; DATA not in tree.
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 096e91ea4fb..3d593570c4e 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -359,10 +359,12 @@ else the global value will be modified."
   "List of commands that are not meant to be called from Lisp.")
 
 (defvar byte-compile-not-obsolete-vars nil
-  "If non-nil, a list of variables that shouldn't be reported as obsolete.")
+  "List of variables that shouldn't be reported as obsolete.")
+(defvar byte-compile-global-not-obsolete-vars nil
+  "Global list of variables that shouldn't be reported as obsolete.")
 
 (defvar byte-compile-not-obsolete-funcs nil
-  "If non-nil, a list of functions that shouldn't be reported as obsolete.")
+  "List of functions that shouldn't be reported as obsolete.")
 
 (defcustom byte-compile-generate-call-tree nil
   "Non-nil means collect call-graph information when compiling.
@@ -1113,7 +1115,7 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
       (unless (and funcp (memq symbol byte-compile-not-obsolete-funcs))
         (byte-compile-warn "`%s' is an obsolete %s%s%s" symbol
                            (if funcp "function" "variable")
-                           (if asof (concat " (as of Emacs " asof ")") "")
+                           (if asof (concat " (as of " asof ")") "")
                            (cond ((stringp instead)
                                   (concat "; " instead))
                                  (instead
@@ -2195,7 +2197,7 @@ list that represents a doc string reference.
            (byte-compile-keep-pending form)))))
 
 ;; Functions and variables with doc strings must be output separately,
-;; so make-docfile can recognise them.  Most other things can be output
+;; so make-docfile can recognize them.  Most other things can be output
 ;; as byte-code.
 
 (put 'autoload 'byte-hunk-handler 'byte-compile-file-form-autoload)
@@ -3030,6 +3032,7 @@ That command is designed for interactive use only" fn))
         ((let ((od (get var 'byte-obsolete-variable)))
            (and od
                 (not (memq var byte-compile-not-obsolete-vars))
+                (not (memq var byte-compile-global-not-obsolete-vars))
                 (or (case (nth 1 od)
                       (set (not (eq access-type 'reference)))
                       (get (eq access-type 'reference))
@@ -4116,7 +4119,7 @@ binding slots have been popped."
 (byte-defop-compiler-1 make-obsolete-variable)
 (defun byte-compile-make-obsolete-variable (form)
   (when (eq 'quote (car-safe (nth 1 form)))
-    (push (nth 1 (nth 1 form)) byte-compile-not-obsolete-vars))
+    (push (nth 1 (nth 1 form)) byte-compile-global-not-obsolete-vars))
   (byte-compile-normal-call form))
 
 (defun byte-compile-defvar (form)
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index 75e7d62f395..e9f2ec54601 100644
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -169,7 +169,7 @@ Make sure the width/height is correct."
               :initform t)
    (name-face :initarg :name-face
               :initform 'bold)
-   (labels-face :initarg :lables-face
+   (labels-face :initarg :labels-face
                 :initform 'italic)
    (chart :initarg :chart
           :initform nil)
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index c9e32023187..9b708d4bbd2 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -2118,7 +2118,7 @@ before using the Ispell engine on it."
               ;; Find out how we spell-check this word.
               (if (or
                    ;; All caps w/ option th, or s tacked on the end
-                   ;; for pluralization or numberthness.
+                   ;; for pluralization or number.
                    (string-match "^[A-Z][A-Z]+\\(s\\|th\\)?$" word)
                    (looking-at "}") ; a keymap expression
                    )
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 287bb531538..81af2030ebe 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -159,12 +159,16 @@ is set to `defun'.")
                              (current-column))))
     (goto-char indent-point)
     (beginning-of-line)
-    (cond ((not (extended-loop-p (elt state 1)))
-           (+ loop-indentation lisp-simple-loop-indentation))
-          ((looking-at "^\\s-*\\(:?\\sw+\\|;\\)")
-           (+ loop-indentation lisp-loop-keyword-indentation))
-          (t
-           (+ loop-indentation lisp-loop-forms-indentation)))))
+    (list
+     (cond ((not (extended-loop-p (elt state 1)))
+            (+ loop-indentation lisp-simple-loop-indentation))
+           ((looking-at "^\\s-*\\(:?\\sw+\\|;\\)")
+            (+ loop-indentation lisp-loop-keyword-indentation))
+           (t
+            (+ loop-indentation lisp-loop-forms-indentation)))
+     ;; Tell the caller that the next line needs recomputation, even
+     ;; though it doesn't start a sexp.
+     loop-indentation)))
 
 
 ;; Cf (info "(elisp)Specification List")
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 176b906632c..86c7e59fd07 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1285,7 +1285,7 @@ expressions; a `progn' form will be returned enclosing these forms."
   ;; Wrap a form, usually a defining form, but any evaluated one.
   ;; If speclist is non-nil, this is being called by edebug-defining-form.
   ;; Otherwise it is being called from edebug-read-and-maybe-wrap-form1.
-  ;; This is a hack, but I havent figured out a simpler way yet.
+  ;; This is a hack, but I haven't figured out a simpler way yet.
   (let* ((form-data-entry (edebug-get-form-data-entry form-begin form-end))
          ;; Set this marker before parsing.
          (edebug-form-begin-marker
diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index df57148962f..278dff0f085 100644
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -178,7 +178,7 @@ only one object ever exists."
 ;; calculate path names relative to a given instance.  This will
 ;; make the saved object location independent by converting all file
 ;; references to be relative to the directory the object is saved to.
-;; You must call `eieio-peristent-path-relative' on each file name
+;; You must call `eieio-persistent-path-relative' on each file name
 ;; saved in your object.
 (defclass eieio-persistent ()
   ((file :initarg :file
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index 0b8aa034500..ba04a27021e 100644
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -296,7 +296,7 @@ If necessary, this first calls `elint-initialize'."
   (elint-display-log)
   (elint-set-mode-line t)
   (mapc 'elint-top-form (elint-update-env))
-  ;; Tell the user we're finished.  This is terribly klugy: we set
+  ;; Tell the user we're finished.  This is terribly kludgy: we set
     ;; elint-top-form-logged so elint-log-message doesn't print the
     ;; ** top form ** header...
   (elint-set-mode-line)
@@ -335,7 +335,7 @@ Will be local in linted buffers.")
 Is measured in buffer-modified-ticks and is local in linted buffers.")
 
 ;; This is a minor optimization.  It is local to every buffer, and so
-;; does not prevent recursive requirs.  It does not list the requires
+;; does not prevent recursive requires.  It does not list the requires
 ;; of requires.
 (defvar elint-features nil
   "List of all libraries this buffer has required, or that have been provided.")
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 8b64cd84bb1..820519e92d8 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -392,7 +392,7 @@ DATA is displayed to the user and should state the reason of the failure."
          ;; compiling doesn't depend on cl and thus doesn't need an
          ;; environment arg for `macroexpand'.
          (if (fboundp 'cl-macroexpand)
-             ;; Suppress warning about run-time call to cl funtion: we
+             ;; Suppress warning about run-time call to cl function: we
              ;; only call it if it's fboundp.
              (with-no-warnings
                (cl-macroexpand form (and (boundp 'cl-macro-environment)
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 9408c0a3c9d..f9e7fe44824 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -769,7 +769,7 @@ this command arranges for all errors to enter the debugger."
 Reset the `defvar' and `defcustom' variables to the initial value.
 Reinitialize the face according to the `defface' specification."
   ;; The code in edebug-defun should be consistent with this, but not
-  ;; the same, since this gets a macroexpended form.
+  ;; the same, since this gets a macroexpanded form.
   (cond ((not (listp form))
          form)
         ((and (eq (car form) 'defvar)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 0bd37ce1d49..8417aa8d380 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -277,7 +277,7 @@ contrast, `package-user-dir' contains packages for personal use."
   :version "24.1")
 
 ;; The value is precomputed in finder-inf.el, but don't load that
-;; until it's needed (i.e. when `package-intialize' is called).
+;; until it's needed (i.e. when `package-initialize' is called).
 (defvar package--builtins nil
   "Alist of built-in packages.
 The actual value is initialized by loading the library
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 265328631e9..d43ba6c0d3e 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -69,13 +69,23 @@
 ;;     (exp ("IF" exp "ELSE" exp "END") ("CASE" cases "END"))
 ;;     (cases (cases "ELSE" insts) ...)
 ;;   The IF-rule implies ELSE=END and the CASE-rule implies ELSE>END.
-;;   FIXME: we could try to resolve such conflicts automatically by changing
-;;   the way BNF rules such as the IF-rule is handled.  I.e. rather than
-;;   IF=ELSE and ELSE=END, we could turn them into IF<ELSE and ELSE>END
-;;   and IF=END,
+;;   This can be resolved simply with:
+;;     (exp ("IF" expelseexp "END") ("CASE" cases "END"))
+;;     (expelseexp (exp) (exp "ELSE" exp))
+;;     (cases (cases "ELSE" insts) ...)
+;; - Another source of conflict is when a terminator/separator is used to
+;;   terminate elements at different levels, as in:
+;;     (decls ("VAR" vars) (decls "," decls))
+;;     (vars (id) (vars "," vars))
+;;   often these can be resolved by making the lexer distinguish the two
+;;   kinds of commas, e.g. based on the following token.
 
 ;; TODO & BUGS:
 ;;
+;; - We could try to resolve conflicts such as the IFexpELSEexpEND -vs-
+;;   CASE(casesELSEexp)END automatically by changing the way BNF rules such as
+;;   the IF-rule is handled.  I.e. rather than IF=ELSE and ELSE=END, we could
+;;   turn them into IF<ELSE and ELSE>END and IF=END.
 ;; - Using the structural information SMIE gives us, it should be possible to
 ;;   implement a `smie-align' command that would automatically figure out what
 ;;   there is to align and how to do it (something like: align the token of
@@ -107,6 +117,10 @@
 
 ;;; Code:
 
+;; FIXME:
+;; - smie-indent-comment doesn't interact well with mis-indented lines (where
+;;   the indent rules don't do what the user wants).  Not sure what to do.
+
 (eval-when-compile (require 'cl))
 
 (defgroup smie nil
@@ -138,6 +152,8 @@
 ;; turns them into a levels table, which is what's used by the rest of
 ;; the SMIE code.
 
+(defvar smie-warning-count 0)
+
 (defun smie-set-prec2tab (table x y val &optional override)
   (assert (and x y))
   (let* ((key (cons x y))
@@ -149,7 +165,8 @@
             ;; be able to distinguish the two cases so that overrides
             ;; don't hide real conflicts.
             (puthash key (gethash key override) table)
-          (display-warning 'smie (format "Conflict: %s %s/%s %s" x old val y)))
+          (display-warning 'smie (format "Conflict: %s %s/%s %s" x old val y))
+          (incf smie-warning-count))
       (puthash key val table))))
 
 (put 'smie-precs->prec2 'pure t)
@@ -193,21 +210,54 @@ one of those elements share the same precedence level and associativity."
       prec2)))
 
 (put 'smie-bnf->prec2 'pure t)
-(defun smie-bnf->prec2 (bnf &rest precs)
+(defun smie-bnf->prec2 (bnf &rest resolvers)
+  "Convert the BNF grammar into a prec2 table.
+BNF is a list of nonterminal definitions of the form:
+  \(NONTERM RHS1 RHS2 ...)
+where each RHS is a (non-empty) list of terminals (aka tokens) or non-terminals.
+Not all grammars are accepted:
+- an RHS cannot be an empty list (this is not needed, since SMIE allows all
+  non-terminals to match the empty string anyway).
+- an RHS cannot have 2 consecutive non-terminals: between each non-terminal
+  needs to be a terminal (aka token).  This is a fundamental limitation of
+  the parsing technology used (operator precedence grammar).
+Additionally, conflicts can occur:
+- The returned prec2 table holds constraints between pairs of
+  token, and for any given pair only one constraint can be
+  present, either: T1 < T2, T1 = T2, or T1 > T2.
+- A token can either be an `opener' (something similar to an open-paren),
+  a `closer' (like a close-paren), or `neither' of the two (e.g. an infix
+  operator, or an inner token like \"else\").
+Conflicts can be resolved via RESOLVERS, which is a list of elements that can
+be either:
+- a precs table (see `smie-precs->prec2') to resolve conflicting constraints,
+- a constraint (T1 REL T2) where REL is one of = < or >."
   ;; FIXME: Add repetition operator like (repeat <separator> <elems>).
   ;; Maybe also add (or <elem1> <elem2>...) for things like
   ;; (exp (exp (or "+" "*" "=" ..) exp)).
   ;; Basically, make it EBNF (except for the specification of a separator in
   ;; the repetition, maybe).
-  (let ((nts (mapcar 'car bnf))         ;Non-terminals
-        (first-ops-table ())
-        (last-ops-table ())
-        (first-nts-table ())
-        (last-nts-table ())
-        (prec2 (make-hash-table :test 'equal))
-        (override (apply 'smie-merge-prec2s
-                         (mapcar 'smie-precs->prec2 precs)))
-        again)
+  (let* ((nts (mapcar 'car bnf))        ;Non-terminals.
+         (first-ops-table ())
+         (last-ops-table ())
+         (first-nts-table ())
+         (last-nts-table ())
+         (smie-warning-count 0)
+         (prec2 (make-hash-table :test 'equal))
+         (override
+          (let ((precs ())
+                (over (make-hash-table :test 'equal)))
+            (dolist (resolver resolvers)
+              (cond
+               ((and (= 3 (length resolver)) (memq (nth 1 resolver) '(= < >)))
+                (smie-set-prec2tab
+                 over (nth 0 resolver) (nth 2 resolver) (nth 1 resolver)))
+               ((memq (caar resolver) '(left right assoc nonassoc))
+                (push resolver precs))
+               (t (error "Unknown resolver %S" resolver))))
+            (apply #'smie-merge-prec2s over
+                   (mapcar 'smie-precs->prec2 precs))))
+         again)
     (dolist (rules bnf)
       (let ((nt (car rules))
             (last-ops ())
@@ -287,8 +337,11 @@ one of those elements share the same precedence level and associativity."
           (setq rhs (cdr rhs)))))
     ;; Keep track of which tokens are openers/closer, so they can get a nil
     ;; precedence in smie-prec2->grammar.
-    (puthash :smie-open/close-alist (smie-bnf-classify bnf) prec2)
-    (puthash :smie-closer-alist (smie-bnf-closer-alist bnf) prec2)
+    (puthash :smie-open/close-alist (smie-bnf--classify bnf) prec2)
+    (puthash :smie-closer-alist (smie-bnf--closer-alist bnf) prec2)
+    (if (> smie-warning-count 0)
+        (display-warning
+         'smie (format "Total: %d warnings" smie-warning-count)))
     prec2))
 
 ;; (defun smie-prec2-closer-alist (prec2 include-inners)
@@ -343,7 +396,7 @@ one of those elements share the same precedence level and associativity."
 ;;                openers)
 ;;       alist)))
 
-(defun smie-bnf-closer-alist (bnf &optional no-inners)
+(defun smie-bnf--closer-alist (bnf &optional no-inners)
   ;; We can also build this closer-alist table from a prec2 table,
   ;; but it takes more work, and the order is unpredictable, which
   ;; is a problem for smie-close-block.
@@ -371,37 +424,33 @@ from the table, e.g. the table will not include things like (\"if\" . \"else\").
                 (pushnew (cons (car rhs) term) alist :test #'equal)))))))
     (nreverse alist)))
 
-(defun smie-bnf-classify (bnf)
+(defun smie-bnf--set-class (table token class)
+  (let ((prev (gethash token table class)))
+    (puthash token
+             (cond
+              ((eq prev class) class)
+              ((eq prev t) t) ;Non-terminal.
+              (t (display-warning
+                  'smie
+                  (format "token %s is both %s and %s" token class prev))
+                 'neither))
+             table)))
+
+(defun smie-bnf--classify (bnf)
   "Return a table classifying terminals.
-Each terminal can either be an `opener', a `closer', or neither."
+Each terminal can either be an `opener', a `closer', or `neither'."
   (let ((table (make-hash-table :test #'equal))
-        (nts (mapcar #'car bnf))
         (alist '()))
     (dolist (category bnf)
-      (puthash (car category) 'neither table) ;Remove non-terminals.
+      (puthash (car category) t table)) ;Mark non-terminals.
+    (dolist (category bnf)
       (dolist (rhs (cdr category))
         (if (null (cdr rhs))
-            (puthash (pop rhs) 'neither table)
-          (let ((first (pop rhs)))
-            (puthash first
-                     (if (memq (gethash first table) '(nil opener))
-                         'opener
-                       (unless (member first nts)
-                         (error "SMIE: token %s is both opener and non-opener"
-                                first))
-                       'neither)
-                     table))
-          (while (cdr rhs)
-            (puthash (pop rhs) 'neither table)) ;Remove internals.
-          (let ((last (pop rhs)))
-            (puthash last
-                     (if (memq (gethash last table) '(nil closer))
-                         'closer
-                       (unless (member last nts)
-                         (error "SMIE: token %s is both closer and non-closer"
-                                last))
-                       'neither)
-                     table)))))
+            (smie-bnf--set-class table (pop rhs) 'neither)
+          (smie-bnf--set-class table (pop rhs) 'opener)
+          (while (cdr rhs)              ;Remove internals.
+            (smie-bnf--set-class table (pop rhs) 'neither))
+          (smie-bnf--set-class table (pop rhs) 'closer))))
     (maphash (lambda (tok v)
                (when (memq v '(closer opener))
                  (push (cons tok v) alist)))
@@ -692,8 +741,22 @@ Possible return values:
                    ;; Keep looking as long as we haven't matched the
                    ;; topmost operator.
                    (levels
-                    (if (numberp (funcall op-forw toklevels))
-                        (push toklevels levels)))
+                    (cond
+                     ((numberp (funcall op-forw toklevels))
+                      (push toklevels levels))
+                     ;; FIXME: For some languages, we can express the grammar
+                     ;; OK, but next-sexp doesn't stop where we'd want it to.
+                     ;; E.g. in SML, we'd want to stop right in front of
+                     ;; "local" if we're scanning (both forward and backward)
+                     ;; from a "val/fun/..." at the same level.
+                     ;; Same for Pascal/Modula2's "procedure" w.r.t
+                     ;; "type/var/const".
+                     ;;
+                     ;; ((and (functionp (cadr (funcall op-forw toklevels)))
+                     ;;       (funcall (cadr (funcall op-forw toklevels))
+                     ;;                levels))
+                     ;;  (setq levels nil))
+                     ))
                    ;; We matched the topmost operator.  If the new operator
                    ;; is the last in the corresponding BNF rule, we're done.
                    ((not (numberp (funcall op-forw toklevels)))
@@ -980,7 +1043,7 @@ function should return nil for arguments it does not expect.
 
 OFFSET can be:
 nil                             use the default indentation rule.
-`(column . COLUMN)              indent to column COLUMN.
+\(column . COLUMN)              indent to column COLUMN.
 NUMBER                          offset by NUMBER, relative to a base token
                                 which is the current token for :after and
                                 its parent for :before.
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index e16970c6804..32ec2bbf7ee 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -146,7 +146,7 @@ If ADVANCE is non-nil, move forward by one line afterwards."
 (defvar tabulated-list-glyphless-char-display
   (let ((table (make-char-table 'glyphless-char-display nil)))
     (set-char-table-parent table glyphless-char-display)
-    ;; Some text terminals can't display the unicode arrows; be safe.
+    ;; Some text terminals can't display the Unicode arrows; be safe.
     (aset table 9650 (cons nil "^"))
     (aset table 9660 (cons nil "v"))
     table)
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 5d90ac694a4..76cab39f5b2 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -741,7 +741,7 @@ If command is repeated at same position, delete the rectangle."
   ;; We try to reuse overlays where possible because this is more efficient
   ;; and results in less flicker.
   ;; If cua--rectangle-virtual-edges is nil and the buffer contains tabs or short lines,
-  ;; the higlighted region may not be perfectly rectangular.
+  ;; the highlighted region may not be perfectly rectangular.
   (let ((deactivate-mark deactivate-mark)
         (old cua--rectangle-overlays)
         (new nil)
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index 99d204692fa..e58656d7941 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -151,7 +151,7 @@
 ;;; Logic in simple.el maps some of these unassigned function keys to
 ;;; ordinary typing keys.  Where this is the case, a call to
 ;;; read-key-sequence, below, does not return the name of the function
-;;; key pressd by the user but, instead, it returns the name of the
+;;; key pressed by the user but, instead, it returns the name of the
 ;;; key to which it has been mapped.  It needs to know the name of the
 ;;; key pressed by the user. As a workaround, we assign a function to
 ;;; each of the unassigned function keys of interest, here.  These
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 93bf8251ce1..3e21e77a77b 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -259,7 +259,7 @@
 (defvar ex-addresses nil)
 
 ;; This flag is supposed to be set only by `#', `print', and `list',
-;; none of which is implemented.  So, it and the pices of the code it
+;; none of which is implemented.  So, it and the pieces of the code it
 ;; controls are dead weight.  We keep it just in case this might be
 ;; needed in the future.
 (defvar ex-flag nil)
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index c069c387003..b0c37ed28e4 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -205,7 +205,7 @@ designated buffers.")
 
 (viper-deflocalvar viper-insert-diehard-minor-mode nil
   "Minor mode that simulates Vi very closely.
-Not recommened, except for the novice user.")
+Not recommended, except for the novice user.")
 
 (viper-deflocalvar viper-insert-kbd-minor-mode nil
 "Minor mode for Ex command macros Insert state.
@@ -679,7 +679,7 @@ to a new place after repeating previous Vi command."
   :group 'viper-search)
 
 (defcustom viper-search-scroll-threshold 2
-  "*If search lands within this threshnold from the window top/bottom,
+  "*If search lands within this threshold from the window top/bottom,
 the window will be scrolled up or down appropriately, to reveal context.
 If you want Viper search to behave as usual in Vi, set this variable to a
 negative number."
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index 778910017cd..a2e289df5e8 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -95,7 +95,7 @@ considered related."
 
 ;; remembers prefix argument to pass along to commands invoked by second
 ;; click.
-;; This is needed because in Emacs (not XEmacs), assigning to preix-arg
+;; This is needed because in Emacs (not XEmacs), assigning to prefix-arg
 ;; causes Emacs to count the second click as if it was a single click
 (defvar viper-global-prefix-argument nil)
 
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 38a881845df..b2035e8ede6 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -777,7 +777,7 @@ It also can't undo some Viper settings."
   (viper-unbind-mouse-search-key)
   (viper-unbind-mouse-insert-key)
   ;; In emacs, we have to advice handle-switch-frame
-  ;; This advice is undone earlier, when all advices matchine "viper-" are
+  ;; This advice is undone earlier, when all advices matching "viper-" are
   ;; deactivated.
   (if (featurep 'xemacs)
       (remove-hook 'mouse-leave-frame-hook 'viper-remember-current-frame))
@@ -1050,7 +1050,7 @@ It also can't undo some Viper settings."
                                          (memq 'down (event-modifiers (aref key 1)))))
                                 (read-event))))))
     ) ; (if (featurep 'xemacs)
-  
+
   (if (featurep 'xemacs)
       ;; XEmacs
       (defadvice describe-key-briefly
@@ -1076,7 +1076,7 @@ It also can't undo some Viper settings."
                                (prefix-numeric-value current-prefix-arg))
                            1))))
     ) ; (if (featurep 'xemacs)
-  
+
   (defadvice find-file (before viper-add-suffix-advice activate)
     "Use `read-file-name' for reading arguments."
     (interactive (cons (read-file-name "Find file: " nil default-directory)
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 9a029893352..3fd2c87d59c 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * erc-log.el (erc-logging-enabled): Fix typo.
+
 2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
 
         * erc-notify.el (erc-notify-interval, erc-cmd-NOTIFY): Fix typos.
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01
index 1e90b33a23b..2b29acf5a25 100644
--- a/lisp/erc/ChangeLog.01
+++ b/lisp/erc/ChangeLog.01
@@ -93,7 +93,7 @@
 
         * erc.el:
         * erc-insert-hook: Changed strategy completely, no start end parameters any more.
-        We narrow-to-region now, thats much cleaner.
+        We narrow-to-region now, that's much cleaner.
         * rename erc-fill-region to erc-fill and change the autoload
         ** You'll probably need to restart Emacs
 
@@ -221,7 +221,7 @@
         * Applied antifuchs/mhp patches, the latest on erc-help, unmodified
         * New variable: erc-reuse-buffers default to t.
         * Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same,
-          then one can assume thats the same channel/query target again.
+          then one can assume that's the same channel/query target again.
 
 2001-11-23  Mario Lang  <mlang@delysid.org>
 
@@ -399,7 +399,7 @@
 
         * erc.el: * Tijs van Bakel's work from 10th Nov. merged in
         * My additions to that idea merged in too
-        Basicly, this is a major rewrite, if you are scared and want avoid problems,
+        Basically, this is a major rewrite, if you are scared and want avoid problems,
         stay at your current version. It seems fairly stable though.
         That changed? erc-buffer-name handling was completely rewritten,
         and erc-buffer-list local variable handling removed.
@@ -415,7 +415,7 @@
         * erc.el: only some code beautification
 
         * erc-imenu.el:
-        remove add-hook call, thats done in erc.el now for autoloadability
+        remove add-hook call, that's done in erc.el now for autoloadability
 
         * erc.el: * Make erc-imenu autoloadable
 
@@ -912,7 +912,7 @@
         fixed one occurrence of a setq with only one argument (XEmacs didn't like that)
 
         * erc.el:
-        Added erc-next-line-add-newlines customisation possibility.
+        Added erc-next-line-add-newlines customization possibility.
 
         * erc.el:
         added erc-fill-prefix for defining your own way of filling and fixed filling somehow
@@ -940,8 +940,7 @@
 
         * erc.el: typo
 
-        * erc.el: ommit
-        :wq
+        * erc.el: omit
 
 2001-07-06  Alex Schroeder  <alex@gnu.org>
 
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index d1b05a23140..279a336f15f 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -343,7 +343,7 @@
 2002-12-14  Damien Elmes  <erc@repose.cx>
 
         * erc.el:
-        last-peers: initialise to a cons. thanks to Francis Litterio
+        last-peers: initialize to a cons. thanks to Francis Litterio
             <franl@world.std.com> for the patch
 
         * erc.el:
@@ -2616,4 +2616,3 @@ See ChangeLog.01 for earlier changes.
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
-
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index 956ef5f4c66..fc7fd09e76c 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -838,7 +838,7 @@
         * erc.el:
         erc-log-channels: removed; set the directory to start logging
         (erc-directory-writeable-p): create directory if it doesn't exist, check if
-            it's writeable
+            it's writable
         (erc-logging-enabled): don't reference erc-log-channels
 
 2003-04-07  Damien Elmes  <erc@repose.cx>
@@ -1425,7 +1425,7 @@
         reference argument directly - no string matching
 
         * erc.el(erc-extract-command-from-line):
-        hmm, thinko in the canonicalisation. should
+        hmm, thinko in the canonicalization. should
             be fixed
 
 2003-01-16  Francis Litterio  <franl@users.sourceforge.net>
@@ -1556,7 +1556,7 @@
 
         * erc.el: This is the "everything is suddenly broken!" release
         You know, this is CVS, you can still go back, and wait until the transition
-        is finished, but here is patch one, which basicly breaks every command
+        is finished, but here is patch one, which basically breaks every command
         which is typed on the prompt.
         Hit me, we can still revert, but something needs to be done about this.
         * (erc-extract-command-from-line): intern-soft the function here.
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index f86c9ef845a..5baa676ab39 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1432,7 +1432,7 @@ add things to `%s' instead."
         (when (string= cmd "PRIVMSG")
           (erc-auto-query proc parsed))))))
 
-;; FIXME: need clean way of specifiying extra hooks in
+;; FIXME: need clean way of specifying extra hooks in
 ;; define-erc-response-handler.
 (add-hook 'erc-server-PRIVMSG-functions 'erc-auto-query)
 
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 24990e1e068..f1754afd1ac 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -50,7 +50,7 @@
 ;;       erc-log-write-after-send t
 ;;       erc-log-write-after-insert t)
 ;;
-;; If you only want to save logs for some buffers, customise the
+;; If you only want to save logs for some buffers, customize the
 ;; variable `erc-enable-logging'.
 
 ;; How it works:
@@ -314,7 +314,7 @@ Returns nil if `erc-server-buffer-p' returns t."
   "Return non-nil if logging is enabled for BUFFER.
 If BUFFER is nil, the value of `current-buffer' is used.
 Logging is enabled if `erc-log-channels-directory' is non-nil, the directory
-is writeable (it will be created as necessary) and
+is writable (it will be created as necessary) and
 `erc-enable-logging' returns a non-nil value."
   (and erc-log-channels-directory
        (or (functionp erc-log-channels-directory)
@@ -450,4 +450,3 @@ You can save every individual message by putting this function on
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index bde51da6e3d..7e567bd1648 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -36,7 +36,7 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-;; Customisation:
+;; Customization:
 
 (defgroup erc-match nil
   "Keyword and Friend/Foe/... recognition.
@@ -633,4 +633,3 @@ This function is meant to be called from `erc-text-matched-hook'."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index b663aeed423..e2e5fa1c4f2 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -1040,7 +1040,7 @@ relative to `erc-track-switch-direction'"
                    ((oldest leastactive)
                     (- (length erc-modified-channels-alist) arg))
                    (t (1- arg))))
-    ;; normalise out of range user input
+    ;; normalize out of range user input
     (cond ((>= offset (length erc-modified-channels-alist))
            (setq offset (1- (length erc-modified-channels-alist))))
           ((< offset 0)
@@ -1075,4 +1075,3 @@ switch back to the last non-ERC buffer visited.  Next is defined by
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 2d8c2565f69..a218dd12555 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1569,7 +1569,7 @@ symbol, it may have these values:
     ;; current ERC buffer.
     ;; if buf-name is taken by a different connection (or by something !erc)
     ;; then see if "buf-name/server" meets the same criteria
-    (dolist (candidate (list buf-name (concat buf-name "/" server))) 
+    (dolist (candidate (list buf-name (concat buf-name "/" server)))
       (if (and (not buffer-name)
                erc-reuse-buffers
                (get-buffer candidate)
@@ -4001,7 +4001,7 @@ and as second argument the event parsed as a vector."
        (not (string-match "^\C-a\\ACTION.*\C-a$" message))))
 
 (defun erc-format-privmessage (nick msg privp msgp)
-  "Format a PRIVMSG in an insertible fashion."
+  "Format a PRIVMSG in an insertable fashion."
   (let* ((mark-s (if msgp (if privp "*" "<") "-"))
          (mark-e (if msgp (if privp "*" ">") "-"))
          (str    (format "%s%s%s %s" mark-s nick mark-e msg))
@@ -5797,7 +5797,7 @@ If it doesn't exist, create it."
   "Give information about the nickname at `point'.
 
 If called interactively, give a human readable message in the
-minibuffer.  If called programatically, return the corresponding
+minibuffer.  If called programmatically, return the corresponding
 entry of `channel-members'."
   (interactive)
   (require 'thingatpt)
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index 4e1dbd41045..04ba19d407d 100644
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -74,7 +74,7 @@
 ;; session, it is likely that they are experiencing a spelling
 ;; difficulty associated with a certain command.  To combat this,
 ;; Eshell will offer to automatically define an alias for that
-;; mispelled command, once a given tolerance threshold has been
+;; misspelled command, once a given tolerance threshold has been
 ;; reached.
 
 ;; Whenever the same bad command name is encountered
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index db9b003895f..df1f7b67e29 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -90,7 +90,7 @@ This option slows down recursive glob processing by quite a bit."
 
 (defcustom eshell-error-if-no-glob nil
   "If non-nil, it is an error for a glob pattern not to match.
- This mimcs the behavior of zsh if non-nil, but bash if nil."
+ This mimics the behavior of zsh if non-nil, but bash if nil."
   :type 'boolean
   :group 'eshell-glob)
 
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index 2308e08ed62..e45b36e3511 100644
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -173,7 +173,7 @@ OWNERSHIP:
 
 FILE ATTRIBUTES:
   l[+-]N                 +/-/= N links
-  a[Mwhms][+-](N|'FILE') access time +/-/= N mnths/weeks/hours/mins/secs
+  a[Mwhms][+-](N|'FILE') access time +/-/= N months/weeks/hours/mins/secs
                          (days if unspecified) if FILE specified,
                          use as comparison basis; so a+'file.c'
                          shows files accessed before file.c was
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index 7d5fbbeabeb..bd575a0f809 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -24,7 +24,7 @@
 ;; At the moment, eshell is stream-based in its interactive input and
 ;; output.  This means that full-screen commands, such as "vi" or
 ;; "lynx", will not display correctly.  These are therefore thought of
-;; as "visual" programs.  In order to run these progrem under Emacs,
+;; as "visual" programs.  In order to run these programs under Emacs,
 ;; Eshell uses the term.el package, and invokes them in a separate
 ;; buffer, giving the illusion that Eshell itself is allowing these
 ;; visual processes to execute.
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index a7c92084bf9..7b90797eb43 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -480,25 +480,20 @@ implemented via rewriting, rather than as a function."
       (let ((body (car (last terms))))
         (setcdr (last terms 2) nil)
         `(let ((for-items
-                ;; Apparently, eshell-do-eval only works for immutable
-                ;; let-bindings, i.e. we cannot use `setq' on `for-items'.
-                ;; Instead we store the list in the car of a cons-cell (which
-                ;; acts as a ref-cell) so we can setcar instead of setq.
-                (list
-                 (append
-                  ,@(mapcar
-                     (lambda (elem)
-                       (if (listp elem)
-                           elem
-                         `(list ,elem)))
-                     (cdr (cddr terms))))))
+                (append
+                 ,@(mapcar
+                    (lambda (elem)
+                      (if (listp elem)
+                          elem
+                        `(list ,elem)))
+                    (cdr (cddr terms)))))
                (eshell-command-body '(nil))
                (eshell-test-body '(nil)))
-           (while (consp (car for-items))
-             (let ((,(intern (cadr terms)) (caar for-items)))
+           (while (consp for-items)
+             (let ((,(intern (cadr terms)) (car for-items)))
                (eshell-protect
                 ,(eshell-invokify-arg body t)))
-             (setcar for-items (cdar for-items)))
+             (setq for-items (cdr for-items)))
            (eshell-close-handles
             eshell-last-command-status
             (list 'quote eshell-last-command-result))))))
@@ -766,9 +761,8 @@ This macro calls itself recursively, with NOTFIRST non-nil."
     `(eshell-copy-handles
       (progn
         ,(when (cdr pipeline)
-           `(let (nextproc)
-              (setq nextproc
-                    (eshell-do-pipelines (quote ,(cdr pipeline)) t))
+           `(let ((nextproc
+                   (eshell-do-pipelines (quote ,(cdr pipeline)) t)))
               (eshell-set-output-handle ,eshell-output-handle
                                         'append nextproc)
               (eshell-set-output-handle ,eshell-error-handle
@@ -796,10 +790,9 @@ This macro calls itself recursively, with NOTFIRST non-nil."
 Output of each command is passed as input to the next one in the pipeline.
 This is used on systems where `start-process' is not supported."
   (when (setq pipeline (cadr pipeline))
-    `(let (result)
+    `(progn
        ,(when (cdr pipeline)
-          `(let (output-marker)
-             (setq output-marker ,(point-marker))
+          `(let ((output-marker ,(point-marker)))
              (eshell-set-output-handle ,eshell-output-handle
                                        'append output-marker)
              (eshell-set-output-handle ,eshell-error-handle
@@ -811,21 +804,21 @@ This is used on systems where `start-process' is not supported."
           (when (memq (car head) eshell-deferrable-commands)
             (ignore
              (setcar head
-                       (intern-soft
-                        (concat (symbol-name (car head)) "*"))))))
-         ;; The last process in the pipe should get its handles
+                     (intern-soft
+                      (concat (symbol-name (car head)) "*"))))))
+       ;; The last process in the pipe should get its handles
        ;; redirected as we found them before running the pipe.
        ,(if (null (cdr pipeline))
             `(progn
                (setq eshell-current-handles tail-handles)
                (setq eshell-in-pipeline-p nil)))
-       (setq result ,(car pipeline))
-       ;; tailproc gets the result of the last successful process in
-       ;; the pipeline.
-       (setq tailproc (or result tailproc))
-       ,(if (cdr pipeline)
-            `(eshell-do-pipelines-synchronously (quote ,(cdr pipeline))))
-       result)))
+       (let ((result ,(car pipeline)))
+         ;; tailproc gets the result of the last successful process in
+         ;; the pipeline.
+         (setq tailproc (or result tailproc))
+         ,(if (cdr pipeline)
+              `(eshell-do-pipelines-synchronously (quote ,(cdr pipeline))))
+         result))))
 
 (defalias 'eshell-process-identity 'identity)
 
@@ -890,8 +883,7 @@ Returns a string comprising the output from the command."
          (eshell-print "errors\n"))
      (if eshell-debug-command
          (eshell-print "commands\n")))
-    ((or (string= (car args) "-h")
-         (string= (car args) "--help"))
+    ((member (car args) '("-h" "--help"))
      (eshell-print "usage: eshell-debug [kinds]
 
 This command is used to aid in debugging problems related to Eshell
@@ -1091,6 +1083,11 @@ be finished later after the completion of an asynchronous subprocess."
           (eshell-manipulate "handling special form"
             (setcar args `(eshell-do-eval ',(car args) ,synchronous-p))))
         (eval form))
+       ((eq (car form) 'setq)
+        (if (cddr args) (error "Unsupported form (setq X1 E1 X2 E2..)"))
+        (eshell-manipulate "evaluating arguments to setq"
+          (setcar (cdr args) (eshell-do-eval (cadr args) synchronous-p)))
+        (list 'quote (eval form)))
        (t
         (if (and args (not (memq (car form) '(run-hooks))))
             (eshell-manipulate
@@ -1127,11 +1124,12 @@ be finished later after the completion of an asynchronous subprocess."
           ;; Thus, aliases can even contain references to asynchronous
           ;; sub-commands, and things will still work out as they
           ;; should.
-          (let (result new-form)
-            (if (setq new-form
-                      (catch 'eshell-replace-command
-                        (ignore
-                         (setq result (eval form)))))
+          (let* (result
+                 (new-form
+                  (catch 'eshell-replace-command
+                    (ignore
+                     (setq result (eval form))))))
+            (if new-form
                 (progn
                   (eshell-manipulate "substituting replacement form"
                     (setcar form (car new-form))
@@ -1247,25 +1245,23 @@ or an external command."
 PRINTER and ERRPRINT are functions to use for printing regular
 messages, and errors.  FORM-P should be non-nil if FUNC-OR-FORM
 represent a lisp form; ARGS will be ignored in that case."
-  (let (result)
-    (eshell-condition-case err
-        (progn
-          (setq result
-                (save-current-buffer
-                  (if form-p
-                      (eval func-or-form)
-                    (apply func-or-form args))))
-          (and result (funcall printer result))
-          result)
-      (error
-       (let ((msg (error-message-string err)))
-         (if (and (not form-p)
-                  (string-match "^Wrong number of arguments" msg)
-                  (fboundp 'eldoc-get-fnsym-args-string))
-             (let ((func-doc (eldoc-get-fnsym-args-string func-or-form)))
-               (setq msg (format "usage: %s" func-doc))))
-         (funcall errprint msg))
-       nil))))
+  (eshell-condition-case err
+      (let ((result
+             (save-current-buffer
+               (if form-p
+                   (eval func-or-form)
+                 (apply func-or-form args)))))
+        (and result (funcall printer result))
+        result)
+    (error
+     (let ((msg (error-message-string err)))
+       (if (and (not form-p)
+                (string-match "^Wrong number of arguments" msg)
+                (fboundp 'eldoc-get-fnsym-args-string))
+           (let ((func-doc (eldoc-get-fnsym-args-string func-or-form)))
+             (setq msg (format "usage: %s" func-doc))))
+       (funcall errprint msg))
+     nil)))
 
 (defsubst eshell-apply* (printer errprint func args)
   "Call FUNC, with ARGS, trapping errors and return them as output.
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 424d246a2b6..b508fd5352f 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -81,7 +81,7 @@ Setting this to nil is offered as an aid to debugging only."
 Numeric form is tested using the regular expression
 `eshell-number-regexp'.
 
-NOTE: If you find that numeric conversions are intefering with the
+NOTE: If you find that numeric conversions are interfering with the
 specification of filenames (for example, in calling `find-file', or
 some other Lisp function that deals with files, not numbers), add the
 following in your .emacs file:
@@ -140,14 +140,13 @@ function `string-to-number'."
 (defmacro eshell-condition-case (tag form &rest handlers)
   "If `eshell-handle-errors' is non-nil, this is `condition-case'.
 Otherwise, evaluates FORM with no error handling."
+  (declare (indent 2))
   (if eshell-handle-errors
       `(condition-case ,tag
            ,form
          ,@handlers)
     form))
 
-(put 'eshell-condition-case 'lisp-indent-function 2)
-
 (defun eshell-find-delimiter
   (open close &optional bound reverse-p backslash-p)
   "From point, find the CLOSE delimiter corresponding to OPEN.
@@ -275,14 +274,14 @@ Prepend remote identification of `default-directory', if any."
     text))
 
 (defmacro eshell-for (for-var for-list &rest forms)
-  "Iterate through a list"
+  "Iterate through a list."
+  (declare (indent 2))
   `(let ((list-iter ,for-list))
      (while list-iter
        (let ((,for-var (car list-iter)))
          ,@forms)
        (setq list-iter (cdr list-iter)))))
 
-(put 'eshell-for 'lisp-indent-function 2)
 
 (make-obsolete 'eshell-for 'dolist "24.1")
 
diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index a3562944039..d0bbdfb2f8a 100644
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@@ -239,7 +239,7 @@ IMAGESPEC is the image data, and DOCSTRING is documentation for the image."
     ("[ ]" . ezimage-page)
     ("{+}" . ezimage-box-plus)
     ("{-}" . ezimage-box-minus)
-    ;; Some vaguely representitive entries
+    ;; Some vaguely representative entries
     ("*" . ezimage-checkout)
     ("#" . ezimage-object)
     ("!" . ezimage-object-out-of-date)
diff --git a/lisp/faces.el b/lisp/faces.el
index 7bc103ca699..f10c9f87f25 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1925,7 +1925,7 @@ frame parameters in PARAMETERS."
           (progn
             ;; Initialize faces from face spec and custom theme.
             (face-spec-recalc face frame)
-            ;; X resouces for the default face are applied during
+            ;; X resources for the default face are applied during
             ;; `x-create-frame'.
             (and (not (eq face 'default)) window-system-p
                  (make-face-x-resource-internal face frame))
diff --git a/lisp/files-x.el b/lisp/files-x.el
index a6320b32e50..ca847097184 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -149,7 +149,7 @@ from the Local Variables list ignoring the input argument VALUE."
 
         (goto-char (point-max))
         (let ((comment-style 'plain)
-              (comment-start (or comment-start ";;; ")))
+              (comment-start (or comment-start ";; ")))
           (comment-region
            (prog1 (setq beg (point))
              (insert "\nLocal Variables:\nEnd:\n"))
diff --git a/lisp/files.el b/lisp/files.el
index 6cf94a89c92..0f167ce3ffa 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5790,7 +5790,7 @@ returns nil."
 
          ;; vc dired listings provide the state or blanks between file
          ;; permissions and date.  The state is always surrounded by
-         ;; parantheses:
+         ;; parentheses:
          ;; -rw-r--r-- (modified) 2005-10-22 21:25 files.el
          ;; This is not supported yet.
     (purecopy (concat "\\([0-9][BkKMGTPEZY]? " iso
diff --git a/lisp/foldout.el b/lisp/foldout.el
index b0eaf753d60..4f93b4205b2 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -111,9 +111,9 @@
 ;; setup a lot easier.
 ;;
 ;; folding.el by Jamie Lokier <u90jl@ecs.ox.ac.uk> supports folding by
-;; recognising special marker text in you file.
+;; recognizing special marker text in you file.
 ;;
-;; c-outline.el (by me) provides outline-mode support to recognise `C'
+;; c-outline.el (by me) provides outline-mode support to recognize `C'
 ;; statements as outline headings, so with foldout you can have a folding `C'
 ;; code editor without having to put in start- and end-of-fold markers.  This
 ;; is a real winner!
diff --git a/lisp/follow.el b/lisp/follow.el
index 92efc8d8cfa..72a091e8ce2 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -87,7 +87,7 @@
 ;;   to turn it off.
 
 
-;; The command `follow-delete-other-windows-and-split' maximises the
+;; The command `follow-delete-other-windows-and-split' maximizes the
 ;; visible area of the current buffer.
 ;;
 ;; I recommend adding it, and `follow-mode', to hotkeys in the global
@@ -154,7 +154,7 @@
 ;;      follow-delete-other-windows-and-split    C-c . 1
 ;;              Maximize the visible area of the current buffer,
 ;;              and enter Follow mode.  This is a very convenient
-;;              way to start Follow mode, hence we recomend that
+;;              way to start Follow mode, hence we recommend that
 ;;              this command be added to the global keymap.
 ;;
 ;;      follow-recenter                          C-c . C-l
@@ -562,7 +562,7 @@ Keys specific to Follow mode:
 ;;
 ;; Almost like the real thing, except when the cursor ends up outside
 ;; the top or bottom...  In our case however, we end up outside the
-;; window and hence we are recenterd.  Should we let `recenter' handle
+;; window and hence we are recentered.  Should we let `recenter' handle
 ;; the point position we would never leave the selected window.  To do
 ;; it ourselves we would need to do our own redisplay, which is easier
 ;; said than done.  (Why didn't I do a real display abstraction from
diff --git a/lisp/font-core.el b/lisp/font-core.el
index 0db17efd7b7..a5de29520f7 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -210,7 +210,7 @@ this function onto `change-major-mode-hook'."
 ;; A few people have hassled in the past for a way to make it easier to turn on
 ;; Font Lock mode, without the user needing to know for which modes s/he has to
 ;; turn it on, perhaps the same way hilit19.el/hl319.el does.  I've always
-;; balked at that way, as I see it as just re-moulding the same problem in
+;; balked at that way, as I see it as just re-molding the same problem in
 ;; another form.  That is; some person would still have to keep track of which
 ;; modes (which may not even be distributed with Emacs) support Font Lock mode.
 ;; The list would always be out of date.  And that person might have to be me.
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index d410b8eb51a..c319974fb41 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -981,7 +981,7 @@ The value of this variable is used when Font Lock mode is turned on."
 ;; rules one way and C code another.  Neat!
 ;;
 ;; A further reason to use the fontification indirection feature is when the
-;; default syntactual fontification, or the default fontification in general,
+;; default syntactic fontification, or the default fontification in general,
 ;; is not flexible enough for a particular major mode.  For example, perhaps
 ;; comments are just too hairy for `font-lock-fontify-syntactically-region' to
 ;; cope with.  You need to write your own version of that function, e.g.,
diff --git a/lisp/forms.el b/lisp/forms.el
index ef6d9b023b4..215f3ce88f7 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -1295,7 +1295,7 @@ Commands:                        Equivalent keys in read-only mode:
   )
 
 (defun forms--mode-menu-ro (map)
-;;; Menu initialisation
+;;; Menu initialization
 ;  (define-key map [menu-bar] (make-sparse-keymap))
   (define-key map [menu-bar forms]
     (cons "Forms" (make-sparse-keymap "Forms")))
@@ -1341,7 +1341,7 @@ Commands:                        Equivalent keys in read-only mode:
   (put 'forms-delete-record 'menu-enable '(not forms-read-only))
 )
 (defun forms--mode-menu-edit (map)
-;;; Menu initialisation
+;;; Menu initialization
 ;  (define-key map [menu-bar] (make-sparse-keymap))
   (define-key map [menu-bar forms]
     (cons "Forms" (make-sparse-keymap "Forms")))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5e25d01da71..889a5230d15 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,24 @@
+2011-11-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-article-setup-buffer): Decode group name used for
+        article buffers' name.
+
+2011-11-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * shr.el (shr-table-horizontal-line): Revert infinite loops introduced
+        by Paul Eggert's spellfixes two days ago.
+
+2011-11-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mm-view.el (mm-display-inline-fontify): Make the font-lock variables
+        buffer-local instead of binding them to avoid warnings.  Also demote
+        errors (bug#10063).
+        (font-lock-mode-hook): Shut up byte compiler.
+
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * mm-util.el (mm-charset-after): Fix typo.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * gnus-sum.el (gnus-summary-make-menu-bar):
@@ -332,7 +353,7 @@
         decoding nnimap groups.
 
         * gnus.el (gnus-variable-list): Don't save `gnus-format-specs' in the
-        newsrc file.  It doesn't seem like an important optimisation any more.
+        newsrc file.  It doesn't seem like an important optimization any more.
 
 2011-09-10  Dave Abrahams  <dave@boostpro.com>  (tiny change)
 
@@ -985,7 +1006,7 @@
         * nnimap.el (nnimap-process-expiry-targets): Say what target we're
         expiring articles to.
 
-        * mm-util.el (mm-charset-to-coding-system): Recognise all ANSI.x3.4
+        * mm-util.el (mm-charset-to-coding-system): Recognize all ANSI.x3.4
         variations as ASCII (bug#5458).
 
 2011-06-30  Katsumi Yamaoka  <yamaoka@jpl.org>
@@ -2849,7 +2870,7 @@
 
 2011-01-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
-        * shr.el (shr-expand-newlines): Proof of concept implemantation of boxy
+        * shr.el (shr-expand-newlines): Proof of concept implementation of boxy
         backgrounds.
         (shr-expand-newlines): Switch to using overlays to enable kill'n'yank
         in a more sensible manner.
@@ -4504,7 +4525,7 @@
 
 2010-10-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * shr.el (shr-tag-span): Drop colorisation of regions since we don't
+        * shr.el (shr-tag-span): Drop colorization of regions since we don't
         control the background color.
         (shr-tag-img): Ignore very small web bug type images.
         (shr-put-image): Add help-echo alt texts to the images.
@@ -11860,7 +11881,7 @@
 
         * message.el (message-font-lock-keywords): Use message-header-xheader
         face for "X-Foo", its apparent intended purpose.  Move "X-" pattern
-        ahead of the anything pattern, to get it recognised.
+        ahead of the anything pattern, to get it recognized.
 
 2007-05-12  Michaël Cadilhac  <michael@cadilhac.name>
 
@@ -14905,7 +14926,7 @@
         (nnweb-request-list): Don't list bogus groups.  There can only be one.
         (nnweb-request-create-group): Don't use ARGS.
         (nnweb-possibly-change-server, nnweb-request-group): Remove some
-        initialisations.  Let nnoo do the work.
+        initializations.  Let nnoo do the work.
 
 2006-01-31  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -19398,7 +19419,7 @@
         * gnus-group.el (gnus-group-get-new-news-this-group):
         Don't update info that isn't there.
 
-2004-06-29  Ilya N. Golubev  <gin@mo.msk.ru>.
+2004-06-29  Ilya N. Golubev  <gin@mo.msk.ru>
 
         * mm-util.el (mm-mime-mule-charset-alist): Add the windows-1251
         entry.
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index e52f898b184..e519ce340c2 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -2111,7 +2111,7 @@
         * gnus-srvr.el (gnus-browse-foreign-server): Parse garbage NNTP
         groups correctly.
 
-2003-06-06  Benjamin Rutt  <rutt+news@cis.ohio-state.edu>.
+2003-06-06  Benjamin Rutt  <rutt+news@cis.ohio-state.edu>
 
         * message.el (message-fetch-field): Augment documentation to state
         the narrowed-to-headers restriction.
@@ -6816,7 +6816,7 @@
         downloaded variable if we're in an uncovered group.
 
         * gnus-agent.el (gnus-agent-downloaded-article-face): Change the
-        font to soemthing less noticeable.
+        font to something less noticeable.
         (gnus-agent-group-covered-p): New function.
 
 2002-12-09  ShengHuo ZHU  <zsh@cs.rochester.edu>
@@ -6972,7 +6972,7 @@
         * gnus-agent.el (gnus-agent-check-overview-buffer): Make debugger
         print message on entry.
 
-2002-11-25  Kevin Greiner  <kgreiner@xpediantsolutions.com>.
+2002-11-25  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-range.el (gnus-range-difference): New function.
         * gnus-sum.el (gnus-summary-insert-old-articles): Use it.
@@ -7964,7 +7964,7 @@
         (mml2015-pgg-encrypt): New functions.
         (defvar, autoload): Prevent byte-compile warnings.
 
-2002-09-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>.
+2002-09-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
         * gnus-art.el (article-strip-banner): Check for the existence of
         from header.
@@ -8097,7 +8097,7 @@
 
         * gnus-sum.el (gnus-summary-next-group): Semi-exit only when needed.
 
-2002-09-12  John Paul Wallington  <jpw@shootybangbang.com>.
+2002-09-12  John Paul Wallington  <jpw@shootybangbang.com>
 
         * gnus.el (gnus-visual, gnus-meta): Fix typo.
 
@@ -8111,7 +8111,7 @@
         (nnimap-split-rule): Doc fix.
         (nnimap-request-expire-articles): Cleanup code.
 
-2002-09-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>.
+2002-09-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
         * gnus-art.el (gnus-article-address-banner-alist): New option.
         (article-strip-banner): Refer the above option to split banners of
@@ -8170,7 +8170,7 @@
 
 2002-09-03  Simon Josefsson  <jas@extundo.com>
 
-        * nntp.el (nntp-wait-for-string): Dont infloop if process died.
+        * nntp.el (nntp-wait-for-string): Don't infloop if process died.
 
         * gnus-agent.el (gnus-agent-batch): Add doc.
 
@@ -8205,7 +8205,7 @@
         (gnus-group-fetch-control): New function.
         Add them to the keymap and menu.  Require mm-url.
 
-2002-08-30  Alex Schroeder  <alex@emacswiki.org>.
+2002-08-30  Alex Schroeder  <alex@emacswiki.org>
 
         * gnus-mlspl.el (gnus-group-split-fancy): Doc fix.
 
@@ -8270,7 +8270,7 @@
 
         * gnus-util.el (gnus-select-frame-set-input-focus): New function.
 
-2002-08-20  $B>.4X(B $B5HB'(B (KOSEKI Yoshinori)  <kose@meadowy.org>.
+2002-08-20  $B>.4X(B $B5HB'(B (KOSEKI Yoshinori)  <kose@meadowy.org>
 
         * message.el (message-set-auto-save-file-name): Add support for
         the Cygwin Emacs; the system-type is `cygwin'.
@@ -8396,7 +8396,7 @@
         * nnimap.el (nnimap-split-articles): Do not call nnmail-fetch-field
         when splitting malformed messages without message-id.
 
-2002-07-28  Niklas Morberg  <niklas.morberg@axis.com>.
+2002-07-28  Niklas Morberg  <niklas.morberg@axis.com>
 
         * nnweb.el (nnweb-type, nnweb-type-definition)
         (nnweb-gmane-create-mapping, nnweb-gmane-wash-article)
@@ -8440,18 +8440,18 @@
         nnmail-expiry-target to 'delete, so that absolute deletion
         happens when absolute deletion is requested.
 
-2002-07-21  Nevin Kapur  <nevin@jhu.edu>.
+2002-07-21  Nevin Kapur  <nevin@jhu.edu>
 
         * nnmail.el (nnmail-fancy-expiry-target): Treat nonexisting
         headers as empty headers.
 
-2002-07-21  Jochen Hein  <jochen@jochen.org>.
+2002-07-21  Jochen Hein  <jochen@jochen.org>
 
         * gnus-art.el (gnus-emphasis-alist): Add strikethrough and
         correct typo.
         (gnus-emphasis-strikethru): New face.
 
-2002-07-20  Jason Merrill  <jason@redhat.com>.
+2002-07-20  Jason Merrill  <jason@redhat.com>
 
         * nnfolder.el (nnfolder-retrieve-headers): Avoid searching the
         entire file for each of a sequence of missing articles.
@@ -9879,7 +9879,7 @@
         (rfc2047-decode-region): Don't unfold.  Let
         gnus-article-treat-unfold-headers do it.
 
-2002-02-07  Matt Armstrong  <matt@lickey.com>.
+2002-02-07  Matt Armstrong  <matt@lickey.com>
 
         * message.el (message-mode): Set local-abbrev-table.
 
@@ -10428,7 +10428,7 @@
         * mml-sec.el (mml-secure-message-encrypt-smime): New.
         * mml-sec.el (mml-secure-message-encrypt-pgp): New.
         * mml-sec.el (mml-secure-message-encrypt-pgpmime): New.
-        * mml.el (mml-parse-1): Added code to recognise the secure tag and
+        * mml.el (mml-parse-1): Added code to recognize the secure tag and
         convert it to either a part or multipart depending on if there are
         other parts in the message.
         * mml.el (mml-mode-map): Changed default sign/encrypt keybindings
@@ -13226,7 +13226,7 @@
         (gnus-topic-catchup-articles): New function.  Suggested by Robin
         S. Socha <robin-dated-1001857693.185e29@socha.net>.
 
-2001-09-27 11:00:00  Gerd M,Av(Bllmann  <gerd@gnu.org>.
+2001-09-27 11:00:00  Gerd M,Av(Bllmann  <gerd@gnu.org>
 
         * gnus-ems.el (gnus-article-display-xface): Insert xface after
         previous ones.
@@ -13977,7 +13977,7 @@
         * mml.el (mml-menu): Changed name to "Attachments".
 
         * mm-decode.el (mm-destroy-postponed-undisplay-list): Only message
-        when there is something to detroy.
+        when there is something to destroy.
 
 2001-05-21 17:11:46  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 71f8cf82d39..bf7f31e6392 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -1368,7 +1368,7 @@ downloaded into the agent."
           ;; disable the set read each time this server is opened.
           ;; NOTE: Opening this group will restore the valid local
           ;; range but it will also expand the local range to
-          ;; incompass the new active range.
+          ;; encompass the new active range.
           (gnus-agent-set-local group agent-min (1- active-min)))))))
 
 (defun gnus-agent-save-group-info (method group active)
@@ -3232,7 +3232,7 @@ FORCE is equivalent to setting the expiration predicates to true."
 
          ;; Convert the keep lists to elements that look like (article#
          ;; nil keep_flag nil) then append it to the expanded dlist
-         ;; These statements are sorted by ascending precidence of the
+         ;; These statements are sorted by ascending precedence of the
          ;; keep_flag.
          (setq dlist (nconc dlist
                             (mapcar (lambda (e)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index dd41947a2af..0abc802f558 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4497,7 +4497,9 @@ commands:
 (defun gnus-article-setup-buffer ()
   "Initialize the article buffer."
   (let* ((name (if gnus-single-article-buffer "*Article*"
-                 (concat "*Article " gnus-newsgroup-name "*")))
+                 (concat "*Article "
+                         (gnus-group-decoded-name gnus-newsgroup-name)
+                         "*")))
          (original
           (progn (string-match "\\*Article" name)
                  (concat " *Original Article"
diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el
index c38b0cd3606..b4d23ff579c 100644
--- a/lisp/gnus/gnus-dired.el
+++ b/lisp/gnus/gnus-dired.el
@@ -251,7 +251,7 @@ file to save in."
           (if (eq gnus-dired-mail-mode 'gnus-user-agent)
               (gnus-print-buffer)
             ;; FIXME:
-            (error "MIME print only implemeted via Gnus")))
+            (error "MIME print only implemented via Gnus")))
         (ps-despool print-to))))
    ((file-symlink-p file-name)
      (error "File is a symlink to a nonexistent target"))
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 4c527caff5c..6f146644115 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1361,7 +1361,7 @@ if it is a string, only list groups matching REGEXP."
                                         ; We list groups with unread articles
                        (and gnus-list-groups-with-ticked-articles
                             (cdr (assq 'tick (gnus-info-marks info))))
-                                        ; And groups with tickeds
+                                        ; And groups with ticked articles
                        ;; Check for permanent visibility.
                        (and gnus-permanently-visible-groups
                             (string-match gnus-permanently-visible-groups
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 08f5e44e13f..7cea88e7f54 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -364,7 +364,7 @@ newsgroups, set the variable to nil in `gnus-select-group-hook'."
 This variable can either be the symbols `first' (place point on the
 first subject), `unread' (place point on the subject line of the first
 unread article), `best' (place point on the subject line of the
-higest-scored article), `unseen' (place point on the subject line of
+highest-scored article), `unseen' (place point on the subject line of
 the first unseen article), `unseen-or-unread' (place point on the subject
 line of the first unseen article or, if all articles have been seen, on the
 subject line of the first unread article), or a function to be called to
@@ -1657,7 +1657,7 @@ For example:
 
 This variable is a list of FUNCTION or (REGEXP . FUNCTION).  If item
 is FUNCTION, FUNCTION will be apply to all newsgroups.  If item is a
-\(REGEXP . FUNCTION), FUNCTION will be only apply to thes newsgroups
+\(REGEXP . FUNCTION), FUNCTION will be applied only to the newsgroups
 whose names match REGEXP.
 
 For example:
diff --git a/lisp/gnus/mail-parse.el b/lisp/gnus/mail-parse.el
index 06aac776486..0fcc206cf71 100644
--- a/lisp/gnus/mail-parse.el
+++ b/lisp/gnus/mail-parse.el
@@ -22,7 +22,7 @@
 
 ;; This file contains wrapper functions for a wide range of mail
 ;; parsing functions.  The idea is that there are low-level libraries
-;; that impement according to various specs (RFC2231, DRUMS, USEFOR),
+;; that implement according to various specs (RFC2231, DRUMS, USEFOR),
 ;; but that programmers that want to parse some header (say,
 ;; Content-Type) will want to use the latest spec.
 ;;
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 176857633e1..5d82faee20d 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7167,7 +7167,7 @@ header line with the old Message-ID."
 
 (defun message-wash-subject (subject)
   "Remove junk like \"Re:\", \"(fwd)\", etc. added to subject string SUBJECT.
-Previous forwarders, replyers, etc. may add it."
+Previous forwarders, repliers, etc. may add it."
   (with-temp-buffer
     (insert subject)
     (goto-char (point-min))
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index d57b61dac83..129609df10d 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -956,7 +956,7 @@ This is a no-op in XEmacs."
 
 (defun mm-charset-after (&optional pos)
   "Return charset of a character in current buffer at position POS.
-If POS is nil, it defauls to the current point.
+If POS is nil, it defaults to the current point.
 If POS is out of range, the value is nil.
 If the charset is `composition', return the actual one."
   (let ((char (char-after pos)) charset)
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 6358e34176f..854ca3497da 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -566,6 +566,8 @@
                      (face-property 'default prop) (current-buffer))))
               (delete-region ,(point-min-marker) ,(point-max-marker)))))))))
 
+;; Shut up byte-compiler.
+(defvar font-lock-mode-hook)
 (defun mm-display-inline-fontify (handle &optional mode)
   "Insert HANDLE inline fontifying with MODE.
 If MODE is not set, try to find mode automatically."
@@ -597,25 +599,25 @@ If MODE is not set, try to find mode automatically."
                     (t
                      text)))
       (require 'font-lock)
-      (let ((font-lock-maximum-size nil)
-            ;; Disable support modes, e.g., jit-lock, lazy-lock, etc.
-            (font-lock-mode-hook nil)
-            (font-lock-support-mode nil)
-            ;; I find font-lock a bit too verbose.
-            (font-lock-verbose nil))
+      ;; I find font-lock a bit too verbose.
+      (let ((font-lock-verbose nil))
+        ;; Disable support modes, e.g., jit-lock, lazy-lock, etc.
+        (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))
         (set (make-local-variable 'enable-local-variables) nil)
-        (if mode
-            (funcall mode)
-          (let ((auto-mode-alist
-                 (delq (rassq 'doc-view-mode-maybe auto-mode-alist)
-                       (copy-sequence auto-mode-alist))))
-            (set-auto-mode)))
-        ;; The mode function might have already turned on font-lock.
-        ;; Do not fontify if the guess mode is fundamental.
-        (unless (or (symbol-value 'font-lock-mode)
-                    (eq major-mode 'fundamental-mode))
-          (font-lock-fontify-buffer)))
+        (with-demoted-errors
+          (if mode
+              (funcall mode)
+            (let ((auto-mode-alist
+                   (delq (rassq 'doc-view-mode-maybe auto-mode-alist)
+                         (copy-sequence auto-mode-alist))))
+              (set-auto-mode)))
+          ;; The mode function might have already turned on font-lock.
+          ;; Do not fontify if the guess mode is fundamental.
+          (unless (or (symbol-value 'font-lock-mode)
+                      (eq major-mode 'fundamental-mode))
+            (font-lock-fontify-buffer))))
       ;; By default, XEmacs font-lock uses non-duplicable text
       ;; properties.  This code forces all the text properties
       ;; to be copied along with the text.
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index a798e22902f..043356ca841 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -55,7 +55,7 @@
 
 ;; * nnoo. NNDiary is very similar to nnml. This makes the idea of using nnoo
 ;;   (to derive nndiary from nnml) natural. However, my experience with nnoo
-;;   is that for reasonably complex back ends like this one, noo is a burden
+;;   is that for reasonably complex back ends like this one, nnoo is a burden
 ;;   rather than an help. It's tricky to use, not everything can be inherited,
 ;;   what can be inherited and when is not very clear, and you've got to be
 ;;   very careful because a little mistake can fuck up your other back ends,
@@ -1320,7 +1320,7 @@ all.  This may very well take some time.")
       (or minute (setq minute 59))
       (or hour (setq hour 23))
       ;; I'll just compute all possible values and test them by decreasing
-      ;; order until one succeeds. This is probably quide rude, but I got
+      ;; order until one succeeds. This is probably quite rude, but I got
       ;; bored in finding a good algorithm for doing that ;-)
       ;; ### FIXME: remove identical entries.
       (let ((dom-list (nth 2 sched))
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index cda17ba57c6..b4e6e31fae4 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1035,7 +1035,7 @@ textual parts.")
                                  ((eq action 'set) ""))
                                 (mapconcat #'identity flags " ")))))))
         ;; Wait for the last command to complete to avoid later
-        ;; syncronisation problems with the stream.
+        ;; synchronization problems with the stream.
         (when sequence
           (nnimap-wait-for-response sequence))))))
 
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 88fd4fe1ff6..78d2478b4fb 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -1269,7 +1269,7 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
           ;; nnir-search failure reason is in this buffer, show it if
           ;; the user wants it.
           (when (> gnus-verbose 6)
-            (display-buffer nnir-tmp-buffer)))) ;; FIXME: Dont clear buffer !
+            (display-buffer nnir-tmp-buffer)))) ;; FIXME: Don't clear buffer !
       (message "Doing hyrex-search query \"%s\"...done" qstring)
       (sit-for 0)
       ;; nnir-search returns:
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index d83467a1ed5..93e8544b633 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1799,7 +1799,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
          (i 0)
          (new 0)
          (total 0)
-         incoming incomings source)
+         source)
     (when (and (nnmail-get-value "%s-get-new-mail" method)
                sources)
       (while (setq source (pop sources))
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index 9d6011e6573..4ad9d11f906 100644
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -204,7 +204,7 @@
 (add-hook 'gnus-summary-mode-hook 'nnmairix-summary-mode-hook)
 
 ;; ;;;###autoload
-;; (defun nnmairix-initalize (&optional force)
+;; (defun nnmairix-initialize (&optional force)
 ;;   (interactive "P")
 ;;   (if (not (or (file-readable-p "~/.mairixrc")
 ;;             force))
@@ -333,7 +333,7 @@ can happen are wrong marks in nnmairix groups."
   "Use only the registry for determining original group(s).
 If set to t, nnmairix will only use the registry for determining
 the original group(s) of an article (which is also necessary for
-propapagting marks).  If set to nil, it will also try to determine
+propagating marks).  If set to nil, it will also try to determine
 the group from an additional mairix search which might be slow
 when propagating lots of marks."
   :version "23.1"
@@ -512,7 +512,7 @@ Other back ends might or might not work.")
        ;; Everything else is an error
        (t
         (nnheader-report
-         'nnmairix "Error running marix. See buffer %s for details"
+         'nnmairix "Error running mairix. See buffer %s for details"
          nnmairix-mairix-output-buffer)
         nil))))))
 
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 325aa67f80d..9816c208fab 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1681,7 +1681,7 @@ password contained in '~/.nntp-authinfo'."
         ;; for the first available article.  Obviously, a client can
         ;; use that entry to avoid making unnecessary requests.  The
         ;; only problem is for a client that assumes that the response
-        ;; will always be within the requested ranage.  For such a
+        ;; will always be within the requested range.  For such a
         ;; client, we can get N copies of the same entry (one for each
         ;; XOVER command sent to the server).
 
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 7b9af3302af..119d8e0a7f3 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -53,17 +53,17 @@ fit these criteria."
   :group 'shr
   :type 'regexp)
 
-(defcustom shr-table-horizontal-line ? 
+(defcustom shr-table-horizontal-line ?  ; space
   "Character used to draw horizontal table lines."
   :group 'shr
   :type 'character)
 
-(defcustom shr-table-vertical-line ? 
+(defcustom shr-table-vertical-line ?    ; space
   "Character used to draw vertical table lines."
   :group 'shr
   :type 'character)
 
-(defcustom shr-table-corner ? 
+(defcustom shr-table-corner ?           ; space
   "Character used to draw table corners."
   :group 'shr
   :type 'character)
@@ -583,7 +583,7 @@ Return a string with image data."
   "Return a function to display an image.
 CONTENT-FUNCTION is a function to retrieve an image for a cid url that
 is an argument.  The function to be returned takes three arguments URL,
-START, and END.  Note that START and END should be merkers."
+START, and END.  Note that START and END should be markers."
   `(lambda (url start end)
      (when url
        (if (string-match "\\`cid:" url)
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 5c2e775a211..a0c1d4f108b 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -1,4 +1,4 @@
-;;; sieve-manage.el --- Implementation of the managesive protocol in elisp
+;;; sieve-manage.el --- Implementation of the managesieve protocol in elisp
 
 ;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 128bda6f516..3c1f75f3dc9 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -99,7 +99,7 @@
 ;;
 ;; I would include pointers to introductory text on concepts used in
 ;; this library here, but the material I've read are so horrible I
-;; don't want to recomend them.
+;; don't want to recommend them.
 ;;
 ;; Why can't someone write a simple introduction to all this stuff?
 ;; Until then, much of this resemble security by obscurity.
@@ -180,7 +180,7 @@ File should contain certificates in PEM format."
 (defcustom smime-certificate-directory "~/Mail/certs/"
   "*Directory containing other people's certificates.
 It should contain files named to the X.509 hash of the certificate,
-and the files themself should be in PEM format."
+and the files themselves should be in PEM format."
 ;The S/MIME library provide simple functionality for fetching
 ;certificates into this directory, so there is no need to populate it
 ;manually.
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 95b5fb578f4..6c94dbdd2c4 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -102,7 +102,7 @@ Reports is as ham when HAM is set."
       (customize-set-variable
        spam-report-resend-to
        (read-from-minibuffer "email address to resend SPAM/HAM to? ")))
-    ;; This is ganked from the `gnus-summary-resend-message' function.
+    ;; This is yanked from the `gnus-summary-resend-message' function.
     ;; It involves rendering the SPAM, which is undesirable, but there does
     ;; not seem to be a nicer way to achieve this.
     ;; select this particular article
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index fa152f688c4..869dbc9bc0e 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -156,7 +156,7 @@ last rule in your split configuration."
   :group 'spam)
 
 (defcustom spam-autodetect-recheck-messages nil
-  "Should spam.el recheck all meessages when autodetecting?
+  "Should spam.el recheck all messages when autodetecting?
 Normally this is nil, so only unseen messages will be checked."
   :type 'boolean
   :group 'spam)
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 5d67a6c4f4c..5906683071b 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -141,7 +141,7 @@ The format is (FUNCTION ARGS...).")
   'help-function 'describe-character-set
   'help-echo (purecopy "mouse-2, RET: describe this character set"))
 
-;; make some more ideosyncratic button types
+;; Make some more idiosyncratic button types.
 
 (define-button-type 'help-symbol
   :supertype 'help-xref
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 75bc1f9743c..69da8fc6110 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -391,7 +391,7 @@ undoes the expansion."
               lst)))
 
 ;; Check if current buffer matches any atom or regexp in LST.
-;; Atoms are interpreted as major modes, strings as regexps mathing the name.
+;; Atoms are interpreted as major modes, strings as regexps matching the name.
 (defun he-buffer-member (lst)
   (or (memq major-mode lst)
       (progn
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index cd9f1fa6b43..056115f57b7 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1,4 +1,4 @@
-;;; htmlfontify.el --- htmlise a buffer/source tree with optional hyperlinks
+;;; htmlfontify.el --- htmlize a buffer/source tree with optional hyperlinks
 
 ;; Copyright (C) 2002-2003, 2009-2011  Free Software Foundation, Inc.
 
@@ -10,7 +10,7 @@
 ;; Author: Vivek Dasmohapatra <vivek@etla.org>
 ;; Maintainer: Vivek Dasmohapatra <vivek@etla.org>
 ;; Created: 2002-01-05
-;; Description: htmlise a buffer/source tree with optional hyperlinks
+;; Description: htmlize a buffer/source tree with optional hyperlinks
 ;; URL: http://rtfm.etla.org/emacs/htmlfontify/
 ;; Compatibility: Emacs23, Emacs22
 ;; Incompatibility: Emacs19, Emacs20, Emacs21
@@ -1576,7 +1576,7 @@ FILE, if set, is the file name."
       (delete-overlay rovl))
     (copy-to-buffer html-buffer (point-min) (point-max))
     (set-buffer     html-buffer)
-    ;; rip out props that could interfere with our htmlisation of the buffer:
+    ;; rip out props that could interfere with our htmlization of the buffer:
     (remove-text-properties (point-min) (point-max) hfy-ignored-properties)
     ;; Apply overlay invisible spec
     (setq orig-ovls
@@ -1774,7 +1774,7 @@ Strips any leading \"./\" from each filename."
           (split-string (shell-command-to-string hfy-find-cmd))) )
 
 ;; strip the filename off, return a directory name
-;; not a particularly thorough implementaion, but it will be
+;; not a particularly thorough implementation, but it will be
 ;; fed pretty carefully, so it should be Ok:
 (defun hfy-dirname (file)
   "Return everything preceding the last \"/\" from a relative filename FILE,
@@ -2026,13 +2026,13 @@ FILE is the specific file we are rendering."
         (hash-entry nil) (tag-string nil) (tag-line   nil)
         (tag-point  nil) (new-entry  nil) (etags-file nil))
 
-    ;; (re)initialise the tag reverse map:
+    ;; (re)initialize the tag reverse map:
     (if trmap-cache (setq trmap-hash (cadr trmap-cache))
       (setq trmap-hash (make-hash-table :test 'equal))
       (setq hfy-tags-rmap (list (list srcdir trmap-hash) hfy-tags-rmap)))
     (clrhash trmap-hash)
 
-    ;; (re)initialise the tag cache:
+    ;; (re)initialize the tag cache:
     (if cache-entry (setq cache-hash (cadr cache-entry))
       (setq cache-hash (make-hash-table :test 'equal))
       (setq hfy-tags-cache (list (list srcdir cache-hash) hfy-tags-cache)))
diff --git a/lisp/ido.el b/lisp/ido.el
index 6af431a2882..f425fd5fc63 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -770,7 +770,7 @@ can be completed using TAB,
 (defcustom ido-use-virtual-buffers nil
   "If non-nil, refer to past buffers as well as existing ones.
 Essentially it works as follows: Say you are visiting a file and
-the buffer gets cleaned up by mignight.el.  Later, you want to
+the buffer gets cleaned up by midnight.el.  Later, you want to
 switch to that buffer, but find it's no longer open.  With
 virtual buffers enabled, the buffer name stays in the buffer
 list (using the `ido-virtual' face, and always at the end), and if
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 8c151d35ed2..4a164dfaa42 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -469,7 +469,7 @@ For more information, see the documentation for
 If non-nil, using `image-dired-next-line-and-display' and
 `image-dired-previous-line-and-display' will leave a trail of thumbnail
 images in the thumbnail buffer.  If you enable this and want to clean
-the thumbnail buffer because it is filled with too many thumbmnails,
+the thumbnail buffer because it is filled with too many thumbnails,
 just call `image-dired-display-thumb' to display only the image at point.
 This value can be toggled using `image-dired-toggle-append-browsing'."
   :type 'boolean
@@ -1605,7 +1605,7 @@ With prefix argument ARG, create thumbnails even if they already exist
        (setq thumb-name (image-dired-thumb-name curr-file))
        ;; If the user overrides the exist check, we must clear the
        ;; image cache so that if the user wants to display the
-       ;; thumnail, it is not fetched from cache.
+       ;; thumbnail, it is not fetched from cache.
        (if arg
            (clear-image-cache))
        (if (or (not (file-exists-p thumb-name))
@@ -2043,7 +2043,7 @@ function.  The result is a couple of new files in
      files)))
 
 (defun image-dired-display-next-thumbnail-original ()
-  "In thubnail buffer, move to next thumbnail and display the image."
+  "In thumbnail buffer, move to next thumbnail and display the image."
   (interactive)
   (image-dired-forward-image)
   (image-dired-display-thumbnail-original-image))
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index 41da9d12c99..805bec064cf 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -313,7 +313,7 @@ should be harmless."
   (interactive)
   (info-xref-check-list (info-xref-all-info-files)))
 
-;; An alternative for geting only top-level files here would be to simply
+;; An alternative for getting only top-level files here would be to simply
 ;; return all files and have info-xref-check-list not follow "Indirect:".
 ;; The current way seems better because it (potentially) gets the proper
 ;; top-level filename into the error messages, and suppresses duplicate "not
@@ -413,7 +413,7 @@ and can take a long time."
    (unless (boundp 'viper-mode)
      (setq viper-mode nil))  ;; avoid viper.el ask about viperizing
    (unless (boundp 'gnus-registry-install)
-     (setq gnus-registry-install nil))  ;; avoid gnus-registery.el querying
+     (setq gnus-registry-install nil))  ;; avoid gnus-registry.el querying
 
    (mapatoms
     (lambda (symbol)
diff --git a/lisp/info.el b/lisp/info.el
index 0148ee544f9..4f2f33d017c 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -231,6 +231,12 @@ want to set `Info-refill-paragraphs'."
                  (const :tag "Replace tag and hide reference" t)
                  (const :tag "Hide tag and reference" hide)
                  (other :tag "Only replace tag" tag))
+  :set (lambda (sym val)
+         (set sym val)
+         (dolist (buffer (buffer-list))
+           (with-current-buffer buffer
+             (when (eq major-mode 'Info-mode)
+               (revert-buffer t t)))))
   :group 'info)
 
 (defcustom Info-refill-paragraphs nil
@@ -811,10 +817,6 @@ otherwise, that defaults to `Top'."
            (concat default-directory (buffer-name))))
   (Info-find-node-2 nil nodename))
 
-;; It's perhaps a bit nasty to kill the *info* buffer to force a re-read,
-;; but at least it keeps this routine (which is for makeinfo-buffer and
-;; Info-revert-buffer-function) out of the way of normal operations.
-;;
 (defun Info-revert-find-node (filename nodename)
   "Go to an Info node FILENAME and NODENAME, re-reading disk contents.
 When *info* is already displaying FILENAME and NODENAME, the window position
@@ -822,27 +824,23 @@ is preserved, if possible."
   (or (eq major-mode 'Info-mode) (switch-to-buffer "*info*"))
   (let ((old-filename Info-current-file)
         (old-nodename Info-current-node)
-        (old-buffer-name (buffer-name))
+        (window-selected (eq (selected-window) (get-buffer-window)))
         (pcolumn      (current-column))
         (pline        (count-lines (point-min) (line-beginning-position)))
         (wline        (count-lines (point-min) (window-start)))
-        (old-history-forward Info-history-forward)
-        (old-history  Info-history)
         (new-history  (and Info-current-file
                            (list Info-current-file Info-current-node (point)))))
-    (kill-buffer (current-buffer))
-    (switch-to-buffer (or old-buffer-name "*info*"))
-    (Info-mode)
+    ;; When `Info-current-file' is nil, `Info-find-node-2' rereads the file.
+    (setq Info-current-file nil)
     (Info-find-node filename nodename)
-    (setq Info-history-forward old-history-forward)
-    (setq Info-history old-history)
     (if (and (equal old-filename Info-current-file)
              (equal old-nodename Info-current-node))
         (progn
           ;; note goto-line is no good, we want to measure from point-min
-          (goto-char (point-min))
-          (forward-line wline)
-          (set-window-start (selected-window) (point))
+          (when window-selected
+            (goto-char (point-min))
+            (forward-line wline)
+            (set-window-start (selected-window) (point)))
           (goto-char (point-min))
           (forward-line pline)
           (move-to-column pcolumn))
@@ -1087,7 +1085,7 @@ a case-insensitive match is tried."
                      ;; Add anchors to the history too
                      (setq Info-history-list
                            (cons new-history
-                                 (delete new-history Info-history-list))))
+                                 (remove new-history Info-history-list))))
                    (goto-char anchorpos))
                   ((numberp Info-point-loc)
                    (forward-line (- Info-point-loc 2))
@@ -1514,7 +1512,7 @@ escaped (\\\",\\\\)."
         ;; Add a new unique history item to full history list
         (let ((new-history (list Info-current-file Info-current-node)))
           (setq Info-history-list
-                (cons new-history (delete new-history Info-history-list)))
+                (cons new-history (remove new-history Info-history-list)))
           (setq Info-history-forward nil))
         (if (not (eq Info-fontify-maximum-menu-size nil))
             (Info-fontify-node))
@@ -1846,7 +1844,9 @@ If DIRECTION is `backward', search in the reverse direction."
                     (setq list nil)))
               (if found
                   (message "")
-                (signal 'search-failed (list regexp))))
+                (signal 'search-failed (if isearch-mode
+                                           (list regexp "end of the manual")
+                                         (list regexp)))))
           (if (not found)
               (progn (Info-read-subfile osubfile)
                      (goto-char opoint)
@@ -2153,7 +2153,7 @@ If SAME-FILE is non-nil, do not move to a different Info file."
   (insert "Recently Visited Nodes\n")
   (insert "**********************\n\n")
   (insert "* Menu:\n\n")
-  (let ((hl (delete '("*History*" "Top") Info-history-list)))
+  (let ((hl (remove '("*History*" "Top") Info-history-list)))
     (while hl
       (let ((file (nth 0 (car hl)))
             (node (nth 1 (car hl))))
@@ -3403,7 +3403,7 @@ Build a menu of the possible matches."
 (declare-function finder-unknown-keywords "finder" ())
 (declare-function lm-commentary "lisp-mnt" (&optional file))
 (defvar finder-keywords-hash)
-(defvar package-alist)                  ; finder requires package
+(defvar package--builtins)              ; finder requires package
 
 (defun Info-finder-find-node (_filename nodename &optional _no-going-back)
   "Finder-specific implementation of `Info-find-node-2'."
@@ -3417,14 +3417,14 @@ Build a menu of the possible matches."
     (insert "***************\n\n")
     (insert "* Menu:\n\n")
     (dolist (assoc (append '((all . "All package info")
-                             (unknown . "unknown keywords"))
+                             (unknown . "Unknown keywords"))
                            finder-known-keywords))
       (let ((keyword (car assoc)))
         (insert (format "* %s %s.\n"
                         (concat (symbol-name keyword) ": "
-                                "kw:" (symbol-name keyword) ".")
+                                "Keyword " (symbol-name keyword) ".")
                         (cdr assoc))))))
-   ((equal nodename "unknown")
+   ((equal nodename "Keyword unknown")
     ;; Display unknown keywords
     (insert (format "\n\^_\nFile: %s,  Node: %s,  Up: Top\n\n"
                     Info-finder-file nodename))
@@ -3434,24 +3434,29 @@ Build a menu of the possible matches."
     (mapc
      (lambda (assoc)
        (insert (format "* %-14s %s.\n"
-                       (concat (symbol-name (car assoc)) "::")
+                       (concat (symbol-name (car assoc)) ": "
+                               "Keyword " (symbol-name (car assoc)) ".")
                        (cdr assoc))))
      (finder-unknown-keywords)))
-   ((equal nodename "all")
+   ((equal nodename "Keyword all")
     ;; Display all package info.
     (insert (format "\n\^_\nFile: %s,  Node: %s,  Up: Top\n\n"
                     Info-finder-file nodename))
     (insert "Finder Package Info\n")
     (insert "*******************\n\n")
-    (dolist (package package-alist)
-      (insert (format "%s - %s\n"
-                      (format "*Note %s::" (nth 0 package))
-                      (nth 1 package)))))
-   ((string-match "\\`kw:" nodename)
+    (insert "* Menu:\n\n")
+    (let (desc)
+      (dolist (package package--builtins)
+        (setq desc (cdr-safe package))
+        (when (vectorp desc)
+          (insert (format "* %-16s %s.\n"
+                          (concat (symbol-name (car package)) "::")
+                          (aref desc 2)))))))
+   ((string-match "\\`Keyword " nodename)
     (setq nodename (substring nodename (match-end 0)))
     ;; Display packages that match the keyword
     ;; or the list of keywords separated by comma.
-    (insert (format "\n\^_\nFile: %s,  Node: kw:%s,  Up: Top\n\n"
+    (insert (format "\n\^_\nFile: %s,  Node: Keyword %s,  Up: Top\n\n"
                     Info-finder-file nodename))
     (insert "Finder Packages\n")
     (insert "***************\n\n")
@@ -3463,11 +3468,11 @@ Build a menu of the possible matches."
                                (split-string nodename ",[ \t\n]*" t)
                              (list nodename))))
           hits desc)
-      (dolist (kw keywords)
-        (push (copy-tree (gethash kw finder-keywords-hash)) hits))
+      (dolist (keyword keywords)
+        (push (copy-tree (gethash keyword finder-keywords-hash)) hits))
       (setq hits (delete-dups (apply 'append hits)))
       (dolist (package hits)
-        (setq desc (cdr-safe (assq package package-alist)))
+        (setq desc (cdr-safe (assq package package--builtins)))
         (when (vectorp desc)
           (insert (format "* %-16s %s.\n"
                           (concat (symbol-name package) "::")
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 94237a0a489..55aee4d53db 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -410,7 +410,7 @@ with L, LRE, or LRO Unicode bidi character type.")
                   ("�-ྐྵྺྻྼ"       "w"     ?0) ;
                   ("ིེཻོཽྀ"       "w"       ?2) ; upper vowel
                   ("ཾྂྃ྆྇ྈྉྊྋ" "w"    ?2) ; upper modifier
-                  ("྄ཱུ༙༵༷"       "w"       ?3) ; lowel vowel/modifier
+                  ("྄ཱུ༙༵༷"       "w"       ?3) ; lower vowel/modifier
                   ("཰"                "w" ?3)             ; invisible vowel a
                   ("༠-༩༪-༳"             "w"     ?6) ; digit
                   ("་�-༒༔ཿ"        "."     ?|) ; line-break char
@@ -512,7 +512,7 @@ with L, LRE, or LRO Unicode bidi character type.")
   ;; relating Unicode categories to Emacs syntax codes.
 
   ;; NBSP isn't semantically interchangeable with other whitespace chars,
-  ;; so it's more like punctation.
+  ;; so it's more like punctuation.
   (set-case-syntax ?  "." tbl)
   (set-case-syntax ?¡ "." tbl)
   (set-case-syntax ?¦ "_" tbl)
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 870f2bece28..e27424b2328 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -218,7 +218,7 @@
 (fmakunbound 'define-iso-single-byte-charset)
 
 ;; Can this be shared with 8859-11?
-;; N.b. not all of these are defined unicodes.
+;; N.b. not all of these are defined in Unicode.
 (define-charset 'thai-tis620
   "TIS620.2533"
   :short-name "TIS620.2533"
@@ -865,7 +865,7 @@
 
 ;; Lao script.
 ;; Codes 0x21..0x7E are mapped to Unicode U+0E81..U+0EDF.
-;; Not all of them are defined unicodes.
+;; Not all of them are defined in Unicode.
 (define-charset 'lao
   "Lao characters (ISO10646 0E81..0EDF)"
   :short-name "Lao"
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 6888056704d..58a08f4506f 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1572,7 +1572,7 @@ of `ctext-non-standard-encodings-alist'.")
 ;; character in CHARSET is encoded using extended segment.  In the
 ;; latter case, a character in CHARSET is encoded using normal ISO2022
 ;; designation sequence.  If a character is not in any of CHARSETs, it
-;; is encoded using UTF-8 encoding extention.
+;; is encoded using UTF-8 encoding extension.
 
 (defun ctext-non-standard-encodings-table ()
   (let* ((table (append ctext-non-standard-encodings
@@ -1656,7 +1656,7 @@ in-place."
                       (insert 2)))
                 ;; Encode this range as characters in CHARSET.
                 (put-text-property last-pos (point) 'charset charset))
-            ;; Encode this range using UTF-8 encoding extention.
+            ;; Encode this range using UTF-8 encoding extension.
             (encode-coding-region last-pos (point) 'mule-utf-8)
             (save-excursion
               (goto-char last-pos)
diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el
index 0da6cc614fd..cc8d1e25c66 100644
--- a/lisp/international/ogonek.el
+++ b/lisp/international/ogonek.el
@@ -284,11 +284,11 @@ The functions come in the following groups.
   :type 'character
   :group 'ogonek)
 (defcustom ogonek-prefix-from-encoding "iso8859-2"
-  "Encoding in the source file subject to prefixifation."
+  "Encoding in the source file subject to prefixation."
   :type ogonek-encoding-choices
   :group 'ogonek)
 (defcustom ogonek-prefix-to-encoding "iso8859-2"
-  "Encoding in the target file subject to deprefixifation."
+  "Encoding in the target file subject to deprefixation."
   :type ogonek-encoding-choices
   :group 'ogonek)
 
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index bdbf2c07b7a..a29b729dcf0 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -2701,7 +2701,7 @@ KEY BINDINGS FOR CONVERSION
 
 (put 'quail-decode-map 'char-table-extra-slots 0)
 
-;; Generate a halfly-cooked decode map (char-table) for the current
+;; Generate a half-cooked decode map (char-table) for the current
 ;; Quail map.  An element for a character C is a key string or a list
 ;; of a key strings to type to input C.  The lenth of key string is at
 ;; most 2.  If it is 2, more keys may be required to input C.
@@ -2974,7 +2974,7 @@ of each directory."
       (if (not (re-search-forward leim-list-entry-regexp nil t))
           nil
 
-        ;; Remove garbages after the header.
+        ;; Remove garbage after the header.
         (goto-char (match-beginning 0))
         (if (< pos (point))
             (delete-region pos (point)))
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 757322aa0ce..0ba0b9085b9 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -1179,7 +1179,7 @@ the generated Quail package is saved."
       (setq tail (cdr tail)))))
 
 (defun batch-miscdic-convert ()
-  "Run `miscdic-convert' on the files remaing on the command line.
+  "Run `miscdic-convert' on the files remaining on the command line.
 Use this from the command line, with `-batch';
 it won't work in an interactive Emacs.
 If there's an argument \"-dir\", the next argument specifies a directory
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 977de6ac4b0..39ed7adc9c4 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1162,11 +1162,10 @@ The following additional command keys are active while editing.
 
           (unwind-protect
               (let* ((message-log-max nil)
-                     ;; Protect global value of search rings from updating
-                     ;; by `read-from-minibuffer'.  It should be updated only
-                     ;; by `isearch-update-ring' in `isearch-done', not here.
-                     (search-ring search-ring)
-                     (regexp-search-ring regexp-search-ring)
+                     ;; Don't add a new search string to the search ring here
+                     ;; in `read-from-minibuffer'. It should be added only
+                     ;; by `isearch-update-ring' called from `isearch-done'.
+                     (history-add-new-input nil)
                      ;; Binding minibuffer-history-symbol to nil is a work-around
                      ;; for some incompatibility with gmhist.
                      (minibuffer-history-symbol))
@@ -2674,25 +2673,27 @@ by other Emacs features."
     ;; something important did indeed change
     (lazy-highlight-cleanup t) ;kill old loop & remove overlays
     (setq isearch-lazy-highlight-error isearch-error)
-    (when (not isearch-error)
-      (setq isearch-lazy-highlight-start-limit beg
-            isearch-lazy-highlight-end-limit end)
-      (setq isearch-lazy-highlight-window       (selected-window)
-            isearch-lazy-highlight-window-start (window-start)
-            isearch-lazy-highlight-window-end   (window-end)
-            isearch-lazy-highlight-start        (point)
-            isearch-lazy-highlight-end          (point)
-            isearch-lazy-highlight-wrapped      nil
-            isearch-lazy-highlight-last-string  isearch-string
-            isearch-lazy-highlight-case-fold-search isearch-case-fold-search
-            isearch-lazy-highlight-regexp       isearch-regexp
-            isearch-lazy-highlight-space-regexp search-whitespace-regexp
-            isearch-lazy-highlight-word         isearch-word
-            isearch-lazy-highlight-forward      isearch-forward)
+    ;; It used to check for `(not isearch-error)' here, but actually
+    ;; lazy-highlighting might find matches to highlight even when
+    ;; `isearch-error' is non-nil.  (Bug#9918)
+    (setq isearch-lazy-highlight-start-limit beg
+          isearch-lazy-highlight-end-limit end)
+    (setq isearch-lazy-highlight-window       (selected-window)
+          isearch-lazy-highlight-window-start (window-start)
+          isearch-lazy-highlight-window-end   (window-end)
+          isearch-lazy-highlight-start        (point)
+          isearch-lazy-highlight-end          (point)
+          isearch-lazy-highlight-wrapped      nil
+          isearch-lazy-highlight-last-string  isearch-string
+          isearch-lazy-highlight-case-fold-search isearch-case-fold-search
+          isearch-lazy-highlight-regexp       isearch-regexp
+          isearch-lazy-highlight-space-regexp search-whitespace-regexp
+          isearch-lazy-highlight-word         isearch-word
+          isearch-lazy-highlight-forward      isearch-forward)
       (unless (equal isearch-string "")
         (setq isearch-lazy-highlight-timer
               (run-with-idle-timer lazy-highlight-initial-delay nil
-                                   'isearch-lazy-highlight-update))))))
+                                   'isearch-lazy-highlight-update)))))
 
 (defun isearch-lazy-highlight-search ()
   "Search ahead for the next or previous match, for lazy highlighting.
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index a96fbf9253f..21201c6cff5 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -122,7 +122,7 @@
 ;; t               IN          | INBOX
 ;; t               In          | [No match]
 
-;;; Customisation
+;;; Customization
 
 ;; See the User Variables section below for easy ways to change the
 ;; functionality of the program.  These are accessible using the
diff --git a/lisp/json.el b/lisp/json.el
index 33e985abbee..2debd46c842 100644
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -166,7 +166,7 @@ this around your call to `json-read' instead of `setq'ing it.")
 (put 'json-number-format 'error-conditions
      '(json-number-format json-error error))
 
-(put 'json-string-escape 'error-message "Bad unicode escape")
+(put 'json-string-escape 'error-message "Bad Unicode escape")
 (put 'json-string-escape 'error-conditions
      '(json-string-escape json-error error))
 
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 5bdec6dec7b..3c2cb083ff6 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -613,6 +613,7 @@ method and applying Turkish case rules for the characters i, I, $(D)E(B, $(D*
   :mnemonic ?M
   :charset-list '(mac-roman)
   :mime-charset 'macintosh)
+(define-coding-system-alias 'macintosh 'mac-roman)
 
 (define-coding-system 'next
   "NeXTstep encoding"
diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el
index b7dbcc1a956..e9943df12a8 100644
--- a/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@ -124,7 +124,7 @@
            (?ใ vowel-base "VOWEL SIGN SARA MAI MUAN")                 ; 0xE3
            (?ไ vowel-base "VOWEL SIGN SARA MAI MALAI")                        ; 0xE4
            (?ๅ vowel-base "LAK KHANG YAO")                            ; 0xE5
-           (?ๆ special "MAI YAMOK (repetion)")                                ; 0xE6
+           (?ๆ special "MAI YAMOK (repetition)")                      ; 0xE6
            (?็ sign-upper "VOWEL SIGN MAI TAI KHU N/S-T")             ; 0xE7
            (?่ tone "TONE MAI EK N/S-T")                              ; 0xE8
            (?้ tone "TONE MAI THO N/S-T")                             ; 0xE9
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index da20e4cb7ca..51df6ecff0a 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -133,7 +133,7 @@ from a file."
     font-lock-unfontify-region-function
     kill-buffer-query-functions kill-emacs-query-functions
     lisp-indent-function mouse-position-function
-    redisplaylay-end-trigger-functions suspend-tty-functions
+    redisplay-end-trigger-functions suspend-tty-functions
     temp-buffer-show-function window-scroll-functions
     window-size-change-functions write-contents-functions
     write-file-functions write-region-annotate-functions)
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 47583e3f860..7167fa567d3 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -1010,7 +1010,7 @@ If it contains a \"%s\", that will be replaced with the value of
 
 
 (defcustom feedmail-ask-before-queue-reprompt "FQM: Please type q, i, d, or e; or ? for help [%s]: "
-  "A string which will be used for repompting after invalid input.
+  "A string which will be used for reprompting after invalid input.
 If it contains a \"%s\", that will be replaced with the value of
 `feedmail-ask-before-queue-default'."
   :group 'feedmail-queue
@@ -2188,7 +2188,7 @@ you can set `feedmail-queue-reminder-alist' to nil."
             (if (or (eq user-sez ?\C-m) (eq user-sez ?\C-j) (eq user-sez ?y))
                 (setq user-sez d-char))
             ;; these char-to-int things are because of some
-            ;; incomprensible difference between the two in
+            ;; incomprehensible difference between the two in
             ;; byte-compiled stuff between Emacs and XEmacs
             ;; (well, I'm sure someone could comprehend it,
             ;; but I say 'uncle')
@@ -2261,9 +2261,9 @@ the counts."
   (while (string-match feedmail-queue-slug-suspect-regexp slug) (setq slug (replace-match "-" nil nil slug)))
   ;; collapse multiple hyphens to one
   (while (string-match "--+" slug) (setq slug (replace-match "-" nil nil slug)))
-  ;; for tidyness, peel off leading hyphens
+  ;; for tidiness, peel off leading hyphens
   (if (string-match "^-*" slug) (setq slug (replace-match "" nil nil slug)))
-  ;; for tidyness, peel off trailing hyphens
+  ;; for tidiness, peel off trailing hyphens
   (if (string-match "-*$" slug) (setq slug (replace-match "" nil nil slug)))
   slug
   )
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index 0f1669562de..342d6c16b6e 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -294,14 +294,14 @@ Use a range of Latin-1 non-ASCII characters for footnoting."
 ;; Unicode
 
 (defconst footnote-unicode-string "�¹²³������"
-  "String of unicode footnoting characters.")
+  "String of Unicode footnoting characters.")
 
 (defconst footnote-unicode-regexp (concat "[" footnote-unicode-string "]+")
-  "Regexp for unicode footnoting characters.")
+  "Regexp for Unicode footnoting characters.")
 
 (defun Footnote-unicode (n)
   "Unicode footnote style.
-Use unicode characters for footnoting."
+Use Unicode characters for footnoting."
   (let (modulus result done)
     (while (not done)
       (setq modulus (mod n 10)
@@ -348,7 +348,7 @@ buffer use the command `Footnote-set-style'."
 
 ;;; Style utilities & functions
 (defun Footnote-style-p (style)
-  "Return non-nil if style is a valid style known to footnote-mode."
+  "Return non-nil if style is a valid style known to `footnote-mode'."
   (assq style footnote-style-alist))
 
 (defun Footnote-index-to-string (index)
diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index 9269a24c4cb..fcc334ea30b 100644
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -165,7 +165,7 @@ redisplayed as output is inserted."
          (list (format "EMACS_VIEW_MODE=%d"
                        (if (numberp viewmode) viewmode 1)))))
     (save-excursion
-      ;; Gee!  Metamail does not ouput to stdout if input comes from
+      ;; Gee!  Metamail does not output to stdout if input comes from
       ;; stdin.
       (let ((selective-display nil))    ;Disable ^M to nl translation.
         (write-region beg end metafile nil 'nomessage))
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 5d219c0084f..184eaca6c4b 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -638,8 +638,11 @@ be available."
   :version "23.3"
   :group 'rmail)
 
-(defvar rmail-enable-mime-composing t
-  "*If non-nil, RMAIL uses `rmail-insert-mime-forwarded-message-function' to forward.")
+(defcustom rmail-enable-mime-composing t
+  "If non-nil, use `rmail-insert-mime-forwarded-message-function' to forward."
+  :type 'boolean
+  :version "24.1"                       ; nil -> t
+  :group 'rmail)
 
 (defvar rmail-show-mime-function nil
   "Function of no argument called to show a decoded MIME message.
@@ -649,8 +652,8 @@ The package providing MIME support should set this.")
 ;;;###autoload
 (defvar rmail-insert-mime-forwarded-message-function nil
   "Function to insert a message in MIME format so it can be forwarded.
-This function is called if `rmail-enable-mime' or
-`rmail-enable-mime-composing' is non-nil.
+This function is called if `rmail-enable-mime' and
+`rmail-enable-mime-composing' are non-nil.
 It is called with one argument FORWARD-BUFFER, which is a
 buffer containing the message to forward.  The current buffer
 is the outgoing mail buffer.")
@@ -681,12 +684,17 @@ expression, LIMIT is the position specifying the end of header.")
 
 (defvar rmail-mime-feature 'rmailmm
   "Feature to require for MIME support in Rmail.
-When starting Rmail, if `rmail-enable-mime' is non-nil,
-this feature is required with `require'.
+When starting Rmail, if `rmail-enable-mime' is non-nil, this
+feature is loaded with `require'.  The default value is `rmailmm'.
 
-The default value is `rmailmm'")
+The library should set the variable `rmail-show-mime-function'
+to an appropriate value, and optionally also set
+`rmail-search-mime-message-function',
+`rmail-search-mime-header-function',
+`rmail-insert-mime-forwarded-message-function', and
+`rmail-insert-mime-resent-message-function'.")
 
-;; FIXME this is unused.
+;; FIXME this is unused since 23.1.
 (defvar rmail-decode-mime-charset t
   "*Non-nil means a message is decoded by MIME's charset specification.
 If this variable is nil, or the message has not MIME specification,
@@ -696,6 +704,9 @@ If the variable `rmail-enable-mime' is non-nil, this variable is
 ignored, and all the decoding work is done by a feature specified by
 the variable `rmail-mime-feature'.")
 
+(make-obsolete-variable 'rmail-decode-mime-charset
+                        "it does nothing." "23.1")
+
 (defvar rmail-mime-charset-pattern
   (concat "^content-type:[ \t]*text/plain;"
           "\\(?:[ \t\n]*\\(?:format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*"
@@ -3128,10 +3139,9 @@ but probably is garbage."
   ;; This is adequate because its only caller, rmail-search,
   ;; unswaps the buffers.
   (goto-char (rmail-msgbeg msg))
-  (if rmail-enable-mime
-      (if rmail-search-mime-message-function
-          (funcall rmail-search-mime-message-function msg regexp)
-        (error "You must set `rmail-search-mime-message-function'"))
+  (if (and rmail-enable-mime
+           rmail-search-mime-message-function)
+      (funcall rmail-search-mime-message-function msg regexp)
     (re-search-forward regexp (rmail-msgend msg) t)))
 
 (defvar rmail-search-last-regexp nil)
@@ -3798,7 +3808,8 @@ see the documentation of `rmail-resend'."
             ;; Insert after header separator--before signature if any.
             (rfc822-goto-eoh)
             (forward-line 1)
-            (if (and rmail-enable-mime rmail-enable-mime-composing)
+            (if (and rmail-enable-mime rmail-enable-mime-composing
+                     rmail-insert-mime-forwarded-message-function)
                 (prog1
                     (funcall rmail-insert-mime-forwarded-message-function
                              forward-buffer)
@@ -3854,10 +3865,9 @@ typically for purposes of moderating a list."
     (unwind-protect
         (with-current-buffer tembuf
           ;;>> Copy message into temp buffer
-          (if rmail-enable-mime
-              (if rmail-insert-mime-resent-message-function
+          (if (and rmail-enable-mime
+                   rmail-insert-mime-resent-message-function)
                   (funcall rmail-insert-mime-resent-message-function mailbuf)
-                (error "You must set `rmail-insert-mime-resent-message-function'"))
             (insert-buffer-substring mailbuf))
           (goto-char (point-min))
           ;; Delete any Sender field, since that's not specifiable.
@@ -4494,7 +4504,7 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "6296f0170a37670c49a88a1b92d78187")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "5ecb69456c4d86a4e905eb3008602a95")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
@@ -4596,7 +4606,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order.
 
 ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
 ;;;;;;  rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels
-;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "35e07b0a5ea8e41971f31a8780eba6bb")
+;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "1375d6512b953c0d7c3bde52192f4055")
 ;;; Generated autoloads from rmailsum.el
 
 (autoload 'rmail-summary "rmailsum" "\
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index f3b539c52d0..e53e0c0744e 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -281,13 +281,20 @@ TRUNCATED is non-nil if the text of this entity was truncated."
 
 (define-button-type 'rmail-mime-save 'action 'rmail-mime-save)
 
+;; Display options returned by rmail-mime-entity-display.
+;; Value is on of nil, t, raw.
+(defsubst rmail-mime-display-header (disp)  (aref disp 0))
+(defsubst rmail-mime-display-tagline (disp) (aref disp 1))
+(defsubst rmail-mime-display-body (disp)    (aref disp 2))
+
 (defun rmail-mime-entity-segment (pos &optional entity)
   "Return a vector describing the displayed region of a MIME-entity at POS.
 Optional 2nd argument ENTITY is the MIME-entity at POS.
 The value is a vector [INDEX HEADER TAGLINE BODY END], where
   INDEX: index into the returned vector indicating where POS is (1..3)
   HEADER: the position of the beginning of a header
-  TAGLINE: the position of the beginning of a tag line
+  TAGLINE: the position of the beginning of a tag line, including
+           the newline that precedes it
   BODY: the position of the beginning of a body
   END: the position of the end of the entity."
   (save-excursion
@@ -305,21 +312,32 @@ The value is a vector [INDEX HEADER TAGLINE BODY END], where
             (index 1)
             tagline-beg body-beg end)
         (goto-char beg)
-        (if (aref current 0)
+        ;; If the header is displayed, get past it to the tagline.
+        (if (rmail-mime-display-header current)
             (search-forward "\n\n" nil t))
         (setq tagline-beg (point))
         (if (>= pos tagline-beg)
             (setq index 2))
-        (if (aref current 1)
-            (forward-line 1))
+        ;; If the tagline is displayed, get past it to the body.
+        (if (rmail-mime-display-tagline current)
+            ;; The next foward-line call must be in sync with how
+            ;; `rmail-mime-insert-tagline' formats the tagline.  The
+            ;; body begins after the empty line that ends the tagline.
+            (forward-line 3))
         (setq body-beg (point))
         (if (>= pos body-beg)
             (setq index 3))
-        (if (aref current 2)
+        ;; If the body is displayed, find its end.
+        (if (rmail-mime-display-body current)
             (let ((tag (aref (rmail-mime-entity-tagline entity) 0))
                   tag2)
               (setq end (next-single-property-change beg 'rmail-mime-entity
                                                      nil (point-max)))
+              ;; `tag' is either an empty string or "/n" where n is
+              ;; the number of the part of the multipart MIME message.
+              ;; The loop below finds the next location whose
+              ;; `rmail-mime-entity' property specifies a tag of a
+              ;; different value.
               (while (and (< end (point-max))
                           (setq entity (get-text-property end 'rmail-mime-entity)
                                 tag2 (aref (rmail-mime-entity-tagline entity) 0))
@@ -367,7 +385,7 @@ Use `raw' for raw mode, and any other non-nil value for decoded mode."
          (segment (rmail-mime-entity-segment pos entity)))
     (if (or (eq state 'raw)
             (and (not state)
-                 (not (eq (aref current 0) 'raw))))
+                 (not (eq (rmail-mime-display-header current) 'raw))))
         ;; Enter the raw mode.
         (rmail-mime-raw-mode entity)
       ;; Enter the shown mode.
@@ -389,7 +407,7 @@ Use `raw' for raw mode, and any other non-nil value for decoded mode."
            (entity (get-text-property pos 'rmail-mime-entity))
            (current (aref (rmail-mime-entity-display entity) 0))
            (segment (rmail-mime-entity-segment pos entity)))
-      (if (aref current 2)
+      (if (rmail-mime-display-body current)
           ;; Enter the hidden mode.
           (progn
             ;; If point is in the body part, move it to the tagline
@@ -430,12 +448,15 @@ Use `raw' for raw mode, and any other non-nil value for decoded mode."
   "Insert a tag line for MIME-entity ENTITY.
 ITEM-LIST is a list of strings or button-elements (list) to add
 to the tag line."
+  ;; Precede the tagline by an empty line to make it a separate
+  ;; paragraph, so that it is aligned to the left margin of the window
+  ;; even if preceded by a right-to-left paragraph.
   (insert "\n[")
   (let ((tag (aref (rmail-mime-entity-tagline entity) 0)))
     (if (> (length tag) 0) (insert (substring tag 1) ":")))
   (insert (car (rmail-mime-entity-type entity)) " ")
   (insert-button (let ((new (aref (rmail-mime-entity-display entity) 1)))
-                   (if (aref new 2) "Hide" "Show"))
+                   (if (rmail-mime-display-body new) "Hide" "Show"))
                  :type 'rmail-mime-toggle
                  'help-echo "mouse-2, RET: Toggle show/hide")
   (dolist (item item-list)
@@ -443,6 +464,9 @@ to the tag line."
       (if (stringp item)
           (insert item)
         (apply 'insert-button item))))
+  ;; Follow the tagline by an empty line to make it a separate
+  ;; paragraph, so that the paragraph direction of the following text
+  ;; is determined based on that text.
   (insert "]\n\n"))
 
 (defun rmail-mime-update-tagline (entity)
@@ -463,7 +487,9 @@ to the tag line."
     (delete-region (button-start button) (point))
     (put-text-property (point) (button-end button) 'rmail-mime-entity entity)
     (restore-buffer-modified-p modified)
-    (forward-line 1)))
+    ;; The following call to forward-line must be in sync with how
+    ;; rmail-mime-insert-tagline formats the tagline.
+    (forward-line 2)))
 
 (defun rmail-mime-insert-header (header)
   "Decode and insert a MIME-entity header HEADER in the current buffer.
@@ -557,48 +583,35 @@ HEADER is a header component of a MIME-entity object (see
           (delete-region (point-min) (point-max))))
 
     ;; header
-    (if (eq (aref current 0) (aref new 0))
+    (if (eq (rmail-mime-display-header current)
+            (rmail-mime-display-header new))
         (goto-char (aref segment 2))
-      (if (aref current 0)
+      (if (rmail-mime-display-header current)
           (delete-char (- (aref segment 2) (aref segment 1))))
-      (if (aref new 0)
+      (if (rmail-mime-display-header new)
           (rmail-mime-insert-header header)))
     ;; tagline
-    (if (eq (aref current 1) (aref new 1))
-        (if (or (not (aref current 1))
-                (eq (aref current 2) (aref new 2)))
+    (if (eq (rmail-mime-display-tagline current)
+            (rmail-mime-display-tagline new))
+        (if (or (not (rmail-mime-display-tagline current))
+                (eq (rmail-mime-display-body current)
+                    (rmail-mime-display-body new)))
             (forward-char (- (aref segment 3) (aref segment 2)))
           (rmail-mime-update-tagline entity))
-      (if (aref current 1)
+      (if (rmail-mime-display-tagline current)
           (delete-char (- (aref segment 3) (aref segment 2))))
-      (if (aref new 1)
+      (if (rmail-mime-display-tagline new)
           (rmail-mime-insert-tagline entity)))
     ;; body
-    (if (eq (aref current 2) (aref new 2))
+    (if (eq (rmail-mime-display-body current)
+            (rmail-mime-display-body new))
         (forward-char (- (aref segment 4) (aref segment 3)))
-      (if (aref current 2)
+      (if (rmail-mime-display-body current)
           (delete-char (- (aref segment 4) (aref segment 3))))
-      (if (aref new 2)
+      (if (rmail-mime-display-body new)
           (rmail-mime-insert-decoded-text entity)))
     (put-text-property beg (point) 'rmail-mime-entity entity)))
 
-;; FIXME move to the test/ directory?
-(defun test-rmail-mime-handler ()
-  "Test of a mail using no MIME parts at all."
-  (let ((mail "To: alex@gnu.org
-Content-Type: text/plain; charset=koi8-r
-Content-Transfer-Encoding: 8bit
-MIME-Version: 1.0
-
-\372\304\322\301\327\323\324\327\325\312\324\305\41"))
-    (switch-to-buffer (get-buffer-create "*test*"))
-    (erase-buffer)
-    (set-buffer-multibyte nil)
-    (insert mail)
-    (rmail-mime-show t)
-    (set-buffer-multibyte t)))
-
-
 (defun rmail-mime-insert-image (entity)
   "Decode and insert the image body of MIME-entity ENTITY."
   (let* ((content-type (car (rmail-mime-entity-type entity)))
@@ -726,22 +739,25 @@ directly."
     (setq beg (point))
 
     ;; header
-    (if (eq (aref current 0) (aref new 0))
+    (if (eq (rmail-mime-display-header current)
+            (rmail-mime-display-header new))
         (goto-char (aref segment 2))
-      (if (aref current 0)
+      (if (rmail-mime-display-header current)
           (delete-char (- (aref segment 2) (aref segment 1))))
-      (if (aref new 0)
+      (if (rmail-mime-display-header new)
           (rmail-mime-insert-header header)))
 
     ;; tagline
-    (if (eq (aref current 1) (aref new 1))
-        (if (or (not (aref current 1))
-                (eq (aref current 2) (aref new 2)))
+    (if (eq (rmail-mime-display-tagline current)
+            (rmail-mime-display-tagline new))
+        (if (or (not (rmail-mime-display-tagline current))
+                (eq (rmail-mime-display-body current)
+                    (rmail-mime-display-body new)))
             (forward-char (- (aref segment 3) (aref segment 2)))
           (rmail-mime-update-tagline entity))
-      (if (aref current 1)
+      (if (rmail-mime-display-tagline current)
           (delete-char (- (aref segment 3) (aref segment 2))))
-      (if (aref new 1)
+      (if (rmail-mime-display-tagline new)
           (rmail-mime-insert-tagline
            entity
            " Save:"
@@ -764,11 +780,12 @@ directly."
            ;;        'image-data data))
            )))
     ;; body
-    (if (eq (aref current 2) (aref new 2))
+    (if (eq (rmail-mime-display-body current)
+            (rmail-mime-display-body new))
         (forward-char (- (aref segment 4) (aref segment 3)))
-      (if (aref current 2)
+      (if (rmail-mime-display-body current)
           (delete-char (- (aref segment 4) (aref segment 3))))
-      (if (aref new 2)
+      (if (rmail-mime-display-body new)
           (cond ((eq (cdr bulk-data) 'text)
                  (rmail-mime-insert-decoded-text entity))
                 ((cdr bulk-data)
@@ -779,27 +796,6 @@ directly."
                  (rmail-mime-insert-decoded-text entity)))))
     (put-text-property beg (point) 'rmail-mime-entity entity)))
 
-(defun test-rmail-mime-bulk-handler ()
-  "Test of a mail used as an example in RFC 2183."
-  (let ((mail "Content-Type: image/jpeg
-Content-Disposition: attachment; filename=genome.jpeg;
-  modification-date=\"Wed, 12 Feb 1997 16:29:51 -0500\";
-Content-Description: a complete map of the human genome
-Content-Transfer-Encoding: base64
-
-iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAABGdBTUEAALGPC/xhBQAAAAZQ
-TFRF////AAAAVcLTfgAAAPZJREFUeNq9ldsOwzAIQ+3//+l1WlvA5ZLsoUiTto4TB+ISoAjy
-+ITfRBfcAmgRFFeAm+J6uhdKdFhFWUgDkFsK0oUp/9G2//Kj7Jx+5tSKOdBscgUYiKHRS/me
-WATQdRUvAK0Bnmshmtn79PpaLBbbOZkjKvRnjRZoRswOkG1wFchKew2g9wXVJVZL/m4+B+vv
-9AxQQR2Q33SgAYJzzVACdAWjAfRYzYFO9n6SLnydtQHSMxYDMAKqZ/8FS/lTK+zuq3CtK64L
-UDwbgUEAUmk2Zyg101d6PhCDySgAvTvDgKiuOrc4dLxUb7UMnhGIexyI+d6U+ABuNAP4Simx
-lgAAAABJRU5ErkJggg==
-"))
-    (switch-to-buffer (get-buffer-create "*test*"))
-    (erase-buffer)
-    (insert mail)
-    (rmail-mime-show)))
-
 (defun rmail-mime-multipart-handler (content-type
                                      content-disposition
                                      content-transfer-encoding)
@@ -937,37 +933,6 @@ The other arguments are the same as `rmail-mime-multipart-handler'."
                 (rmail-mime-hidden-mode child)))))
       entities)))
 
-(defun test-rmail-mime-multipart-handler ()
-  "Test of a mail used as an example in RFC 2046."
-  (let ((mail "From: Nathaniel Borenstein <nsb@bellcore.com>
-To: Ned Freed <ned@innosoft.com>
-Date: Sun, 21 Mar 1993 23:56:48 -0800 (PST)
-Subject: Sample message
-MIME-Version: 1.0
-Content-type: multipart/mixed; boundary=\"simple boundary\"
-
-This is the preamble.  It is to be ignored, though it
-is a handy place for composition agents to include an
-explanatory note to non-MIME conformant readers.
-
---simple boundary
-
-This is implicitly typed plain US-ASCII text.
-It does NOT end with a linebreak.
---simple boundary
-Content-type: text/plain; charset=us-ascii
-
-This is explicitly typed plain US-ASCII text.
-It DOES end with a linebreak.
-
---simple boundary--
-
-This is the epilogue.  It is also to be ignored."))
-    (switch-to-buffer (get-buffer-create "*test*"))
-    (erase-buffer)
-    (insert mail)
-    (rmail-mime-show t)))
-
 (defun rmail-mime-insert-multipart (entity)
   "Presentation handler for a multipart MIME entity."
   (let ((current (aref (rmail-mime-entity-display entity) 0))
@@ -978,27 +943,31 @@ This is the epilogue.  It is also to be ignored."))
         (beg (point))
         (segment (rmail-mime-entity-segment (point) entity)))
     ;; header
-    (if (eq (aref current 0) (aref new 0))
+    (if (eq (rmail-mime-display-header current)
+            (rmail-mime-display-header new))
         (goto-char (aref segment 2))
-      (if (aref current 0)
+      (if (rmail-mime-display-header current)
           (delete-char (- (aref segment 2) (aref segment 1))))
-      (if (aref new 0)
+      (if (rmail-mime-display-header new)
           (rmail-mime-insert-header header)))
     ;; tagline
-    (if (eq (aref current 1) (aref new 1))
-        (if (or (not (aref current 1))
-                (eq (aref current 2) (aref new 2)))
+    (if (eq (rmail-mime-display-tagline current)
+            (rmail-mime-display-tagline new))
+        (if (or (not (rmail-mime-display-tagline current))
+                (eq (rmail-mime-display-body current)
+                    (rmail-mime-display-body new)))
             (forward-char (- (aref segment 3) (aref segment 2)))
           (rmail-mime-update-tagline entity))
-      (if (aref current 1)
+      (if (rmail-mime-display-tagline current)
           (delete-char (- (aref segment 3) (aref segment 2))))
-      (if (aref new 1)
+      (if (rmail-mime-display-tagline new)
           (rmail-mime-insert-tagline entity)))
 
     (put-text-property beg (point) 'rmail-mime-entity entity)
 
     ;; body
-    (if (eq (aref current 2) (aref new 2))
+    (if (eq (rmail-mime-display-body current)
+            (rmail-mime-display-body new))
         (forward-char (- (aref segment 4) (aref segment 3)))
       (dolist (child (rmail-mime-entity-children entity))
         (rmail-mime-insert child)))
@@ -1228,7 +1197,7 @@ This function will be called recursively if multiple parts are
 available."
   (let ((current (aref (rmail-mime-entity-display entity) 0))
         (new (aref (rmail-mime-entity-display entity) 1)))
-    (if (not (eq (aref new 0) 'raw))
+    (if (not (eq (rmail-mime-display-header new) 'raw))
         ;; Not a raw-mode.  Each handler should handle it.
         (funcall (rmail-mime-entity-handler entity) entity)
       (let ((header (rmail-mime-entity-header entity))
@@ -1237,14 +1206,15 @@ available."
             (beg (point))
             (segment (rmail-mime-entity-segment (point) entity)))
         ;; header
-        (if (eq (aref current 0) (aref new 0))
+        (if (eq (rmail-mime-display-header current)
+                (rmail-mime-display-header new))
             (goto-char (aref segment 2))
-          (if (aref current 0)
+          (if (rmail-mime-display-header current)
               (delete-char (- (aref segment 2) (aref segment 1))))
           (insert-buffer-substring rmail-mime-mbox-buffer
                                      (aref header 0) (aref header 1)))
         ;; tagline
-        (if (aref current 1)
+        (if (rmail-mime-display-tagline current)
             (delete-char (- (aref segment 3) (aref segment 2))))
         ;; body
         (let ((children (rmail-mime-entity-children entity)))
@@ -1253,9 +1223,10 @@ available."
                 (put-text-property beg (point) 'rmail-mime-entity entity)
                 (dolist (child children)
                   (rmail-mime-insert child)))
-            (if (eq (aref current 2) (aref new 2))
+            (if (eq (rmail-mime-display-body current)
+                    (rmail-mime-display-body new))
                 (forward-char (- (aref segment 4) (aref segment 3)))
-              (if (aref current 2)
+              (if (rmail-mime-display-body current)
                 (delete-char (- (aref segment 4) (aref segment 3))))
               (insert-buffer-substring rmail-mime-mbox-buffer
                                        (aref body 0) (aref body 1))
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index a3f722443dc..e6a0a34f33b 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -342,10 +342,9 @@ Emacs will list the message in the summary."
 (defun rmail-message-regexp-p-1 (msg regexp)
   ;; Search functions can expect to start from the beginning.
   (narrow-to-region (point) (save-excursion (search-forward "\n\n") (point)))
-  (if rmail-enable-mime
-      (if rmail-search-mime-header-function
-          (funcall rmail-search-mime-header-function msg regexp (point))
-        (error "You must set `rmail-search-mime-header-function'"))
+  (if (and rmail-enable-mime
+           rmail-search-mime-header-function)
+      (funcall rmail-search-mime-header-function msg regexp (point))
     (re-search-forward regexp nil t)))
 
 ;;;###autoload
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 026b03e350f..bc38b10124e 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -975,7 +975,7 @@ The list is in preference order.")
           (subst-char-in-region (point-min) (point-max)  9 ?  t) ; tab     --> blank
 
           (goto-char (point-min))
-          ;; tidyness in case hook is not robust when it looks at this
+          ;; tidiness in case hook is not robust when it looks at this
           (while (re-search-forward "[ \t]+" header-end t) (replace-match " "))
 
           (goto-char (point-min))
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 9aa0ba4e262..9c020ffadab 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -445,7 +445,7 @@
     (define-key menu [props]
       `(menu-item ,(purecopy "Text Properties") facemenu-menu))
 
-    ;; ns-win.el said: Add spell for platorm consistency.
+    ;; ns-win.el said: Add spell for platform consistency.
     (if (featurep 'ns)
         (define-key menu [spell]
           `(menu-item ,(purecopy "Spell") ispell-menu-map)))
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index ca179a78b61..6bdd96c0fcc 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,14 @@
+2011-11-20  Bill Wohler  <wohler@newt.com>
+
+        * Release MH-E version 8.3.1.
+
+        * mh-e.el (Version, mh-version): Update for release 8.3.1.
+
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * mh-utils.el (mh-folder-list): Fix typo.
+        (mh-children-p): Move part of the docstring to a comment.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * mh-search.el (mh-pick-parse-search-buffer): Fix typo.
@@ -347,7 +358,7 @@
 
 2008-06-20  Stephen Eglen  <stephen@gnu.org>
 
-        * mh-show.el (mh-defun-show-buffer): Use `...' rather than than
+        * mh-show.el (mh-defun-show-buffer): Use `...' rather than
         "..." in generated docstrings.
 
 2008-06-12  Glenn Morris  <rgm@gnu.org>
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index b12c47e7f1f..d35d7d4c676 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -10944,7 +10944,7 @@
 2001-11-21  Peter S Galbraith  <psg@debian.org>
 
         * mh-comp.el (mh-reply-show-message-p): The setting of this
-        variable determines whether the MH show-buffer is diplayed with
+        variable determines whether the MH show-buffer is displayed with
         the current message when using mh-reply without a prefix argument.
         Set it to nil if you already include the message automatically in
         your draft using "repl: -filter repl.filter" in your ~/.mh_profile
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index b614cdb7991..77ff914b0cc 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -5,7 +5,7 @@
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
-;; Version: 8.3
+;; Version: 8.3.1
 ;; Keywords: mail
 
 ;; This file is part of GNU Emacs.
@@ -127,7 +127,7 @@
 ;; Try to keep variables local to a single file. Provide accessors if
 ;; variables are shared. Use this section as a last resort.
 
-(defconst mh-version "8.3" "Version number of MH-E.")
+(defconst mh-version "8.3.1" "Version number of MH-E.")
 
 ;; Variants
 
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 0327b64a33f..a97185e1496 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1399,7 +1399,7 @@ See also \\[mh-mh-to-mime]."
     ("mailto")          ; RFC1738 Electronic mail address
     ("news")            ; RFC1738 Usenet news
     ("nntp")            ; RFC1738 Usenet news using NNTP access
-    ("propspero")       ; RFC1738 Prospero Directory Service
+    ("prospero")        ; RFC1738 Prospero Directory Service
     ("telnet")          ; RFC1738 Telnet
     ("tftp")            ; RFC2046 Trivial File Transfer Protocol
     ("url")             ; RFC2017 URL scheme MIME access-type Protocol
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 6132af17dab..327d8ad7040 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -484,18 +484,18 @@ no effect."
   folder)
 
 (defmacro mh-children-p (folder)
-  "Return t if FOLDER from sub-folders cache has children.
-The car of folder is the name, and the cdr is either t or some
-sort of count that I do not understand. It's too small to be the
-number of messages in the sub-folders and too large to be the
-number of sub-folders. XXX"
+  "Return t if FOLDER from sub-folders cache has children."
+;; The car of folder is the name, and the cdr is either t or some
+;; sort of count that I do not understand. It's too small to be the
+;; number of messages in the sub-folders and too large to be the
+;; number of sub-folders. XXX
   `(if (cdr ,folder)
        t
      nil))
 
 ;;;###mh-autoload
 (defun mh-folder-list (folder)
-  "Return FOLDER and its descendents.
+  "Return FOLDER and its descendants.
 FOLDER may have a + prefix. Returns a list of strings without the
 + prefix. If FOLDER is nil, then all folders are considered. For
 example, if your Mail directory only contains the folders +inbox,
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 38785fc48e8..11e195d4f7f 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -51,7 +51,7 @@
 ;; - choose-completion doesn't know how to quote the text it inserts.
 ;;   E.g. it fails to double the dollars in file-name completion, or
 ;;   to backslash-escape spaces and other chars in comint completion.
-;;   - when completing ~/tmp/fo$$o, the highligting in *Completions*
+;;   - when completing ~/tmp/fo$$o, the highlighting in *Completions*
 ;;     is off by one position.
 ;;   - all code like PCM which relies on all-completions to match
 ;;     its argument gets confused because all-completions returns unquoted
@@ -2427,7 +2427,7 @@ PATTERN is as returned by `completion-pcm--string->pattern'."
   "Find all completions for STRING at POINT in TABLE, satisfying PRED.
 POINT is a position inside STRING.
 FILTER is a function applied to the return value, that can be used, e.g. to
-filter out additional entries (because TABLE migth not obey PRED)."
+filter out additional entries (because TABLE might not obey PRED)."
   (unless filter (setq filter 'identity))
   (let* ((beforepoint (substring string 0 point))
          (afterpoint (substring string point))
diff --git a/lisp/misearch.el b/lisp/misearch.el
index c533562f073..de1a32ff7d5 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -142,7 +142,7 @@ Intended to be added to `isearch-mode-hook'."
        ;; 1. First try searching in the initial buffer
        (let ((res (funcall search-fun string bound noerror)))
          ;; Reset wrapping for all-buffers pause after successful search
-         (if (and res (eq multi-isearch-pause t))
+         (if (and res (not bound) (eq multi-isearch-pause t))
              (setq multi-isearch-current-buffer nil))
          res)
        ;; 2. If the above search fails, start visiting next/prev buffers
@@ -173,8 +173,8 @@ Intended to be added to `isearch-mode-hook'."
                    found)
                ;; Return nil when multi-isearch-next-buffer-current-function fails
                ;; (`with-current-buffer' raises an error for nil returned from it).
-               (error nil))
-           (signal 'search-failed (list string "Repeat for next buffer"))))))))
+               (error (signal 'search-failed (list string "end of multi"))))
+           (signal 'search-failed (list string "repeat for next buffer"))))))))
 
 (defun multi-isearch-wrap ()
   "Wrap the multiple buffers search when search is failed.
diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el
index bcf1749e13f..7f04cac96fe 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/mouse-sel.el
@@ -60,7 +60,7 @@
 ;;
 ;; Thanks to KevinB@bartley.demon.co.uk for his useful input.
 ;;
-;;--- Customisation -------------------------------------------------------
+;;--- Customization -------------------------------------------------------
 ;;
 ;; * You may want to use none or more of following:
 ;;
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 238e8ad68ae..6c2556b1f39 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -1589,7 +1589,7 @@ when constructing the set of constraints."
 (defvar mpc--changed-selection)
 
 (defun mpc-reorder (&optional nodeactivate)
-  "Reorder entries based on thre currently active selections.
+  "Reorder entries based on the currently active selections.
 I.e. split the current browser buffer into a first part containing the
 entries included in the selection, then a separator, and then the entries
 not included in the selection.
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index cbad30199d7..f6a5b53ae7f 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -46,7 +46,7 @@
 ;; Extended filename syntax:
 ;;
 ;; The default extended filename syntax is '/user@host:name', where the
-;; 'user@' part may be omitted.  This syntax can be customised to a certain
+;; 'user@' part may be omitted.  This syntax can be customized to a certain
 ;; extent by changing ange-ftp-name-format.  There are limitations.
 ;; The `host' part has an optional suffix `#port' which may be used to
 ;; specify a non-default port number for the connexion.
@@ -721,7 +721,7 @@ parenthesized expressions in REGEXP for the components (in that order)."
           "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|"
           "^500 .*AUTH\\|^KERBEROS\\|"
           "^504 Unknown security mechanism\\|"
-          "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd
+          "^530 Please login with USER and PASS\\|" ; non kerberized vsFTPd
           "^534 Kerberos Authentication not enabled\\|"
           "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT")
   "Regular expression matching FTP messages that can be ignored."
@@ -1665,7 +1665,7 @@ good, skip, fatal, or unknown."
               (ange-ftp-process-handle-line line proc)
             ;; If we've seen a potential error message and it
             ;; hasn't been cancelled by a good message before
-            ;; seeing a propt, then the error was real.
+            ;; seeing a prompt, then the error was real.
             (delete-process proc)
             (setq ange-ftp-process-busy nil
                   ange-ftp-process-result-line ange-ftp-pending-error-line))))
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index b78e8d5676c..34bfb403e1c 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -100,7 +100,7 @@
 ;; <URL:ftp://ftp.lysator.liu.se/pub/sgml>; hm--html-menus can be used
 ;; with this.
 
-;; This package generalises function html-previewer-process in Marc
+;; This package generalizes function html-previewer-process in Marc
 ;; Andreessen's html-mode (LCD modes/html-mode.el.Z).  See also the
 ;; ffap.el package.  The huge hyperbole package also contains similar
 ;; functions.
@@ -138,7 +138,7 @@
 ;; M-x browse-url-of-dired-file RET
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Customisation (~/.emacs)
+;; Customization (~/.emacs)
 
 ;; To see what variables are available for customization, type
 ;; `M-x set-variable browse-url TAB'.  Better, use
@@ -190,7 +190,7 @@
 ;;
 ;;      (add-hook 'browse-url-of-file-hook 'browse-url-netscape-reload)
 
-;; You may also want to customise browse-url-netscape-arguments, e.g.
+;; You may also want to customize browse-url-netscape-arguments, e.g.
 ;;      (setq browse-url-netscape-arguments '("-install"))
 ;;
 ;; or similarly for the other browsers.
diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el
index 16b36df07f8..f1b3ce7fd05 100644
--- a/lisp/net/newst-plainview.el
+++ b/lisp/net/newst-plainview.el
@@ -1574,7 +1574,7 @@ property to '(<nt-type>-<nt-age> <nt-type> <nt-age>)."
       (while (and (setq pos2 (next-single-property-change pos1 'nt-type))
                   (<= pos2 end)
                   (> pos2 pos1))
-        ;; must shift one char to the left in order to handle inivisible
+        ;; must shift one char to the left in order to handle invisible
         ;; newlines, motion in invisible text areas and all that correctly
         (put-text-property (1- pos1) (1- pos2)
                            'invisible
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 7cfdd2cb89d..8ff74a94eb0 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -1793,7 +1793,7 @@ Update teeview afterwards unless NO-UPDATE is non-nil."
     result))
 
 (defun newsticker--group-remove-obsolete-feeds (group)
-  "Recursively remove obselete feeds from GROUP."
+  "Recursively remove obsolete feeds from GROUP."
   (let ((result nil)
         (urls (append newsticker-url-list newsticker-url-list-defaults)))
     (mapc (lambda (g)
diff --git a/lisp/net/ntlm.el b/lisp/net/ntlm.el
index 25e7a7b43de..9af148e8faa 100644
--- a/lisp/net/ntlm.el
+++ b/lisp/net/ntlm.el
@@ -102,8 +102,8 @@ is not given."
             (md4-pack-int16 ld) ;domain field, count field
             (md4-pack-int16 ld) ;domain field, max count field
             (md4-pack-int32 (cons 0 off-d)) ;domain field, offset field
-            user                        ;bufer field
-            domain              ;bufer field
+            user                        ;buffer field
+            domain              ;buffer field
             )))
 
 (eval-when-compile
@@ -207,16 +207,16 @@ by PASSWORD-HASHES.  PASSWORD-HASHES should be a return value of
             ;; buffer field
             lmRespData                  ;lmResponse, 24 bytes
             ntRespData                  ;ntResponse, 24 bytes
-            (ntlm-ascii2unicode domain  ;unicode domain string, 2*ld bytes
+            (ntlm-ascii2unicode domain  ;Unicode domain string, 2*ld bytes
                                 (length domain)) ;
-            (ntlm-ascii2unicode user    ;unicode user string, 2*lu bytes
+            (ntlm-ascii2unicode user    ;Unicode user string, 2*lu bytes
                                 (length user)) ;
-            (ntlm-ascii2unicode user    ;unicode user string, 2*lu bytes
+            (ntlm-ascii2unicode user    ;Unicode user string, 2*lu bytes
                                 (length user)) ;
             )))
 
 (defun ntlm-get-password-hashes (password)
-  "Return a pair of SMB hash and NT MD4 hash of the given password PASSWORD"
+  "Return a pair of SMB hash and NT MD4 hash of the given password PASSWORD."
   (list (ntlm-smb-passwd-hash password)
         (ntlm-md4hash password)))
 
@@ -526,7 +526,7 @@ into a Unicode string.  PASSWD is truncated to 128 bytes if longer."
     (setq len (length passwd))
     (if (> len 128)
         (setq len 128))
-    ;; Password must be converted to NT unicode
+    ;; Password must be converted to NT Unicode
     (setq wpwd (ntlm-ascii2unicode passwd len))
     ;; Calculate length in bytes
     (setq len (* len 2))
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 7a1e5fc6a80..a31ec496c16 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -201,7 +201,7 @@ in your ~/.emacs (after loading/requiring quickurl).")
   (listp (cdr url)))
 
 (defun quickurl-make-url (keyword url &optional comment)
-  "Create a URL from KEYWORD, URL and (optionaly) COMMENT."
+  "Create a URL from KEYWORD, URL and (optionally) COMMENT."
   (if (and comment (not (zerop (length comment))))
       (list keyword url comment)
     (cons keyword url)))
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index f6981aeabd9..7d069a0f306 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -659,7 +659,7 @@ Functions are called with PROCESS and SENTINEL arguments.")
 (defun rcirc-disconnect-buffer (&optional buffer)
   (with-current-buffer (or buffer (current-buffer))
     ;; set rcirc-target to nil for each channel so cleanup
-    ;; doesnt happen when we reconnect
+    ;; doesn't happen when we reconnect
     (setq rcirc-target nil)
     (setq mode-line-process ":disconnected")))
 
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index fcf523a7068..998f62920a1 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -23,7 +23,7 @@
 
 ;;; Commentary:
 
-;; This package provides all interactive commands which are releated
+;; This package provides all interactive commands which are related
 ;; to Tramp.
 
 ;;; Code:
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 269b47be20c..fda88351253 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -39,7 +39,7 @@
 ;; Consequently, GNU Emacs 23.1 with enabled D-Bus bindings is a
 ;; precondition.
 
-;; The GVFS D-Bus interface is said to be instable.  There are even no
+;; The GVFS D-Bus interface is said to be unstable.  There are even no
 ;; introspection data.  The interface, as discovered during
 ;; development time, is given in respective comments.
 
diff --git a/lisp/net/tramp-gw.el b/lisp/net/tramp-gw.el
index 70b70004de9..4ddd63bc3b8 100644
--- a/lisp/net/tramp-gw.el
+++ b/lisp/net/tramp-gw.el
@@ -178,7 +178,7 @@ instead of the host name declared in TARGET-VEC."
            (tramp-file-name-host gw-vec)))
          ;; Declare the SOCKS server to be used.
          (socks-server
-          (list "Tramp tempory socks server list"
+          (list "Tramp temporary socks server list"
                 ;; Host name.
                 (tramp-file-name-real-host gw-vec)
                 ;; Port number.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 50a3c1fca5e..941b788ae4d 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4905,7 +4905,7 @@ If no corresponding command is found, nil is returned."
 
 (defun tramp-get-inline-coding (vec prop size)
   "Return the coding command related to PROP.
-PROP is either `remote-encoding', `remode-decoding',
+PROP is either `remote-encoding', `remote-decoding',
 `local-encoding' or `local-decoding'.
 
 SIZE is the length of the file to be coded.  Depending on SIZE,
@@ -5033,11 +5033,11 @@ function cell is returned to be applied on a buffer."
 ;;   until the last but one hop via `start-file-process'.  Apply it
 ;;   also for ftp and smb.
 ;; * WIBNI if we had a command "trampclient"?  If I was editing in
-;;   some shell with root priviledges, it would be nice if I could
+;;   some shell with root privileges, it would be nice if I could
 ;;   just call
 ;;     trampclient filename.c
 ;;   as an editor, and the _current_ shell would connect to an Emacs
-;;   server and would be used in an existing non-priviledged Emacs
+;;   server and would be used in an existing non-privileged Emacs
 ;;   session for doing the editing in question.
 ;;   That way, I need not tell Emacs my password again and be afraid
 ;;   that it makes it into core dumps or other ugly stuff (I had Emacs
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 150ef18be52..73b9339e25a 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -480,7 +480,7 @@ PRESERVE-UID-GID and PRESERVE-SELINUX-CONTEXT are completely ignored."
     ;; Dissect NAME.
     (with-parsed-tramp-file-name name nil
       ;; Tilde expansion if necessary.  We use the user name as share,
-      ;; which is offen the case in domains.
+      ;; which is often the case in domains.
       (when (string-match "\\`/?~\\([^/]*\\)" localname)
         (setq localname
               (replace-match
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el
index efb2cdd6166..ea4a887898e 100644
--- a/lisp/net/xesam.el
+++ b/lisp/net/xesam.el
@@ -88,7 +88,7 @@
 ;;
 ;;   (setq xesam-query-type 'fulltext-query)
 ;;
-;; Another option to be customised is the number of hits to be
+;; Another option to be customized is the number of hits to be
 ;; presented at once.
 ;;
 ;;   (setq xesam-hits-per-page 50)
diff --git a/lisp/notifications.el b/lisp/notifications.el
index a4e7fdd5425..e4e44fb0f67 100644
--- a/lisp/notifications.el
+++ b/lisp/notifications.el
@@ -163,7 +163,7 @@ Various PARAMS can be set:
                  only URI schema supported right now) or a name
                  in a freedesktop.org-compliant icon theme.
  :sound-file     The path to a sound file to play when the notification pops up.
- :sound-name     A themeable named sound from the freedesktop.org sound naming
+ :sound-name     A themable named sound from the freedesktop.org sound naming
                  specification to play when the notification pops up.
                  Similar to icon-name,only for sounds. An example would
                  be \"message-new-instant\".
diff --git a/lisp/nxml/xsd-regexp.el b/lisp/nxml/xsd-regexp.el
index fbf0e159247..9701b8dc6e0 100644
--- a/lisp/nxml/xsd-regexp.el
+++ b/lisp/nxml/xsd-regexp.el
@@ -49,7 +49,7 @@
 ;; Unicode character means a character in one of the Mule charsets
 ;; ascii, latin-iso8859-1, mule-unicode-0100-24ff,
 ;; mule-unicode-2500-33ff, mule-unicode-e000-ffff, eight-bit-control
-;; or a character translateable to such a character (i.e a character
+;; or a character translatable to such a character (i.e a character
 ;; for which `encode-char' will return non-nil).
 ;;
 ;; Using unify-8859-on-decoding-mode is probably a good idea here
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index b946d147e5b..1cdb0a6f574 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,15 @@
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org.el (org-link-unescape, org-link-unescape-compound): Fix typos.
+
+2011-11-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * org-list.el (org-list-send-item): Use sort instead of sort*.
+
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org-table.el (org-table-line-to-dline): Fix typo.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * org-agenda.el (org-agenda-add-entry-text-descriptive-links)
@@ -4165,7 +4177,7 @@
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
-        * org.el (org-link-escape): New unicode aware percent encoding
+        * org.el (org-link-escape): New Unicode aware percent encoding
         algorithm.
 
 2011-07-28  Sebastian Rose  <sebastian_rose@gmx.de>
@@ -4173,7 +4185,7 @@
         * org-protocol.el (org-protocol-unhex-single-byte-sequence): New
         function.  Decode hex-encoded singly byte sequences.
         (org-protocol-unhex-compound): Use new function if decoding sequence
-        as unicode character failed.
+        as Unicode character failed.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -6185,8 +6197,8 @@
 2010-11-11  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-indent.el (org-indent-add-properties):
-        Use `with-silent-modificatons'.
-        (org-indent-remove-properties): Use `with-silent-modificatons'.
+        Use `with-silent-modifications'.
+        (org-indent-remove-properties): Use `with-silent-modifications'.
 
 2010-11-11  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -13637,7 +13649,7 @@
 2009-08-06  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.el (org-remove-empty-overlays-at)
-        (org-clean-visibility-after-subtree-move): New functons.
+        (org-clean-visibility-after-subtree-move): New functions.
         (org-move-subtree-down): Simplify cleanup of display.
 
 2009-08-06  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -14386,7 +14398,7 @@
 2009-08-06  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.el (org-edit-src-code, org-edit-fixed-width-region): Use a
-        better bufer-generating mechanism.
+        better buffer-generating mechanism.
         (org-edit-src-find-buffer): New function.
 
         * org-icalendar.el (org-print-icalendar-entries): Don't check for
@@ -14739,7 +14751,7 @@
 
 2009-08-06  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org.el (org-sort-entries-or-items): Match TODO keywrds
+        * org.el (org-sort-entries-or-items): Match TODO keywords
         case-sensitively, when sorting.
         (org-priority): Do not match TODO keywords with wrong case.
 
@@ -15201,7 +15213,7 @@
 
         * org-exp.el (org-export-as-html): Use IDs in the correct way.
 
-        * org.el (org-uuidgen-p): New funtion.
+        * org.el (org-uuidgen-p): New function.
 
         * org-agenda.el (org-agenda-fontify-priorities): New default value
         `cookies'.
@@ -17067,7 +17079,7 @@
         (org-file-apps-defaults-macosx): Let PostScript files be opened by
         preview.
         (org-time-stamp-inactive): Call `org-time-stamp'.
-        (org-time-stamp): New argument `inactive'.  Also edit inacive
+        (org-time-stamp): New argument `inactive'.  Also edit inactive
         stamps.  Convert time stamp type.
         (org-open-file): Interpret the `default' value for the `command'
         in `org-file-apps'.
diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el
index a5bdcbf2f73..4fe61451982 100644
--- a/lisp/org/ob-ledger.el
+++ b/lisp/org/ob-ledger.el
@@ -30,7 +30,7 @@
 ;;
 ;; 1) there is no such thing as a "session" in ledger
 ;;
-;; 2) we are generally only going to return output from the leger program
+;; 2) we are generally only going to return output from the ledger program
 ;;
 ;; 3) we are adding the "cmdline" header argument
 ;;
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index f7aa7bf4701..50761ede7cb 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -1619,7 +1619,7 @@ Where CATEGORY-REGEXP is a regexp matching the categories where
 the icon should be displayed.
 FILE-OR-DATA either a file path or a string containing image data.
 
-The other fields can be omited safely if not needed:
+The other fields can be omitted safely if not needed:
 TYPE indicates the image type.
 DATA-P is a boolean indicating whether the FILE-OR-DATA string is
 image data.
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 05cca0e311e..e3a87b77b5c 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -372,7 +372,7 @@ to avoid conflicts with other active capture processes."
   (plist-get (if local org-capture-current-plist org-capture-plist) prop))
 
 (defun org-capture-member (prop &optional local)
-  "Is PROP a preperty in `org-capture-plist'.
+  "Is PROP a property in `org-capture-plist'.
 When LOCAL is set, use the local variable `org-capture-current-plist',
 this is necessary after initialization of the capture process,
 to avoid conflicts with other active capture processes."
@@ -1449,7 +1449,7 @@ The template may still contain \"%?\" for cursor positioning."
       (goto-char (point-min))
       (while (looking-at "[ \t]*\n") (replace-match ""))
       (if (re-search-forward "[ \t\n]*\\'" nil t) (replace-match "\n"))
-      ;; Return the expanded tempate and kill the temporary buffer
+      ;; Return the expanded template and kill the temporary buffer
       (untabify (point-min) (point-max))
       (set-buffer-modified-p nil)
       (prog1 (buffer-string) (kill-buffer (current-buffer))))))
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 352d414a4b6..d567b929056 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -36,7 +36,7 @@
 ;; links to these 'tagged' destinations, allowing seamless navigation between
 ;; multiple org-mode files. Topics can be created in any org mode file and
 ;; will always be found by plain links from other files. Other file types
-;; recognised by ctags (source code files, latex files, etc) will also be
+;; recognized by ctags (source code files, latex files, etc) will also be
 ;; available as destinations for plain links, and similarly, org-mode links
 ;; will be available as tags from source files. Finally, the function
 ;; `org-ctags-find-tag-interactive' lets you choose any known tag, using
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index ee8e6027706..35a51649452 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -2922,7 +2922,7 @@ to the value of `temporary-file-directory'."
           (org-load-modules-maybe)
           (unless org-local-vars
             (setq org-local-vars (org-get-local-variables)))
-          (eval ;; convert to fmt -- mimicing `org-run-like-in-org-mode'
+          (eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode'
            (list 'let org-local-vars
                  (list (intern (format "org-export-as-%s" fmt))
                        nil nil nil ''string t))))
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 9184f0c3d54..a86c145a9ee 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -1439,7 +1439,7 @@ This function returns, destructively, the new list structure."
         ;; 1.1. Remove the item just created in structure.
         (setq struct (delete (assq new-item struct) struct))
         ;; 1.2. Copy ITEM and any of its sub-items at NEW-ITEM.
-        (setq struct (sort*
+        (setq struct (sort
                       (append
                        struct
                        (mapcar (lambda (e)
@@ -3008,7 +3008,7 @@ Valid parameters PARAMS are:
 
 Alternatively, each parameter can also be a form returning
 a string.  These sexp can use keywords `counter' and `depth',
-reprensenting respectively counter associated to the current
+representing respectively counter associated to the current
 item, and depth of the current sub-list, starting at 0.
 Obviously, `counter' is only available for parameters applying to
 items."
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 2fba931528e..76e4eae4b45 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -51,7 +51,7 @@
 (defvar orgtbl-after-send-table-hook nil
   "Hook for functions attaching to `C-c C-c', if the table is sent.
 This can be used to add additional functionality after the table is sent
-to the receiver position, othewise, if table is not sent, the functions
+to the receiver position, otherwise, if table is not sent, the functions
 are not run.")
 
 (defcustom orgtbl-optimized (eq org-enable-table-editor 'optimized)
@@ -1302,7 +1302,7 @@ However, when FORCE is non-nil, create new columns if necessary."
 (defun org-table-line-to-dline (line &optional above)
   "Turn a buffer line number into a data line number.
 If there is no data line in this line, return nil.
-If there is no matchin dline (most likely te refrence was a hline), the
+If there is no matching dline (most likely the reference was a hline), the
 first dline below it is used.  When ABOVE is non-nil, the one above is used."
   (catch 'exit
     (let ((ll (length org-table-dlines))
@@ -2641,7 +2641,7 @@ in the buffer and column1 and column2 are table column numbers."
             (prog1 (org-trim (org-table-get-field c1))
               (if highlight (org-table-highlight-rectangle (point) (point)))))
         ;; A range, return a vector
-        ;; First sort the numbers to get a regular ractangle
+        ;; First sort the numbers to get a regular rectangle
         (if (< r2 r1) (setq tmp r1 r1 r2 r2 tmp))
         (if (< c2 c1) (setq tmp c1 c1 c2 c2 tmp))
         (if corners-only
@@ -2901,7 +2901,7 @@ known that the table will be realigned a little later anyway."
 
 (defun org-table-iterate (&optional arg)
   "Recalculate the table until it does not change anymore.
-The maximun number of iterations is 10, but you can chose a different value
+The maximum number of iterations is 10, but you can chose a different value
 with the prefix ARG."
   (interactive "P")
   (let ((imax (if arg (prefix-numeric-value arg) 10))
diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el
index 0d9516a389e..1fb3114bf3f 100644
--- a/lisp/org/org-taskjuggler.el
+++ b/lisp/org/org-taskjuggler.el
@@ -70,7 +70,7 @@
 ;; "taskjuggler_project" (or whatever you customized
 ;; `org-export-taskjuggler-project-tag' to). You are now ready to
 ;; export the project plan with `org-export-as-taskjuggler-and-open'
-;; which will export the project plan and open a gant chart in
+;; which will export the project plan and open a Gantt chart in
 ;; TaskJugglerUI.
 ;;
 ;; * Resources
@@ -354,8 +354,8 @@ information, all the properties, etc."
   (let* ((props (org-entry-properties))
          (components (org-heading-components))
          (level (nth 1 components))
-         (headline 
-          (replace-regexp-in-string 
+         (headline
+          (replace-regexp-in-string
            "\"" "\\\"" (nth 4 components) t t)) ; quote double quotes in headlines
          (parent-ordered (org-taskjuggler-parent-is-ordered-p)))
     (push (cons "level" level) props)
@@ -405,10 +405,10 @@ deeper), then it's not a leaf."
             (successor (car (cdr tasks))))
         (cond
          ;; if a task has no successors it is a leaf
-         ((null successor) 
+         ((null successor)
           (push (cons (cons "leaf-node" t) task) new-list))
          ;; if the successor has a lower level than task it is a leaf
-         ((<= (cdr (assoc "level" successor)) (cdr (assoc "level" task))) 
+         ((<= (cdr (assoc "level" successor)) (cdr (assoc "level" task)))
           (push (cons (cons "leaf-node" t) task) new-list))
          ;; otherwise examine the rest of the tasks
          (t (push task new-list))))
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 25bfb8a78e8..afd4ea6b4c3 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -8775,8 +8775,8 @@ If optional argument MERGE is set, merge TABLE into
          (char-to-string char))) text "")))
 
 (defun org-link-unescape (str)
-  "Unhex hexified unicode strings as returned from the JavaScript function
-encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ö'."
+  "Unhex hexified Unicode strings as returned from the JavaScript function
+encodeURIComponent.  E.g. `%C3%B6' is the german Umlaut `ö'."
   (unless (and (null str) (string= "" str))
     (let ((pos 0) (case-fold-search t) unhexed)
       (while (setq pos (string-match "\\(%[0-9a-f][0-9a-f]\\)+" str pos))
@@ -8786,7 +8786,7 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ö'."
   str)
 
 (defun org-link-unescape-compound (hex)
-  "Unhexify unicode hex-chars. E.g. `%C3%B6' is the German Umlaut `ö'.
+  "Unhexify Unicode hex-chars.  E.g. `%C3%B6' is the German Umlaut `ö'.
 Note: this function also decodes single byte encodings like
 `%E1' (\"á\") if not followed by another `%[A-F0-9]{2}' group."
   (save-match-data
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index a7a332d97f2..e111e743608 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -579,7 +579,7 @@ Solutions are sorted from least to greatest Hamming weight."
     (let* (calc-command-flags
            (grid-size-squared (* 5x5-grid-size 5x5-grid-size))
 
-           ;; targetv is the vector the origine of which is org="current
+           ;; targetv is the vector the origin of which is org="current
            ;; grid" and the end of which is dest="all ones".
            (targetv
             (5x5-log
@@ -649,7 +649,7 @@ Solutions are sorted from least to greatest Hamming weight."
            ;; 23x25 is a diagonal of 1, and the two last columns are a
            ;; base of kernel of transferm.
            ;;
-           ;; base-change must be by construction inversible.
+           ;; base-change must be by construction invertible.
            (base-change
             (5x5-log
              "p"
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index f2b7294e2d0..62d486ffca5 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -55,7 +55,7 @@
 
 ;; 0.3 (2007-03-11)
 ;;     - Renamed shift modes and thus names of score files. All
-;;       highscores are lost, unless you rename the score files from
+;;       high scores are lost, unless you rename the score files from
 ;;       bubbles-shift-... to bubbles-...!
 ;;     - Bugfixes: Check for successful image creation.
 ;;                 Disable menus and counter when game is over.
diff --git a/lisp/printing.el b/lisp/printing.el
index c5951a4983f..d6c67cc68a6 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -3692,7 +3692,7 @@ VI. Customization:
           "\n\n
 The printing interface buffer has the same functionality as the printing menu.
 The major difference is that the states (like sending PostScript generated to a
-file, n-up printing, etc.) are set and saved between priting buffer
+file, n-up printing, etc.) are set and saved between printing buffer
 activation.  Also, the landscape, duplex and tumble values are the same for
 PostScript file and directory/buffer/region/mode processing; using menu, there
 are different value sets for PostScript file and directory/buffer/region/mode
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 9d2aad7741b..b8bf62d90b4 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -826,7 +826,7 @@ the 4 file locations can be clicked on and jumped to."
 ;; to be considered as part of a word or not.
 ;; Some characters may have multiple meanings depending on the context:
 ;;  - ' is either the beginning of a constant character or an attribute
-;;  - # is either part of a based litteral or a gnatprep statement.
+;;  - # is either part of a based literal or a gnatprep statement.
 ;;  - " starts a string, but not if inside a constant character.
 ;;  - ( and ) should be ignored if inside a constant character.
 ;; Thus their syntax property is changed automatically, and we can still use
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index aa1289cd632..8213a83461b 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -128,7 +128,7 @@
 ;; REGEXPS FOR "HARMLESS" STRINGS/LINES.
 (defconst c-awk-harmless-char-re "[^_#/\"\\\\\n\r]")
 ;;   Matches any character but a _, #, /, ", \, or newline.  N.B. _" starts a
-;; localisation string in gawk 3.1
+;; localization string in gawk 3.1
 (defconst c-awk-harmless-_ "_\\([^\"]\\|\\'\\)")
 ;;   Matches an underline NOT followed by ".
 (defconst c-awk-harmless-string*-re
@@ -160,7 +160,7 @@
 (defconst c-awk-string-without-end-here-re
   (concat "\\=_?\"" c-awk-string-innards-re))
 ;;   Matches an AWK string at point up to, but not including, any terminator.
-;; A gawk 3.1+ string may look like _"localisable string".
+;; A gawk 3.1+ string may look like _"localizable string".
 (defconst c-awk-one-line-possibly-open-string-re
   (concat "\"\\(" c-awk-string-ch-re "\\|" c-awk-non-eol-esc-pair-re "\\)*"
           "\\(\"\\|\\\\?$\\|\\'\\)"))
@@ -231,7 +231,7 @@
 ;; to foul things up.
 (defconst c-awk-non-arith-op-bra-re
   "[[\(&=:!><,?;'~|]")
-;;   Matches an openeing BRAcket ,round or square, or any operator character
+;;   Matches an opening BRAcket, round or square, or any operator character
 ;; apart from +,-,/,*,%.  For the purpose at hand (detecting a / which is a
 ;; regexp bracket) these arith ops are unnecessary and a pain, because of "++"
 ;; and "--".
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 68f31c55e71..1eaf8910d14 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -2178,7 +2178,7 @@ function does not require the declaration to contain a brace block."
            (end (1- (cdr range)))
            (here-filler            ; matches WS and escaped newlines at point.
             "\\=\\([ \t\n\r\f]\\|\\\\[\n\r]\\)*")
-           ;; Enhance paragraph-start and paragraph-separate also to recognise
+           ;; Enhance paragraph-start and paragraph-separate also to recognize
            ;; blank lines terminated by escaped EOLs.  IT MAY WELL BE that
            ;; these values should be customizable user options, or something.
            (paragraph-start c-string-par-start)
@@ -2234,7 +2234,7 @@ function does not require the declaration to contain a brace block."
   (save-match-data
     (let* ((here (point))
            last
-           ;; Enhance paragraph-start and paragraph-separate to recognise
+           ;; Enhance paragraph-start and paragraph-separate to recognize
            ;; blank lines terminated by escaped EOLs.
            (paragraph-start c-string-par-start)
            (paragraph-separate c-string-par-separate)
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index fb9fd406ef8..c91fe13543a 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -774,7 +774,7 @@ be after it."
 ;; In addition to `c-at-vsemi-p-fn', a mode may need to supply a function for
 ;; `c-vsemi-status-unknown-p-fn'.  The macro `c-vsemi-status-unknown-p' is a
 ;; rather recondite kludge.  It exists because the function
-;; `c-beginning-of-statement-1' sometimes tests for VSs as an optimisation,
+;; `c-beginning-of-statement-1' sometimes tests for VSs as an optimization,
 ;; but `c-at-vsemi-p' might well need to call `c-beginning-of-statement-1' in
 ;; its calculations, thus potentially leading to infinite recursion.
 ;;
@@ -1249,7 +1249,7 @@ been put there by c-put-char-property.  POINT remains unchanged."
 ;; which introduces a CPP construct and every EOL (or EOB, or character
 ;; preceding //, etc.) which terminates it.  We can instantly "comment
 ;; out" all CPP constructs by giving `c-cpp-delimiter' a syntax-table
-;; propery '(14) (generic comment delimiter).
+;; property '(14) (generic comment delimiter).
 (defmacro c-set-cpp-delimiters (beg end)
   ;; This macro does a hidden buffer change.
   `(progn
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 31a58e48f50..c794cad65db 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -893,7 +893,7 @@ comment at the start of cc-engine.el for more info."
                           ((eq sym 'while)
                            ;; Is this a real while, or a do-while?
                            ;; The next `when' triggers unless we are SURE that
-                           ;; the `while' is not the tailend of a `do-while'.
+                           ;; the `while' is not the tail end of a `do-while'.
                            (when (or (not pptok)
                                      (memq (char-after pptok) delims)
                                      ;; The following kludge is to prevent
@@ -2364,7 +2364,7 @@ comment at the start of cc-engine.el for more info."
 
 (defun c-parse-state-get-strategy (here good-pos)
   ;; Determine the scanning strategy for adjusting `c-parse-state', attempting
-  ;; to minimise the amount of scanning.  HERE is the pertinent position in
+  ;; to minimize the amount of scanning.  HERE is the pertinent position in
   ;; the buffer, GOOD-POS is a position where `c-state-cache' (possibly with
   ;; its head trimmed) is known to be good, or nil if there is no such
   ;; position.
@@ -2548,7 +2548,7 @@ comment at the start of cc-engine.el for more info."
                         c-state-cache)))
         ;; N.B.  This defsubst codes one method for the simple, normal case,
         ;; and a more sophisticated, slower way for the general case.  Don't
-        ;; eliminate this defsubst - it's a speed optimisation.
+        ;; eliminate this defsubst - it's a speed optimization.
         (c-append-lower-brace-pair-to-state-cache (1- bra+1)))))
 
 (defun c-append-to-state-cache (from)
@@ -2788,7 +2788,7 @@ comment at the start of cc-engine.el for more info."
   ;;
   ;; This function must only be called only when (> `c-state-cache-good-pos'
   ;; HERE).  Usually the gap between CACHE-POS and HERE is large.  It is thus
-  ;; optimised to eliminate (or minimise) scanning between these two
+  ;; optimized to eliminate (or minimize) scanning between these two
   ;; positions.
   ;;
   ;; Return a three element list (GOOD-POS SCAN-BACK-POS FWD-FLAG), where:
@@ -2820,7 +2820,7 @@ comment at the start of cc-engine.el for more info."
                                         ; or `here' itself.
         here- here+                  ; start/end of macro around HERE, or HERE
         (here-bol (c-point 'bol here))
-        (too-far-back (max (- here c-state-cache-too-far) 1)))
+        (too-far-back (max (- here c-state-cache-too-far) (point-min))))
 
     ;; Remove completely irrelevant entries from `c-state-cache'.
     (while (and c-state-cache
@@ -2964,9 +2964,9 @@ comment at the start of cc-engine.el for more info."
             c-state-cache-good-pos nil
             c-state-min-scan-pos nil)
 
-;;; Truncate `c-state-cache' and set `c-state-cache-good-pos' to a value below
-;;; `here'.  To maintain its consistency, we may need to insert a new brace
-;;; pair.
+    ;; Truncate `c-state-cache' and set `c-state-cache-good-pos' to a value
+    ;; below `here'.  To maintain its consistency, we may need to insert a new
+    ;; brace pair.
     (let ((here-bol (c-point 'bol here))
           too-high-pa             ; recorded {/(/[ next above here, or nil.
           dropped-cons            ; was the last removed element a brace pair?
@@ -4233,9 +4233,9 @@ comment at the start of cc-engine.el for more info."
 ;; fails to take account of the change of the s-t property on the opening / to
 ;; "string", and reports that the { is within a string started by the second /.
 ;;
-;; The workaround for this is for the AWK Mode initialisation to switch the
+;; The workaround for this is for the AWK Mode initialization to switch the
 ;; defalias for c-in-literal to c-slow-in-literal.  This will slow down other
-;; cc-modes in XEmacs whenever an awk-buffer has been initialised.
+;; cc-modes in XEmacs whenever an awk-buffer has been initialized.
 ;;
 ;; (Alan Mackenzie, 2003/4/30).
 
@@ -4904,7 +4904,7 @@ comment at the start of cc-engine.el for more info."
             (setq cfd-prop-match nil))
 
         (when (/= cfd-macro-end 0)
-          ;; Restore limits if we did macro narrowment above.
+          ;; Restore limits if we did macro narrowing above.
           (narrow-to-region (point-min) cfd-buffer-end)))
 
       (goto-char cfd-continue-pos)
@@ -5052,7 +5052,7 @@ comment at the start of cc-engine.el for more info."
 ;; The strategy now (2010-01) adopted is to mark and unmark < and
 ;; > IN MATCHING PAIRS ONLY.  [Previously, they were marked
 ;; individually when their context so indicated.  This gave rise to
-;; intractible problems when one of a matching pair was deleted, or
+;; intractable problems when one of a matching pair was deleted, or
 ;; pulled into a literal.]
 ;;
 ;; At each buffer change, the syntax-table properties are removed in a
@@ -5965,7 +5965,7 @@ comment at the start of cc-engine.el for more info."
   ;;     `*-font-lock-extra-types');
   ;;   o - 'prefix if it's a known prefix of a type;
   ;;   o - 'found if it's a type that matches one in `c-found-types';
-  ;;   o - 'maybe if it's an identfier that might be a type; or
+  ;;   o - 'maybe if it's an identifier that might be a type; or
   ;;   o -  nil if it can't be a type (the point isn't moved then).
   ;;
   ;; The point is assumed to be at the beginning of a token.
@@ -7100,7 +7100,7 @@ comment at the start of cc-engine.el for more info."
   ;;   colon).  Currently (2006-03), this applies only to Objective C's
   ;;   keywords "@private", "@protected", and "@public".  Returns t.
   ;;
-  ;; One of the things which will NOT be recognised as a label is a bit-field
+  ;; One of the things which will NOT be recognized as a label is a bit-field
   ;; element of a struct, something like "int foo:5".
   ;;
   ;; The end of the label is taken to be just after the colon, or the end of
@@ -9582,7 +9582,7 @@ comment at the start of cc-engine.el for more info."
             (c-add-syntax 'inher-cont (c-point 'boi)))
 
            ;; CASE 5D.5: Continuation of the "expression part" of a
-           ;; top level construct.  Or, perhaps, an unrecognised construct.
+           ;; top level construct.  Or, perhaps, an unrecognized construct.
            (t
             (while (and (setq placeholder (point))
                         (eq (car (c-beginning-of-decl-1 containing-sexp))
@@ -9593,7 +9593,7 @@ comment at the start of cc-engine.el for more info."
                         (< (point) placeholder)))
             (c-add-stmt-syntax
              (cond
-              ((eq (point) placeholder) 'statement) ; unrecognised construct
+              ((eq (point) placeholder) 'statement) ; unrecognized construct
               ;; A preceding comma at the top level means that a
               ;; new variable declaration starts here.  Use
               ;; topmost-intro-cont for it, for consistency with
@@ -9784,7 +9784,7 @@ comment at the start of cc-engine.el for more info."
           (c-beginning-of-statement-1 containing-sexp)
           (c-add-stmt-syntax 'statement nil t containing-sexp paren-state))
 
-         ;;CASE 5N: We are at a tompmost continuation line and the only
+         ;;CASE 5N: We are at a topmost continuation line and the only
          ;;preceding items are annotations.
          ((and (c-major-mode-is 'java-mode)
                (setq placeholder (point))
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index a5a9582315b..a31de35f3ba 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1040,7 +1040,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
         ;; Inside the following "condition form", we move forward over the
         ;; declarator's identifier up as far as any opening bracket (for array
         ;; size) or paren (for parameters of function-type) or brace (for
-        ;; array/struct initialisation) or "=" or terminating delimiter
+        ;; array/struct initialization) or "=" or terminating delimiter
         ;; (e.g. "," or ";" or "}").
         (and
             pos
@@ -1122,7 +1122,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
                           (char-after (match-beginning 1))))
 
       (if types
-          ;; Register and fontify the identifer as a type.
+          ;; Register and fontify the identifier as a type.
           (let ((c-promote-possible-types t))
             (goto-char id-start)
             (c-forward-type))
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index e1fb69c30c8..4a6344727b4 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -221,7 +221,7 @@ the evaluated constant value at compile time."
     ;;
     ;; OPS either has the structure of `c-operators', is a single
     ;; group in `c-operators', or is a plain list of operators.
-    ;; 
+    ;;
     ;; OPGROUP-FILTER specifies how to select the operator groups.  It
     ;; can be t to choose all groups, a list of group type symbols
     ;; (such as 'prefix) to accept, or a function which will be called
@@ -772,7 +772,7 @@ literal are multiline."
   "Regexp matching the prefix of a cpp directive in the languages that
 normally use that macro preprocessor.  Tested at bol or at boi.
 Assumed to not contain any submatches or \\| operators."
-  ;; TODO (ACM, 2005-04-01).  Amend the following to recognise escaped NLs;
+  ;; TODO (ACM, 2005-04-01).  Amend the following to recognize escaped NLs;
   ;; amend all uses of c-opt-cpp-prefix which count regexp-depth.
   t "\\s *#\\s *"
   (java awk) nil)
@@ -1520,7 +1520,7 @@ properly."
 ;; end-of-defun-function will be set so that commands like
 ;; `mark-defun' and `narrow-to-defun' work right.  The key sequences
 ;; C-M-a and C-M-e are, however, bound directly to the CC Mode
-;; functions, allowing optimisation for large n.
+;; functions, allowing optimization for large n.
 (c-lang-defconst beginning-of-defun-function
   "Function to which beginning-of-defun-function will be set."
   t 'c-beginning-of-defun
@@ -2530,7 +2530,7 @@ Note that Java specific rules are currently applied to tell this from
        "\\.?[0-9]"
 
        "\\|"
-       ;; The nonambiguous operators from `prefix-ops'.
+       ;; The unambiguous operators from `prefix-ops'.
        (c-make-keywords-re nil
          (set-difference nonkeyword-prefix-ops in-or-postfix-ops
                          :test 'string-equal))
@@ -2681,7 +2681,7 @@ possible for good performance."
                                pos (match-end 0)))
                        res))))
 
-  ;; Allow cpp operatios (where applicable).
+  ;; Allow cpp operations (where applicable).
   t (if (c-lang-const c-opt-cpp-prefix)
         (set-difference (c-lang-const c-block-prefix-disallowed-chars)
                         '(?#))
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index 4e9350de425..942303b1096 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -66,7 +66,7 @@ A sample value might look like: `\\(_P\\|_PROTO\\)'.")
 (defvar cc-imenu-c++-generic-expression
   `(
     ;; Try to match ::operator definitions first. Otherwise `X::operator new ()'
-    ;; will be incorrectly recognised as function `new ()' because the regexps
+    ;; will be incorrectly recognized as function `new ()' because the regexps
     ;; work by backtracking from the end of the definition.
     (nil
      ,(concat
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index d93d174047b..cc5a5236255 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -293,7 +293,7 @@ control).  See \"cc-mode.el\" for more info."
   ;; replaces `fill-paragraph' and does the adaption before calling
   ;; `fill-paragraph-function', and we have to mask comments etc
   ;; before that.  Also, `c-fill-paragraph' chains on to
-  ;; `fill-paragraph' and the value on `fill-parapgraph-function' to
+  ;; `fill-paragraph' and the value on `fill-paragraph-function' to
   ;; do the actual filling work.
   (substitute-key-definition 'fill-paragraph 'c-fill-paragraph
                              c-mode-base-map global-map)
@@ -505,7 +505,7 @@ that requires a literal mode spec at compile time."
   ;; doesn't work with filladapt but it's better than nothing.
   (set (make-local-variable 'fill-paragraph-function) 'c-fill-paragraph)
 
-  ;; Initialise the cache of brace pairs, and opening braces/brackets/parens.
+  ;; Initialize the cache of brace pairs, and opening braces/brackets/parens.
   (c-state-cache-init)
 
   (when (or c-recognize-<>-arglists
@@ -587,7 +587,7 @@ that requires a literal mode spec at compile time."
   (add-hook 'after-change-functions 'c-after-change nil t)
   (set (make-local-variable 'font-lock-extend-after-change-region-function)
         'c-extend-after-change-region)) ; Currently (2009-05) used by all
-                        ; lanaguages with #define (C, C++,; ObjC), and by AWK.
+                        ; languages with #define (C, C++,; ObjC), and by AWK.
 
 (defun c-setup-doc-comment-style ()
   "Initialize the variables that depend on the value of `c-doc-comment-style'."
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 02256ead392..549f94387d2 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -420,7 +420,7 @@ If a LINE-TYPE is missing, then \\[indent-for-comment] indents the comment
 according to `comment-column'.
 
 Note that a non-nil value on `c-indent-comments-syntactically-p'
-overrides this variable, so empty lines are indentented syntactically
+overrides this variable, so empty lines are indented syntactically
 in that case, i.e. as if \\[c-indent-command] was used instead."
   :type
   (let ((space '(cons :tag "space"
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index eea822328f1..823304bd250 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -24,7 +24,7 @@
 ;;; Commentary:
 
 ;; Provides support for editing GNU Cfengine files, including
-;; font-locking, Imenu and indention, but with no special keybindings.
+;; font-locking, Imenu and indentation, but with no special keybindings.
 
 ;; The CFEngine 3.x support doesn't have Imenu support but patches are
 ;; welcome.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 3dba1af515a..73e990e2755 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1013,11 +1013,11 @@ POS and RES.")
             (setq col (funcall col))
           (and
            (setq col (match-string-no-properties col))
-           (setq col (- (string-to-number col) compilation-first-column)))))
+           (setq col (string-to-number col)))))
     (if (and end-col (functionp end-col))
         (setq end-col (funcall end-col))
       (if (and end-col (setq end-col (match-string-no-properties end-col)))
-          (setq end-col (- (string-to-number end-col) compilation-first-column -1))
+          (setq end-col (- (string-to-number end-col) -1))
         (if end-line (setq end-col -1))))
     (if (consp type)                    ; not a static type, check what it is.
         (setq type (or (and (car type) (match-end (car type)) 1)
@@ -1037,6 +1037,7 @@ POS and RES.")
   "Go to column COL on the current line.
 If SCREEN is non-nil, columns are screen columns, otherwise, they are
 just char-counts."
+  (setq col (- col compilation-first-column))
   (if screen
       (move-to-column (max col 0))
     (goto-char (min (+ (line-beginning-position) col) (line-end-position)))))
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 1925d16ba58..0e649480dda 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -839,7 +839,7 @@ voice);
         b) Can lineup vertically \"middles\" of rows, like `=' in
                 a  = b;
                 cc = d;
-        c) Can insert spaces where this impoves readability (in one
+        c) Can insert spaces where this improves readability (in one
                 interactive sweep over the buffer);
         d) Has support for imenu, including:
                 1) Separate unordered list of \"interesting places\";
@@ -927,7 +927,7 @@ syntax-parsing routines, and marks them up so that either
 
     A1) CPerl may work around these deficiencies (for big chunks, mostly
         PODs and HERE-documents), or
-    A2) On capable Emaxen CPerl will use improved syntax-handlings
+    A2) On capable Emaxen CPerl will use improved syntax-handling
         which reads mark-up hints directly.
 
     The scan in case A2 is much more comprehensive, thus may be slower.
@@ -1277,7 +1277,7 @@ versions of Emacs."
           "----"
           ["Ispell PODs" cperl-pod-spell
            ;; Better not to update syntaxification here:
-           ;; debugging syntaxificatio can be broken by this???
+           ;; debugging syntaxification can be broken by this???
            (or
             (get-text-property (point-min) 'in-pod)
             (< (progn
@@ -2801,7 +2801,7 @@ Will not look before LIM."
                                  (skip-chars-forward " \t")
                                  (if (memq (char-after (point))
                                            (append "#\n" nil))
-                                     nil ; Can't use intentation of this line...
+                                     nil ; Can't use indentation of this line...
                                    (point)))
                              (skip-chars-forward " \t")
                              (point)))
@@ -4540,7 +4540,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                        (forward-char 2))
                                 (and (eq (following-char) ?\] )
                                      (forward-char 1)))
-                              (setq REx-subgr-end qtag) ;EndOf smart-highlighed
+                              (setq REx-subgr-end qtag) ;End smart-highlighted
                               ;; Apparently, I can't put \] into a charclass
                               ;; in m]]: m][\\\]\]] produces [\\]]
 ;;; POSIX?  [:word:] [:^word:] only inside []
diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el
index 211c856f9b7..0516aca8d2b 100644
--- a/lisp/progmodes/cwarn.el
+++ b/lisp/progmodes/cwarn.el
@@ -210,16 +210,16 @@ This function is designed to be added to hooks, for example:
 
 (defun cwarn-is-enabled (mode &optional feature)
   "Non-nil if CWarn FEATURE is enabled for MODE.
-feature is an atom representing one construction to highlight.
+FEATURE is an atom representing one construction to highlight.
 
 Check if any feature is enabled for MODE if no feature is specified.
 
 The valid features are described by the variable
 `cwarn-font-lock-feature-keywords-alist'."
-  (let ((mode-configuraion (assq mode cwarn-configuration)))
-    (and mode-configuraion
+  (let ((mode-configuration (assq mode cwarn-configuration)))
+    (and mode-configuration
          (or (null feature)
-             (let ((list-or-t (nth 1 mode-configuraion)))
+             (let ((list-or-t (nth 1 mode-configuration)))
                (or (eq list-or-t t)
                    (if (eq (car-safe list-or-t) 'not)
                        (not (memq feature (cdr list-or-t)))
@@ -235,7 +235,7 @@ The valid features are described by the variable
     (eq (char-after) ?#)))
 
 (defun cwarn-font-lock-keywords (addp)
-  "Install/Remove keywords into current buffer.
+  "Install/remove keywords into current buffer.
 If ADDP is non-nil, install else remove."
   (dolist (pair cwarn-font-lock-feature-keywords-alist)
     (let ((feature (car pair))
diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el
index 204b6a91b0f..7b63575195e 100644
--- a/lisp/progmodes/ebnf-dtd.el
+++ b/lisp/progmodes/ebnf-dtd.el
@@ -515,7 +515,7 @@
 ;; -----
 ;;
 ;; At moment, only the `<!ELEMENT' generates a syntactic chart.  The
-;; `<!ATTLIST', `<!NOTATION' and `<!ENTITY' are syntacticly checked but they
+;; `<!ATTLIST', `<!NOTATION' and `<!ENTITY' are syntactically checked but they
 ;; don't generate a syntactic chart.
 ;;
 ;; Besides the syntax above, ebnf-dtd also accepts a `pure' dtd file.  An
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index f98f3d191d7..d9adff6c8b8 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -6069,7 +6069,7 @@ killed after process termination."
 
 
 (defun ebnf-make-terminal1 (name gen-func dim-func)
-  (vector gen-func                      ; 0 generatore
+  (vector gen-func                      ; 0 generator
           'ignore                       ; 1 width fun
           dim-func                      ; 2 dimension fun
           0.0                           ; 3 entry
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 13cba0fe701..2d0b18f3dae 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1191,7 +1191,7 @@ error message."
     ;; Note: there is a small inefficiency in find-buffer-visiting :
     ;;   truename is computed even if not needed. Not too sure about this
     ;;   but I suspect truename computation accesses the disk.
-    ;;   It is maybe a good idea to optimise this find-buffer-visiting.
+    ;;   It is maybe a good idea to optimize this find-buffer-visiting.
     ;; An alternative would be to use only get-file-buffer
     ;; but this looks less "sure" to find the buffer for the file.
     (while (and (not the-buffer) buffer-search-extensions)
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 7d31fb63e91..a1a41bd0b1b 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -74,7 +74,7 @@
 ;; GDB in Emacs on Mac OSX works best with FSF GDB as Apple have made
 ;; some changes to the version that they include as part of Mac OSX.
 ;; This requires GDB version 7.0 or later (estimated release date Aug 2009)
-;; as earlier versions don not compile on Mac OSX.
+;; as earlier versions do not compile on Mac OSX.
 
 ;;; Known Bugs:
 
@@ -823,7 +823,7 @@ detailed description of this mode.
   (run-hooks 'gdb-mode-hook))
 
 (defun gdb-init-1 ()
-  ;; (re-)initialise
+  ;; (re-)initialize
   (setq gdb-selected-frame nil
         gdb-frame-number nil
         gdb-thread-number nil
@@ -3578,7 +3578,7 @@ member."
       (gud-basic-call
        (concat  "-gdb-set variable " var " = " value)))))
 
-;; Dont display values of arrays or structures.
+;; Don't display values of arrays or structures.
 ;; These can be expanded using gud-watch.
 (defun gdb-locals-handler-custom ()
   (let ((locals-list (bindat-get-field (gdb-json-partial-output) 'locals))
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index c60e8d72abc..527bc51eef8 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -1168,7 +1168,7 @@ containing the executable being debugged."
 ;; appears to indicate a breakpoint.  Then we prod the dbx sub-process
 ;; to output the information we want with a combination of the
 ;; `printf' and `file' commands as a pseudo marker which we can
-;; recognise next time through the marker-filter.  This would be like
+;; recognize next time through the marker-filter.  This would be like
 ;; the gdb marker but you can't get the file name without a newline...
 ;; Note that gud-remove won't work since Irix dbx expects a breakpoint
 ;; number rather than a line number etc.  Maybe this could be made to
@@ -1689,7 +1689,7 @@ and source-file directory for your debugger."
 ;;    Run jdb (like this): jdb
 ;;
 ;; type any jdb switches followed by the name of the class you'd like to debug.
-;; Supply a fully qualfied classname (these do not have the ".class" extension)
+;; Supply a fully qualified classname (these don't have the ".class" extension)
 ;; for the name of the class to debug (e.g. "COM.the-kind.ddavies.CoolClass").
 ;; See the known problems section below for restrictions when specifying jdb
 ;; command line switches (search forward for '-classpath').
@@ -2094,7 +2094,7 @@ extension EXTN.  Normally EXTN is given as the regular expression
 
         ;; By this point the current directory is all screwed up.  Maybe we
         ;; could fix things and re-invoke gud-common-init, but for now I think
-        ;; issueing the error is good enough.
+        ;; issuing the error is good enough.
         (if user-error
             (progn
               (kill-buffer (current-buffer))
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index 2708346f05f..0266fc17f9c 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -986,10 +986,10 @@ describes the correct routine - even if the keyword description cannot
 be found.  TYPE is ignored.
 
 This function expects a more or less standard routine header.  In
-particlar it looks for the `NAME:' tag, either with a colon, or alone
+particular it looks for the `NAME:' tag, either with a colon, or alone
 on a line.  Then `NAME:' must be followed by the routine name on the
 same or the next line.  When KEYWORD is non-nil, looks first for a
-`KEYWORDS' section.  It is amazing how inconsisten this is through
+`KEYWORDS' section.  It is amazing how inconsistent this is through
 some IDL libraries I have seen.  We settle for a line containing an
 upper case \"KEYWORD\" string.  If this line is not found we search
 for the keyword anyway to increase the hit-rate
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 1233ee19ff6..d8715599d74 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -5789,7 +5789,7 @@ end
     (setq idlwave-idlwave_routine_info-compiled t))
 
   ;; Restore if necessary.  Must use execute to hide lame routine_info
-  ;; errors on undefinded routine
+  ;; errors on undefined routine
   (idlwave-shell-send-command
    (format "if execute(\"_v=routine_info('idlwave_routine_info',/SOURCE)\") eq 0 then restore,'%s' else if _v.path eq '' then restore,'%s'"
            idlwave-shell-temp-rinfo-save-file
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 636766b36e7..1328e303d45 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -598,7 +598,7 @@ See variable `lisp-describe-sym-command'."
         (error "No Lisp subprocess; see variable `inferior-lisp-buffer'"))))
 
 
-;;; Do the user's customisation...
+;;; Do the user's customization...
 ;;;===============================
 (defvar inferior-lisp-load-hook nil
   "This hook is run when the library `inf-lisp' is loaded.")
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 0e3fdc78a39..94a9c250fee 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1599,7 +1599,7 @@ will be returned."
 
 (defun js-syntactic-context ()
   "Return the JavaScript syntactic context at point.
-When called interatively, also display a message with that
+When called interactively, also display a message with that
 context."
   (interactive)
   (let* ((syntactic-context (js--syntactic-context-from-pstate
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 67e3c4a18b4..b1502adbeb1 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -414,7 +414,7 @@ no args, if that value is non-nil."
       (electric-pascal-terminate-line)))
 
 (defun electric-pascal-colon ()
-  "Insert `:' and do all indentions except line indent on this line."
+  "Insert `:' and do all indentations except line indent on this line."
   (interactive)
   (insert last-command-event)
   ;; Do nothing if within string.
@@ -427,7 +427,7 @@ no args, if that value is non-nil."
       (pascal-indent-command))))
 
 (defun electric-pascal-equal ()
-  "Insert `=', and do indention if within type declaration."
+  "Insert `=', and do indentation if within type declaration."
   (interactive)
   (insert last-command-event)
   (if (eq (car (pascal-calculate-indent)) 'declaration)
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index ef0905bb2a8..8b4798e1c14 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -169,7 +169,7 @@
 ;;     package requirements.
 ;; Version 1.13:
 ;;  o  Removed the use of `map-char-table' in `prolog-build-case-strings'
-;;     which appears to cause prblems in (at least) Emacs 23.0.0.1.
+;;     which appears to cause problems in (at least) Emacs 23.0.0.1.
 ;;  o  Added if-then-else indentation + corresponding electric
 ;;     characters.  New customization: `prolog-electric-if-then-else-flag'
 ;;  o  Align support (requires `align').  New customization:
@@ -391,7 +391,7 @@ Otherwise indent to `prolog-indent-width'."
 
 (defcustom prolog-left-indent-regexp "\\(;\\|\\*?->\\)"
   "*Regexp for character sequences after which next line is indented.
-Next line after such a regexp is indented to the opening paranthesis level."
+Next line after such a regexp is indented to the opening parenthesis level."
   :group 'prolog-indentation
   :type 'regexp)
 
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index 94d55ee3f61..c2adc3b801b 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -267,7 +267,7 @@ If nil, use `temporary-file-directory'."
       . (1 font-lock-function-name-face))
     '("/\\w+" . font-lock-variable-name-face)
     (cons ps-mode-operators 'font-lock-keyword-face)))
-  "High level highliting for PostScript mode.")
+  "High level highlighting for PostScript mode.")
 
 (defconst ps-mode-font-lock-keywords ps-mode-font-lock-keywords-1
   "Default expressions to highlight in PostScript mode.")
@@ -713,7 +713,7 @@ defines the beginning of a group. These tokens are:  {  [  <<"
   (ps-mode-r-balance ">>"))
 
 (defun ps-mode-r-balance (right)
-  "Adjust indentification if point after RIGHT."
+  "Adjust indenting if point after RIGHT."
   (if ps-mode-auto-indent
       (save-excursion
         (when (re-search-backward (concat "^[ \t]*" (regexp-quote right) "\\=") nil t)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index a0a368777e7..fbf7c3c42f7 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1122,7 +1122,7 @@ don't move and return nil.  Otherwise return t."
 
 ;;;; Imenu.
 
-;; For possibily speeding this up, here's the top of the ELP profile
+;; For possibly speeding this up, here's the top of the ELP profile
 ;; for rescanning pydoc.py (2.2k lines, 90kb):
 ;; Function Name                         Call Count  Elapsed Time  Average Time
 ;; ====================================  ==========  =============  ============
@@ -1549,7 +1549,7 @@ behavior, change `python-remove-cwd-from-path' to nil."
                               (if path (concat path path-separator))
                               data-directory)
                       process-environment))
-               ;; If we use a pipe, unicode characters are not printed
+               ;; If we use a pipe, Unicode characters are not printed
                ;; correctly (Bug#5794) and IPython does not work at
                ;; all (Bug#5390).
                (process-connection-type t))
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index bca5c93e0a5..62ca2ce085f 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -567,6 +567,7 @@ This is buffer-local in every such buffer.")
   '((csh . "\\<\\([[:alnum:]_]+\\)\\(\\[.+\\]\\)?[ \t]*[-+*/%^]?=")
     ;; actually spaces are only supported in let/(( ... ))
     (ksh88 . "\\<\\([[:alnum:]_]+\\)\\(\\[.+\\]\\)?[ \t]*\\([-+*/%&|~^]\\|<<\\|>>\\)?=")
+    (bash . "\\<\\([[:alnum:]_]+\\)\\(\\[.+\\]\\)?\\+?=")
     (rc . "\\<\\([[:alnum:]_*]+\\)[ \t]*=")
     (sh . "\\<\\([[:alnum:]_]+\\)="))
   "Regexp for the variable name and what may follow in an assignment.
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 2d8334bcb7d..4cc4a133c8e 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -2622,7 +2622,7 @@ user-visible changes to the buffer must not be within a
 
 (defmacro verilog-save-no-change-functions (&rest body)
   "Execute BODY forms, disabling all change hooks in BODY.
-For insigificant changes, see instead `verilog-save-buffer-state'."
+For insignificant changes, see instead `verilog-save-buffer-state'."
   `(let* ((inhibit-point-motion-hooks t)
           before-change-functions
           after-change-functions)
@@ -3596,7 +3596,7 @@ With ARG, first kill any existing labels."
               (looking-at "\\w+\\W*:\\W*\\(coverpoint\\|cross\\|constraint\\)")
           ;; keep going if we are in the middle of a word
               (not (or (looking-at "\\<") (forward-word -1)))
-          ;; stop if we see an assertion (perhaps labled)
+          ;; stop if we see an assertion (perhaps labeled)
               (and
                (looking-at "\\(\\<\\(assert\\|assume\\|cover\\)\\>\\s-+\\<property\\>\\)\\|\\(\\<assert\\>\\)")
                (progn
@@ -6974,7 +6974,7 @@ Signals must be in standard (base vector) form."
 ;;(verilog-signals-not-in '(("A" "") ("B" "") ("DEL" "[2:3]")) '(("DEL" "") ("EXT" "")))
 
 (defun verilog-signals-memory (in-list)
-  "Return list of signals in IN-LIST that are memoried (multidimensional)."
+  "Return list of signals in IN-LIST that are memorized (multidimensional)."
   (let (out-list)
     (while in-list
       (if (nth 3 (car in-list))
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index cd2d45b7856..3a94601768d 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -16857,7 +16857,7 @@ User Options
 `vhdl-configuration-file-name': (new)
   Specify how the configuration file name is obtained.
 `vhdl-compose-configuration-name': (new)
-  Specify how the configuration name is optained.
+  Specify how the configuration name is obtained.
 `vhdl-compose-configuration-create-file': (new)
   Specify whether a new file should be created for a configuration.
 `vhdl-compose-configuration-hierarchical': (new)
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index c0e4d68107b..65cdb600d74 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -1010,7 +1010,7 @@ the sequence."
           ps-mule-external-libraries))
 
 (defun ps-mule-encode-header-string (string fonttag)
-  "Generate PostScript code for ploting STRING by font FONTTAG.
+  "Generate PostScript code for plotting STRING by font FONTTAG.
 FONTTAG should be a string \"/h0\", \"/h1\", \"/L0\", or \"/H0\".
 Any other value is treated as \"/H0\"."
   (with-temp-buffer
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 6c80705f993..6d05e6db586 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -5372,9 +5372,9 @@ Where:
 KIND is a valid value of `ps-n-up-filling'.
 XCOL YCOL are the relative position for the next column.
 XLIN YLIN are the relative position for the beginning of next line.
-REPEAT is the number of repetions for external loop.
-END is the number of repetions for internal loop and also the number of pages in
-    a row.
+REPEAT is the number of repetitions for external loop.
+END is the number of repetitions for internal loop and also the number
+    of pages in a row.
 XSTART YSTART are the relative position for the first page in a sheet.")
 
 
@@ -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" "cf055ee6ba398da614a675dc25bdb123")
+;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "afb9022f2e1e366c51672aa11a3bd76f")
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 79f4eb437d9..2dac870afd5 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -567,7 +567,7 @@ menu-elements (no sub-menu)."
   (if (and l (functionp filter))
       (let ((case-fold-search recentf-case-fold-search)
             elts others)
-        ;; split L into two sub-listes, one of sub-menus elements and
+        ;; split L into two sub-lists, one of sub-menus elements and
         ;; another of single menu elements.
         (dolist (elt l)
           (if (recentf-sub-menu-element-p elt)
diff --git a/lisp/repeat.el b/lisp/repeat.el
index 8bab8691b4f..8ddc8d41429 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -26,7 +26,7 @@
 
 ;; Sometimes the fastest way to get something done is just to lean on a key;
 ;; moving forward through a series of words by leaning on M-f is an example.
-;; But 'forward-page is orthodoxily bound to C-x ], so moving forward through
+;; But 'forward-page is orthodoxly bound to C-x ], so moving forward through
 ;; several pages requires
 ;;   Loop until desired page is reached:
 ;;     Hold down control key with left pinkie.
diff --git a/lisp/replace.el b/lisp/replace.el
index bf6425f4099..4ea3f747caa 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1225,7 +1225,7 @@ See also `multi-occur'."
 
     (with-current-buffer occur-buf
       (if (stringp nlines)
-          (fundamental-mode) ;; This is for collect opeartion.
+          (fundamental-mode) ;; This is for collect operation.
         (occur-mode))
       (let ((inhibit-read-only t)
             ;; Don't generate undo entries for creation of the initial contents.
diff --git a/lisp/ses.el b/lisp/ses.el
index c71c603726c..cdc58e12d00 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -1315,7 +1315,7 @@ Newlines in the data are escaped."
               (setq formula (cadr formula)))
           (if (eq (car-safe printer) 'ses-safe-printer)
               (setq printer (cadr printer)))
-          ;; This is noticably faster than (format "%S %S %S %S %S")
+          ;; This is noticeably faster than (format "%S %S %S %S %S")
           (setq text    (concat "(ses-cell "
                                 (symbol-name sym)
                                 " "
@@ -2720,7 +2720,7 @@ When inserting cells, the formulas are usually relocated to keep the same
 relative references to neighboring cells.  This is best if the formulas
 generally refer to other cells within the yanked text.  You can use the C-u
 prefix to specify insertion without relocation, which is best when the
-formulas refer to cells outsite the yanked text.
+formulas refer to cells outside the yanked text.
 
 When inserting formulas, the text is treated as a string constant if it doesn't
 make sense as a sexp or would otherwise be considered a symbol.  Use 'sym to
diff --git a/lisp/shell.el b/lisp/shell.el
index c75594ddbe4..47119e6769c 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -89,7 +89,7 @@
 ;;         comint-strip-ctrl-m          Remove trailing ^Ms from output
 ;;
 ;; The shell mode hook is shell-mode-hook
-;; comint-prompt-regexp is initialised to shell-prompt-pattern, for backwards
+;; comint-prompt-regexp is initialized to shell-prompt-pattern, for backwards
 ;; compatibility.
 
 ;; Read the rest of this file for more information.
@@ -293,7 +293,7 @@ Value is a list of strings, which may be nil."
                    (getenv "ESHELL") shell-file-name))
          (name (file-name-nondirectory prog)))
     ;; Tell bash not to use readline, except for bash 1.x which
-    ;; doesn't grook --noediting.  Bash 1.x has -nolineediting, but
+    ;; doesn't grok --noediting.  Bash 1.x has -nolineediting, but
     ;; process-send-eof cannot terminate bash if we use it.
     (if (and (not purify-flag)
              (equal name "bash")
diff --git a/lisp/simple.el b/lisp/simple.el
index e70d37588a0..1dc866cf64d 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4277,8 +4277,8 @@ into account variable-width characters and line continuation.
 If nil, `line-move' moves point by logical lines.
 A non-nil setting of `goal-column' overrides the value of this variable
 and forces movement by logical lines.
-Disabling `auto-hscroll-mode' also overrides forces movement by logical
-lines when the window is horizontally scrolled."
+A window that is  horizontally scrolled also forces movement by logical
+lines."
   :type 'boolean
   :group 'editing-basics
   :version "23.1")
@@ -4358,12 +4358,10 @@ lines when the window is horizontally scrolled."
     (if (and line-move-visual
              ;; Display-based column are incompatible with goal-column.
              (not goal-column)
-             ;; When auto-hscroll-mode is turned off and the text in
-             ;; the window is scrolled to the left, display-based
-             ;; motion doesn't make sense (because each logical line
-             ;; occupies exactly one screen line).
-             (not (and (null auto-hscroll-mode)
-                       (> (window-hscroll) 0))))
+             ;; When the text in the window is scrolled to the left,
+             ;; display-based motion doesn't make sense (because each
+             ;; logical line occupies exactly one screen line).
+             (not (> (window-hscroll) 0)))
         (line-move-visual arg noerror)
       (line-move-1 arg noerror to-end))))
 
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 23a91888c1b..30642e8f2f7 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -35,7 +35,7 @@ this version is not backward compatible to 0.14 or earlier.")
 ;;
 ;;; Customizing and Developing for speedbar
 ;;
-;; Please see the speedbar manual for informaion.
+;; Please see the speedbar manual for information.
 ;;
 ;;; Notes:
 ;;
@@ -471,7 +471,7 @@ Possible values are:
  'trim - trim large directories to only show the last few.
  nil   - no trimming."
   :group 'speedbar
-  :type '(radio (const :tag "Span large directories over mutiple lines."
+  :type '(radio (const :tag "Span large directories over multiple lines."
                        span)
                 (const :tag "Trim large directories to only show the last few."
                        trim)
@@ -1004,7 +1004,7 @@ supported at a time.
                      #'speedbar-frame-mode
                      (if (featurep 'xemacs)
                          (append speedbar-frame-plist
-                                 ;; This is a hack to get speedbar to iconfiy
+                                 ;; This is a hack to get speedbar to iconify
                                  ;; with the selected frame.
                                  (list 'parent (selected-frame)))
                        speedbar-frame-parameters)
diff --git a/lisp/startup.el b/lisp/startup.el
index 877ba1987f6..06911e00d0d 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -943,7 +943,7 @@ opening the first frame (e.g. open a connection to an X server).")
   (normal-erase-is-backspace-setup-frame)
 
   ;; Register default TTY colors for the case the terminal hasn't a
-  ;; terminal init file.  We do this regardles of whether the terminal
+  ;; terminal init file.  We do this regardless of whether the terminal
   ;; supports colors or not and regardless the current display type,
   ;; since users can connect to color-capable terminals and also
   ;; switch color support on or off in mid-session by setting the
diff --git a/lisp/subr.el b/lisp/subr.el
index 1cd6598eeb5..6d652f55b29 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1,4 +1,4 @@
-;;; subr.el --- basic lisp subroutines for Emacs
+;;; subr.el --- basic lisp subroutines for Emacs  -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2011
 ;;   Free Software Foundation, Inc.
diff --git a/lisp/term.el b/lisp/term.el
index e1638aecc76..dc5ae29ffd2 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -2122,7 +2122,7 @@ If this takes us past the end of the current line, don't skip at all."
   "Is point after the process output marker?"
   ;; Since output could come into the buffer after we looked at the point
   ;; but before we looked at the process marker's value, we explicitly
-  ;; serialise.  This is just because I don't know whether or not Emacs
+  ;; serialize.  This is just because I don't know whether or not Emacs
   ;; services input during execution of lisp commands.
   (let ((proc-pos (marker-position
                    (process-mark (get-buffer-process (current-buffer))))))
@@ -3890,7 +3890,7 @@ if KIND is 1, erase from home to point; else erase from home to point-max."
   (goto-char (point-max))
   (recenter -1))
 
-;;; Do the user's customisation...
+;;; Do the user's customization...
 
 (defvar term-load-hook nil
   "This hook is run when term is loaded in.
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el
index 490c06148a9..3e06810cce6 100644
--- a/lisp/term/iris-ansi.el
+++ b/lisp/term/iris-ansi.el
@@ -136,8 +136,8 @@
 
     (define-key map "\e[Z" [?\S-\t])
     (define-key map "\e[072q" [?\C-\t])
-    ;; This only works if you remove the M-TAB keybing from the system.4Dwmrc
-    ;; our your ~/.4Dwmrc, if you use the 4Dwm window manager.
+    ;; This only works if you remove the M-TAB keybinding from the system.4Dwmrc
+    ;; or your ~/.4Dwmrc, if you use the 4Dwm window manager.
     (define-key map "\e[073q" [?\M-\t])
 
     (define-key map "\e[074q" [?\M-q])
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index db826f1db8a..10c1c19e0c4 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -662,7 +662,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 (defvar ns-reg-to-script)               ; nsfont.m
 
 ;; This maps font registries (not exposed by NS APIs for font selection) to
-;; unicode scripts (which can be mapped to unicode character ranges which are).
+;; Unicode scripts (which can be mapped to Unicode character ranges which are).
 ;; See ../international/fontset.el
 (setq ns-reg-to-script
       '(("iso8859-1" . latin)
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index 5b21913c32e..c784892ce6b 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -114,11 +114,11 @@
 
 (defvar rxvt-alternatives-map
   (let ((map (make-sparse-keymap)))
-    ;; The terminal intialization C code file might have initialized
+    ;; The terminal initialization C code file might have initialized
     ;; function keys F11->F42 from the termcap/terminfo information.  On
     ;; a PC-style keyboard these keys correspond to
     ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-.  The
-    ;; code here subsitutes the corresponding definitions in
+    ;; code here substitutes the corresponding definitions in
     ;; function-key-map.  This substitution is needed because if a key
     ;; definition if found in function-key-map, there are no further
     ;; lookups in other keymaps.
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index 9a900916830..d62db664d21 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -76,7 +76,7 @@
 ;; defined for the MS-DOS and MS-Windows consoles, because the users
 ;; on those systems expect these colors to be available.
 ;;
-;; For these reasons, package maintaners are advised NOT to use color
+;; For these reasons, package maintainers are advised NOT to use color
 ;; names such as "lightred" or "lightblue", because they will have
 ;; different effect on different displays.  Instead, use "red1" and
 ;; "blue1", respectively.
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 47da0bf4de5..c2856660ea8 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -460,7 +460,7 @@ features.  Set to nil to skip the checks."
   "Terminal initialization function for xterm."
   ;; rxvt terminals sometimes set the TERM variable to "xterm", but
   ;; rxvt's keybindings are incompatible with xterm's. It is
-  ;; better in that case to use rxvt's initializion function.
+  ;; better in that case to use rxvt's initialization function.
   (if (and (getenv "COLORTERM" (selected-frame))
            (string-match "\\`rxvt" (getenv "COLORTERM" (selected-frame))))
       (tty-run-terminal-initialization (selected-frame) "rxvt")
diff --git a/lisp/terminal.el b/lisp/terminal.el
index 6fdaecf9c9c..99f652f7df4 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -1285,7 +1285,7 @@ in the directory specified by `te-terminfo-directory'."
         ;; Rename it to the desired name.
         ;; We use this roundabout approach
         ;; to avoid any risk of writing a name that
-        ;; was michievouslyt set up as a symlink.
+        ;; was mischievously set up as a symlink.
         (rename-file temp-file file-name))
       ;; Now compile that source to make the binary that the
       ;; programs actually use.
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index d13437f4c7c..232d42efc94 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -1985,7 +1985,7 @@ Also updates the variables `artist-draw-min-y' and `artist-draw-max-y'."
   "Retrieve a replacement for character C from `artist-replacement-table'.
 The replacement is used to convert tabs and new-lines to spaces."
   ;; Characters may be outside the range of the `artist-replacement-table',
-  ;; for example if they are unicode code points >= 256.
+  ;; for example if they are Unicode code points >= 256.
   ;; Check so we don't attempt to access the array out of its bounds,
   ;; assuming no such character needs to be replaced.
   (if (< c (length artist-replacement-table))
@@ -2338,7 +2338,7 @@ Octant are numbered 1--8, anti-clockwise as:
           5
         6))))
 
-;; Some inline funtions for creating, setting and reading
+;; Some inline functions for creating, setting and reading
 ;; members of a coordinate
 ;;
 
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 4459ac10098..c9b1c44eb91 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -3595,7 +3595,7 @@ If optional arg CONTENT is non-nil extract content of text fields."
 (defun bibtex-autofill-entry ()
   "Try to fill fields of current BibTeX entry based on neighboring entries.
 The current entry must have a key.  Determine the neighboring entry
-\(previouse or next\) whose key is more similar to the key of the current
+\(previous or next\) whose key is more similar to the key of the current
 entry.  For all empty fields of the current entry insert the corresponding
 field contents of the neighboring entry.  Finally try to update the text
 based on the difference between the keys of the neighboring and the current
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 5cc5ba45e13..1127e6a5d20 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -155,7 +155,7 @@ not align (only setting space according to `conf-assignment-space')."
     (modify-syntax-entry ?/  ". 124" table)
     (modify-syntax-entry ?*  ". 23b" table)
     table)
-  "Syntax table in use in Java prperties buffers.")
+  "Syntax table in use in Java properties buffers.")
 
 (defvar conf-ppd-mode-syntax-table
   (let ((table (make-syntax-table conf-mode-syntax-table)))
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index db536c100f3..d54debcec4c 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -715,7 +715,7 @@ not the very same deplacement command."
   (remove-hook 'after-change-functions 'flyspell-after-change-function t)
   (remove-hook 'hack-local-variables-hook
                (function flyspell-hack-local-variables-hook) t)
-  ;; we remove all the flyspell hilightings
+  ;; we remove all the flyspell highlightings
   (flyspell-delete-all-overlays)
   ;; we have to erase pre cache variables
   (setq flyspell-pre-buffer nil)
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index 78d80da41ac..e0fd940208a 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -69,14 +69,14 @@
   (unless (eq (get 'reftex-default-bibliography :reftex-raw)
               reftex-default-bibliography)
     (put 'reftex-default-bibliography :reftex-expanded
-         (reftex-locate-bibliography-files 
+         (reftex-locate-bibliography-files
           default-directory reftex-default-bibliography))
     (put 'reftex-default-bibliography :reftex-raw
          reftex-default-bibliography))
   (get 'reftex-default-bibliography :reftex-expanded))
 
 (defun reftex-bib-or-thebib ()
-  ;; Tests if BibTeX or \begin{tehbibliography} should be used for the
+  ;; Tests if BibTeX or \begin{thebibliography} should be used for the
   ;; citation
   ;; Find the bof of the current file
   (let* ((docstruct (symbol-value reftex-docstruct-symbol))
@@ -128,7 +128,7 @@
   ;; If RETURN is non-nil, just return the entry and restore point.
 
   (let* ((re
-          (if item 
+          (if item
               (concat "\\\\bibitem\\(\\[[^]]*\\]\\)?{" (regexp-quote key) "}")
             (concat "@[a-zA-Z]+[ \t\n\r]*[{(][ \t\n\r]*" (regexp-quote key)
                     "[, \t\r\n}]")))
@@ -152,7 +152,7 @@
           (when return
             ;; Just return the relevant entry
             (if item (goto-char (match-end 0)))
-            (setq return (buffer-substring 
+            (setq return (buffer-substring
                           (point) (reftex-end-of-bib-entry item)))
             (goto-char oldpos) ;; restore point.
             (set-buffer buffer-conf)
@@ -169,9 +169,9 @@
         (error "No BibTeX entry with citation key %s" key)))))
 
 (defun reftex-end-of-bib-entry (item)
-  (save-excursion 
+  (save-excursion
     (condition-case nil
-        (if item 
+        (if item
             (progn (end-of-line)
                    (re-search-forward
                     "\\\\bibitem\\|\\end{thebibliography}")
@@ -192,16 +192,16 @@
 
     ;; Read a regexp, completing on known citation keys.
     (setq default (regexp-quote (reftex-get-bibkey-default)))
-    (setq re-list 
-          (split-string 
-           (completing-read 
+    (setq re-list
+          (split-string
+           (completing-read
             (concat
              "Regex { && Regex...}: "
              "[" default "]: ")
             (if reftex-mode
                 (if (fboundp 'LaTeX-bibitem-list)
                     (LaTeX-bibitem-list)
-                  (cdr (assoc 'bibview-cache 
+                  (cdr (assoc 'bibview-cache
                               (symbol-value reftex-docstruct-symbol))))
               nil)
             nil nil nil 'reftex-cite-regexp-hist)
@@ -248,7 +248,7 @@
                    (error (goto-char key-point)
                           (throw 'search-again nil)))
                  (setq end-point (point))
-                 
+
                  ;; Ignore @string, @comment and @c entries or things
                  ;; outside entries
                  (when (or (string= (downcase (match-string 2)) "string")
@@ -257,12 +257,12 @@
                            (< (point) key-point)) ; this means match not in {}
                    (goto-char key-point)
                    (throw 'search-again nil))
-                 
+
                  ;; Well, we have got a match
                  ;;(setq entry (concat
                  ;;             (buffer-substring start-point (point)) "\n"))
                  (setq entry (buffer-substring start-point (point)))
-                 
+
                  ;; Check if other regexp match as well
                  (setq re-list rest-re)
                  (while re-list
@@ -270,24 +270,24 @@
                      ;; nope - move on
                      (throw 'search-again nil))
                    (pop re-list))
-                 
+
                  (setq alist (reftex-parse-bibtex-entry
                               nil start-point end-point))
                  (push (cons "&entry" entry) alist)
-                 
+
                  ;; check for crossref entries
                  (if (assoc "crossref" alist)
                      (setq alist
                            (append
                             alist (reftex-get-crossref-alist alist))))
-                 
+
                  ;; format the entry
                  (push (cons "&formatted" (reftex-format-bib-entry alist))
                        alist)
-                 
+
                  ;; make key the first element
                  (push (reftex-get-bib-field "&key" alist) alist)
-                 
+
                  ;; add it to the list
                  (push alist found-list)))))
           (reftex-kill-temporary-buffers))))
@@ -350,7 +350,7 @@
     (unless files
       (error "Need file name to find thebibliography environment"))
     (while (setq file (pop files))
-      (setq buf (reftex-get-file-buffer-force 
+      (setq buf (reftex-get-file-buffer-force
                  file (not reftex-keep-temporary-buffers)))
       (unless buf
         (error "No such file %s" file))
@@ -386,16 +386,16 @@
 
     ;; Read a regexp, completing on known citation keys.
     (setq default (regexp-quote (reftex-get-bibkey-default)))
-    (setq re-list 
-          (split-string 
-           (completing-read 
+    (setq re-list
+          (split-string
+           (completing-read
             (concat
              "Regex { && Regex...}: "
              "[" default "]: ")
             (if reftex-mode
                 (if (fboundp 'LaTeX-bibitem-list)
                     (LaTeX-bibitem-list)
-                  (cdr (assoc 'bibview-cache 
+                  (cdr (assoc 'bibview-cache
                               (symbol-value reftex-docstruct-symbol))))
               nil)
             nil nil nil 'reftex-cite-regexp-hist)
@@ -408,14 +408,14 @@
         (error "Empty regular expression"))
 
     (while (and (setq re (pop re-list)) entries)
-      (setq entries 
+      (setq entries
             (delq nil (mapcar
                        (lambda (x)
                          (if (string-match re (cdr (assoc "&entry" x)))
                              x nil))
                        entries))))
-    (setq entries 
-          (mapcar 
+    (setq entries
+          (mapcar
             (lambda (x)
               (push (cons "&formatted" (reftex-format-bibitem x)) x)
               (push (reftex-get-bib-field "&key" x) x)
@@ -655,12 +655,12 @@ While entering the regexp, completion on knows citation keys is possible.
 
     (when (eq (car selected-entries) 'concat)
       ;; All keys go into a single command - we need to trick a little
-      ;; FIXME: Unfortunately, this meens that commenting does not work right.
+      ;; FIXME: Unfortunately, this means that commenting does not work right.
       (pop selected-entries)
       (let ((concat-keys (mapconcat 'car selected-entries ",")))
-        (setq insert-entries 
+        (setq insert-entries
               (list (list concat-keys (cons "&key" concat-keys))))))
-    
+
     (unless no-insert
 
       ;; We shall insert this into the buffer...
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index 7de15c66cec..ff6ffffc382 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -361,7 +361,7 @@ will display info in the echo area."
   "View location in a LaTeX document which cites the BibTeX entry at point.
 Since BibTeX files can be used by many LaTeX documents, this function
 prompts upon first use for a buffer in RefTeX mode.  To reset this
-link to a document, call the function with with a prefix arg.
+link to a document, call the function with a prefix arg.
 Calling this function several times find successive citation locations."
   (interactive "P")
   (when arg
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index fa958632799..f9e3283b783 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -847,7 +847,7 @@ and disable it otherwise.  If called from Lisp, enable the mode
 if ARG is omitted or nil.
 
 SGML Electric Tag Pair mode is a buffer-local minor mode for use
-with `sgml-mode' and related maor modes.  When enabled, editing
+with `sgml-mode' and related major modes.  When enabled, editing
 an opening markup tag automatically updates the closing tag."
   :lighter "/e"
   (if sgml-electric-tag-pair-mode
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 08922445521..08a45b6b302 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -5535,7 +5535,7 @@ When COORDINATE is omitted or nil the point in current buffer is assumed in plac
    table-cell-info-lu-coordinate))
 
 (defun table--offset-coordinate (coordinate offset &optional negative)
-  "Return the offseted COORDINATE by OFFSET.
+  "Return the offset COORDINATE by OFFSET.
 When optional NEGATIVE is non-nil offsetting direction is negative."
   (cons (if negative (- (car coordinate) (car offset))
           (+ (car coordinate) (car offset)))
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 6ac8eddc9d6..6ffd256d0a0 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -92,7 +92,7 @@ When it reaches that size (in bytes), a warning is sent."
   :group 'thumbs)
 
 ;; Unfortunately Windows XP has a program called CONVERT.EXE in
-;; C:/WINDOWS/SYSTEM32/ for partioning NTFS system.  So Emacs
+;; C:/WINDOWS/SYSTEM32/ for partitioning NTFS systems.  So Emacs
 ;; can find the one in your ImageMagick directory, you need to
 ;; customize this value to the absolute filename.
 (defcustom thumbs-conversion-program
@@ -235,7 +235,7 @@ reached."
       (setq dirsize (- dirsize (car (cdar files-list))))
       (setq files-list (cdr files-list)))))
 
-;; Check the thumbsnail directory size and clean it if necessary.
+;; Check the thumbnail directory size and clean it if necessary.
 (when thumbs-thumbsdir-auto-clean
   (thumbs-cleanup-thumbsdir))
 
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 9e29de0cbed..0e3713c9fcc 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -417,7 +417,7 @@ XML document."
 Automatically creates an XML request body if TAG is non-nil.
 BODY is the XML document fragment to be enclosed by <TAG></TAG>.
 
-DEPTH is how deep the request should propogate.  Default is 0, meaning
+DEPTH is how deep the request should propagate.  Default is 0, meaning
 it should apply only to URL.  A negative number means to use
 `Infinity' for the depth.  Not all WebDAV servers support this depth
 though.
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index bb7744be434..a9ff042d681 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -721,7 +721,7 @@ should be shown to the user."
           ;; The request could not be completed due to a conflict with
           ;; the current state of the resource.  This code is only
           ;; allowed in situations where it is expected that the user
-          ;; mioght be able to resolve the conflict and resubmit the
+          ;; might be able to resolve the conflict and resubmit the
           ;; request.  The response body SHOULD include enough
           ;; information for the user to recognize the source of the
           ;; conflict.
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index 20c83429ced..85ec49885bd 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -1292,7 +1292,7 @@ delimiter regions"))
 Used for splitting difference regions into individual words.")
 (make-variable-buffer-local 'ediff-forward-word-function)
 
-;; \240 is unicode symbol for nonbreakable whitespace
+;; \240 is Unicode symbol for nonbreakable whitespace
 (defvar ediff-whitespace " \n\t\f\r\240"
   "*Characters constituting white space.
 These characters are ignored when differing regions are split into words.")
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index cadcdec29b4..ce7818d5ef4 100644
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -2164,7 +2164,7 @@ all marked sessions must be active."
 ;; If meta-buf doesn't exist, it is created.  In that case, id doesn't have a
 ;; parent meta-buf
 ;; Check if META-BUF exists before calling this function
-;; Optional MUST-REDRAW, if non-nil, would force redrawal of the whole meta
+;; Optional MUST-REDRAW, if non-nil, would force redrawing of the whole meta
 ;; buffer.  Otherwise, it will just go over the buffer and update activity marks
 ;; and session status.
 ;; SESSION-NUMBER, if specified, says which session caused the update.
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index df6a7e938af..5d7d2451422 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -452,7 +452,7 @@ to invocation.")
       (if ediff-3way-job
           (ediff-with-current-buffer ediff-buffer-C
             (ediff-nuke-selective-display)
-            ;; the merge bufer should never be narrowed
+            ;; the merge buffer should never be narrowed
             ;; (it can happen if it is on rmail-mode or similar)
             (if (ediff-with-current-buffer control-buffer ediff-merge-job)
                 (widen))
diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el
index c514026b1f1..43292ed14e4 100644
--- a/lisp/vc/pcvs-parse.el
+++ b/lisp/vc/pcvs-parse.el
@@ -430,7 +430,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
         ;; Conflict
         (and
          (cvs-match (concat "C \\(.*" qfile "\\)$") (path 1) (type 'CONFLICT))
-         ;; C might be followed by a "suprious" U for non-mergeable files
+         ;; C might be followed by a "spurious" U for non-mergable files
          (cvs-or (cvs-match (concat "U \\(.*" qfile "\\)$")) t))
         ;; Successful merge
         (cvs-match (concat "M \\(.*" qfile "\\)$") (path 1))
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index 4915cb9bf7f..ea739ea726a 100644
--- a/lisp/vc/pcvs-util.el
+++ b/lisp/vc/pcvs-util.el
@@ -89,7 +89,7 @@ try to split a new window instead."
     (or (let ((buf (get-buffer-window buf))) (and buf (select-window buf)))
         (and pop-up-windows
              (ignore-errors (select-window (split-window-below)))
-             (switch-to-buffer buf))
+             (switch-to-buffer buf nil 'force-same-window))
         (pop-to-buffer (current-buffer)))))
 
 (defun cvs-bury-buffer (buf &optional mainbuf)
diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el
index eeac55ac0f8..a20a49a4c39 100644
--- a/lisp/vc/vc-arch.el
+++ b/lisp/vc/vc-arch.el
@@ -398,7 +398,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see
          (with-temp-buffer
            (insert-file-contents rej)
            (goto-char (point-min))
-           (looking-at "Conflicts occured, diff3 conflict markers left in file\\.")))))
+           (looking-at "Conflicts occurred, diff3 conflict markers left in file\\.")))))
 
 (defun vc-arch-delete-rej-if-obsolete ()
   "For use in `after-save-hook'."
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 82eb8783a74..d4b631a1d1b 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -1021,7 +1021,7 @@ specific headers."
                             (lambda (info)
                               ;; The state for directory entries might
                               ;; have been changed to 'up-to-date,
-                              ;; reset it, othewise it will be removed when doing 'x'
+                              ;; reset it, otherwise it will be removed when doing 'x'
                               ;; next time.
                               ;; FIXME: There should be a more elegant way to do this.
                               (when (and (vc-dir-fileinfo->directory info)
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 84c7f4a510b..7fe727bd179 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -103,7 +103,7 @@
 ;;
 ;; When the client mode adds a local vc-mode-line-hook to a buffer, it
 ;; will be called with the buffer file name as argument whenever the
-;; dispatcher resynchs the buffer.
+;; dispatcher resyncs the buffer.
 
 ;; To do:
 ;;
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index 0b263e9c669..0fc7ba96fb7 100644
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -299,7 +299,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
       ids)))
 
 (defun vc-mtn-revision-completion-table (files)
-  ;; TODO: Implement completion for for selectors
+  ;; TODO: Implement completion for selectors
   ;; TODO: Implement completion for composite selectors.
   (lexical-let ((files files))
     ;; What about using `files'?!?  --Stef
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 909585138fc..ed2bac17217 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2690,7 +2690,7 @@ log entries should be gathered."
       (substring rev 0 index))))
 
 (defun vc-default-responsible-p (backend file)
-  "Indicate whether BACKEND is reponsible for FILE.
+  "Indicate whether BACKEND is responsible for FILE.
 The default is to return nil always."
   nil)
 
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index cb21d4b08c0..20361d32450 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -381,7 +381,7 @@ bit output with no translation."
 (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000)
 (w32-add-charset-info "iso10646-1" 'w32-charset-default t)
 
-;;   ;; If unicode windows charset is not defined, use ansi fonts.
+;;   ;; If Unicode Windows charset is not defined, use ansi fonts.
 ;;   (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))
 
 ;; Prefered names
diff --git a/lisp/window.el b/lisp/window.el
index 10c6adc04e4..2885c3a5c70 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -246,51 +246,51 @@ windows horizontally arranged within WINDOW."
         (setq child (window-right child)))
       count))))
 
-(defun walk-window-tree-1 (proc walk-window-tree-window any &optional sub-only)
+(defun walk-window-tree-1 (fun walk-window-tree-window any &optional sub-only)
   "Helper function for `walk-window-tree' and `walk-window-subtree'."
   (let (walk-window-tree-buffer)
     (while walk-window-tree-window
       (setq walk-window-tree-buffer
             (window-buffer walk-window-tree-window))
       (when (or walk-window-tree-buffer any)
-        (funcall proc walk-window-tree-window))
+        (funcall fun walk-window-tree-window))
       (unless walk-window-tree-buffer
         (walk-window-tree-1
-         proc (window-left-child walk-window-tree-window) any)
+         fun (window-left-child walk-window-tree-window) any)
         (walk-window-tree-1
-         proc (window-top-child walk-window-tree-window) any))
+         fun (window-top-child walk-window-tree-window) any))
       (if sub-only
           (setq walk-window-tree-window nil)
         (setq walk-window-tree-window
               (window-right walk-window-tree-window))))))
 
-(defun walk-window-tree (proc &optional frame any)
-  "Run function PROC on each live window of FRAME.
-PROC must be a function with one argument - a window.  FRAME must
+(defun walk-window-tree (fun &optional frame any)
+  "Run function FUN on each live window of FRAME.
+FUN must be a function with one argument - a window.  FRAME must
 be a live frame and defaults to the selected one.  ANY, if
-non-nil means to run PROC on all live and internal windows of
+non-nil means to run FUN on all live and internal windows of
 FRAME.
 
 This function performs a pre-order, depth-first traversal of the
-window tree.  If PROC changes the window tree, the result is
+window tree.  If FUN changes the window tree, the result is
 unpredictable."
   (let ((walk-window-tree-frame (window-normalize-frame frame)))
     (walk-window-tree-1
-     proc (frame-root-window walk-window-tree-frame) any)))
+     fun (frame-root-window walk-window-tree-frame) any)))
 
-(defun walk-window-subtree (proc &optional window any)
-  "Run function PROC on the subtree of windows rooted at WINDOW.
-WINDOW defaults to the selected window.  PROC must be a function
-with one argument - a window.  By default, run PROC only on live
+(defun walk-window-subtree (fun &optional window any)
+  "Run function FUN on the subtree of windows rooted at WINDOW.
+WINDOW defaults to the selected window.  FUN must be a function
+with one argument - a window.  By default, run FUN only on live
 windows of the subtree.  If the optional argument ANY is non-nil,
-run PROC on all live and internal windows of the subtree.  If
-WINDOW is live, run PROC on WINDOW only.
+run FUN on all live and internal windows of the subtree.  If
+WINDOW is live, run FUN on WINDOW only.
 
 This function performs a pre-order, depth-first traversal of the
-subtree rooted at WINDOW.  If PROC changes that tree, the result
+subtree rooted at WINDOW.  If FUN changes that tree, the result
 is unpredictable."
   (setq window (window-normalize-window window))
-  (walk-window-tree-1 proc window any t))
+  (walk-window-tree-1 fun window any t))
 
 (defun window-with-parameter (parameter &optional value frame any)
   "Return first window on FRAME with PARAMETER non-nil.
@@ -524,10 +524,10 @@ imposed by fixed size windows, `window-min-height' or
 windows may get as small as `window-safe-min-height' lines and
 `window-safe-min-width' columns.  IGNORE a window means ignore
 restrictions for that window only."
-  (window-min-size-1
+  (window--min-size-1
    (window-normalize-window window) horizontal ignore))
 
-(defun window-min-size-1 (window horizontal ignore)
+(defun window--min-size-1 (window horizontal ignore)
   "Internal function of `window-min-size'."
   (let ((sub (window-child window)))
     (if sub
@@ -538,13 +538,13 @@ restrictions for that window only."
               ;; the minimum sizes of its child windows.
               (while sub
                 (setq value (+ value
-                               (window-min-size-1 sub horizontal ignore)))
+                               (window--min-size-1 sub horizontal ignore)))
                 (setq sub (window-right sub)))
             ;; The minimum size of an ortho-combination is the maximum of
             ;; the minimum sizes of its child windows.
             (while sub
               (setq value (max value
-                               (window-min-size-1 sub horizontal ignore)))
+                               (window--min-size-1 sub horizontal ignore)))
               (setq sub (window-right sub))))
           value)
       (with-current-buffer (window-buffer window)
@@ -687,7 +687,7 @@ WINDOW can be resized in the desired direction.  The function
   (window--size-fixed-1
    (window-normalize-window window) horizontal))
 
-(defun window-min-delta-1 (window delta &optional horizontal ignore trail noup)
+(defun window--min-delta-1 (window delta &optional horizontal ignore trail noup)
   "Internal function for `window-min-delta'."
   (if (not (window-parent window))
       ;; If we can't go up, return zero.
@@ -723,7 +723,7 @@ WINDOW can be resized in the desired direction.  The function
             (setq sub (window-right sub))))
         (if noup
             delta
-          (window-min-delta-1 parent delta horizontal ignore trail))))))
+          (window--min-delta-1 parent delta horizontal ignore trail))))))
 
 (defun window-min-delta (&optional window horizontal ignore trail noup nodown)
   "Return number of lines by which WINDOW can be shrunk.
@@ -757,7 +757,7 @@ at least one other window can be enlarged appropriately."
     (cond
      (nodown
       ;; If NODOWN is t, try to recover the entire size of WINDOW.
-      (window-min-delta-1 window size horizontal ignore trail noup))
+      (window--min-delta-1 window size horizontal ignore trail noup))
      ((= size minimum)
       ;; If NODOWN is nil and WINDOW's size is already at its minimum,
       ;; there's nothing to recover.
@@ -765,10 +765,10 @@ at least one other window can be enlarged appropriately."
      (t
       ;; Otherwise, try to recover whatever WINDOW is larger than its
       ;; minimum size.
-      (window-min-delta-1
+      (window--min-delta-1
        window (- size minimum) horizontal ignore trail noup)))))
 
-(defun window-max-delta-1 (window delta &optional horizontal ignore trail noup)
+(defun window--max-delta-1 (window delta &optional horizontal ignore trail noup)
   "Internal function of `window-max-delta'."
   (if (not (window-parent window))
       ;; Can't go up.  Return DELTA.
@@ -804,7 +804,7 @@ at least one other window can be enlarged appropriately."
             delta
           ;; Else try with parent of WINDOW, passing the DELTA we
           ;; recovered so far.
-          (window-max-delta-1 parent delta horizontal ignore trail))))))
+          (window--max-delta-1 parent delta horizontal ignore trail))))))
 
 (defun window-max-delta (&optional window horizontal ignore trail noup nodown)
   "Return maximum number of lines WINDOW by which WINDOW can be enlarged.
@@ -840,7 +840,7 @@ only whether other windows can be shrunk appropriately."
       ;; size.
       0
     ;; WINDOW has no fixed size.
-    (window-max-delta-1 window 0 horizontal ignore trail noup)))
+    (window--max-delta-1 window 0 horizontal ignore trail noup)))
 
 ;; Make NOUP also inhibit the min-size check.
 (defun window--resizable (window delta &optional horizontal ignore trail noup nodown)
@@ -997,9 +997,9 @@ taken into account."
             (setq hor (cdr fcsb)))))
     (cons vert hor)))
 
-(defun walk-windows (proc &optional minibuf all-frames)
-  "Cycle through all live windows, calling PROC for each one.
-PROC must specify a function with a window as its sole argument.
+(defun walk-windows (fun &optional minibuf all-frames)
+  "Cycle through all live windows, calling FUN for each one.
+FUN must specify a function with a window as its sole argument.
 The optional arguments MINIBUF and ALL-FRAMES specify the set of
 windows to include in the walk.
 
@@ -1041,7 +1041,7 @@ windows nor the buffer list."
     (when (framep all-frames)
       (select-window (frame-first-window all-frames) 'norecord))
     (dolist (walk-windows-window (window-list-1 nil minibuf all-frames))
-      (funcall proc walk-windows-window))))
+      (funcall fun walk-windows-window))))
 
 (defun window-point-1 (&optional window)
   "Return value of WINDOW's point.
@@ -2039,8 +2039,8 @@ move it as far as possible in the desired direction."
       ;; two windows we want to resize.
       (cond
        ((> delta 0)
-        (setq max-delta (window-max-delta-1 left 0 horizontal nil 'after))
-        (setq min-delta (window-min-delta-1 right (- delta) horizontal nil 'before))
+        (setq max-delta (window--max-delta-1 left 0 horizontal nil 'after))
+        (setq min-delta (window--min-delta-1 right (- delta) horizontal nil 'before))
         (when (or (< max-delta delta) (> min-delta (- delta)))
           ;; We can't get the whole DELTA - move as far as possible.
           (setq delta (min max-delta (- min-delta))))
@@ -2062,8 +2062,8 @@ move it as far as possible in the desired direction."
                (window-left-column right)
              (window-top-line right)))))
        ((< delta 0)
-        (setq max-delta (window-max-delta-1 right 0 horizontal nil 'before))
-        (setq min-delta (window-min-delta-1 left delta horizontal nil 'after))
+        (setq max-delta (window--max-delta-1 right 0 horizontal nil 'before))
+        (setq min-delta (window--min-delta-1 left delta horizontal nil 'after))
         (when (or (< max-delta (- delta)) (> min-delta delta))
           ;; We can't get the whole DELTA - move as far as possible.
           (setq delta (max (- max-delta) min-delta)))
@@ -2920,6 +2920,7 @@ window.
 
 This function removes the buffer denoted by BUFFER-OR-NAME from
 all window-local buffer lists."
+  (interactive "bBuffer to replace: ")
   (let ((buffer (window-normalize-buffer buffer-or-name)))
     (dolist (window (window-list-1 nil nil t))
       (if (eq (window-buffer window) buffer)
@@ -3570,7 +3571,7 @@ specific buffers."
 (defvar window-state-ignored-parameters '(quit-restore)
   "List of window parameters ignored by `window-state-get'.")
 
-(defun window-state-get-1 (window &optional markers)
+(defun window--state-get-1 (window &optional markers)
   "Helper function for `window-state-get'."
   (let* ((type
           (cond
@@ -3625,7 +3626,7 @@ specific buffers."
             (let (list)
               (setq window (window-child window))
               (while window
-                (setq list (cons (window-state-get-1 window markers) list))
+                (setq list (cons (window--state-get-1 window markers) list))
                 (setq window (window-right window)))
               (nreverse list)))))
     (append head tail)))
@@ -3664,12 +3665,12 @@ value can be also stored on disk and read back in a new session."
      ;; These are probably not needed.
      ,@(when (window-size-fixed-p window) `((fixed-height . t)))
      ,@(when (window-size-fixed-p window t) `((fixed-width . t))))
-   (window-state-get-1 window markers)))
+   (window--state-get-1 window markers)))
 
 (defvar window-state-put-list nil
   "Helper variable for `window-state-put'.")
 
-(defun window-state-put-1 (state &optional window ignore totals)
+(defun window--state-put-1 (state &optional window ignore totals)
   "Helper function for `window-state-put'."
   (let ((type (car state)))
     (setq state (cdr state))
@@ -3677,8 +3678,7 @@ value can be also stored on disk and read back in a new session."
      ((eq type 'leaf)
       ;; For a leaf window just add unprocessed entries to
       ;; `window-state-put-list'.
-      (setq window-state-put-list
-            (cons (cons window state) window-state-put-list)))
+      (push (cons window state) window-state-put-list))
      ((memq type '(vc hc))
       (let* ((horizontal (eq type 'hc))
              (total (window-total-size window horizontal))
@@ -3689,7 +3689,7 @@ value can be also stored on disk and read back in a new session."
           ;; real window that we want to fill with what we find here.
           (when (memq (car item) '(leaf vc hc))
             (if (assq 'last item)
-                ;; The last child window.  Below `window-state-put-1'
+                ;; The last child window.  Below `window--state-put-1'
                 ;; will put into it whatever ITEM has in store.
                 (setq new nil)
               ;; Not the last child window, prepare for splitting
@@ -3730,11 +3730,11 @@ value can be also stored on disk and read back in a new session."
 
             ;; Now process the current window (either the one we've just
             ;; split or the last child of its parent).
-            (window-state-put-1 item window ignore totals)
+            (window--state-put-1 item window ignore totals)
             ;; Continue with the last window split off.
             (setq window new))))))))
 
-(defun window-state-put-2 (ignore)
+(defun window--state-put-2 (ignore)
   "Helper function for `window-state-put'."
   (dolist (item window-state-put-list)
     (let ((window (car item))
@@ -3860,11 +3860,11 @@ windows can get as small as `window-safe-min-height' and
       ;; Work on the windows of a temporary buffer to make sure that
       ;; splitting proceeds regardless of any buffer local values of
       ;; `window-size-fixed'.  Release that buffer after the buffers of
-      ;; all live windows have been set by `window-state-put-2'.
+      ;; all live windows have been set by `window--state-put-2'.
       (with-temp-buffer
         (set-window-buffer window (current-buffer))
-        (window-state-put-1 state window nil totals)
-        (window-state-put-2 ignore))
+        (window--state-put-1 state window nil totals)
+        (window--state-put-2 ignore))
       (window--check frame))))
 
 (defun display-buffer-record-window (type window buffer)
@@ -4951,7 +4951,7 @@ the list of recently selected ones."
 
 (defun read-buffer-to-switch (prompt)
   "Read the name of a buffer to switch to, prompting with PROMPT.
-Return the neame of the buffer as a string.
+Return the name of the buffer as a string.
 
 This function is intended for the `switch-to-buffer' family of
 commands since these need to omit the name of the current buffer
diff --git a/lisp/woman.el b/lisp/woman.el
index a16bfa39c86..243196a5302 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -2558,7 +2558,7 @@ REQUEST is the invoking directive without the leading dot."
      ;; ((looking-at "[te]") (setq c nil))   ; reject t(roff) and e(ven page)
      ((looking-at "[ntoe]")
       (setq c (memq (following-char) woman-if-conditions-true)))
-     ;; Unrecognised letter so reject:
+     ;; Unrecognized letter so reject:
      ((looking-at "[A-Za-z]") (setq c nil)
       (WoMan-warn "%s %s -- unrecognized condition name rejected!"
                   request (match-string 0)))
@@ -3697,7 +3697,7 @@ expression in parentheses.  Leaves point after the value."
                               (setq woman-request (match-string 1)))))
             ;; Delete request or macro name:
             (woman-delete-match 0))
-           ;; Unrecognised request:
+           ;; Unrecognized request:
            ((prog1 nil
               ;; (WoMan-warn ".%s request ignored!" woman-request)
               (WoMan-warn-ignored woman-request "ignored!")
diff --git a/lisp/xml.el b/lisp/xml.el
index 68aa5f4db6f..478872dd92e 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -756,7 +756,7 @@ This follows the rule [28] in the XML specifications."
 ;;*******************************************************************
 
 (defun xml-substitute-special (string)
-  "Return STRING, after subsituting entity references."
+  "Return STRING, after substituting entity references."
   ;; This originally made repeated passes through the string from the
   ;; beginning, which isn't correct, since then either "&amp;amp;" or
   ;; "&#38;amp;" won't DTRT.
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 5ed33d5be05..0128464d6e0 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -113,7 +113,7 @@ xlwMenuTranslations [] =
 <KeyUp>:          key()\n\
 ";
 
-/* FIXME: Space should toggle toggleable menu item but not remove the menu
+/* FIXME: Space should toggle togglable menu item but not remove the menu
    so you can toggle the next one without entering the menu again.  */
 
 /* FIXME: Should ESC close one level of menu structure or the complete menu?  */
@@ -1486,7 +1486,7 @@ remap_menubar (XlwMenuWidget mw)
   if (new_selection && !new_selection->enabled)
     new_selection = NULL;
 
-  /* Call callback when the hightlighted item changes.  */
+  /* Call callback when the highlighted item changes.  */
   if (old_selection || new_selection)
     XtCallCallbackList ((Widget)mw, mw->menu.highlight,
                         (XtPointer) new_selection);
diff --git a/nt/INSTALL b/nt/INSTALL
index 63285047a67..bb621dceb6b 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -29,7 +29,7 @@
 
        "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 /Debug
 
-      if you are goiung to compile a debug version, or
+      if you are going to compile a debug version, or
 
        "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 /Release
 
@@ -268,7 +268,7 @@
   "Error in --cflags argument: ... Backslashes and quotes cannot be
   used with --cflags.  Please use forward slashes for filenames and
   paths (e.g. when passing directories to -I)."
-  
+
   N.B.  It is normal to see a few error messages output while configure
   is running, when gcc support is being tested.  These cannot be
   suppressed because of limitations in the Windows 9X command.com shell.
diff --git a/nt/README b/nt/README
index 5d54ce90041..75a3c1cb111 100644
--- a/nt/README
+++ b/nt/README
@@ -34,7 +34,7 @@
 
   + emacsclient.exe - A command-line client program that can
     communicate with a running Emacs process. See the `Emacs Server'
-    node of the Emacs manul.
+    node of the Emacs manual.
 
   + emacsclientw.exe - A version of emacsclient that does not open
     a command-line window.
diff --git a/nt/runemacs.c b/nt/runemacs.c
index 47b8f54bb02..2d2474c3592 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -111,7 +111,7 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
 #endif
 
   /* Append original arguments if any; first look for arguments we
-     recognise (-wait, -high, and -low), and apply them ourselves.  */
+     recognize (-wait, -high, and -low), and apply them ourselves.  */
   while (cmdline[0] == '-' || cmdline[0] == '/')
     {
       if (strncmp (cmdline+1, "wait", 4) == 0)
diff --git a/oldXMenu/AddSel.c b/oldXMenu/AddSel.c
index 9bbcf71cd3c..2b1ff3d6c89 100644
--- a/oldXMenu/AddSel.c
+++ b/oldXMenu/AddSel.c
@@ -30,7 +30,7 @@ XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, ch
     register XMSelect *sel;     /* Newly created selection. */
 
 
-    int label_length;           /* Label lenght in characters. */
+    int label_length;           /* Label length in characters. */
     int label_width;            /* Label width in pixels. */
 
     /*
diff --git a/src/ChangeLog b/src/ChangeLog
index e1854d7ffcd..a0f83560603 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,115 @@
+2011-11-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * process.c (wait_reading_process_output): Fix asynchrounous
+        GnuTLS socket handling on some versions of the GnuTLS library.
+        (wait_reading_process_output): Add comment and URL.
+
+2011-11-21  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_clear_frame): Reinstate the XClearWindow call.
+
+2011-11-21  Chong Yidong  <cyd@gnu.org>
+
+        * window.c (Fnext_window, Fprevious_window): Doc fix.
+
+2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (get_phys_cursor_glyph): Fix Lisp_Object/int mixup.
+
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * nsfont.m (syms_of_nsfont) <ns-reg-to-script>: Fix typo.
+
+2011-11-20  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Fset_window_combination_limit): Rename argument
+        STATUS to LIMIT.
+        (Vwindow_combination_limit): Remove "status" from doc-string.
+
+2011-11-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * m/ibms390.h: Remove.
+        * m/ibms390x.h: Don't include "ibms390.h".
+
+2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Finsert_file_contents): Add missing gcpro1 variable.
+        Suggested by Dmitry Antipov <dmantipov@yandex.ru>.
+
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * casetab.c (Fset_case_table):
+        * charset.c (Fcharset_after): Fix typos.
+
+2011-11-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Standardize on VIRT_ADDR_VARIES behavior (Bug#10042).
+        Otherwise, valgrind does not work on some platforms.
+        Problem reported by Andreas Schwab in
+        <http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00081.html>.
+        * puresize.h (pure, PURE_P): Always behave as if VIRT_ADDR_VARIES
+        is set, removing the need for VIRT_ADDRESS_VARIES.
+        (PURE_P): Use a more-efficient implementation that needs just one
+        comparison, not two: on x86-64 with GCC 4.6.2, this cut down the
+        number of instructions from 6 (xorl, cmpq, jge, xorl, cmpq, setge)
+        to 4 (xorl, subq, cmpq, setbe).
+        * alloc.c (pure): Always extern now, since that's the
+        VIRT_ADDR_VARIES behavior.
+        (PURE_POINTER_P): Use a single comparison, not two, for
+        consistency with the new puresize.h.
+        * lisp.h (PNTR_COMPARISON_TYPE): Remove; no longer needed.
+        * m/ibms390.h, m/intel386.h, m/template.h, s/cygwin.h, s/hpux10-20.h:
+        Remove VIRT_ADDR_VARIES no longer needed.
+
+2011-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (x_write_glyphs, draw_phys_cursor_glyph)
+        (erase_phys_cursor, update_window_cursor, show_mouse_face)
+        (cursor_in_mouse_face_p): If the cursor position is out of bounds,
+        behave as if the cursor position were at the window margin.
+
+        * window.c (get_phys_cursor_glyph): If the window is hscrolled,
+        and the cursor position is out of bounds, behave as if the cursor
+        position were at the window margin.  (Bug#10075)
+
+2011-11-18  Chong Yidong  <cyd@gnu.org>
+
+        * window.c (Fwindow_combination_limit): Make first argument
+        non-optional, since it is meaningless for live windows like the
+        selected window.
+
+2011-11-18  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.
+
+2011-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * intervals.c: Fix grafting over the whole buffer (bug#10071).
+        (graft_intervals_into_buffer): Simplify.
+
+2011-11-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (swap_glyph_pointers): Swap the used[] arrays and the
+        hash values of the two rows.
+        (copy_row_except_pointers): Preserve the used[] arrays and the
+        hash values of the two rows.  (Bug#10035)
+        (add_row_entry): Add xassert to verify that ROW's hash code is valid.
+
+        * xdisp.c (row_hash): New function, body extracted from
+        compute_line_metrics.
+        (compute_line_metrics): Call row_hash, instead of computing the
+        hash code inline.
+
+        * dispnew.c (verify_row_hash): Call row_hash for computing the
+        hash code of a row, instead of duplicating code from xdisp.c.
+
+        * dispextern.h (row_hash): Add prototype.
+
+2011-11-18  Tassilo Horn  <tassilo@member.fsf.org>
+
+        * frame.c (delete_frame): Don't delete the terminal when the last
+        X frame is closed if emacs is built with GTK toolkit.
+
 2011-11-17  Juanma Barranquero  <lekktu@gmail.com>
 
         * window.c (syms_of_window) <window-combination-resize>: Fix typo.
@@ -371,7 +483,7 @@
 
         Fix the `xbytecode' command.
         * .gdbinit (xprintbytestr): New command.
-        (xwhichsymbols): Renamed from `which'; all callers changed.
+        (xwhichsymbols): Rename from `which'; all callers changed.
         (xbytecode): Print the byte-code string as well.
 
 2011-10-29  Kim Storm  <storm@cua.dk>
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index efe77648458..7fef45f36da 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -2237,7 +2237,7 @@
 
         * data.c (Fset):
         If Vautoload_queue non-nil, record function and old definition
-        by consing onto Vautoload_qeueue.
+        by consing onto Vautoload_queue.
 
         * fns.c (Fprovide):
         If Vautoload_queue is non-nil, record old value of Vfeatures.
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 181b11b5a2b..99ab02577d5 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -6387,7 +6387,7 @@
 2005-11-20  Nick Roberts  <nickrob@snap.net.nz>
 
         * lisp.h: Use typedef when Lisp_Object is EMACS_INT so that
-        this type is recognised when debugging.
+        this type is recognized when debugging.
 
 2005-11-19  Andreas Schwab  <schwab@suse.de>
 
@@ -13398,7 +13398,7 @@
 2004-07-04  John Paul Wallington  <jpw@gnu.org>
 
         * fileio.c (read_file_name_completion_ignore_case): New variable.
-        (syms_of_fileio): Declare and initialise it.
+        (syms_of_fileio): Declare and initialize it.
         (Fread_file_name): Bind `completion-ignore-case' to respect it.
 
 2004-07-03  Eli Zaretskii  <eliz@gnu.org>
@@ -18755,7 +18755,7 @@
 
 2003-05-21  Dave Love  <fx@gnu.org>
 
-        [Merged from unicode branch.]
+        [Merged from Unicode branch.]
 
         * xfns.c (x_window, x_window): Use use_xim.
 
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 73ac5fd4e00..07d4f4ec116 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -4839,7 +4839,7 @@
 
 2010-08-13  Jason Rumney  <jasonr@gnu.org>
 
-        * w32menu.c (simple_dialog_show): Use unicode message box if available.
+        * w32menu.c (simple_dialog_show): Use Unicode message box if available.
         (MessageBoxW_Proc): New function typedef.
         (unicode-message-box): New function pointer.
         (globals_of_w32menu): Import it from user32.dll.  (Bug#5629)
@@ -5896,7 +5896,7 @@
         * eval.c (Feval, Ffuncall): Use the new names.
 
         * lisp.h (struct Lisp_Subr): Rename `am' to aMANY and add aUNEVALLED.
-        (DEFUN): Add braces around the union initialisation and use ## to
+        (DEFUN): Add braces around the union initialization and use ## to
         specify the right union alternative and avoid a cast.
 
 2010-07-18  Juanma Barranquero  <lekktu@gmail.com>
@@ -6604,9 +6604,9 @@
         * keyboard.c (input_available_signal): Declare.
         (kbd_buffer_nr_stored): New function.
         (kbd_buffer_store_event_hold): If kbd_buffer_nr_stored returns
-        more than KBD_BUFFER_SIZE/2, stop reding input (Bug#6571).
+        more than KBD_BUFFER_SIZE/2, stop reading input (Bug#6571).
         (kbd_buffer_get_event): If input is suspended and kbd_buffer_nr_stored
-        returns less than KBD_BUFFER_SIZE/4, resume reding input (Bug#6571).
+        returns less than KBD_BUFFER_SIZE/4, resume reading input (Bug#6571).
         (tty_read_avail_input): If input is on hold, return.
         Don't read more that free slots in kbd_buffer (Bug#6571).
 
@@ -7199,7 +7199,7 @@
 
 2010-06-27  Chong Yidong  <cyd@stupidchicken.com>
 
-        * xfns.c (Fx_create_frame): Don't consult X resouces when setting
+        * xfns.c (Fx_create_frame): Don't consult X resources when setting
         menu-bar-lines and tool-bar-lines.  Use menu-bar-mode and
         tool-bar-mode, which are now set using these X resources at
         startup, to determine the defaults (Bug#2249).
@@ -7683,7 +7683,7 @@
 
 2010-05-20  Juri Linkov  <juri@jurta.org>
 
-        * fileio.c (Fdelete_file): Change interative spec to use
+        * fileio.c (Fdelete_file): Change interactive spec to use
         `read-file-name' like in `find-file-read-args' where the default
         value is `default-directory' instead of `buffer-file-name'.
         http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00533.html
@@ -8991,8 +8991,8 @@
 2010-04-13  Jan Djärv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (xg_set_geometry): Set geometry for PPosition also.
-        (x_wm_set_size_hint): Dont set position flags, gtk_window_parse_geometry
-        does that.
+        (x_wm_set_size_hint): Don't set position flags,
+        gtk_window_parse_geometry does that.
 
         * xfns.c (Fx_create_frame, x_create_tip_frame): Set default border width
         to zero.
@@ -9266,7 +9266,7 @@
 
         Get rid of the direct_output optimizations.
         * keyboard.c (nonundocount): Remove extern declaration.
-        (command_loop_1): Remove brittle optimisation for cheap and
+        (command_loop_1): Remove brittle optimization for cheap and
         common operations.
         * xdisp.c (redisplay_internal): Don't bother checking
         redisplay_performed_directly_p any more.
@@ -9864,8 +9864,8 @@
 
 2010-01-27  Jason Rumney  <jasonr@gnu.org>
 
-        * w32inevt.c (w32_kbd_patch_key): Save the unicode character.
-        (key_event): Use unicode for characters 128 and higher (Bug#4567).
+        * w32inevt.c (w32_kbd_patch_key): Save the Unicode character.
+        (key_event): Use Unicode for characters 128 and higher (Bug#4567).
 
 2010-01-27  Kenichi Handa  <handa@m17n.org>
 
@@ -11541,7 +11541,7 @@
         (syms_of_nsfont): Declare it.
         (ns_registry_to_script): New function.
         (ns_get_req_script): Call it.
-        (ns_findfonts): Don't give up on non-unicode registry.
+        (ns_findfonts): Don't give up on non-Unicode registry.
 
         * font.c (DEFAULT_ENCODING) [HAVE_NS]: Remove special case.
 
@@ -11923,7 +11923,7 @@
 
         * process.c (status_notify): Don't perform redisplay.
         (Fdelete_process, list_processes_1, process_send_signal):
-        Expliticly perform redisplay.
+        Explicitly perform redisplay.
         (wait_reading_process_output): Always check process status, but
         don't perform redisplay unless DO_DISPLAY is non-zero (Bug#2930).
 
@@ -12481,7 +12481,7 @@
 
         * dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function
         xd_symbol_to_dbus_type.  With Solaris 2.11, it was said to compile
-        for hours, when optimzation is enabled.
+        for hours, when optimization is enabled.
         (xd_signature, xd_append_arg, xd_retrieve_arg, xd_initialize)
         (xd_read_message): Make them static.
 
@@ -13149,7 +13149,7 @@
         (ftfont_has_char): Special handling of `ja' and `ko' adstyle.
 
         * font.c (font_sort_entites): Change the meaning of the arg
-        BEST-ONLY.  Don't optimize for VEC of lenght 1.
+        BEST-ONLY.  Don't optimize for VEC of length 1.
         (font_select_entity): Just return the value of font_sort_entites.
 
         * xfaces.c (merge_face_vectors): Reflect font properties in
@@ -16072,7 +16072,7 @@
 2008-09-07  Andreas Schwab  <schwab@suse.de>
 
         * callproc.c (Fcall_process): Don't hold references to string data
-        across garbage collection.  Move initialisation of new_argv down
+        across garbage collection.  Move initialization of new_argv down
         to avoid compiler bug.
 
 2008-09-07  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
@@ -17147,10 +17147,10 @@
 
 2008-07-30  Jason Rumney  <jasonr@gnu.org>
 
-        * w32font.h (struct w32font_info): Use unicode version of textmetrics.
+        * w32font.h (struct w32font_info): Use Unicode version of textmetrics.
 
-        * w32font.c (w32font_encode_char): Leave as unicode if in range.
-        (w32font_open_internal): Get unicode version of textmetrics.
+        * w32font.c (w32font_encode_char): Leave as Unicode if in range.
+        (w32font_open_internal): Get Unicode version of textmetrics.
         Don't enable or disable glyph indices here.
         (w32font_open): Disable use of glyph indices.
 
@@ -19178,7 +19178,7 @@
 2008-06-10  Jason Rumney  <jasonr@gnu.org>
 
         * w32uniscribe.c (add_opentype_font_name_to_list):
-        Skip non unicode fonts.
+        Skip non Unicode fonts.
 
 2008-06-10  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -19248,7 +19248,7 @@
         * w32menu.c (Fx_popup_menu): Unwind protect while building menu.
         (parse_single_submenu): Remove.
         (digest_single_submenu): Remove.
-        (syms_of_w32menu): Don't initialise variables that have moved
+        (syms_of_w32menu): Don't initialize variables that have moved
         to menu.c.
         (set_frame_menubar): Sync with version in xmenu.c.
         (w32_menu_show): Sync with xmenu_show in xmenu.c.
@@ -19647,7 +19647,7 @@
         `raster' specified.
         (add_font_entity_to_list): Allow non-opentype truetype fonts back
         in the uniscribe backend, but disallow any font that has no
-        unicode subrange support.
+        Unicode subrange support.
 
 2008-05-29  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -21290,7 +21290,7 @@
         (CACHE_BLOCKSIZE): New constants.
 
         * w32font.c (Qja, Qko, Qzh): New symbols.
-        (syms_of_w32font): Initialise them.
+        (syms_of_w32font): Initialize them.
         (font_matches_spec): Use them to filter by language.
         (recompute_cached_metrics): Remove function.
         (compute_metrics, clear_cached_metrics): New functions.
@@ -21813,8 +21813,8 @@
 2008-03-06  Jason Rumney  <jasonr@gnu.org>
 
         * w32font.c (w32_registry): Take font_type argument.  Use ANSI
-        when charset not specified.  Only translate ANSI to unicode when
-        font_type is truetype.
+        when charset not specified.  Only translate ANSI to Unicode when
+        font_type is TrueType.
         (w32font_coverage_ok): New function.
         (add_font_entity_to_list): Use it to filter unsuitable fonts.
 
@@ -23463,10 +23463,10 @@
         (w32font_list, w32font_match): Use it.
         (w32font_open): Don't populate subranges.
         (w32font_has_char): Use script Lisp symbols, not subrange bitmask.
-        (w32font_encode_char): Always return unicode code-point as-is.
+        (w32font_encode_char): Always return Unicode code-point as-is.
         (w32font_text_extents): Supply a transformation matrix to
         GetGlyphOutline.  Never look up by glyph index.  Avoid looping
-        twice.  Use unicode version of GetTexExtentPoint32 instead of
+        twice.  Use Unicode version of GetTexExtentPoint32 instead of
         glyph index version.
         (set_fonts_frame): Remove.
         (w32_enumfont_pattern_entity): Add frame parameter, use it to
@@ -25081,7 +25081,7 @@
         * keymap.c (describe_vector): Handle default value of a char table.
 
         * fontset.c (fontset_face): Handle fallback fonts correctly.
-        (Ffontset_info): Return infomation about fallback fonts.
+        (Ffontset_info): Return information about fallback fonts.
 
 2008-02-01  Kenichi Handa  <handa@m17n.org>
 
@@ -25425,16 +25425,16 @@
         (pfnGetFontUnicodeRanges): New dynamically loaded function.
         (w32_initialize): Try to load it.
         (x_get_font_repertory): Use it if available.
-        (w32_encode_char): Add shortcut for unicode output.
+        (w32_encode_char): Add shortcut for Unicode output.
 
         * w32fns.c (w32_load_system_font): Default charset to -1.
-        (x_to_w32_charset): Match all fonts for unicode.
+        (x_to_w32_charset): Match all fonts for Unicode.
         (w32_to_x_charset): New parameter matching.  Don't return partial
         or wildcard charsets.
         (w32_to_all_x_charsets): Don't return partial or wildcard charsets.
-        (w32_codepage_for_font): Return CP_UNICODE for unicode.
+        (w32_codepage_for_font): Return CP_UNICODE for Unicode.
         (w32_to_x_font): Match charset to real charset.
-        (enum_font_cb2): Always list unicode versions.
+        (enum_font_cb2): Always list Unicode versions.
 
         * makefile.w32-in (temacs): Increase EMHEAP.
 
@@ -25458,7 +25458,7 @@
 
         * w32fns.c (Fx_create_frame, x_create_tip_frame): Use new version
         of x_new_fontset.
-        (w32_load_system_font): Initialize charset as unicode.
+        (w32_load_system_font): Initialize charset as Unicode.
         font_info.encoding becomes encoding_type.
         (w32_to_x_font): Use decode_coding_c_string in place of decode_coding.
         (x_to_w32_font): Use encode_coding_object in place of encode_coding.
@@ -27685,7 +27685,7 @@
         * xterm.c (handle_one_xevent): Revert to counting chars not bytes.
 
         * w32term.c (w32_read_socket) <WM_CHAR>: Decode characters outside
-        the unicode range available in MULE by locale-coding-system.
+        the Unicode range available in MULE by locale-coding-system.
         Improve dbcs lead byte detection.  Set event timestamp and modifiers
         earlier.
 
@@ -29136,7 +29136,7 @@
 
         * lisp.h (defvar_per_buffer, DEFVAR_PER_BUFFER):
         * lread.c (defvar_per_buffer):
-        * abbrev.c (syms_of_abbrev) <local-abbrev-tabl>: Move to buffer.c.
+        * abbrev.c (syms_of_abbrev) <local-abbrev-table>: Move to buffer.c.
 
         * window.c (candidate_window_p): Only consider as visible frames that
         are on the same terminal.
@@ -29651,7 +29651,7 @@
 
         * callproc.c (child_setup, getenv_internal): Use the
         display-environment-variable and term-environment-variable frame params.
-        (set_initial_environment): Initialise Vprocess_environment.
+        (set_initial_environment): Initialize Vprocess_environment.
 
         * config.in: Disable multi-keyboard support on a mac.
 
@@ -30873,7 +30873,7 @@
 2007-06-17  Jason Rumney  <jasonr@gnu.org>
 
         * w32menu.c (add_menu_item): Don't use multibyte string functions on
-        unicode strings.
+        Unicode strings.
 
 2007-06-16  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -30892,7 +30892,7 @@
 2007-06-14  Jason Rumney  <jasonr@gnu.org>
 
         * w32.c (get_process_times_fn): New function pointer.
-        (globals_of_w32): Intialize it if present in kernel32.dll.
+        (globals_of_w32): Initialize it if present in kernel32.dll.
         (w32_get_internal_run_time): New function.
 
         * editfns.c (Fget_internal_run_time) [WINDOWSNT]: Use it.
@@ -31298,7 +31298,7 @@
         (term_mouse_highlight, term_mouse_movement, term_mouse_position)
         (term_mouse_click, handle_one_term_event, Fterm_open_connection)
         (Fterm_close_connection): New functions.
-        (term_init): Initialise mouse_face_window.
+        (term_init): Initialize mouse_face_window.
 
 2007-05-19  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 05e448c043c..62e3de22b09 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -1152,7 +1152,7 @@
 
 1987-07-29  Richard Mlynarik  (mly@prep)
 
-        * lread.c (init_read): Initialise load_in_progress.
+        * lread.c (init_read): Initialize load_in_progress.
 
 1987-07-28  Richard M. Stallman  (rms@prep)
 
@@ -2251,7 +2251,7 @@
 1987-01-16  Richard Mlynarik  (mly@prep)
 
         * xfns.c (Fx_set_{background,cursor,mouse}_color):
-        Initialise save_color.
+        Initialize save_color.
 
         * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c:
         Delete/replace unused/conditionalised variables
@@ -3002,7 +3002,7 @@
 1986-11-18  Richard Mlynarik  (mly@prep)
 
         * emacs.c (main):
-        Giving `inhibit_x_windows' an initialisation loses;
+        Giving `inhibit_x_windows' an initialization loses;
         do it explicitly.
 
         * xfns.c (Fx_rubber_band):
@@ -3291,7 +3291,7 @@
 1986-11-03  Richard Mlynarik  (mly@prep)
 
         * xterm.c (stufflines):
-        Initialise signal mask.
+        Initialize signal mask.
 
         * xterm.h:
         Add definition of sigmask
@@ -3346,7 +3346,7 @@
         New function.
 
         * window.c (Fset_window_hscroll):
-        Don't inhibit redisplay optimisations if hscroll is same.
+        Don't inhibit redisplay optimizations if hscroll is same.
 
         * ymakefile:
         rm ../etc/DOC to avoid make-docfile overwriting any files which
@@ -3358,7 +3358,7 @@
         VMS changes from Sasaki
 
         * termcap.c (tgetent):
-        Make sure `indirect' initialised.
+        Make sure `indirect' initialized.
 
         * xfns.c (grey_p and callers):
         New function to compensate for ugly chauvinistic American
@@ -3496,7 +3496,7 @@
         core-dump)
 
         Dike out global-minor-modes.  This wasn't actually being used by
-        anything (due to a bug) and wasn't even being initialised!
+        anything (due to a bug) and wasn't even being initialized!
         minor-mode-alist does what this thought it was doing.
 
 1986-10-11  Richard Mlynarik  (mly@prep)
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index cdfe63fc59c..cbf867829c7 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -6089,7 +6089,7 @@
         shrink below the minimum, this code would only try to delete it if
         it had a parent.  Well, even if the window doesn't have a parent,
         you want Fdelete_window to signal an error, since you're trying to
-        resize one of the undeleteable windows into nothingness.  So call
+        resize one of the undeletable windows into nothingness.  So call
         Fdelete_window even if the window doesn't have a parent.
 
         * window.c (MINSIZE): Add kludge so that the minibuffer is always
@@ -9010,7 +9010,7 @@
         * keyboard.c (cmd_error): If an error occurs before somebody has
         provided a screen to print it on, print it to stderr and exit
         Emacs.  Handle batch-mode errors with the same code.
-        * lisp.h (Qexternal_debugging_ouput): New extern declaration, for
+        * lisp.h (Qexternal_debugging_output): New extern declaration, for
         use in cmd_error.
 
         * screen.c (Fscreen_pixel_size, Fset_screen_position): Doc fix.
@@ -13137,7 +13137,7 @@
         * print.c: Include dispextern.h.
         (printchar, strout): Use message_buf.
 
-        * sysdep.c (get_screen_size): Don't use MscreenWidth, MscreenLenght.
+        * sysdep.c (get_screen_size): Don't use MscreenWidth, MscreenLength.
         * term.c: Likewise.
 
         * scroll.c (CalcIDCosts, CalcIDCosts1, CalcLID): These now take a
@@ -13147,7 +13147,7 @@
         (do_scrolling): Use alloca for queue.
 
         * dispnew.c (remake_screen_structures): Allocate message_buf.
-        Don't use MscreenWidth, MscreenLenght.
+        Don't use MscreenWidth, MscreenLength.
 
         * xdisp.c: bf_cur replaced with current_buffer.
         Calls to SetBfx deleted.
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index 208d9c2cdb0..88c9e3dbf71 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -3656,7 +3656,7 @@
 
         * m/delta.h (BROKEN_CLOSEDIR): Added because closedir is interruptible.
         (HAVE_UNISTD_H): Deleted because configure takes care of it.
-        (C_SWITCH_MACHINE): Added optimisation options for gnu cc.
+        (C_SWITCH_MACHINE): Added optimization options for gnu cc.
 
 1993-12-17  Mike Long  (mike.long@analog.com)
 
@@ -5007,7 +5007,7 @@
         Change display code to handle the `invisible' text property.
         * dispnew.c (direct_output_for_insert): Fail if character
         just inserted has text properties.
-        (direct_ouput_forward_char): Fail if moving near invisible chars.
+        (direct_output_forward_char): Fail if moving near invisible chars.
         * indent.c (compute_motion): Compute correctly for invisible text.
         (vmotion): Take care of invisible newlines.
         * intervals.c (set_point): Ignore `invisible' property
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index 1f21e9fb99c..ee79917a34d 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -3463,7 +3463,7 @@
 
         * lisp.h (running_asynch_code): New global flag.
         * emacs.c (running_asynch_code): New global flag.
-        (main): Initialise it.
+        (main): Initialize it.
         * process.c (read_process_output, exec_sentinel): Set and
         reset the running_asynch_code global flag and restore match data.
 
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 141a570040c..af97d0de7b4 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -1182,7 +1182,7 @@
         support in sys_select.
 
         (term_ntproc): New function.
-        (init_ntproc): New function to initialise socket support and make
+        (init_ntproc): New function to initialize socket support and make
         initial std handles non-inheritable.  Also ensure stdin, stdout
         and stderr have valid handles so that pipes and sockets can't
         inadvertently use fd 0, 1, or 2.
@@ -1440,7 +1440,7 @@
         Correctly detect when default_directory is absolute.
         Be strict when looking for MSDOS drive specifier; defer calling
         getdefdir.  Ignore drive specifier if name now has UNC prefix.
-        Correctly recognise if name is not absolute when trying simple
+        Correctly recognize if name is not absolute when trying simple
         method to expand; return original string if possible.
         Skip dir sep after ~ or ~user.
         Use getpwnam instead of HOME for ~user on NT.
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 73d0d45e9c1..fc97acdeb1e 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -5774,7 +5774,7 @@
 
         (w32_initialize): Set input mode.  Use w32_msg_worker instead
         of windows_msg_worker.  Dynamically link proportional scroll bar
-        functions and intialize proportional scroll bar variables.
+        functions and initialize proportional scroll bar variables.
         (syms_of_w32term): DEFVAR new variables.
 
         * w32term.h (w32_output): New fields menubar_widget, menubar_active,
@@ -10963,7 +10963,7 @@
 1996-08-28  Morten Welinder  <terra@diku.dk>
 
         * minibuf.c (Vhistory_length, Qhistory_length): New variables.
-        (syms_of_minibuf): Register and initialise these.
+        (syms_of_minibuf): Register and initialize these.
         (read_minibuf): Truncate history list if needed.
 
 1996-08-28  Richard Stallman  <rms@psilocin.gnu.ai.mit.edu>
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 00e4a1f62c8..e21af17657f 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -2723,7 +2723,7 @@
         (CURSOR_FACE_ID, MOUSE_FACE_ID): New.
 
         * xfaces.c (Qscroll_bar, Qcursor, Qborder, Qmouse): New.
-        (syms_of_xfaces): Intialize new symbols.
+        (syms_of_xfaces): Initialize new symbols.
 
         * fns.c (Fmakehash): Take one argument, test, make all the
         rest keyword arguments.
@@ -9227,7 +9227,7 @@
         * xdisp.c (store_frame_title_char): New function to store a
         single character for the frame title with re-allocation of
         frame_title_buf.
-        (init_xdisp): Intialize frame_title_.* variables to null.
+        (init_xdisp): Initialize frame_title_.* variables to null.
 
         * dispnew.c (quit_error_check): Removed.
 
@@ -12321,7 +12321,7 @@
         (enumfont_t): Remove unused head pointer.
         (enum_font_cb2): Dereference elfLogFont.
         (w32_list_bdf_fonts): New function.
-        (w32_list_fonts): Use one_w32_dispay_info instead of insisting on
+        (w32_list_fonts): Use one_w32_display_info instead of insisting on
         valid frame.  Remove MessageBox.  Support BDF fonts.
         (Fw32_find_bdf_fonts): New function.
         (syms_of_w32fns): Add Vw32_bdf_filename_alist and
@@ -13266,7 +13266,7 @@
 
         * charset.c (Fchar_bytes): Doc fix.
         (char_bytes): Fix returned value to match returned type.
-        (syms_of_charset): Fix type clash in initialisation of
+        (syms_of_charset): Fix type clash in initialization of
         Vauto_fill_chars.
 
 1998-10-29  Geoff Voelker  <voelker@cs.washington.edu>
@@ -13429,7 +13429,7 @@
         `x-list-fonts.c'.
         (w32_get_font_info, w32_query_font, w32_find_ccl_program): New
         functions for fontset support - adapted from x_ equivalents.
-        (syms_of_w32fns): New lisp variables initialised.  Function
+        (syms_of_w32fns): New lisp variables initialized.  Function
         pointers for fontset.c set up.
 
         * w32term.c: Include fontset.h.  Define codepage macros.
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index 9e7bd24f792..6f007992bef 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -5150,7 +5150,7 @@
 2000-11-27  Jason Rumney  <jasonr@gnu.org>
 
         * w32fns.c (w32_load_system_font): Always mark font as double byte
-        if codepage is unicode.
+        if codepage is Unicode.
 
 2000-11-27  Gerd Moellmann  <gerd@gnu.org>
 
diff --git a/src/alloc.c b/src/alloc.c
index 5d04bd77872..96d63f53cf9 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -203,9 +203,6 @@ static int malloc_hysteresis;
    remapping on more recent systems because this is less important
    nowadays than in the days of small memories and timesharing.  */
 
-#ifndef VIRT_ADDR_VARIES
-static
-#endif
 EMACS_INT pure[(PURESIZE + sizeof (EMACS_INT) - 1) / sizeof (EMACS_INT)] = {1,};
 #define PUREBEG (char *) pure
 
@@ -222,10 +219,7 @@ static ptrdiff_t pure_bytes_used_before_overflow;
 /* Value is non-zero if P points into pure space.  */
 
 #define PURE_POINTER_P(P)                                       \
-     (((PNTR_COMPARISON_TYPE) (P)                               \
-       < (PNTR_COMPARISON_TYPE) ((char *) purebeg + pure_size)) \
-      && ((PNTR_COMPARISON_TYPE) (P)                            \
-          >= (PNTR_COMPARISON_TYPE) purebeg))
+  ((uintptr_t) (P) - (uintptr_t) purebeg <= pure_size)
 
 /* Index in pure at which next pure Lisp object will be allocated.. */
 
diff --git a/src/bidi.c b/src/bidi.c
index e688637a408..e0337927ec5 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -51,7 +51,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
    A note about references to UAX#9 rules: if the reference says
    something like "X9/Retaining", it means that you need to refer to
-   rule X9 and to its modifications decribed in the "Implementation
+   rule X9 and to its modifications described in the "Implementation
    Notes" section of UAX#9, under "Retaining Format Codes".  */
 
 #include <config.h>
diff --git a/src/buffer.c b/src/buffer.c
index 90b43d29fc8..a327a1650f1 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4400,7 +4400,7 @@ static int mmap_fd_1;
 
 static int mmap_page_size;
 
-/* 1 means mmap has been intialized.  */
+/* 1 means mmap has been initialized.  */
 
 static int mmap_initialized_p;
 
@@ -4439,7 +4439,7 @@ static int mmap_initialized_p;
 #define MMAP_ALLOCATED_P(start, end) 1
 #endif
 
-/* Perform necessary intializations for the use of mmap.  */
+/* Perform necessary initializations for the use of mmap.  */
 
 static void
 mmap_init (void)
diff --git a/src/buffer.h b/src/buffer.h
index a6b82abf053..fa65a4b81fd 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -978,7 +978,7 @@ extern int last_per_buffer_idx;
    variable has an index > 0 associated with it, except when it always
    has buffer-local values, in which case the index is -1.  If this is
    0, this is a bug and means that the slot of VAR in
-   buffer_local_flags wasn't intiialized.  */
+   buffer_local_flags wasn't initialized.  */
 
 #define PER_BUFFER_VAR_IDX(VAR) \
     PER_BUFFER_IDX (PER_BUFFER_VAR_OFFSET (VAR))
diff --git a/src/casetab.c b/src/casetab.c
index 3433b313c03..575a48ed146 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -95,7 +95,7 @@ CANONICALIZE maps each character to a canonical equivalent;
  any two characters that are related by case-conversion have the same
  canonical equivalent character; it may be nil, in which case it is
  deduced from DOWNCASE and UPCASE.
-EQUIVALENCES is a map that cyclicly permutes each equivalence class
+EQUIVALENCES is a map that cyclically permutes each equivalence class
  (of characters with the same canonical equivalent); it may be nil,
  in which case it is deduced from CANONICALIZE.  */)
   (Lisp_Object table)
diff --git a/src/ccl.c b/src/ccl.c
index 6366f1acb88..84d7a6a25ff 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -47,7 +47,7 @@ static Lisp_Object Qcode_conversion_map;
 static Lisp_Object Qcode_conversion_map_id;
 
 /* Symbols of ccl program have this property, a value of the property
-   is an index for Vccl_protram_table. */
+   is an index for Vccl_program_table. */
 static Lisp_Object Qccl_program_idx;
 
 /* Table of registered CCL programs.  Each element is a vector of
@@ -826,7 +826,7 @@ while (0)
    : (charset = CHARSET_FROM_ID ((id)), DECODE_CHAR (charset, (code))))
 
 /* Encode character C by some of charsets in CHARSET_LIST.  Set ID to
-   the id of the used charset, ENCODED to the resulf of encoding.
+   the id of the used charset, ENCODED to the result of encoding.
    Assume that we can use the variable `charset'.  */
 
 #define CCL_ENCODE_CHAR(c, charset_list, id, encoded)           \
diff --git a/src/character.c b/src/character.c
index a21760c8ab2..88b1f11b96b 100644
--- a/src/character.c
+++ b/src/character.c
@@ -669,7 +669,7 @@ str_as_multibyte (unsigned char *str, EMACS_INT len, EMACS_INT nbytes,
 }
 
 /* Parse unibyte string at STR of LEN bytes, and return the number of
-   bytes it may ocupy when converted to multibyte string by
+   bytes it may occupy when converted to multibyte string by
    `str_to_multibyte'.  */
 
 EMACS_INT
diff --git a/src/character.h b/src/character.h
index 09bcf17ab96..5ae6cb8c49c 100644
--- a/src/character.h
+++ b/src/character.h
@@ -596,7 +596,7 @@ sanitize_char_width (EMACS_INT width)
    ? ASCII_CHAR_WIDTH (c)       \
    : sanitize_char_width (XINT (CHAR_TABLE_REF (Vchar_width_table, c))))
 
-/* If C is a variation selector, return the index numnber of the
+/* If C is a variation selector, return the index of the
    variation selector (1..256).  Otherwise, return 0.  */
 
 #define CHAR_VARIATION_SELECTOR_P(c)            \
diff --git a/src/charset.c b/src/charset.c
index 266753f9d05..b6921a762b6 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2082,7 +2082,7 @@ that case, find the charset from what supported by that coding system.  */)
 DEFUN ("charset-after", Fcharset_after, Scharset_after, 0, 1, 0,
        doc: /*
 Return charset of a character in the current buffer at position POS.
-If POS is nil, it defauls to the current point.
+If POS is nil, it defaults to the current point.
 If POS is out of range, the value is nil.  */)
   (Lisp_Object pos)
 {
diff --git a/src/chartab.c b/src/chartab.c
index 724b3076a11..8d903749284 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -747,7 +747,7 @@ equivalent and can be merged.  It defaults to `equal'.  */)
    ARG is passed to C_FUNCTION when that is called.
 
    It returns the value of last character covered by TABLE (not the
-   value inheritted from the parent), and by side-effect, the car part
+   value inherited from the parent), and by side-effect, the car part
    of RANGE is updated to the minimum character C where C and all the
    following characters in TABLE have the same value.  */
 
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 52e08d8ee2a..7984be3564b 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -184,7 +184,7 @@ static int xd_in_read_queued_messages = 0;
 #endif
 
 /* This was a macro.  On Solaris 2.11 it was said to compile for
-   hours, when optimzation is enabled.  So we have transferred it into
+   hours, when optimization is enabled.  So we have transferred it into
    a function.  */
 /* Determine the DBusType of a given Lisp symbol.  OBJECT must be one
    of the predefined D-Bus type symbols.  */
diff --git a/src/dispextern.h b/src/dispextern.h
index 006ceb31a5a..a45c5cc138f 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2677,11 +2677,11 @@ struct redisplay_interface
   void (*flush_display) (struct frame *f);
 
   /* Flush the display of frame F if non-NULL.  This is called
-     during redisplay, and should be NULL on systems which flushes
+     during redisplay, and should be NULL on systems which flush
      automatically before reading input.  */
   void (*flush_display_optional) (struct frame *f);
 
-  /* Clear the mouse hightlight in window W, if there is any.  */
+  /* Clear the mouse highlight in window W, if there is any.  */
   void (*clear_window_mouse_face) (struct window *w);
 
   /* Set *LEFT and *RIGHT to the left and right overhang of GLYPH on
@@ -3154,6 +3154,9 @@ void compute_fringe_widths (struct frame *, int);
 void w32_init_fringe (struct redisplay_interface *);
 void w32_reset_fringes (void);
 #endif
+
+extern unsigned row_hash (struct glyph_row *);
+
 /* Defined in image.c */
 
 #ifdef HAVE_WINDOW_SYSTEM
diff --git a/src/dispnew.c b/src/dispnew.c
index 700952f6ae3..b920693688c 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -438,18 +438,7 @@ margin_glyphs_to_reserve (struct window *w, int total_glyphs, Lisp_Object margin
 int
 verify_row_hash (struct glyph_row *row)
 {
-  int area, k;
-  unsigned row_hash = 0;
-
-  for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
-    for (k = 0; k < row->used[area]; ++k)
-      row_hash = ((((row_hash << 4) + (row_hash >> 24)) & 0x0fffffff)
-                  + row->glyphs[area][k].u.val
-                  + row->glyphs[area][k].face_id
-                  + row->glyphs[area][k].padding_p
-                  + (row->glyphs[area][k].type << 2));
-
-  return row_hash == row->hash;
+  return row->hash == row_hash (row);
 }
 #endif
 
@@ -1087,37 +1076,55 @@ swap_glyphs_in_rows (struct glyph_row *a, struct glyph_row *b)
 
 #endif /* 0 */
 
-/* Exchange pointers to glyph memory between glyph rows A and B.  */
+/* Exchange pointers to glyph memory between glyph rows A and B.  Also
+   exchange the used[] array and the hash values of the rows, because
+   these should all go together for the row's hash value to be
+   correct.  */
 
 static inline void
 swap_glyph_pointers (struct glyph_row *a, struct glyph_row *b)
 {
   int i;
+  unsigned hash_tem = a->hash;
+
   for (i = 0; i < LAST_AREA + 1; ++i)
     {
       struct glyph *temp = a->glyphs[i];
+      short used_tem = a->used[i];
+
       a->glyphs[i] = b->glyphs[i];
       b->glyphs[i] = temp;
+      a->used[i] = b->used[i];
+      b->used[i] = used_tem;
     }
+  a->hash = b->hash;
+  b->hash = hash_tem;
 }
 
 
 /* Copy glyph row structure FROM to glyph row structure TO, except
-   that glyph pointers in the structures are left unchanged.  */
+   that glyph pointers, the `used' counts, and the hash values in the
+   structures are left unchanged.  */
 
 static inline void
 copy_row_except_pointers (struct glyph_row *to, struct glyph_row *from)
 {
   struct glyph *pointers[1 + LAST_AREA];
+  short used[1 + LAST_AREA];
+  unsigned hashval;
 
   /* Save glyph pointers of TO.  */
   memcpy (pointers, to->glyphs, sizeof to->glyphs);
+  memcpy (used, to->used, sizeof to->used);
+  hashval = to->hash;
 
   /* Do a structure assignment.  */
   *to = *from;
 
   /* Restore original pointers of TO.  */
   memcpy (to->glyphs, pointers, sizeof to->glyphs);
+  memcpy (to->used, used, sizeof to->used);
+  to->hash = hashval;
 }
 
 
@@ -4240,6 +4247,7 @@ add_row_entry (struct glyph_row *row)
   ptrdiff_t i = row->hash % row_table_size;
 
   entry = row_table[i];
+  xassert (entry || verify_row_hash (row));
   while (entry && !row_equal_p (entry->row, row, 1))
     entry = entry->next;
 
diff --git a/src/fileio.c b/src/fileio.c
index 44a85ab1977..7e75e6285f0 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -62,7 +62,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef DOS_NT
 /* On Windows, drive letters must be alphabetic - on DOS, the Netware
-   redirector allows the six letters between 'Z' and 'a' as well. */
+   redirector allows the six letters between 'Z' and 'a' as well.  */
 #ifdef MSDOS
 #define IS_DRIVE(x) ((x) >= 'A' && (x) <= 'z')
 #endif
@@ -70,7 +70,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define IS_DRIVE(x) isalpha ((unsigned char) (x))
 #endif
 /* Need to lower-case the drive letter, or else expanded
-   filenames will sometimes compare inequal, because
+   filenames will sometimes compare unequal, because
    `expand-file-name' doesn't always down-case the drive letter.  */
 #define DRIVE_LETTER(x) (tolower ((unsigned char) (x)))
 #endif
@@ -338,7 +338,7 @@ Given a Unix syntax file name, returns a string ending in slash.  */)
 
   while (p != beg && !IS_DIRECTORY_SEP (p[-1])
 #ifdef DOS_NT
-         /* only recognise drive specifier at the beginning */
+         /* only recognize drive specifier at the beginning */
          && !(p[-1] == ':'
               /* handle the "/:d:foo" and "/:foo" cases correctly  */
               && ((p == beg + 2 && !IS_DIRECTORY_SEP (*beg))
@@ -401,7 +401,7 @@ or the entire name if it contains no slash.  */)
 
   while (p != beg && !IS_DIRECTORY_SEP (p[-1])
 #ifdef DOS_NT
-         /* only recognise drive specifier at beginning */
+         /* only recognize drive specifier at beginning */
          && !(p[-1] == ':'
               /* handle the "/:d:foo" case correctly  */
               && (p == beg + 2 || (p == beg + 4 && IS_DIRECTORY_SEP (*beg))))
@@ -3686,6 +3686,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
       int this_count = SPECPDL_INDEX ();
       int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
       Lisp_Object conversion_buffer;
+      struct gcpro gcpro1;
 
       conversion_buffer = code_conversion_save (1, multibyte);
 
@@ -3706,7 +3707,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
         {
           /* We read one bunch by one (READ_BUF_SIZE bytes) to allow
              quitting while reading a huge while.  */
-          /* try is reserved in some compilers (Microsoft C) */
+          /* `try'' is reserved in some compilers (Microsoft C).  */
           EMACS_INT trytry = min (total - how_much,
                                   READ_BUF_SIZE - unprocessed);
 
diff --git a/src/fns.c b/src/fns.c
index 392f447a6d8..04b51d10d9b 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3252,7 +3252,7 @@ DEFUN ("base64-decode-string", Fbase64_decode_string, Sbase64_decode_string,
   return decoded_string;
 }
 
-/* Base64-decode the data at FROM of LENGHT bytes into TO.  If
+/* Base64-decode the data at FROM of LENGTH bytes into TO.  If
    MULTIBYTE is nonzero, the decoded result should be in multibyte
    form.  If NCHARS_RETRUN is not NULL, store the number of produced
    characters in *NCHARS_RETURN.  */
diff --git a/src/fontset.c b/src/fontset.c
index 34b2131832f..9697f62ea72 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -905,7 +905,7 @@ face_suitable_for_char_p (struct face *face, int c)
 
 
 /* Return ID of face suitable for displaying character C on frame F.
-   FACE must be reazlied for ASCII characters in advance.  Called from
+   FACE must be realized for ASCII characters in advance.  Called from
    the macro FACE_FOR_CHAR.  */
 
 int
@@ -1346,7 +1346,7 @@ accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val)
 
    In FONTSET, set FONT_DEF in a fashion specified by ADD for
    characters in RANGE and ranges in SCRIPT_RANGE_LIST before RANGE.
-   The consumed ranges are poped up from SCRIPT_RANGE_LIST, and the
+   The consumed ranges are popped up from SCRIPT_RANGE_LIST, and the
    new SCRIPT_RANGE_LIST is stored in ARG.
 
    If ASCII is nil, don't set FONT_DEF for ASCII characters.  It is
diff --git a/src/frame.c b/src/frame.c
index c14f4db91da..039ed6543cb 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -374,7 +374,7 @@ make_frame (int mini_p)
 
     /* Use set_window_buffer, not Fset_window_buffer, and don't let
        hooks be run by it.  The reason is that the whole frame/window
-       arrangement is not yet fully intialized at this point.  Windows
+       arrangement is not yet fully initialized at this point.  Windows
        don't have the right size, glyph matrices aren't initialized
        etc.  Running Lisp functions at this point surely ends in a
        SEGV.  */
@@ -1359,6 +1359,13 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
     /* If needed, delete the terminal that this frame was on.
        (This must be done after the frame is killed.) */
     terminal->reference_count--;
+#ifdef USE_GTK
+    /* FIXME: Deleting the terminal crashes emacs because of a GTK
+       bug.
+       http://lists.gnu.org/archive/html/emacs-devel/2011-10/msg00363.html */
+    if (terminal->reference_count == 0 && terminal->type == output_x_window)
+      terminal->reference_count = 1;
+#endif /* USE_GTK */
     if (terminal->reference_count == 0)
       {
         Lisp_Object tmp;
@@ -1705,7 +1712,7 @@ If omitted, FRAME defaults to the currently selected frame.  */)
 }
 
 /* Update the display_time slot of the buffers shown in WINDOW
-   and all its descendents.  */
+   and all its descendants.  */
 
 static void
 make_frame_visible_1 (Lisp_Object window)
diff --git a/src/ftfont.c b/src/ftfont.c
index 7858a31be21..5c540f9bf82 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -272,7 +272,7 @@ ftfont_pattern_entity (FcPattern *p, Lisp_Object extra)
     }
   else
     {
-      /* As this font is not scalable, parhaps this is a BDF or PCF
+      /* As this font is not scalable, perhaps this is a BDF or PCF
          font. */
       FT_Face ft_face;
 
@@ -730,7 +730,7 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots
 
   if ((n = FONT_SLANT_NUMERIC (spec)) >= 0
       && n < 100)
-    /* Fontconfig doesn't support reverse-italic/obligue.  */
+    /* Fontconfig doesn't support reverse-italic/oblique.  */
     return NULL;
 
   if (INTEGERP (AREF (spec, FONT_DPI_INDEX)))
diff --git a/src/ftxfont.c b/src/ftxfont.c
index bbba3ca8163..608cfd8d44d 100644
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -55,7 +55,7 @@ struct ftxfont_frame_data
 {
   /* Background and foreground colors.  */
   XColor colors[2];
-  /* GCs interporationg the above colors.  gcs[0] is for a color
+  /* GCs interpolating the above colors.  gcs[0] is for a color
    closest to BACKGROUND, and gcs[5] is for a color closest to
    FOREGROUND.  */
   GC gcs[6];
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 0b7fd41f5f6..7e6f5c3164d 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -127,7 +127,7 @@ xg_set_screen (GtkWidget *w, FRAME_PTR f)
 
    Returns non-zero if display could be opened, zero if display could not
    be opened, and less than zero if the GTK version doesn't support
-   multipe displays.  */
+   multiple displays.  */
 
 void
 xg_display_open (char *display_name, Display **dpy)
@@ -348,7 +348,7 @@ file_for_image (Lisp_Object image)
 
 /* For the image defined in IMG, make and return a GtkImage.  For displays with
    8 planes or less we must make a GdkPixbuf and apply the mask manually.
-   Otherwise the highlightning and dimming the tool bar code in GTK does
+   Otherwise the highlighting and dimming the tool bar code in GTK does
    will look bad.  For display with more than 8 planes we just use the
    pixmap and mask directly.  For monochrome displays, GTK doesn't seem
    able to use external pixmaps, it looks bad whatever we do.
@@ -2363,7 +2363,7 @@ xg_create_one_menuitem (widget_value *item,
    HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
    POP_UP_P is non-zero if we shall create a popup menu.
    MENU_BAR_P is non-zero if we shall create a menu bar.
-   ADD_TEAROFF_P is non-zero if we shall add a teroff menu item.  Ignored
+   ADD_TEAROFF_P is non-zero if we shall add a tearoff menu item.  Ignored
    if MENU_BAR_P is non-zero.
    TOPMENU is the topmost GtkWidget that others shall be placed under.
    It may be NULL, in that case we create the appropriate widget
@@ -4262,7 +4262,7 @@ xg_make_tool_item (FRAME_PTR f,
 #endif
       gtk_tool_item_set_homogeneous (ti, FALSE);
 
-      /* Callback to save modifyer mask (Shift/Control, etc).  GTK makes
+      /* Callback to save modifier mask (Shift/Control, etc).  GTK makes
          no distinction based on modifiers in the activate callback,
          so we have to do it ourselves.  */
       g_signal_connect (wb, "button-release-event",
diff --git a/src/image.c b/src/image.c
index e80f2b72102..8b61c7eefbc 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7754,7 +7754,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
     }
 
   /* Finally we are done manipulating the image.  Figure out the
-     resulting width/height and transfer ownerwship to Emacs.  */
+     resulting width/height and transfer ownership to Emacs.  */
   height = MagickGetImageHeight (image_wand);
   width = MagickGetImageWidth (image_wand);
 
@@ -7786,7 +7786,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
           goto imagemagick_error;
         }
 
-      /* Copy imagegmagick image to x with primitive yet robust pixel
+      /* Copy imagemagick image to x with primitive yet robust pixel
          pusher loop.  This has been tested a lot with many different
          images.  */
 
diff --git a/src/insdel.c b/src/insdel.c
index 01e5c57b2b0..e39a362eac7 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1316,7 +1316,7 @@ replace_range (EMACS_INT from, EMACS_INT to, Lisp_Object new,
 
   UNGCPRO;
 
-  /* Make args be valid */
+  /* Make args be valid.  */
   if (from < BEGV)
     from = BEGV;
   if (to > ZV)
diff --git a/src/intervals.c b/src/intervals.c
index a78c7f07f6c..05b7175ac3f 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1317,7 +1317,7 @@ interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from,
   if (NULL_INTERVAL_P (tree))
     return 0;
 
-  /* Left branch */
+  /* Left branch.  */
   if (relative_position < LEFT_TOTAL_LENGTH (tree))
     {
       EMACS_INT subtract = interval_deletion_adjustment (tree->left,
@@ -1327,7 +1327,7 @@ interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from,
       CHECK_TOTAL_LENGTH (tree);
       return subtract;
     }
-  /* Right branch */
+  /* Right branch.  */
   else if (relative_position >= (TOTAL_LENGTH (tree)
                                  - RIGHT_TOTAL_LENGTH (tree)))
     {
@@ -1699,54 +1699,37 @@ graft_intervals_into_buffer (INTERVAL source, EMACS_INT position,
                                  Qnil, buf, 0);
         }
       if (! NULL_INTERVAL_P (BUF_INTERVALS (buffer)))
-        /* Shouldn't be necessary.  -stef  */
+        /* Shouldn't be necessary.  --Stef  */
         BUF_INTERVALS (buffer) = balance_an_interval (BUF_INTERVALS (buffer));
       return;
     }
 
-  if (NULL_INTERVAL_P (tree))
-    {
-      /* The inserted text constitutes the whole buffer, so
+  eassert (length == TOTAL_LENGTH (source));
+
+  if ((BUF_Z (buffer) - BUF_BEG (buffer)) == length)
+    {  /* The inserted text constitutes the whole buffer, so
          simply copy over the interval structure.  */
-      if ((BUF_Z (buffer) - BUF_BEG (buffer)) == TOTAL_LENGTH (source))
-        {
           Lisp_Object buf;
           XSETBUFFER (buf, buffer);
           BUF_INTERVALS (buffer) = reproduce_tree_obj (source, buf);
-          BUF_INTERVALS (buffer)->position = BEG;
-          BUF_INTERVALS (buffer)->up_obj = 1;
-
+      BUF_INTERVALS (buffer)->position = BUF_BEG (buffer);
+      eassert (BUF_INTERVALS (buffer)->up_obj == 1);
           return;
         }
-
-      /* Create an interval tree in which to place a copy
+  else if (NULL_INTERVAL_P (tree))
+    { /* Create an interval tree in which to place a copy
          of the intervals of the inserted string.  */
-      {
         Lisp_Object buf;
         XSETBUFFER (buf, buffer);
         tree = create_root_interval (buf);
       }
-    }
-  else if (TOTAL_LENGTH (tree) == TOTAL_LENGTH (source))
-    /* If the buffer contains only the new string, but
-       there was already some interval tree there, then it may be
-       some zero length intervals.  Eventually, do something clever
-       about inserting properly.  For now, just waste the old intervals.  */
-    {
-      BUF_INTERVALS (buffer) = reproduce_tree (source, INTERVAL_PARENT (tree));
-      BUF_INTERVALS (buffer)->position = BEG;
-      BUF_INTERVALS (buffer)->up_obj = 1;
-      /* Explicitly free the old tree here.  */
-
-      return;
-    }
   /* Paranoia -- the text has already been added, so this buffer
      should be of non-zero length.  */
   else if (TOTAL_LENGTH (tree) == 0)
     abort ();
 
   this = under = find_interval (tree, position);
-  if (NULL_INTERVAL_P (under))  /* Paranoia */
+  if (NULL_INTERVAL_P (under))  /* Paranoia.  */
     abort ();
   over = find_interval (source, interval_start_pos (source));
 
@@ -1917,7 +1900,7 @@ set_point (EMACS_INT charpos)
    current buffer, and the invisible property has a `stickiness' such that
    inserting a character at position POS would inherit the property it,
    return POS + ADJ, otherwise return POS.  If TEST_INTANG is non-zero,
-   then intangibility is required as well as invisibleness.
+   then intangibility is required as well as invisibility.
 
    TEST_OFFS should be either 0 or -1, and ADJ should be either 1 or -1.
 
diff --git a/src/intervals.h b/src/intervals.h
index 720598fe7a6..977f3d965a4 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -64,71 +64,71 @@ struct interval
   Lisp_Object plist;
 };
 
-/* These are macros for dealing with the interval tree. */
+/* These are macros for dealing with the interval tree.  */
 
-/* Size of the structure used to represent an interval */
+/* Size of the structure used to represent an interval.  */
 #define INTERVAL_SIZE (sizeof (struct interval))
 
-/* Size of a pointer to an interval structure */
+/* Size of a pointer to an interval structure.  */
 #define INTERVAL_PTR_SIZE (sizeof (struct interval *))
 
 #define NULL_INTERVAL_P(i) ((i) == NULL_INTERVAL)
 
-/* True if this interval has no right child. */
+/* True if this interval has no right child.  */
 #define NULL_RIGHT_CHILD(i) ((i)->right == NULL_INTERVAL)
 
-/* True if this interval has no left child. */
+/* True if this interval has no left child.  */
 #define NULL_LEFT_CHILD(i) ((i)->left == NULL_INTERVAL)
 
-/* True if this interval has no parent. */
+/* True if this interval has no parent.  */
 #define NULL_PARENT(i) ((i)->up_obj || (i)->up.interval == 0)
 
-/* True if this interval is the left child of some other interval. */
+/* True if this interval is the left child of some other interval.  */
 #define AM_LEFT_CHILD(i) (! NULL_PARENT (i) \
                           && INTERVAL_PARENT (i)->left == (i))
 
-/* True if this interval is the right child of some other interval. */
+/* True if this interval is the right child of some other interval.  */
 #define AM_RIGHT_CHILD(i) (! NULL_PARENT (i) \
                            && INTERVAL_PARENT (i)->right == (i))
 
-/* True if this interval has no children. */
+/* True if this interval has no children.  */
 #define LEAF_INTERVAL_P(i) ((i)->left == NULL_INTERVAL \
                             && (i)->right == NULL_INTERVAL)
 
-/* True if this interval has no parent and is therefore the root. */
+/* True if this interval has no parent and is therefore the root.  */
 #define ROOT_INTERVAL_P(i) (NULL_PARENT (i))
 
-/* True if this interval is the only interval in the interval tree. */
+/* True if this interval is the only interval in the interval tree.  */
 #define ONLY_INTERVAL_P(i) (ROOT_INTERVAL_P ((i)) && LEAF_INTERVAL_P ((i)))
 
-/* True if this interval has both left and right children. */
+/* True if this interval has both left and right children.  */
 #define BOTH_KIDS_P(i) ((i)->left != NULL_INTERVAL     \
                         && (i)->right != NULL_INTERVAL)
 
 /* The total size of all text represented by this interval and all its
-   children in the tree.   This is zero if the interval is null. */
+   children in the tree.   This is zero if the interval is null.  */
 #define TOTAL_LENGTH(i) ((i) == NULL_INTERVAL ? 0 : (i)->total_length)
 
-/* The size of text represented by this interval alone. */
+/* The size of text represented by this interval alone.  */
 #define LENGTH(i) ((i) == NULL_INTERVAL ? 0 : (TOTAL_LENGTH ((i))          \
                                                - TOTAL_LENGTH ((i)->right) \
                                                - TOTAL_LENGTH ((i)->left)))
 
 /* The position of the character just past the end of I.  Note that
-   the position cache i->position must be valid for this to work. */
+   the position cache i->position must be valid for this to work.  */
 #define INTERVAL_LAST_POS(i) ((i)->position + LENGTH ((i)))
 
-/* The total size of the left subtree of this interval. */
+/* The total size of the left subtree of this interval.  */
 #define LEFT_TOTAL_LENGTH(i) ((i)->left ? (i)->left->total_length : 0)
 
-/* The total size of the right subtree of this interval. */
+/* The total size of the right subtree of this interval.  */
 #define RIGHT_TOTAL_LENGTH(i) ((i)->right ? (i)->right->total_length : 0)
 
 
-/* These macros are for dealing with the interval properties. */
+/* These macros are for dealing with the interval properties.  */
 
 /* True if this is a default interval, which is the same as being null
-   or having no properties. */
+   or having no properties.  */
 #define DEFAULT_INTERVAL_P(i) (NULL_INTERVAL_P (i) || EQ ((i)->plist, Qnil))
 
 /* Test what type of parent we have.  Three possibilities: another
@@ -169,7 +169,7 @@ struct interval
     }                                        \
   while (0)
 
-/* Reset this interval to its vanilla, or no-property state. */
+/* Reset this interval to its vanilla, or no-property state.  */
 #define RESET_INTERVAL(i) \
 { \
     (i)->total_length = (i)->position = 0;    \
@@ -181,7 +181,7 @@ struct interval
     (i)->plist = Qnil;                        \
 }
 
-/* Copy the cached property values of interval FROM to interval TO. */
+/* Copy the cached property values of interval FROM to interval TO.  */
 #define COPY_INTERVAL_CACHE(from,to) \
 { \
   (to)->write_protect = (from)->write_protect; \
@@ -190,7 +190,7 @@ struct interval
   (to)->rear_sticky = (from)->rear_sticky;     \
 }
 
-/* Copy only the set bits of FROM's cache. */
+/* Copy only the set bits of FROM's cache.  */
 #define MERGE_INTERVAL_CACHE(from,to) \
 { \
   if ((from)->write_protect) (to)->write_protect = 1; \
@@ -201,18 +201,18 @@ struct interval
 
 /* Macro determining whether the properties of an interval being
    inserted should be merged with the properties of the text where
-   they are being inserted. */
+   they are being inserted.  */
 #define MERGE_INSERTIONS(i) 1
 
 /* Macro determining if an invisible interval should be displayed
-   as a special glyph, or not at all. */
+   as a special glyph, or not at all.  */
 #define DISPLAY_INVISIBLE_GLYPH(i) 0
 
-/* Is this interval visible?  Replace later with cache access */
+/* Is this interval visible?  Replace later with cache access.  */
 #define INTERVAL_VISIBLE_P(i) \
   (! NULL_INTERVAL_P (i) && NILP (textget ((i)->plist, Qinvisible)))
 
-/* Is this interval writable?  Replace later with cache access */
+/* Is this interval writable?  Replace later with cache access.  */
 #define INTERVAL_WRITABLE_P(i)                                  \
   (! NULL_INTERVAL_P (i)                                        \
    && (NILP (textget ((i)->plist, Qread_only))                  \
@@ -222,7 +222,7 @@ struct interval
             : !NILP (Vinhibit_read_only)))))                    \
 
 /* Macros to tell whether insertions before or after this interval
-   should stick to it. */
+   should stick to it.  */
 /* Replace later with cache access */
 /*#define FRONT_STICKY_P(i) ((i)->front_sticky != 0)
   #define END_STICKY_P(i) ((i)->rear_sticky != 0)*/
@@ -245,11 +245,11 @@ struct interval
    ? !NILP (prop)                                               \
    : invisible_p (prop, BVAR (current_buffer, invisibility_spec)))
 
-/* Declared in alloc.c */
+/* Declared in alloc.c.  */
 
 extern INTERVAL make_interval (void);
 
-/* Declared in intervals.c */
+/* Declared in intervals.c.  */
 
 extern INTERVAL create_root_interval (Lisp_Object);
 extern void copy_properties (INTERVAL, INTERVAL);
@@ -288,12 +288,12 @@ extern INTERVAL validate_interval_range (Lisp_Object, Lisp_Object *,
                                          Lisp_Object *, int);
 extern INTERVAL interval_of (EMACS_INT, Lisp_Object);
 
-/* Defined in xdisp.c */
+/* Defined in xdisp.c.  */
 extern int invisible_p (Lisp_Object, Lisp_Object);
 
-/* Declared in textprop.c */
+/* Declared in textprop.c.  */
 
-/* Types of hooks. */
+/* Types of hooks.  */
 extern Lisp_Object Qpoint_left;
 extern Lisp_Object Qpoint_entered;
 extern Lisp_Object Qmodification_hooks;
@@ -301,11 +301,11 @@ extern Lisp_Object Qcategory;
 extern Lisp_Object Qlocal_map;
 extern Lisp_Object Qkeymap;
 
-/* Visual properties text (including strings) may have. */
+/* Visual properties text (including strings) may have.  */
 extern Lisp_Object Qfont;
 extern Lisp_Object Qinvisible, Qintangible;
 
-/* Sticky properties */
+/* Sticky properties.  */
 extern Lisp_Object Qfront_sticky, Qrear_nonsticky;
 
 EXFUN (Fget_char_property, 3);
diff --git a/src/keyboard.c b/src/keyboard.c
index 8b94ee6b5d1..bee91c6b5cf 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4823,7 +4823,7 @@ const char *const lispy_function_keys[] =
     "ico-00",        /* VK_ICO_00         0xE4 */
     0,               /* VK_PROCESSKEY     0xE5 - used by IME */
     "ico-clear",     /* VK_ICO_CLEAR      0xE6 */
-    0,               /* VK_PACKET         0xE7  - used to pass unicode chars */
+    0,               /* VK_PACKET         0xE7  - used to pass Unicode chars */
     0,               /*                   0xE8 */
     "reset",         /* VK_OEM_RESET      0xE9 */
     "jump",          /* VK_OEM_JUMP       0xEA */
@@ -10153,7 +10153,7 @@ will read just one key sequence.  */)
                          ! NILP (can_return_switch_frame), 0);
 
 #if 0  /* The following is fine for code reading a key sequence and
-          then proceeding with a lenghty computation, but it's not good
+          then proceeding with a lengthy computation, but it's not good
           for code reading keys in a loop, like an input method.  */
 #ifdef HAVE_WINDOW_SYSTEM
   if (display_hourglass_p)
@@ -12120,7 +12120,7 @@ This variable is keyboard-local.  */);
 Function key definitions that apply to all terminal devices should go
 here.  If a mapping is defined in both the current
 `local-function-key-map' binding and this variable, then the local
-definition will take precendence.  */);
+definition will take precedence.  */);
   Vfunction_key_map = Fmake_sparse_keymap (Qnil);
 
   DEFVAR_LISP ("key-translation-map", Vkey_translation_map,
diff --git a/src/keymap.c b/src/keymap.c
index 6f9cf288f6d..b429ca968d7 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2624,11 +2624,11 @@ remapped command in the returned list.  */)
       /* We have a list of advertised bindings.  */
       while (CONSP (tem))
         if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil, 0), definition))
-          return XCAR (tem);
+          RETURN_UNGCPRO (XCAR (tem));
         else
           tem = XCDR (tem);
       if (EQ (shadow_lookup (keymaps, tem, Qnil, 0), definition))
-        return tem;
+        RETURN_UNGCPRO (tem);
     }
 
   sequences = Freverse (where_is_internal (definition, keymaps,
diff --git a/src/lisp.h b/src/lisp.h
index 5407956c202..2056b7caff8 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -947,7 +947,7 @@ struct Lisp_Vector
 
 /* Compute A OP B, using the unsigned comparison operator OP.  A and B
    should be integer expressions.  This is not the same as
-   mathemeatical comparison; for example, UNSIGNED_CMP (0, <, -1)
+   mathematical comparison; for example, UNSIGNED_CMP (0, <, -1)
    returns 1.  For efficiency, prefer plain unsigned comparison if A
    and B's sizes both fit (after integer promotion).  */
 #define UNSIGNED_CMP(a, op, b)                                          \
@@ -1881,9 +1881,6 @@ typedef struct {
     CHECK_NATNUM (tmp);                 \
     XSETCDR ((x), tmp);                 \
   } while (0)
-
-/* Cast pointers to this type to compare them.  */
-#define PNTR_COMPARISON_TYPE uintptr_t
 
 /* Define a built-in function for calling from Lisp.
  `lname' should be the name to give the function in Lisp,
diff --git a/src/lread.c b/src/lread.c
index 110f3e62f71..f1f6f0cbd78 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3984,7 +3984,7 @@ init_obarray (void)
   Qnil = intern_c_string ("nil");
 
   /* Fmake_symbol inits fields of new symbols with Qunbound and Qnil,
-     so those two need to be fixed manally.  */
+     so those two need to be fixed manually.  */
   SET_SYMBOL_VAL (XSYMBOL (Qunbound), Qunbound);
   XSYMBOL (Qunbound)->function = Qunbound;
   XSYMBOL (Qunbound)->plist = Qnil;
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
deleted file mode 100644
index c309035dc5c..00000000000
--- a/src/m/ibms390.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Machine description file for IBM S390 in 32-bit mode
-
-Copyright (C) 1985-1986, 2001-2011 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-#define VIRT_ADDR_VARIES
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 04092d6e1ac..5ea7974b052 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -17,8 +17,6 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "ibms390.h"
-
 #define BITS_PER_LONG 64
 #define BITS_PER_EMACS_INT 64
 
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 16f0645715c..114b7fef963 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -19,7 +19,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #ifdef WINDOWSNT
-#define VIRT_ADDR_VARIES
 #define DATA_START      get_data_start ()
 #endif
 
@@ -28,4 +27,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* we cannot get the maximum address for brk */
 #define ULIMIT_BREAK_VALUE (32*1024*1024)
 #endif
-
diff --git a/src/m/template.h b/src/m/template.h
index 54fb0da9521..38649e8ac6d 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -21,14 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    does not define it automatically.
    Ones defined so far include m68k and many others */
 
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-#define VIRT_ADDR_VARIES
-
 /* After adding support for a new machine, modify the large case
    statement in configure.in to recognize reasonable
    configuration names, and add a description of the system to
diff --git a/src/msdos.c b/src/msdos.c
index 6b6e365a165..4c08c5b29e0 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1342,7 +1342,7 @@ static void
 IT_copy_glyphs (int xfrom, int xto, size_t len, int ypos)
 {
   /* The offsets of source and destination relative to the
-     conventional memorty selector.  */
+     conventional memory selector.  */
   int from = 2 * (xfrom + screen_size_X * ypos) + ScreenPrimary;
   int to = 2 * (xto + screen_size_X * ypos) + ScreenPrimary;
 
diff --git a/src/nsfont.m b/src/nsfont.m
index c4d9123faef..7d691ced6e1 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -256,7 +256,7 @@ ns_char_width (NSFont *sfont, int c)
 
 
 /* Return whether set1 covers set2 to a reasonable extent given by pct.
-   We check, out of each 16 unicode char range containing chars in set2,
+   We check, out of each 16 Unicode char range containing chars in set2,
    whether at least one character is present in set1.
    This must be true for pct of the pairs to consider it covering. */
 static BOOL
@@ -297,7 +297,7 @@ static NSString
 
 
 /* Convert OTF 4-letter script code to emacs script name.  (Why can't
-   everyone just use some standard unicode names for these?) */
+   everyone just use some standard Unicode names for these?) */
 static NSString
 *ns_otf_to_script (Lisp_Object otf)
 {
@@ -329,7 +329,7 @@ static NSString
 
 /* Searches the :script, :lang, and :otf extra-bundle properties of the spec,
    plus registry regular property, for something that can be mapped to a
-   unicode script.  Empty string returned if no script spec found. */
+   Unicode script.  Empty string returned if no script spec found. */
 static NSString
 *ns_get_req_script (Lisp_Object font_spec)
 {
@@ -385,7 +385,7 @@ accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val)
 }
 
 
-/* Use the unicode range information in Vchar_script_table to convert a script
+/* Use the Unicode range information in Vchar_script_table to convert a script
    name into an NSCharacterSet. */
 static NSCharacterSet
 *ns_script_to_charset (NSString *scriptName)
@@ -426,7 +426,7 @@ static NSCharacterSet
    If none are found, we reduce the percentage and try again, until 5%.
    This provides a font with at least some characters if such can be found.
    We don't use isSupersetOfSet: because (a) it doesn't work on Tiger, and
-   (b) need approximate match as fonts covering full unicode ranges are rare. */
+   (b) need approximate match as fonts covering full Unicode ranges are rare. */
 static NSSet
 *ns_get_covering_families (NSString *script, float pct)
 {
@@ -1292,7 +1292,7 @@ ns_uni_to_glyphs (struct nsfont_info *font_info, unsigned char block)
   if (!unichars || !(font_info->glyphs[block]))
     abort ();
 
-  /* create a string containing all unicode characters in this block */
+  /* create a string containing all Unicode characters in this block */
   for (idx = block<<8, i =0; i<0x100; idx++, i++)
     if (idx < 0xD800 || idx > 0xDFFF)
       unichars[i] = idx;
@@ -1487,5 +1487,5 @@ syms_of_nsfont (void)
   DEFSYM (Qroman, "roman");
   DEFSYM (Qmedium, "medium");
   DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script,
-               doc: /* Internal use: maps font registry to unicode script. */);
+               doc: /* Internal use: maps font registry to Unicode script. */);
 }
diff --git a/src/nsterm.h b/src/nsterm.h
index 574d31c962a..52246caac84 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -470,7 +470,7 @@ struct nsfont_info
   XCharStruct max_bounds;
   /* we compute glyph codes and metrics on-demand in blocks of 256 indexed
      by hibyte, lobyte */
-  unsigned short **glyphs; /* map unicode index to glyph */
+  unsigned short **glyphs; /* map Unicode index to glyph */
   struct font_metrics **metrics;
 };
 
diff --git a/src/print.c b/src/print.c
index 1d6998d8f1a..0fdb750f370 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1637,7 +1637,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
                 /* Detect circular list.  */
                 if (NILP (Vprint_circle))
                   {
-                    /* Simple but imcomplete way.  */
+                    /* Simple but incomplete way.  */
                     if (i != 0 && EQ (obj, halftail))
                       {
                         sprintf (buf, " . #%"pMd, i / 2);
diff --git a/src/process.c b/src/process.c
index 53382d804f2..a02ba44ae71 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1414,7 +1414,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS)  */)
           val = XCDR (Vdefault_process_coding_system);
       }
     XPROCESS (proc)->encode_coding_system = val;
-    /* Note: At this momemnt, the above coding system may leave
+    /* Note: At this moment, the above coding system may leave
        text-conversion or eol-conversion unspecified.  They will be
        decided after we read output from the process and decode it by
        some coding system, or just before we actually send a text to
@@ -4620,15 +4620,43 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
              some data in the TCP buffers so that select works, but
              with custom pull/push functions we need to check if some
              data is available in the buffers manually.  */
-          if (nfds == 0 &&
-              wait_proc && wait_proc->gnutls_p /* Check for valid process.  */
-              /* Do we have pending data?  */
-              && emacs_gnutls_record_check_pending (wait_proc->gnutls_state) > 0)
-          {
-              nfds = 1;
-              /* Set to Available.  */
-              FD_SET (wait_proc->infd, &Available);
-          }
+          if (nfds == 0)
+            {
+              if (! wait_proc)
+                {
+                  /* We're not waiting on a specific process, so loop
+                     through all the channels and check for data.
+                     This is a workaround needed for some versions of
+                     the gnutls library -- 2.12.14 has been confirmed
+                     to need it.  See
+                     http://comments.gmane.org/gmane.emacs.devel/145074 */
+                  struct Lisp_Process *proc;
+                  for (channel = 0; channel < MAXDESC; ++channel)
+                    {
+                      if (! NILP (chan_process[channel]) &&
+                          (proc = XPROCESS (chan_process[channel])) != NULL &&
+                          proc->gnutls_p &&
+                          proc->infd &&
+                          emacs_gnutls_record_check_pending (proc->gnutls_state) > 0)
+                        {
+                          nfds++;
+                          FD_SET (proc->infd, &Available);
+                        }
+                    }
+                }
+              else
+                {
+                  /* Check this specific channel. */
+                  if (wait_proc->gnutls_p && /* Check for valid process.  */
+                      /* Do we have pending data?  */
+                      emacs_gnutls_record_check_pending (wait_proc->gnutls_state) > 0)
+                    {
+                      nfds = 1;
+                      /* Set to Available.  */
+                      FD_SET (wait_proc->infd, &Available);
+                    }
+                }
+            }
 #endif
         }
 
diff --git a/src/puresize.h b/src/puresize.h
index c26c496a757..4290c30c68d 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -75,21 +75,7 @@ extern void pure_write_error (void) NO_RETURN;
 
 /* Define PURE_P.  */
 
-#ifdef VIRT_ADDR_VARIES
-/* For machines where text and data can go anywhere
-   in virtual memory.  */
-
 extern EMACS_INT pure[];
 
 #define PURE_P(obj) \
- ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) \
-  && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure)
-
-#else /* not VIRT_ADDR_VARIES */
-
-extern char my_edata[];
-
-#define PURE_P(obj) \
-  ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) my_edata)
-
-#endif /* VIRT_ADDRESS_VARIES */
+  ((uintptr_t) XPNTR (obj) - (uintptr_t) pure <= PURESIZE)
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index af5308ff7bb..8f5a0ab1fc7 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -91,9 +91,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    why it needed to be changed.  */
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
 
-/* Virtual addresses of pure and impure space can vary, as on Windows.  */
-#define VIRT_ADDR_VARIES
-
 /* Emacs supplies its own malloc, but glib (part of Gtk+) calls
    memalign and on Cygwin, that becomes the Cygwin-supplied memalign.
    As malloc is not the Cygwin malloc, the Cygwin memalign always
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 37199bcc29b..be457498add 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -100,14 +100,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    header sections which lose when `static' is defined away, as it is
    on HP-UX.  (You get duplicate symbol errors on linking). */
 #undef _FILE_OFFSET_BITS
-
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-#define VIRT_ADDR_VARIES
 
 /* The data segment on this machine always starts at address 0x40000000.  */
 #define DATA_SEG_BITS 0x40000000
diff --git a/src/search.c b/src/search.c
index a3b4e1dcbce..a6a0fddb137 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1892,7 +1892,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
                                || CHAR_HEAD_P (cursor[1]))
                               && (CHAR_HEAD_P (cursor[0])
                                   /* Check if this is the last byte of
-                                     a translable character.  */
+                                     a translatable character.  */
                                   || (translate_prev_byte1 == cursor[-1]
                                       && (CHAR_HEAD_P (translate_prev_byte1)
                                           || (translate_prev_byte2 == cursor[-2]
@@ -1991,7 +1991,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
                            || CHAR_HEAD_P (ptr[1]))
                           && (CHAR_HEAD_P (ptr[0])
                               /* Check if this is the last byte of a
-                                 translable character.  */
+                                 translatable character.  */
                               || (translate_prev_byte1 == ptr[-1]
                                   && (CHAR_HEAD_P (translate_prev_byte1)
                                       || (translate_prev_byte2 == ptr[-2]
diff --git a/src/sound.c b/src/sound.c
index 39007574afc..4e9758d27df 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -267,7 +267,7 @@ struct sound
      read from the start of a sound file.  */
   char *header;
 
-  /* Number of bytes raed from sound file.  This is always <=
+  /* Number of bytes read from sound file.  This is always <=
      MAX_SOUND_HEADER_BYTES.  */
   int header_size;
 
diff --git a/src/sysdep.c b/src/sysdep.c
index d666f8dbb79..ae200308bf3 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1663,7 +1663,7 @@ init_signals (void)
       sys_siglist[SIGQUIT] = "Quit";
 # endif
 # ifdef SIGRETRACT
-      sys_siglist[SIGRETRACT] = "Need to relinguish monitor mode";
+      sys_siglist[SIGRETRACT] = "Need to relinquish monitor mode";
 # endif
 # ifdef SIGSAK
       sys_siglist[SIGSAK] = "Secure attention";
diff --git a/src/w32.c b/src/w32.c
index c752333c68d..304445e2238 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3057,7 +3057,7 @@ generate_inode_val (const char * name)
   unsigned hash;
 
   /* Get the truly canonical filename, if it exists.  (Note: this
-     doesn't resolve aliasing due to subst commands, or recognise hard
+     doesn't resolve aliasing due to subst commands, or recognize hard
      links.  */
   if (!w32_get_long_filename ((char *)name, fullname, MAX_PATH))
     abort ();
@@ -3403,7 +3403,7 @@ stat (const char * path, struct stat * buf)
                            FILE_FLAG_BACKUP_SEMANTICS, NULL))
          != INVALID_HANDLE_VALUE)
     {
-      /* This is more accurate in terms of gettting the correct number
+      /* This is more accurate in terms of getting the correct number
          of links, but is quite slow (it is noticeable when Emacs is
          making a list of file name completions). */
       BY_HANDLE_FILE_INFORMATION info;
@@ -5845,7 +5845,7 @@ term_ntproc (void)
 void
 init_ntproc (void)
 {
-  /* Initialise the socket interface now if available and requested by
+  /* Initialize the socket interface now if available and requested by
      the user by defining PRELOAD_WINSOCK; otherwise loading will be
      delayed until open-network-stream is called (w32-has-winsock can
      also be used to dynamically load or reload winsock).
diff --git a/src/w32console.c b/src/w32console.c
index 49bf56ddee9..30c71f1c276 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -748,7 +748,7 @@ syms_of_ntterm (void)
                doc: /* Non-nil means make terminal frames use the full screen buffer dimensions.
 This is desirable when running Emacs over telnet.
 A value of nil means use the current console window dimensions; this
-may be preferrable when working directly at the console with a large
+may be preferable when working directly at the console with a large
 scroll-back buffer.  */);
   w32_use_full_screen_buffer = 0;
 
@@ -757,4 +757,3 @@ scroll-back buffer.  */);
   defsubr (&Sset_cursor_size);
   defsubr (&Sset_message_beep);
 }
-
diff --git a/src/w32fns.c b/src/w32fns.c
index 4a6da46141c..434861320a5 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2262,7 +2262,7 @@ w32_msg_pump (deferred_msg * msg_buf)
                  some third party shell extensions can cause it to be used in
                  system dialogs, which causes a crash if it is not initialized.
                  This is a known bug in Windows, which was fixed long ago, but
-                 the patch for XP is not publically available until XP SP3,
+                 the patch for XP is not publicly available until XP SP3,
                  and older versions will never be patched.  */
               CoInitialize (NULL);
               w32_createwindow ((struct frame *) msg.wParam);
@@ -2880,7 +2880,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                       key.dwControlKeyState = modifiers;
 
                       add = w32_kbd_patch_key (&key);
-                      /* 0 means an unrecognised keycode, negative means
+                      /* 0 means an unrecognized keycode, negative means
                          dead key.  Ignore both.  */
                       while (--add >= 0)
                         {
@@ -2943,7 +2943,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
       break;
 
     case WM_IME_CHAR:
-      /* If we can't get the IME result as unicode, use default processing,
+      /* If we can't get the IME result as Unicode, use default processing,
          which will at least allow characters decodable in the system locale
          get through.  */
       if (!get_composition_string_fn)
diff --git a/src/w32font.c b/src/w32font.c
index bd58e7e757b..5cc37c0e74f 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -462,7 +462,7 @@ w32font_has_char (Lisp_Object entity, int c)
    Return a glyph code of FONT for character C (Unicode code point).
    If FONT doesn't have such a glyph, return FONT_INVALID_CODE.
 
-   For speed, the gdi backend uses unicode (Emacs calls encode_char
+   For speed, the gdi backend uses Unicode (Emacs calls encode_char
    far too often for it to be efficient). But we still need to detect
    which characters are not supported by the font.
   */
@@ -620,7 +620,7 @@ w32font_text_extents (struct font *font, unsigned *code,
       total_width = size.cx;
     }
 
-  /* On 95/98/ME, only some unicode functions are available, so fallback
+  /* On 95/98/ME, only some Unicode functions are available, so fallback
      on doing a dummy draw to find the total width.  */
   if (!total_width)
     {
@@ -1153,7 +1153,7 @@ w32_enumfont_pattern_entity (Lisp_Object frame,
   else
     ASET (entity, FONT_SIZE_INDEX, make_number (0));
 
-  /* Cache unicode codepoints covered by this font, as there is no other way
+  /* Cache Unicode codepoints covered by this font, as there is no other way
      of getting this information easily.  */
   if (font_type & TRUETYPE_FONTTYPE)
     {
@@ -1514,7 +1514,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font,
   /* Skip non matching fonts.  */
 
   /* For uniscribe backend, consider only truetype or opentype fonts
-     that have some unicode coverage.  */
+     that have some Unicode coverage.  */
   if (match_data->opentype_only
       && ((!(physical_font->ntmTm.ntmFlags & NTMFLAGS_OPENTYPE)
            && !(font_type & TRUETYPE_FONTTYPE))
@@ -1557,7 +1557,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font,
       Lisp_Object spec_charset = AREF (match_data->orig_font_spec,
                                        FONT_REGISTRY_INDEX);
 
-      /* iso10646-1 fonts must contain unicode mapping tables.  */
+      /* iso10646-1 fonts must contain Unicode mapping tables.  */
       if (EQ (spec_charset, Qiso10646_1))
         {
           if (!is_unicode)
@@ -1572,7 +1572,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font,
               && !(physical_font->ntmFontSig.fsUsb[0] & 0x007F001F))
             return 1;
         }
-      /* unicode-sip fonts must contain characters in unicode plane 2.
+      /* unicode-sip fonts must contain characters in Unicode plane 2.
          so look for bit 57 (surrogates) in the Unicode subranges, plus
          the bits for CJK ranges that include those characters.  */
       else if (EQ (spec_charset, Qunicode_sip))
@@ -1597,7 +1597,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font,
             ASET (entity, FONT_REGISTRY_INDEX, spec_charset);
         }
       /* Otherwise if using the uniscribe backend, report ANSI and DEFAULT
-         fonts as unicode and skip other charsets.  */
+         fonts as Unicode and skip other charsets.  */
       else if (match_data->opentype_only)
         {
           if (logical_font->elfLogFont.lfCharSet == ANSI_CHARSET
@@ -1640,7 +1640,7 @@ x_to_w32_charset (char * lpcs)
   if (strncmp (lpcs, "*-#", 3) == 0)
     return atoi (lpcs + 3);
 
-  /* All Windows fonts qualify as unicode.  */
+  /* All Windows fonts qualify as Unicode.  */
   if (!strncmp (lpcs, "iso10646", 8))
     return DEFAULT_CHARSET;
 
@@ -1925,7 +1925,7 @@ w32_registry (LONG w32_charset, DWORD font_type)
 {
   char *charset;
 
-  /* If charset is defaulted, charset is unicode or unknown, depending on
+  /* If charset is defaulted, charset is Unicode or unknown, depending on
      font type.  */
   if (w32_charset == DEFAULT_CHARSET)
     return font_type == TRUETYPE_FONTTYPE ? Qiso10646_1 : Qunknown;
@@ -2080,7 +2080,7 @@ fill_in_logfont (FRAME_PTR f, LOGFONT *logfont, Lisp_Object font_spec)
         {
           Lisp_Object key, val;
           key = XCAR (tmp), val = XCDR (tmp);
-          /* Only use QCscript if charset is not provided, or is unicode
+          /* Only use QCscript if charset is not provided, or is Unicode
              and a single script is specified.  This is rather crude,
              and is only used to narrow down the fonts returned where
              there is a definite match.  Some scripts, such as latin, han,
diff --git a/src/w32menu.c b/src/w32menu.c
index 39d101e7bd5..9b2d014cd58 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1219,7 +1219,7 @@ simple_dialog_show (FRAME_PTR f, Lisp_Object contents, Lisp_Object header)
      is_simple_dialog, we don't need to worry about checking contents
      to see what type of dialog to use.  */
 
-  /* Use unicode if possible, so any language can be displayed.  */
+  /* Use Unicode if possible, so any language can be displayed.  */
   if (unicode_message_box)
     {
       WCHAR *text, *title;
@@ -1476,7 +1476,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
                                           utf16_string);
       if (!return_value)
         {
-          /* On W9x/ME, unicode menus are not supported, though AppendMenuW
+          /* On W9x/ME, Unicode menus are not supported, though AppendMenuW
              apparently does exist at least in some cases and appears to be
              stubbed out to do nothing.  out_string is UTF-8, but since
              our standard menus are in English and this is only going to
@@ -1486,7 +1486,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
             AppendMenu (menu, fuFlags,
                         item != NULL ? (UINT) item: (UINT) wv->call_data,
                         out_string);
-          /* Don't use unicode menus in future.  */
+          /* Don't use Unicode menus in future.  */
           unicode_append_menu = NULL;
         }
 
diff --git a/src/w32proc.c b/src/w32proc.c
index 279816bcc3e..254a32503c4 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -122,12 +122,12 @@ new_child (void)
 
   for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--)
     if (!CHILD_ACTIVE (cp))
-      goto Initialise;
+      goto Initialize;
   if (child_proc_count == MAX_CHILDREN)
     return NULL;
   cp = &child_procs[child_proc_count++];
 
- Initialise:
+ Initialize:
   memset (cp, 0, sizeof (*cp));
   cp->fd = -1;
   cp->pid = -1;
@@ -821,7 +821,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
 
      The w32 GNU-based library from Cygnus doubles quotes to escape
      them, while MSVC uses backslash for escaping.  (Actually the MSVC
-     startup code does attempt to recognise doubled quotes and accept
+     startup code does attempt to recognize doubled quotes and accept
      them, but gets it wrong and ends up requiring three quotes to get a
      single embedded quote!)  So by default we decide whether to use
      quote or backslash as the escape character based on whether the
diff --git a/src/w32term.c b/src/w32term.c
index e9fa16ba325..a2ccdd21f7d 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4506,7 +4506,7 @@ w32_read_socket (struct terminal *terminal, int expected,
             }
 
           /* If window has been obscured or exposed by another window
-             being maximised or minimised/restored, then recheck
+             being maximized or minimized/restored, then recheck
              visibility of all frames.  Direct changes to our own
              windows get handled by WM_SIZE.  */
 #if 0
@@ -5576,7 +5576,7 @@ x_raise_frame (struct frame *f)
      input focus anyway (so the window with focus will never be
      completely obscured) - if not, then just moving the mouse over it
      is sufficient to give it focus.  On Windows, the user must actually
-     click on the frame (preferrably the title bar so as not to move
+     click on the frame (preferably the title bar so as not to move
      point), which is more awkward.  Also, no other Windows program
      raises a window to the top but leaves another window (possibly now
      completely obscured) with input focus.
@@ -5692,10 +5692,10 @@ x_make_frame_visible (struct frame *f)
 
       /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL
          causes unexpected behavior when unminimizing frames that were
-         previously maximised.  But only SW_SHOWNORMAL works properly for
+         previously maximized.  But only SW_SHOWNORMAL works properly for
          frames that were truely hidden (using make-frame-invisible), so
          we need it to avoid Bug#5482.  It seems that async_iconified
-         is only set for minimised windows that are still visible, so
+         is only set for minimized windows that are still visible, so
          use that to determine the appropriate flag to pass ShowWindow.  */
       my_show_window (f, FRAME_W32_WINDOW (f),
                       f->async_iconified ? SW_RESTORE : SW_SHOWNORMAL);
@@ -6164,7 +6164,7 @@ w32_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
   dpyinfo->has_palette = GetDeviceCaps (hdc, RASTERCAPS) & RC_PALETTE;
   ReleaseDC (NULL, hdc);
 
-  /* initialise palette with white and black */
+  /* initialize palette with white and black */
   {
     XColor color;
     w32_defined_color (0, "white", &color, 1);
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 36197b3b28a..63da3b9e962 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -469,7 +469,7 @@ uniscribe_encode_char (struct font *font, int c)
 
   /* Non BMP characters must be handled by the uniscribe shaping
      engine as GDI functions (except blindly displaying lines of
-     unicode text) and the promising looking ScriptGetCMap do not
+     Unicode text) and the promising looking ScriptGetCMap do not
      convert surrogate pairs to glyph indexes correctly.  */
     {
       items = (SCRIPT_ITEM *) alloca (sizeof (SCRIPT_ITEM) * 2 + 1);
@@ -581,7 +581,7 @@ add_opentype_font_name_to_list (ENUMLOGFONTEX *logical_font,
       && font_type != TRUETYPE_FONTTYPE)
     return 1;
 
-  /* Skip fonts that have no unicode coverage.  */
+  /* Skip fonts that have no Unicode coverage.  */
   if (!physical_font->ntmFontSig.fsUsb[3]
       && !physical_font->ntmFontSig.fsUsb[2]
       && !physical_font->ntmFontSig.fsUsb[1]
diff --git a/src/w32xfns.c b/src/w32xfns.c
index fbbf11bd65c..fc2d5904d67 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -188,7 +188,7 @@ get_next_msg (W32Msg * lpmsg, BOOL bWait)
       }
 
       nQueue--;
-      /* Consolidate WM_PAINT messages to optimise redrawing.  */
+      /* Consolidate WM_PAINT messages to optimize redrawing.  */
       if (lpmsg->msg.message == WM_PAINT && nQueue)
         {
           int_msg * lpCur = lpHead;
@@ -441,4 +441,3 @@ void
 x_sync (void *f)
 {
 }
-
diff --git a/src/window.c b/src/window.c
index a7daa1353bd..728e811f304 100644
--- a/src/window.c
+++ b/src/window.c
@@ -467,10 +467,8 @@ Return nil if WINDOW has no previous sibling.  */)
   return decode_any_window (window)->prev;
 }
 
-DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 0, 1, 0,
+DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 1, 1, 0,
        doc: /* Return combination limit of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
-
 If the return value is nil, child windows of WINDOW can be recombined with
 WINDOW's siblings.  A return value of t means that child windows of
 WINDOW are never \(re-)combined with WINDOW's siblings.  */)
@@ -480,18 +478,16 @@ WINDOW are never \(re-)combined with WINDOW's siblings.  */)
 }
 
 DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0,
-       doc: /* Set combination limit of window WINDOW to STATUS; return STATUS.
-If WINDOW is omitted or nil, it defaults to the selected window.
-
-If STATUS is nil, child windows of WINDOW can be recombined with
-WINDOW's siblings.  STATUS t means that child windows of WINDOW are
+       doc: /* Set combination limit of window WINDOW to LIMIT; return LIMIT.
+If LIMIT is nil, child windows of WINDOW can be recombined with
+WINDOW's siblings.  LIMIT t means that child windows of WINDOW are
 never \(re-)combined with WINDOW's siblings.  Other values are reserved
 for future use.  */)
-  (Lisp_Object window, Lisp_Object status)
+  (Lisp_Object window, Lisp_Object limit)
 {
   register struct window *w = decode_any_window (window);
 
-  w->combination_limit = status;
+  w->combination_limit = limit;
 
   return w->combination_limit;
 }
@@ -2187,7 +2183,7 @@ next_window (Lisp_Object window, Lisp_Object minibuf, Lisp_Object all_frames, in
 
 
 DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0,
-       doc: /* Return window following WINDOW in cyclic ordering of windows.
+       doc: /* Return live window after WINDOW in the cyclic ordering of windows.
 WINDOW must be a live window and defaults to the selected one.  The
 optional arguments MINIBUF and ALL-FRAMES specify the set of windows to
 consider.
@@ -2226,7 +2222,7 @@ windows, eventually ending up back at the window you started with.
 
 
 DEFUN ("previous-window", Fprevious_window, Sprevious_window, 0, 3, 0,
-       doc: /* Return window preceding WINDOW in cyclic ordering of windows.
+       doc: /* Return live window before WINDOW in the cyclic ordering of windows.
 WINDOW must be a live window and defaults to the selected one.  The
 optional arguments MINIBUF and ALL-FRAMES specify the set of windows to
 consider.
@@ -5782,13 +5778,30 @@ get_phys_cursor_glyph (struct window *w)
 {
   struct glyph_row *row;
   struct glyph *glyph;
+  int hpos = w->phys_cursor.hpos;
+
+  if (!(w->phys_cursor.vpos >= 0
+        && w->phys_cursor.vpos < w->current_matrix->nrows))
+    return NULL;
+
+  row = MATRIX_ROW (w->current_matrix, w->phys_cursor.vpos);
+  if (!row->enabled_p)
+    return NULL;
+
+  if (XINT (w->hscroll))
+    {
+      /* When the window is hscrolled, cursor hpos can legitimately be
+         out of bounds, but we draw the cursor at the corresponding
+         window margin in that case.  */
+      if (!row->reversed_p && hpos < 0)
+        hpos = 0;
+      if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+        hpos = row->used[TEXT_AREA] - 1;
+    }
 
-  if (w->phys_cursor.vpos >= 0
-      && w->phys_cursor.vpos < w->current_matrix->nrows
-      && (row = MATRIX_ROW (w->current_matrix, w->phys_cursor.vpos),
-          row->enabled_p)
-      && row->used[TEXT_AREA] > w->phys_cursor.hpos)
-    glyph = row->glyphs[TEXT_AREA] + w->phys_cursor.hpos;
+  if (row->used[TEXT_AREA] > hpos
+      && 0 <= hpos)
+    glyph = row->glyphs[TEXT_AREA] + hpos;
   else
     glyph = NULL;
 
@@ -6524,10 +6537,10 @@ sibling.
 
 Other values are reserved for future use.
 
-The value of this variable is also assigned to the combination-limit
-status of the new parent window.  The combination-limit status of a
-window can be retrieved via the function `window-combination-limit' and
-altered by the function `set-window-combination-limit'.  */);
+The value of this variable is also assigned to the combination limit of
+the new parent window.  The combination limit of a window can be
+retrieved via the function `window-combination-limit' and altered by the
+function `set-window-combination-limit'.  */);
   Vwindow_combination_limit = Qnil;
 
   defsubr (&Sselected_window);
diff --git a/src/window.h b/src/window.h
index de0f7307a51..df29ca1368f 100644
--- a/src/window.h
+++ b/src/window.h
@@ -268,7 +268,7 @@ struct window
     /* List of buffers re-shown in this window.  */
     Lisp_Object next_buffers;
 
-    /* An alist with parameteres.  */
+    /* An alist with parameters.  */
     Lisp_Object window_parameters;
 
     /* No Lisp data may follow below this point without changing
diff --git a/src/xdisp.c b/src/xdisp.c
index 747b91fa4ab..7c415e485b5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1450,7 +1450,7 @@ pos_visible_p (struct window *w, EMACS_INT charpos, int *x, int *y,
                      position is CHARPOS.  For the contingency that we
                      didn't, and stopped at the first newline from the
                      display string, move back over the glyphs
-                     prfoduced from the string, until we find the
+                     produced from the string, until we find the
                      rightmost glyph not from the string.  */
                   if (IT_CHARPOS (it3) != charpos && EQ (it3.object, string))
                     {
@@ -14170,7 +14170,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
               || (STRINGP (g1->object)
                   && (!NILP (Fget_char_property (make_number (g1->charpos),
                                                 Qcursor, g1->object))
-                      /* pevious candidate is from the same display
+                      /* previous candidate is from the same display
                          string as this one, and the display string
                          came from a text property */
                       || (EQ (g1->object, glyph->object)
@@ -15092,7 +15092,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
   int current_matrix_up_to_date_p = 0;
   int used_current_matrix_p = 0;
   /* This is less strict than current_matrix_up_to_date_p.
-     It indictes that the buffer contents and narrowing are unchanged.  */
+     It indicates that the buffer contents and narrowing are unchanged.  */
   int buffer_unchanged_p = 0;
   int temp_scroll_step = 0;
   int count = SPECPDL_INDEX ();
@@ -17102,7 +17102,7 @@ try_window_id (struct window *w)
   last_unchanged_at_beg_row = find_last_unchanged_at_beg_row (w);
   if (last_unchanged_at_beg_row)
     {
-      /* Avoid starting to display in the moddle of a character, a TAB
+      /* Avoid starting to display in the middle of a character, a TAB
          for instance.  This is easier than to set up the iterator
          exactly, and it's not a frequent case, so the additional
          effort wouldn't really pay off.  */
@@ -18054,6 +18054,23 @@ insert_left_trunc_glyphs (struct it *it)
     }
 }
 
+/* Compute the hash code for ROW.  */
+unsigned
+row_hash (struct glyph_row *row)
+{
+  int area, k;
+  unsigned hashval = 0;
+
+  for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
+    for (k = 0; k < row->used[area]; ++k)
+      hashval = ((((hashval << 4) + (hashval >> 24)) & 0x0fffffff)
+                  + row->glyphs[area][k].u.val
+                  + row->glyphs[area][k].face_id
+                  + row->glyphs[area][k].padding_p
+                  + (row->glyphs[area][k].type << 2));
+
+  return hashval;
+}
 
 /* Compute the pixel height and width of IT->glyph_row.
 
@@ -18140,17 +18157,7 @@ compute_line_metrics (struct it *it)
     }
 
   /* Compute a hash code for this row.  */
-  {
-    int area, i;
-    row->hash = 0;
-    for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
-      for (i = 0; i < row->used[area]; ++i)
-        row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff)
-                     + row->glyphs[area][i].u.val
-                     + row->glyphs[area][i].face_id
-                     + row->glyphs[area][i].padding_p
-                     + (row->glyphs[area][i].type << 2));
-  }
+  row->hash = row_hash (row);
 
   it->max_ascent = it->max_descent = 0;
   it->max_phys_ascent = it->max_phys_descent = 0;
@@ -24895,9 +24902,17 @@ x_produce_glyphs (struct it *it)
 void
 x_write_glyphs (struct glyph *start, int len)
 {
-  int x, hpos;
+  int x, hpos, chpos = updated_window->phys_cursor.hpos;
 
   xassert (updated_window && updated_row);
+  /* When the window is hscrolled, cursor hpos can legitimately be out
+     of bounds, but we draw the cursor at the corresponding window
+     margin in that case.  */
+  if (!updated_row->reversed_p && chpos < 0)
+    chpos = 0;
+  if (updated_row->reversed_p && chpos >= updated_row->used[TEXT_AREA])
+    chpos = updated_row->used[TEXT_AREA] - 1;
+
   BLOCK_INPUT;
 
   /* Write glyphs.  */
@@ -24912,8 +24927,8 @@ x_write_glyphs (struct glyph *start, int len)
   if (updated_area == TEXT_AREA
       && updated_window->phys_cursor_on_p
       && updated_window->phys_cursor.vpos == output_cursor.vpos
-      && updated_window->phys_cursor.hpos >= hpos
-      && updated_window->phys_cursor.hpos < hpos + len)
+      && chpos >= hpos
+      && chpos < hpos + len)
     updated_window->phys_cursor_on_p = 0;
 
   UNBLOCK_INPUT;
@@ -25430,8 +25445,17 @@ draw_phys_cursor_glyph (struct window *w, struct glyph_row *row,
     {
       int on_p = w->phys_cursor_on_p;
       int x1;
-      x1 = draw_glyphs (w, w->phys_cursor.x, row, TEXT_AREA,
-                        w->phys_cursor.hpos, w->phys_cursor.hpos + 1,
+      int hpos = w->phys_cursor.hpos;
+
+      /* When the window is hscrolled, cursor hpos can legitimately be
+         out of bounds, but we draw the cursor at the corresponding
+         window margin in that case.  */
+      if (!row->reversed_p && hpos < 0)
+        hpos = 0;
+      if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+        hpos = row->used[TEXT_AREA] - 1;
+
+      x1 = draw_glyphs (w, w->phys_cursor.x, row, TEXT_AREA, hpos, hpos + 1,
                         hl, 0);
       w->phys_cursor_on_p = on_p;
 
@@ -25519,6 +25543,14 @@ erase_phys_cursor (struct window *w)
        : (w->phys_cursor.hpos >= cursor_row->used[TEXT_AREA])))
     goto mark_cursor_off;
 
+  /* When the window is hscrolled, cursor hpos can legitimately be out
+     of bounds, but we draw the cursor at the corresponding window
+     margin in that case.  */
+  if (!cursor_row->reversed_p && hpos < 0)
+    hpos = 0;
+  if (cursor_row->reversed_p && hpos >= cursor_row->used[TEXT_AREA])
+    hpos = cursor_row->used[TEXT_AREA] - 1;
+
   /* If the cursor is in the mouse face area, redisplay that when
      we clear the cursor.  */
   if (! NILP (hlinfo->mouse_face_window)
@@ -25662,8 +25694,26 @@ update_window_cursor (struct window *w, int on)
      of being deleted.  */
   if (w->current_matrix)
     {
+      int hpos = w->phys_cursor.hpos;
+      int vpos = w->phys_cursor.vpos;
+      struct glyph_row *row;
+
+      if (vpos >= w->current_matrix->nrows
+          || hpos >= w->current_matrix->matrix_w)
+        return;
+
+      row = MATRIX_ROW (w->current_matrix, vpos);
+
+      /* When the window is hscrolled, cursor hpos can legitimately be
+         out of bounds, but we draw the cursor at the corresponding
+         window margin in that case.  */
+      if (!row->reversed_p && hpos < 0)
+        hpos = 0;
+      if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+        hpos = row->used[TEXT_AREA] - 1;
+
       BLOCK_INPUT;
-      display_and_set_cursor (w, on, w->phys_cursor.hpos, w->phys_cursor.vpos,
+      display_and_set_cursor (w, on, hpos, vpos,
                               w->phys_cursor.x, w->phys_cursor.y);
       UNBLOCK_INPUT;
     }
@@ -25833,9 +25883,18 @@ show_mouse_face (Mouse_HLInfo *hlinfo, enum draw_glyphs_face draw)
       if (FRAME_WINDOW_P (f)
           && phys_cursor_on_p && !w->phys_cursor_on_p)
         {
+          int hpos = w->phys_cursor.hpos;
+
+          /* When the window is hscrolled, cursor hpos can legitimately be
+             out of bounds, but we draw the cursor at the corresponding
+             window margin in that case.  */
+          if (!row->reversed_p && hpos < 0)
+            hpos = 0;
+          if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+            hpos = row->used[TEXT_AREA] - 1;
+
           BLOCK_INPUT;
-          display_and_set_cursor (w, 1,
-                                  w->phys_cursor.hpos, w->phys_cursor.vpos,
+          display_and_set_cursor (w, 1, hpos, w->phys_cursor.vpos,
                                   w->phys_cursor.x, w->phys_cursor.y);
           UNBLOCK_INPUT;
         }
@@ -25934,7 +25993,19 @@ coords_in_mouse_face_p (struct window *w, int hpos, int vpos)
 int
 cursor_in_mouse_face_p (struct window *w)
 {
-  return coords_in_mouse_face_p (w, w->phys_cursor.hpos, w->phys_cursor.vpos);
+  int hpos = w->phys_cursor.hpos;
+  int vpos = w->phys_cursor.vpos;
+  struct glyph_row *row = MATRIX_ROW (w->current_matrix, vpos);
+
+  /* When the window is hscrolled, cursor hpos can legitimately be out
+     of bounds, but we draw the cursor at the corresponding window
+     margin in that case.  */
+  if (!row->reversed_p && hpos < 0)
+    hpos = 0;
+  if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+    hpos = row->used[TEXT_AREA] - 1;
+
+  return coords_in_mouse_face_p (w, hpos, vpos);
 }
 
 
diff --git a/src/xfns.c b/src/xfns.c
index 6de412c4e68..c68149cce11 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2962,7 +2962,7 @@ x_default_font_parameter (struct frame *f, Lisp_Object parms)
 
   if (NILP (font_param))
     {
-      /* System font should take precedendce over X resources.  We suggest this
+      /* System font should take precedence over X resources.  We suggest this
          regardless of font-use-system-font because .emacs may not have been
          read yet.  */
       const char *system_font = xsettings_get_system_font ();
@@ -5914,7 +5914,7 @@ the tool bar buttons.  */);
   x_gtk_whole_detached_tool_bar = 0;
 
   DEFVAR_BOOL ("x-gtk-use-system-tooltips", x_gtk_use_system_tooltips,
-    doc: /* *If non-nil with a Gtk+ built Emacs, the Gtk+ toolip is used.
+    doc: /* *If non-nil with a Gtk+ built Emacs, the Gtk+ tooltip is used.
 Otherwise use Emacs own tooltip implementation.
 When using Gtk+ tooltips, the tooltip face is not used.  */);
   x_gtk_use_system_tooltips = 1;
diff --git a/src/xmenu.c b/src/xmenu.c
index 0dd652b566d..4b7bbfd73dc 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1304,7 +1304,7 @@ free_frame_menubar (FRAME_PTR f)
 #ifdef USE_MOTIF
       /* Removing the menu bar magically changes the shell widget's x
          and y position of (0, 0) which, when the menu bar is turned
-         on again, leads to pull-down menuss appearing in strange
+         on again, leads to pull-down menus appearing in strange
          positions near the upper-left corner of the display.  This
          happens only with some window managers like twm and ctwm,
          but not with other like Motif's mwm or kwm, because the
diff --git a/src/xterm.c b/src/xterm.c
index f8af8ae3df0..f750c00cea0 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2972,9 +2972,7 @@ x_clear_frame (struct frame *f)
      follow an explicit cursor_to.  */
   BLOCK_INPUT;
 
-  /* The following call is commented out because it does not seem to accomplish
-     anything, apart from causing flickering during window resize.  */
-  /* XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); */
+  XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
 
   /* We have to clear the scroll bars.  If we have changed colors or
      something like that, then they should be notified.  */
@@ -4193,7 +4191,7 @@ static Boolean xaw3d_arrow_scroll;
 
 /* Whether the drag scrolling maintains the mouse at the top of the
    thumb.  If not, resizing the thumb needs to be done more carefully
-   to avoid jerkyness.  */
+   to avoid jerkiness.  */
 
 static Boolean xaw3d_pick_top;
 
@@ -8779,7 +8777,7 @@ x_wait_for_event (struct frame *f, int eventtype)
   pending_event_wait.f = f;
   pending_event_wait.eventtype = eventtype;
 
-  /* Set timeout to 0.1 second.  Hopefully not noticable.
+  /* Set timeout to 0.1 second.  Hopefully not noticeable.
      Maybe it should be configurable.  */
   EMACS_SET_SECS_USECS (tmo, 0, 100000);
   EMACS_GET_TIME (tmo_at);
diff --git a/test/ChangeLog b/test/ChangeLog
index 9afed6f5f90..04a70737d61 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-22  Glenn Morris  <rgm@gnu.org>
+
+        * rmailmm.el: New file, split from lisp/mail/rmailmm.el.
+
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * cedet/semantic-utest-c.el (semantic-utest-c-comparisons): Fix typo.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * automated/icalendar-tests.el (icalendar-tests--get-ical-event)
diff --git a/test/cedet/semantic-utest-c.el b/test/cedet/semantic-utest-c.el
index 946a818e70e..3fbd180290c 100644
--- a/test/cedet/semantic-utest-c.el
+++ b/test/cedet/semantic-utest-c.el
@@ -28,7 +28,7 @@
 (defvar semantic-utest-c-comparisons
   '( ("testsppreplace.c" . "testsppreplaced.c")
      )
-  "List of files to parse and compare against eachother.")
+  "List of files to parse and compare against each other.")
 
 ;;; Code:
 ;;;###autoload
diff --git a/test/cedet/semantic-utest.el b/test/cedet/semantic-utest.el
index db737b60c6f..ff62040129d 100644
--- a/test/cedet/semantic-utest.el
+++ b/test/cedet/semantic-utest.el
@@ -170,7 +170,7 @@ def fun2(a,b,c): #1
 
 
 )
-;  "pyhon test case. notice that python is indentation sensitive
+;  "python test case. notice that python is indentation sensitive
 
 
 (defvar semantic-utest-Python-name-contents
@@ -622,7 +622,7 @@ INSERTME is the text to be inserted after the deletion."
   )
 
 ;look at http://mfgames.com/linux/csharp-mode
-(defun semantic-utest-Csharp() ;; hmm i dont even know how to edit a scharp file. need a csharp mode implementation i suppose
+(defun semantic-utest-Csharp() ;; hmm i don't even know how to edit a scharp file. need a csharp mode implementation i suppose
   (interactive)
   (if (fboundp 'csharp-mode)
       (semantic-utest-generic "C#" (semantic-utest-fname "csharptest.cs") semantic-utest-Csharp-buffer-contents  semantic-utest-Csharp-name-contents   '("fun2") "//1" "//deleted line")
diff --git a/test/cedet/tests/testsppreplaced.c b/test/cedet/tests/testsppreplaced.c
index 5098715081f..58d1ac2b684 100644
--- a/test/cedet/tests/testsppreplaced.c
+++ b/test/cedet/tests/testsppreplaced.c
@@ -69,7 +69,7 @@ int continuation_symbol () { };
 
 int tail (int q) {}
 
-/* TEST: macros used impropertly. */
+/* TEST: macros used improperly */
 
 int tail_fcn(int q);
 
@@ -98,7 +98,7 @@ namespace foo { namespace bar {
 
     int foo_bar_func(int a) { }
 
-  } 
+  }
 }
 
 /* TEST: The VC++ macro hack. */
@@ -115,4 +115,3 @@ int MACROA () {
 
 
 /* End */
-
diff --git a/test/rmailmm.el b/test/rmailmm.el
new file mode 100644
index 00000000000..97577ee35cb
--- /dev/null
+++ b/test/rmailmm.el
@@ -0,0 +1,93 @@
+;;; rmailmm.el --- tests for mail/rmailmm.el
+
+;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'rmailmm)
+
+(defun rmailmm-test-handler ()
+  "Test of a mail using no MIME parts at all."
+  (let ((mail "To: alex@gnu.org
+Content-Type: text/plain; charset=koi8-r
+Content-Transfer-Encoding: 8bit
+MIME-Version: 1.0
+
+\372\304\322\301\327\323\324\327\325\312\324\305\41"))
+    (switch-to-buffer (get-buffer-create "*test*"))
+    (erase-buffer)
+    (set-buffer-multibyte nil)
+    (insert mail)
+    (rmail-mime-show t)
+    (set-buffer-multibyte t)))
+
+(defun rmailmm-test-bulk-handler ()
+  "Test of a mail used as an example in RFC 2183."
+  (let ((mail "Content-Type: image/jpeg
+Content-Disposition: attachment; filename=genome.jpeg;
+  modification-date=\"Wed, 12 Feb 1997 16:29:51 -0500\";
+Content-Description: a complete map of the human genome
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAABGdBTUEAALGPC/xhBQAAAAZQ
+TFRF////AAAAVcLTfgAAAPZJREFUeNq9ldsOwzAIQ+3//+l1WlvA5ZLsoUiTto4TB+ISoAjy
++ITfRBfcAmgRFFeAm+J6uhdKdFhFWUgDkFsK0oUp/9G2//Kj7Jx+5tSKOdBscgUYiKHRS/me
+WATQdRUvAK0Bnmshmtn79PpaLBbbOZkjKvRnjRZoRswOkG1wFchKew2g9wXVJVZL/m4+B+vv
+9AxQQR2Q33SgAYJzzVACdAWjAfRYzYFO9n6SLnydtQHSMxYDMAKqZ/8FS/lTK+zuq3CtK64L
+UDwbgUEAUmk2Zyg101d6PhCDySgAvTvDgKiuOrc4dLxUb7UMnhGIexyI+d6U+ABuNAP4Simx
+lgAAAABJRU5ErkJggg==
+"))
+    (switch-to-buffer (get-buffer-create "*test*"))
+    (erase-buffer)
+    (insert mail)
+    (rmail-mime-show)))
+
+(defun rmailmm-test-multipart-handler ()
+  "Test of a mail used as an example in RFC 2046."
+  (let ((mail "From: Nathaniel Borenstein <nsb@bellcore.com>
+To: Ned Freed <ned@innosoft.com>
+Date: Sun, 21 Mar 1993 23:56:48 -0800 (PST)
+Subject: Sample message
+MIME-Version: 1.0
+Content-type: multipart/mixed; boundary=\"simple boundary\"
+
+This is the preamble.  It is to be ignored, though it
+is a handy place for composition agents to include an
+explanatory note to non-MIME conformant readers.
+
+--simple boundary
+
+This is implicitly typed plain US-ASCII text.
+It does NOT end with a linebreak.
+--simple boundary
+Content-type: text/plain; charset=us-ascii
+
+This is explicitly typed plain US-ASCII text.
+It DOES end with a linebreak.
+
+--simple boundary--
+
+This is the epilogue.  It is also to be ignored."))
+    (switch-to-buffer (get-buffer-create "*test*"))
+    (erase-buffer)
+    (insert mail)
+    (rmail-mime-show t)))
+
+;;; rmailmm.el ends here