Merge from trunk.

92 files changed, 410 insertions, 356 deletions

diff --git a/ChangeLog b/ChangeLog
index 68f5042d7cf..bce682d5d88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-13  Glenn Morris  <rgm@gnu.org>
+
+        * INSTALL: Tiny updates for disk space used during installation.
+
 2011-11-05  Eli Zaretskii  <eliz@gnu.org>
 
         * lib/makefile.w32-in (FRC): New dummy target.
diff --git a/INSTALL b/INSTALL
index 3aed5a869cc..dcbc729b463 100644
--- a/INSTALL
+++ b/INSTALL
@@ -31,9 +31,9 @@ some of the steps manually.  The more detailed description in the other
 sections of this guide will help you do that, so please refer to those
 sections if you need to.
 
-  1. Unpacking the Emacs 23.2 release requires about 170 MB of free
-  disk space.  Building Emacs uses about another 60 MB of space.
-  The final installed Emacs uses about 120 MB of disk space.
+  1. Unpacking the Emacs 24.1 release requires about 180 MB of free
+  disk space.  Building Emacs uses about another 70 MB of space.
+  The final installed Emacs uses about 110 MB of disk space.
   This includes the space-saving that comes from automatically
   compressing the Lisp source files on installation.
 
diff --git a/admin/charsets/cp51932.awk b/admin/charsets/cp51932.awk
index 39ccc1c7dc1..b611def710d 100644
--- a/admin/charsets/cp51932.awk
+++ b/admin/charsets/cp51932.awk
@@ -20,7 +20,7 @@
 
 # Commentary:
 
-# Genereate a translation table for CP51932 (EUC-JP of MicroSoft Version).
+# Generate a translation table for CP51932 (EUC-JP of MicroSoft Version).
 # It maps invalid JISX0208 code points used by CP51932 to Unicode.
 # 4th field of the input has these meanings:
 #   0: JISX0208 characters.
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index a0af813e5e8..b30305ee78a 100644
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -828,7 +828,7 @@ paren_classes
   ;
 
 ;; In general, the base class can be specified by a general expression
-;; which evalue to a class object, i.e., base classes are not just names!
+;; which evaluates to a class object, i.e., base classes are not just names!
 ;; However base classes are names in most cases.  Thus the
 ;; non-terminals below work only with simple names.  Even if the
 ;; parser can parse general expressions, I don't see much benefit in
diff --git a/admin/notes/bzr b/admin/notes/bzr
index 12a3b194266..50eaf3710ee 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -173,7 +173,7 @@ This restores file, but without its history (`bzr log file' will be
 very short).  This is because file gets re-added with a new file-id
 (use `bzr file-id file' to see the id).
 
-Insteading of adding the file, try:
+Instead of adding the file, try:
 
 bzr revert -rN file; bzr commit
 
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 5dee94f28c5..3c70ed8dbe0 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -92,7 +92,7 @@ See the end of the file for license conditions.
       or libpng.dll. LibPNG requires zlib, which should come from the same
       source as you got libpng.
 
-      JPEG: requires the Independant JPEG Group's libjpeg 6b or later,
+      JPEG: requires the Independent JPEG Group's libjpeg 6b or later,
       which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll.
 
       TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 1cfb3d9ffe9..c2242c444dd 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -99,7 +99,7 @@ ERC distribution).
 
 @item
 Scott Bender, Michael Brouwer, Christophe de Dinechin, Carl Edman,
-Christian Limpach and Adrian Robert developed and maintained the 
+Christian Limpach and Adrian Robert developed and maintained the
 NeXTstep port of Emacs.
 
 @item
@@ -576,7 +576,7 @@ Emacs.
 
 @item
 Karel Klí@v{c} contributed SELinux support, for preserving the
-Security-Enchanced Linux context of files on backup and copy.
+Security-Enhanced Linux context of files on backup and copy.
 
 @item
 Shuhei Kobayashi wrote @file{hex-util.el}, for operating on hexadecimal
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 2abed9f870c..a8e1439d242 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-12  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Splitting Windows, Deleting Windows): Remove
+        references to splits status of windows.
+
 2011-11-10  Glenn Morris  <rgm@gnu.org>
 
         * buffers.texi (Read Only Buffers): Expand a bit on why
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 71b612c527d..86ecfd122ef 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2827,7 +2827,7 @@ If @code{file-remote-p} returns the same identifier for two different
 filenames, that means they are stored on the same file system and can
 be accessed locally with respect to each other.  This means, for
 example, that it is possible to start a remote process accessing both
-files at the same time.  Implementors of file handlers need to ensure
+files at the same time.  Implementers of file handlers need to ensure
 this principle is valid.
 
 @var{identification} specifies which part of the identifier shall be
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index cf5cfedf5af..b6bacc27684 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -855,42 +855,13 @@ resize all windows that are part of the same combination as
 this may allow @code{split-window} to succeed even if @var{window} is
 a fixed-size window or too small to ordinarily split.
 
-In any case, the value of this variable is assigned to the splits status
-of the new window and, provided old and new window form a new
-combination, of the old window as well.  The splits status of a window
-can be retrieved by invoking the function @code{window-splits} and
-altered by the function @code{set-window-splits} described next.
-
-If @code{window-nest} (see below) is non-@code{nil}, the space for the
-new window is exclusively taken from the old window, but the splits
-status of the involved windows is nevertheless set as described here.
-@end defopt
-
-@defun window-splits &optional window
-This function returns the splits status of @var{window}.  The argument
-@var{window} can be any window and defaults to the selected one.
-
-@cindex splits status
-The @dfn{splits status} of a window specifies how resizing and deleting
-that window may affect the size of other windows in the same window
-combination.  More precisely, if @var{window}'s splits status is
-@code{nil} and @var{window} is resized, the corresponding space is
-preferably taken from (or given to) @var{window}'s right sibling.  When
-@var{window} is deleted, its space is given to its left sibling.  If
-@var{window}'s splits status is non-@code{nil}, resizing and deleting
-@var{window} may resize @emph{all} windows in @var{window}'s
-combination.
-
-The splits status is initially set by @code{split-window}
-from the current value of the variable @code{window-splits} (see above)
-and can be reset by the function @code{set-window-splits} (see below).
-@end defun
+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.
 
-@defun set-window-splits window &optional status
-This function sets the splits status (see above) of @var{window} to
-@var{status}.  The argument @var{window} can be any window and defaults
-to the selected one.  The return value is @var{status}.
-@end defun
+The setting of this variable has no effect if @code{window-nest} (see
+below) is non-@code{nil}.
+@end defopt
 
 To illustrate the use of @code{window-splits} consider the following
 window configuration:
@@ -1208,12 +1179,11 @@ window parameters.  If the @code{delete-window} parameter specifies a
 function, that function is called with @var{window} as its sole
 argument.
 
-If the splits status of @var{window} (@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 the
-splits status of @var{window} is non-@code{nil}, its space is
-proportionally distributed among the remaining windows in the same
-combination.
+If @code{window-splits} (@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-splits} is
+non-@code{nil}, the space of @var{window} is proportionally distributed
+among the remaining windows in the same combination.
 @end deffn
 
 @deffn Command delete-other-windows &optional window
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 029406e2d30..af8d38a077f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * semantic.texi (Tag handling): Fix typo.
+
 2011-10-31  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.texi (Other Gnus Versions): Remove.
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index f3f11d29f17..f6cf7a07ae8 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -306,7 +306,7 @@ Files associated with tags.  Goto-tag, file for include, and file for
 a prototype.
 
 @item semantic-tag-ls.el
-Language dependant features of a tag, such as parent calculation, slot
+Language dependent features of a tag, such as parent calculation, slot
 protection, and other states like abstract, virtual, static, and leaf.
 
 @item semantic-dep.el
diff --git a/etc/NEWS.20 b/etc/NEWS.20
index c76ddb2485e..f4cfb14de62 100644
--- a/etc/NEWS.20
+++ b/etc/NEWS.20
@@ -2047,7 +2047,7 @@ standard fontset are created automatically.
 
 If you specify a default ASCII font with the `Font' resource or `-fn'
 argument, a fontset is generated from it.  This works by replacing the
-FOUNDARY, FAMILY, ADD_STYLE, and AVERAGE_WIDTH fields of the font name
+FOUNDRY, FAMILY, ADD_STYLE, and AVERAGE_WIDTH fields of the font name
 with `*' then using this to specify a fontset.  This fontset's short
 name is `fontset-startup'.
 
diff --git a/lib-src/etags.c b/lib-src/etags.c
index cdcc6461a64..5bd8077265f 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -6097,7 +6097,7 @@ readline (linebuffer *lbp, FILE *stream)
   lineno += 1;                  /* increment global line number */
   charno += result;             /* increment global char number */
 
-  /* Honour #line directives. */
+  /* Honor #line directives. */
   if (!no_line_directive)
     {
       static bool discard_until_line_directive;
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b1572f9bce..65ab83e0204 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,52 @@
+2011-11-14  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/executable.el
+        (executable-make-buffer-file-executable-if-script-p):
+        Handle file-modes returning nil.
+
+        * mail/rmail.el (rmail-no-mail-p): Remove mode-line N/M indicator.
+
+        * mail/rmailsum.el (rmail-summary, rmail-new-summary)
+        (rmail-new-summary-1): Allow empty summaries.  (Bug#9964)
+        (rmail-new-summary): Remember that rmail-summary-buffer is buffer-local.
+
+2011-11-12  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-resize, delete-window): Use window-splits
+        variable instead of function.
+        (window-state-get-1, window-state-put-2, window-state-put):
+        Don't deal with windows' splits status.
+
+2011-11-12  Glenn Morris  <rgm@gnu.org>
+
+        * apropos.el (apropos-do-all, apropos-library, apropos-value)
+        (apropos-documentation): Doc fixes.
+
+2011-11-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/idlw-shell.el (idlwave-shell-make-new-bp-overlay):
+        * textmodes/sgml-mode.el (html-tag-help): Fix typos.
+
+2011-11-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * electric.el (electric-indent-post-self-insert-function): Make it
+        possible for a char to only indent in some circumstances.
+        (electric-indent-mode): Simplify.
+
+2011-11-11  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (windows-with-parameter): Remove unused function.
+        (windows-at-side): Rename to window-at-side-list.
+        (window-check, window-atom-check, window-atom-check-1)
+        (window-side-check, window-size-ignore, window-size-fixed-1)
+        (window-in-direction-2): Prefix with "window--".
+        (window-tree-1): Rename to window--subtree, fix doc-string.
+
+2011-11-11  Glenn Morris  <rgm@gnu.org>
+
+        * subr.el (eval-after-load): If FILE is already loaded,
+        evaluate FORM before it gets wrapped in more stuff.  (Bug#10009)
+
 2011-11-10  Glenn Morris  <rgm@gnu.org>
 
         * vc/vc-svn.el (vc-svn-create-repo, vc-svn-modify-change-comment):
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 35572bd6105..1e7ed845b49 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -18374,7 +18374,7 @@
         (tar-summarize-buffer): Don't clear the modified-p bit if it wasn't
         cleared before.  Obey default-enable-multibyte-characters.
         Use mapconcat.  Simplify setting of tar-header-offset.
-        (tar-mode-map): Move initialization inside delcaration.
+        (tar-mode-map): Move initialization inside declaration.
         (tar-flag-deleted): Use `abs'.
         (tar-expunge-internal): Remove unused var `line'.
         (tar-expunge-internal): Don't hardcode point-min==1.
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 9cb24baeb1f..ed70075754c 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -2252,7 +2252,7 @@
         Use define-derived-mode.
         * textmodes/reftex-index.el (reftex-index-phrases-mode-map)
         (reftex-index-mode-map): Rename from reftex-index(-phrases)-map.
-        Move init into delcaration.
+        Move init into declaration.
         (reftex-index-mode, reftex-index-phrases-mode):
         Use define-derived-mode.
         * speedbar.el (speedbar-mode-syntax-table): Renaqme from
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 14214ccc3d3..edfe26fbc03 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -2628,7 +2628,7 @@
 
 2001-07-06  Vinicius Jose Latorre  <vinicius@cpqd.com.br>
 
-        * ps-print.el: Use locale dependant date to print date in header.
+        * ps-print.el: Use locale dependent date to print date in header.
         Doc fix.
         (ps-print-version): New version number (6.5.3).
         (ps-right-header, ps-right-footer): Initialization and doc fix.
diff --git a/lisp/apropos.el b/lisp/apropos.el
index d3d66f2a070..1dfe5cde9ed 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -66,9 +66,22 @@
 
 ;; I see a degradation of maybe 10-20% only.
 (defcustom apropos-do-all nil
-  "Whether the apropos commands should do more.
-
-Slows them down more or less.  Set this non-nil if you have a fast machine."
+  "Non nil means apropos commands will search more extensively.
+This may be slower.  This option affects the following commands:
+
+`apropos-variable' will search all variables, not just user variables.
+`apropos-command' will also search non-interactive functions.
+`apropos' will search all symbols, not just functions, variables, faces,
+and those with property lists.
+`apropos-value' will also search in property lists and functions.
+`apropos-documentation' will search all documentation strings, not just
+those in the etc/DOC documentation file.
+
+This option only controls the default behavior.  Each of the above
+commands also has an optional argument to request a more extensive search.
+
+Additionally, this option makes the function `apropos-library'
+include key-binding information in its output."
   :group 'apropos
   :type 'boolean)
 
@@ -582,7 +595,8 @@ Returns list of symbols and documentation found."
 (defun apropos-library (file)
   "List the variables and functions defined by library FILE.
 FILE should be one of the libraries currently loaded and should
-thus be found in `load-history'."
+thus be found in `load-history'.  If `apropos-do-all' is non-nil,
+the output includes key-bindings of commands."
   (interactive
    (let* ((libs (delq nil (mapcar 'car load-history)))
           (libs
@@ -693,7 +707,9 @@ search for matches for that word as a substring.  If it is a list of words,
 search for matches for any two (or more) of those words.
 
 With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also looks
-at the function and at the names and values of properties.
+at function definitions (arguments, documentation and body) and at the
+names and values of properties.
+
 Returns list of symbols and values found."
   (interactive (list (apropos-read-pattern "value")
                      current-prefix-arg))
@@ -738,10 +754,14 @@ or a regexp (using some regexp special characters).  If it is a word,
 search for matches for that word as a substring.  If it is a list of words,
 search for matches for any two (or more) of those words.
 
-With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also use
-documentation that is not stored in the documentation file and show key
-bindings.
+Note that by default this command only searches in the file specified by
+`internal-doc-file-name'; i.e., the etc/DOC file.  With \\[universal-argument] prefix,
+or if `apropos-do-all' is non-nil, it searches all currently defined
+documentation strings.
+
 Returns list of symbols and documentation found."
+  ;; The doc used to say that DO-ALL includes key-bindings info in the
+  ;; output, but I cannot see that that is true.
   (interactive (list (apropos-read-pattern "documentation")
                      current-prefix-arg))
   (apropos-parse-pattern pattern)
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index d2fb066515b..d7645bc97ed 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 Dependant packages.
+  "Display all active versions of CEDET and Dependent packages.
 
 The PACKAGE column is the name of a given package from CEDET.
 
diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el
index 42a20cc4a1a..66c71063363 100644
--- a/lisp/cedet/ede/proj-elisp.el
+++ b/lisp/cedet/ede/proj-elisp.el
@@ -217,7 +217,7 @@ is found, such as a `-version' variable, or the standard header."
       (save-excursion
         (if (file-symlink-p ec)
             (progn
-              ;; Desymlinkafy
+              ;; Desymlinkify
               (rename-file ec (concat ec ".tmp"))
               (copy-file (concat ec ".tmp") ec)
               (delete-file (concat ec ".tmp"))))
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 0b3e6881891..1076402ac91 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -249,7 +249,7 @@ Return the defined symbol as a special spp lex token."
                                                  (point))))
            )
 
-      ;; Only do argument checking if the paren was immediatly after
+      ;; Only do argument checking if the paren was immediately after
       ;; the macro name.
       (if with-args
           (semantic-lex-spp-first-token-arg-list (car raw-stream)))
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index e984965a737..a37f43d177f 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -296,7 +296,7 @@ This mode provides a nice context menu on the include statements."
         ;; Set ourselves up for synchronization
         (semanticdb-cache-get
          table 'semantic-decoration-unparsed-include-cache)
-        ;; Add a dependancy.
+        ;; Add a dependency.
         (let ((table semanticdb-current-table))
           (semanticdb-add-reference table tag))
         )
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index 7f7e82a95c2..307071e743c 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -427,7 +427,7 @@ See `semantic-edits-change-leaf-tag' for details on parents."
             ;; which must have a value by now.
 
             ;; Loop over the search list to find the preceding CDR.
-            ;; Fortunatly, (car overlapped-tags) happens to be
+            ;; Fortunately, (car overlapped-tags) happens to be
             ;; the first tag positionally.
             (let ((tokstart (semantic-tag-start (car overlapped-tags))))
               (while (and list-to-search
diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index fa6e7517624..381801559da 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -291,7 +291,7 @@ local definitions."
   ;; Try and find a trail of parents from PARENT
   (let ((rlist (list parent))
         )
-    ;; IMPLELEMENT ME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    ;; IMPLEMENT ME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     (reverse rlist)))
 
 (define-overloadable-function semantic-format-tag-canonical-name (tag &optional parent color)
diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el
index 972ce5e26bc..137759d46ac 100644
--- a/lisp/cedet/semantic/html.el
+++ b/lisp/cedet/semantic/html.el
@@ -61,7 +61,7 @@
 (define-mode-local-override semantic-parse-region
   html-mode (&rest ignore)
   "Parse the current html buffer for semantic tags.
-INGNORE any arguments.  Always parse the whole buffer.
+IGNORE any arguments.  Always parse the whole buffer.
 Each tag returned is of the form:
  (\"NAME\" section (:members CHILDREN))
 or
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 78a1fd049f0..53695015e4a 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -426,7 +426,7 @@ implicit \"object\"."
 
     ;; Collect all the types (class, etc) that are in our heratage.
     ;; These are types that we can extract members from, not those
-    ;; delclared in using statements, or the like.
+    ;; declared in using statements, or the like.
     ;; Get the PARENTS including nesting scope for this location.
     (while parentlist
       (oset miniscope scope currentscope)
diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el
index 17fd3b45356..d118d9b6203 100644
--- a/lisp/cedet/semantic/tag-file.el
+++ b/lisp/cedet/semantic/tag-file.el
@@ -154,7 +154,7 @@ Depends on `semantic-dependency-include-path' for searching.  Always searches
           (setq result
                 ;; I don't have a plan for refreshing tags with a dependency
                 ;; stuck on them somehow.  I'm thinking that putting a cache
-                ;; onto the dependancy finding with a hash table might be best.
+                ;; onto the dependency finding with a hash table might be best.
                 ;;(if (semantic--tag-get-property tag 'dependency-file)
                 ;;  (semantic--tag-get-property tag 'dependency-file)
                 (:override
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 393d64e6420..30c5a5cf8b6 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -421,7 +421,7 @@ Optional argument POINT is where to look for the environment."
   texinfo-mode (context)
   "List smart completions at point.
 Since texinfo is not a programming language the default version is not
-useful.  Insted, look at the current symbol.  If it is a command
+useful.  Instead, look at the current symbol.  If it is a command
 do primitive texinfo built ins.  If not, use ispell to lookup words
 that start with that symbol."
   (let ((prefix (car (oref context :prefix)))
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index dba4b876edb..80e6f9d8d1c 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -66,7 +66,7 @@
 
 (defmethod srecode-extract-state-extract ((st srecode-extract-state)
                                           endpoint)
-  "Perform an extraction on the extract state ST with ENDPOITNT.
+  "Perform an extraction on the extract state ST with ENDPOINT.
 If there was no waiting inserter, do nothing."
   (when (oref st lastinserter)
     (save-match-data
diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el
index a582d4ff59e..9a6c27dcd73 100644
--- a/lisp/cedet/srecode/getset.el
+++ b/lisp/cedet/srecode/getset.el
@@ -215,7 +215,7 @@ INCLASS specifies if the cursor is already in CLASS or not."
           (when (not te)
             (message "Unknown location for tag-end in %s:" (semantic-tag-name aftertag)))
           (goto-char te)
-          ;; If there is a comment immediatly after aftertag, skip over it.
+          ;; If there is a comment immediately after aftertag, skip over it.
           (when (looking-at (concat "\\s-*\n?\\s-*" semantic-lex-comment-regex))
             (let ((pos (point))
                   (rnext (semantic-find-tag-by-overlay-next (point))))
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index 6ca0cefe9a7..bb2db79acc6 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -366,7 +366,7 @@ programming modes."
         (define-key srecode-prefix-map oldkey nil)
         )))
 
-  ;; Update Keybings
+  ;; Update Keybindings
   (let ((oldbinding (lookup-key srecode-prefix-map binding)))
 
     ;; During development, allow overrides.
diff --git a/lisp/dframe.el b/lisp/dframe.el
index 02eeef064fe..93d9e7948cf 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -523,7 +523,7 @@ LOCATION can be one of 'random, 'left-right, or 'top-bottom."
             (funcall f 'default frame)))))
 
 (defun dframe-detach (frame-var cache-var buffer-var)
-  "Detatch the frame in symbol FRAME-VAR.
+  "Detach the frame in symbol FRAME-VAR.
 CACHE-VAR and BUFFER-VAR are symbols as in `dframe-frame-mode'"
   (with-current-buffer (symbol-value buffer-var)
     (rename-buffer (buffer-name) t)
diff --git a/lisp/electric.el b/lisp/electric.el
index 3d7c1fd8ac4..69acb773648 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -197,7 +197,11 @@ Returns nil when we can't find this char."
 ;; value, which only works well if the variable is preloaded.
 ;;;###autoload
 (defvar electric-indent-chars '(?\n)
-  "Characters that should cause automatic reindentation.")
+  "Characters that should cause automatic reindentation.
+Each entry of the list can be either a character or a cons of the
+form (CHAR . PREDICATE) which means that CHAR should cause reindentation
+only if PREDICATE returns non-nil.  PREDICATE is called with no arguments
+and with point before the inserted char.")
 
 (defun electric-indent-post-self-insert-function ()
   ;; FIXME: This reindents the current line, but what we really want instead is
@@ -208,7 +212,12 @@ Returns nil when we can't find this char."
   ;; There might be a way to get it working by analyzing buffer-undo-list, but
   ;; it looks challenging.
   (let (pos)
-    (when (and (memq last-command-event electric-indent-chars)
+    (when (and (or (memq last-command-event electric-indent-chars)
+                   (let ((cp (assq last-command-event electric-indent-chars)))
+                     (and cp (setq pos (electric--after-char-pos))
+                          (save-excursion
+                            (goto-char (1- pos))
+                            (funcall (cdr cp))))))
                ;; Don't reindent while inserting spaces at beginning of line.
                (or (not (memq last-command-event '(?\s ?\t)))
                    (save-excursion (skip-chars-backward " \t") (not (bolp))))
@@ -253,19 +262,13 @@ in `electric-indent-chars'."
   :group 'electricity
   (if electric-indent-mode
       (add-hook 'post-self-insert-hook
-                #'electric-indent-post-self-insert-function)
+                #'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))
-  ;; FIXME: electric-indent-mode and electric-layout-mode interact
-  ;; in non-trivial ways.  It turns out that electric-indent-mode works
-  ;; better if it is run *after* electric-layout-mode's hook.
-  (when (memq #'electric-layout-post-self-insert-function
-              (memq #'electric-indent-post-self-insert-function
-                    (default-value 'post-self-insert-hook)))
-    (remove-hook 'post-self-insert-hook
-                 #'electric-layout-post-self-insert-function)
-    (add-hook 'post-self-insert-hook
-              #'electric-layout-post-self-insert-function)))
+                 #'electric-indent-post-self-insert-function)))
 
 ;; Electric pairing.
 
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index 1b101cef875..8869530dc23 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -92,7 +92,7 @@ Optional HEADERFCN should be called to insert a few bits of info first."
     (princ "Class ")
     (prin1 class)
     (terpri)
-    ;; Inheritence tree information
+    ;; Inheritance tree information
     (let ((pl (class-parents class)))
       (when pl
         (princ " Inherits from ")
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index f1fe9594fc0..352bd245ba4 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -1,5 +1,5 @@
 ;;; eieio.el --- Enhanced Implementation of Emacs Interpreted Objects
-;;;              or maybe Eric's Implementation of Emacs Intrepreted Objects
+;;;              or maybe Eric's Implementation of Emacs Interpreted Objects
 
 ;; Copyright (C) 1995-1996, 1998-2011  Free Software Foundation, Inc.
 
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 359b3ff751d..df37157f7a9 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1599,7 +1599,7 @@ as a Meta key and any number of multiple escapes are allowed."
 ;; call viper-execute-com to execute viper-exec-change, which eventually will
 ;; call viper-change to invoke the replace mode on the region.
 ;;
-;; The var viper-d-com is set to (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS)
+;; The var viper-d-com is set to (M-COM VAL COM REG INSERTED-TEXT COMMAND-KEYS)
 ;; via a call to viper-set-destructive-command, for later use by viper-repeat.
 (defun viper-execute-com (m-com val com)
   (let ((reg viper-use-register))
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index d363ea92bdb..f86c9ef845a 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -79,7 +79,7 @@
 
 ;;; TODO:
 
-;; o Generalise the display-line code so that we can use it to
+;; o Generalize the display-line code so that we can use it to
 ;;   display the stuff we send, as well as the stuff we receive.
 ;;   Then, move all display-related code into another backend-like
 ;;   file, erc-display.el, say.
@@ -2000,4 +2000,3 @@ See `erc-display-error-notice'." nil
 ;; Local Variables:
 ;; indent-tabs-mode: nil
 ;; End:
-
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index 69004a841f1..03774396485 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -344,7 +344,7 @@ This function is explicit for adding to `eshell-parse-argument-hook'."
               (pcomplete-here))))
 
 (defun eshell/env (&rest args)
-  "Implemention of `env' in Lisp."
+  "Implementation of `env' in Lisp."
   (eshell-init-print-buffer)
   (eshell-eval-using-options
    "env" args
diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index b828f79f8fa..e8680b65d96 100644
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@@ -257,9 +257,9 @@ Optional argument STRING is a string upon which to add text properties."
            (a (assoc bt ezimage-expand-image-button-alist)))
       ;; Regular images (created with `insert-image' are intangible
       ;; which (I suppose) make them more compatible with XEmacs 21.
-      ;; Unfortunatly, there is a giant pile o code dependent on the
+      ;; Unfortunately, there is a giant pile of code dependent on the
       ;; underlying text.  This means if we leave it tangible, then I
-      ;; don't have to change said giant piles o code.
+      ;; don't have to change said giant piles of code.
       (if (and a (symbol-value (cdr a)))
           (ezimage-insert-over-text (symbol-value (cdr a))
                                     start
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 2f4b7413dcc..d410b8eb51a 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1742,7 +1742,7 @@ If SYNTACTIC-KEYWORDS is non-nil, it means these keywords are used for
          keyword)))
 
 (defun font-lock-eval-keywords (keywords)
-  "Evalulate KEYWORDS if a function (funcall) or variable (eval) name."
+  "Evaluate KEYWORDS if a function (funcall) or variable (eval) name."
   (if (listp keywords)
       keywords
     (font-lock-eval-keywords (if (fboundp keywords)
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index b84c493cc58..6ffc5d9e821 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -4727,7 +4727,7 @@ If LINE, insert the rebuilt thread starting on line LINE."
       (car headers))))
 
 (defun gnus-parent-headers (in-headers &optional generation)
-  "Return the headers of the GENERATIONeth parent of HEADERS."
+  "Return the headers of the GENERATIONth parent of HEADERS."
   (unless generation
     (setq generation 1))
   (let ((parent t)
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index c8e95581510..ffef8cdf7b7 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -432,8 +432,8 @@ and so on."
                                  (const :tag "Lucid Toolkit" lucid    )
                                  (const :tag "Motif Toolkit" motif    )))
 
-             (class      (choice (const :tag "Colour"        color    )
-                                 (const :tag "Greyscale"     grayscale)))
+             (class      (choice (const :tag "Color"         color    )
+                                 (const :tag "Grayscale"     grayscale)))
 
              (background (choice (const :tag "Dark"          dark     )
                                  (const :tag "Bright"        light    ))) ))
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index f47d73a9508..3f83841f60d 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -43,7 +43,7 @@
 ;; CONVERSION-KEYS argument of the Quail package.
 
 ;; [There was an input method for Mule 2.3 called `Tamago' from the
-;; Japanese `TAkusan MAtasete GOmenasai', or `Sorry for having you
+;; Japanese `TAkusan MAtasete GOmen-nasai', or `Sorry for having you
 ;; wait so long'; this couldn't be included in Emacs 20.  `Tamago' is
 ;; Japanese for `egg' (implicitly a hen's egg).  Handa-san made a
 ;; smaller and simpler system; the smaller quail egg is also eaten in
@@ -1377,7 +1377,7 @@ Return the input string."
           (set-buffer-modified-p modified-p)
           (quail-show-guidance)
           (let* ((prompt (if input-method-use-echo-area
-                             (format "%s%s %s" 
+                             (format "%s%s %s"
                                      (or input-method-previous-message "")
                                      quail-current-str
                                      quail-guidance-str)))
@@ -1443,7 +1443,7 @@ Return the input string."
                 (quail-setup-overlays nil)))
           (quail-show-guidance)
           (let* ((prompt (if input-method-use-echo-area
-                             (format "%s%s%s %s" 
+                             (format "%s%s%s %s"
                                      (or input-method-previous-message "")
                                      quail-conversion-str
                                      quail-current-str
@@ -2125,7 +2125,7 @@ minibuffer and the selected frame has no other windows)."
                                (- quail-guidance-translations-starting-column
                                   7 (string-width str))
                                32))))
-            (setq str (format "%s(%02d/%s)" 
+            (setq str (format "%s(%02d/%s)"
                               str (nth 3 indices)
                               (if (nth 4 indices)
                                   (format "%02d" (nth 4 indices))
@@ -2135,7 +2135,7 @@ minibuffer and the selected frame has no other windows)."
                     (trans (aref (cdr quail-current-translations) idx)))
                 (or (stringp trans)
                     (setq trans (string trans)))
-                (setq str (format "%s %d.%s" 
+                (setq str (format "%s %d.%s"
                                   str
                                   (if (= (- idx start) 9) 0
                                     (1+ (- idx start)))
@@ -2787,7 +2787,7 @@ If CHAR is an ASCII character and can be input by typing itself, return t."
                 (cdr decode-map)))
       (let ((key-head (aref decode-map char)))
         (if (stringp key-head)
-            (setq key-list (quail-find-key1 
+            (setq key-list (quail-find-key1
                             (quail-lookup-key key-head nil t)
                             key-head char nil))
           (mapc #'(lambda (elt)
diff --git a/lisp/international/robin.el b/lisp/international/robin.el
index 6f78aaede3f..443a292f4c1 100644
--- a/lisp/international/robin.el
+++ b/lisp/international/robin.el
@@ -229,7 +229,7 @@
 ;; As stated in Murphy's law, it took longer than expected to develop the
 ;; very first version of Japanese input subsystem in NEmacs (Nihongo
 ;; Emacs).  So the subsystem was named "TAMAGO", which is an acronym of
-;; "TAkusan Matasete GOmennasai" (Sorry to have kept you waiting so
+;; "TAkusan Matasete GOmen-nasai" (Sorry to have kept you waiting so
 ;; long).  "Tamago" as a Japanese word means "egg", so the word "egg" was
 ;; also used for related filenames and function names.
 
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 4b3441a8cdc..76c9b87f881 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2602,6 +2602,8 @@ Ask the user whether to add that list name to `mail-mailing-lists'."
   "Return nil if there is mail, else \"No mail.\"."
   (if (zerop rmail-total-messages)
       (save-excursion
+        ;; Eg we deleted all the messages, so remove the old N/M mark.
+        (with-current-buffer rmail-buffer (setq mode-line-process nil))
         (with-current-buffer rmail-view-buffer
           (erase-buffer)
           "No mail."))))
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 8e28201e31f..b95651d3b69 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -269,7 +269,8 @@ Setting this option to nil might speed up the generation of summaries."
   "Display a summary of all messages, one line per message."
   (interactive)
   (rmail-new-summary "All" '(rmail-summary) nil)
-  (unless (get-buffer-window rmail-buffer)
+  (unless (or (zerop (buffer-size))             ; empty summary
+              (get-buffer-window rmail-buffer))
     (rmail-summary-beginning-of-message)))
 
 ;;;###autoload
@@ -404,13 +405,13 @@ nil for FUNCTION means all messages."
   (message "Computing summary lines...")
   (unless rmail-buffer
     (error "No RMAIL buffer found"))
-  (let (mesg was-in-summary)
+  (let (mesg was-in-summary sumbuf)
     (if (eq major-mode 'rmail-summary-mode)
         (setq was-in-summary t))
     (with-current-buffer rmail-buffer
-      (if (zerop (setq mesg rmail-current-message))
-          (error "No messages to summarize"))
-      (setq rmail-summary-buffer (rmail-new-summary-1 desc redo func args)))
+      (setq rmail-summary-buffer (rmail-new-summary-1 desc redo func args)
+            ;; r-s-b is buffer-local.
+            sumbuf rmail-summary-buffer))
     ;; Now display the summary buffer and go to the right place in it.
     (unless was-in-summary
       (if (and (one-window-p)
@@ -420,13 +421,12 @@ nil for FUNCTION means all messages."
           (progn
             (split-window (selected-window) rmail-summary-window-size)
             (select-window (next-window (frame-first-window)))
-            (rmail-pop-to-buffer rmail-summary-buffer)
+            (rmail-pop-to-buffer sumbuf)
             ;; If pop-to-buffer did not use that window, delete that
             ;; window.  (This can happen if it uses another frame.)
-            (if (not (eq rmail-summary-buffer
-                         (window-buffer (frame-first-window))))
+            (if (not (eq sumbuf (window-buffer (frame-first-window))))
                 (delete-other-windows)))
-        (rmail-pop-to-buffer rmail-summary-buffer))
+        (rmail-pop-to-buffer sumbuf))
       (set-buffer rmail-buffer)
       ;; This is how rmail makes the summary buffer reappear.
       ;; We do this here to make the window the proper size.
@@ -490,9 +490,6 @@ message."
     ;; Temporarily, while summary buffer is unfinished,
     ;; we "don't have" a summary.
     (setq rmail-summary-buffer nil)
-    (unless summary-msgs
-      (kill-buffer sumbuf)
-      (error "Nothing to summarize"))
     ;; I have not a clue what this clause is doing.  If you read this
     ;; chunk of code and have a clue, then please email that clue to
     ;; pmr@pajato.com
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index e0e213b92b9..458993ca8f1 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -2447,7 +2447,7 @@ of citations entirely, choose \"None\"."
     "Followup-To:"                      ; RFC 1036
     "For-Approval:"                     ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "For-Comment:"                      ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
-    "For-Handdling:"                    ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
+    "For-Handling:"                     ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "Forwarded:"                        ; MH
     "From "                             ; sendmail
     "Generate-Delivery-Report:"         ; RFC 2156
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index ba7d7115ffc..e5eb2015418 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -145,7 +145,7 @@ association to the service from D-Bus."
          (service (car value))
          (entry (gethash key dbus-registered-objects-table))
          ret)
-    ;; key has the structure (BUS INTERRFACE MEMBER).
+    ;; key has the structure (BUS INTERFACE MEMBER).
     ;; value has the structure (SERVICE PATH [HANDLER]).
     ;; entry has the structure ((UNAME SERVICE PATH MEMBER [RULE]) ...).
     ;; MEMBER is either a string (the handler), or a cons cell (a
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index 42c698876cd..d6949e4d250 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -32,7 +32,7 @@
 ;; `soap-invoke' method passing it the WSDL, the service name, the operation
 ;; you wish to invoke and any required parameters.
 ;;
-;; Idealy, the service you want to access will have some documentation about
+;; Ideally, the service you want to access will have some documentation about
 ;; the operations it supports.  If it does not, you can try using
 ;; `soap-inspect' to browse the WSDL document and see the available operations
 ;; and their parameters.
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index 3a2560b3c61..6ef24e9f354 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -235,7 +235,7 @@
      "www.faqs.org/faqs/")
     ("RTFM Usenet FAQs by Group" .
      "ftp://rtfm.mit.edu/pub/usenet-by-group/")
-    ("RTFM Usenet FAQs by Hierachy" .
+    ("RTFM Usenet FAQs by Hierarchy" .
      "ftp://rtfm.mit.edu/pub/usenet-by-hierarchy/")
     ("X Consortium Archive" . "ftp.x.org")
 
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index ae150621dc0..f6bd1ffa2d4 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org-plot.el (org-plot/gnuplot-to-grid-data): Fix typo in docstring.
+
 2011-09-27  Eli Zaretskii  <eliz@gnu.org>
 
         * org.el (org-mode): Force left-to-right paragraphs in Org
@@ -1965,7 +1969,7 @@
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org-latex.el (org-export-latex-preprocess): Protect index string
+        * org-latex.el (org-export-latex-preprocess): Protect index string.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -2119,11 +2123,11 @@
         (org-bibtex-headline): Make use of new
         `org-bibtex-export-arbitrary-fields' and `org-bibtex-key-property'
         variables.
-        (org-bibtex-autokey):  Make use of new `org-bibtex-key-property'
+        (org-bibtex-autokey): Make use of new `org-bibtex-key-property'
         variable.
-        (org-bibtex-fleshout):  Make use of new `org-bibtex-key-property'
+        (org-bibtex-fleshout): Make use of new `org-bibtex-key-property'
         variable.
-        (org-bibtex-write):  Make use of new `org-bibtex-key-property'
+        (org-bibtex-write): Make use of new `org-bibtex-key-property'
         variable.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -2247,7 +2251,7 @@
 2011-07-28  Manuel Giraud  <manuel.giraud@univ-nantes.fr>
 
         * org-html.el (org-html-handle-links): Add an alternate for inline
-        images
+        images.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -2293,7 +2297,7 @@
 
         * ob-python.el (org-babel-python-evaluate-external-process): Allow
         parsing as a table in the case of ":results output table".
-        (org-babel-python-evaluate-session):   Allow parsing as a table in
+        (org-babel-python-evaluate-session): Allow parsing as a table in
         the case of ":results output table".
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -2343,7 +2347,7 @@
 
         * org.el (org-set-font-lock-defaults): Be more strict when
         recognizing description items, and do not fontify wrong cases
-        like: "- term ::description" or "1. term :: description"
+        like: "- term ::description" or "1. term :: description".
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
@@ -2894,12 +2898,12 @@
 2011-07-28  Bernt Hansen  <bernt@norang.ca>
 
         * org-clock.el (org-clock-in): Allow clocking in new tasks
-        inserted before the current clocking task
+        inserted before the current clocking task.
 
 2011-07-28  Bernt Hansen  <bernt@norang.ca>
 
         * org-clock.el (org-clock-in): Set default clocking task when
-        already clocking the task
+        already clocking the task.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
@@ -3045,7 +3049,7 @@
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org.el (org-refile-get-targets): Rename from
-        `org-get-refile-targets.'
+        `org-get-refile-targets'.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -3727,7 +3731,7 @@
         (org-in-item-p,org-list-struct,org-list-parse-list): Apply change.
 
         * org-exp.el (org-export-mark-list-end)
-        (org-export-mark-list-properties): Apply change
+        (org-export-mark-list-properties): Apply change.
 
         * org-latex.el (org-export-latex-lists): Apply change.  Also
         prevent items with org-example property to be considered as real
@@ -4774,7 +4778,7 @@
         * ob-tangle.el (org-babel-spec-to-string): Adding "noweb" as a
         linking comment type
         (org-babel-tangle-comment-links): Returns comment links for the
-        source code block at point
+        source code block at point.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -4855,7 +4859,7 @@
 
         * org-capture.el (org-capture-templates): Add %f and %F escapes
         (org-capture): Add more information to capture property list
-        (org-capture-fill-template): Handle %f and %F escapes
+        (org-capture-fill-template): Handle %f and %F escapes.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -5003,7 +5007,7 @@
         output file.
 
         * ob-sass.el (org-babel-execute:sass): Return nil if result has
-        been written to file
+        been written to file.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
@@ -16833,7 +16837,7 @@
 
         * org-agenda.el (org-format-agenda-item)
         (org-agenda-filter-make-matcher): Make sure tags are stored and
-        compared donwcased.
+        compared downcased.
 
 2008-10-26  Carsten Dominik  <dominik@science.uva.nl>
 
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index d3c5dd99aa6..866176e4e8f 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -70,12 +70,12 @@
 ;; (a few thousand lines long).  Thus, code should follow the rule :
 ;; "collect once, use many".  As a corollary, it is usally a bad idea
 ;; to use directly an interactive function inside the code, as those,
-;; being independant entities, read the whole list structure another
+;; being independent entities, read the whole list structure another
 ;; time.
 
 ;;; Code:
 
-(eval-when-compile 
+(eval-when-compile
   (require 'cl))
 (require 'org-macs)
 (require 'org-compat)
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index b90c248eb6d..419467226c9 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -136,7 +136,7 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
   "Export the data in TABLE to DATA-FILE for gnuplot.
 This means in a format appropriate for grid plotting by gnuplot.
 PARAMS specifies which columns of TABLE should be plotted as independent
-and dependant variables."
+and dependent variables."
   (interactive)
   (let* ((ind (- (plist-get params :ind) 1))
          (deps (if (plist-member params :deps)
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 9a83d5196db..2028a7c4675 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -317,7 +317,7 @@
                         (match-beginning ,(car highlight))
                         (match-end ,(car highlight))
                         ,(elt highlight 1))))
-                ;; highlight is an "ANCHORED HIGHLIGHER" of the form
+                ;; highlight is an "ANCHORED HIGHLIGHTER" of the form
                 ;; (ANCHORED-MATCHER PRE-FORM POST-FORM SUBEXP-HIGHLIGHTERS...)
                 (when (nth 3 highlight)
                   (error "Match highlights currently not supported in %s"
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index f7965d2cd01..c027b2b7454 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -4007,7 +4007,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
 /#ebnf2ps#dict 230 dict def
 #ebnf2ps#dict begin
 
-% Initiliaze variables to avoid name-conflicting with document variables.
+% Initialize variables to avoid name-conflicting with document variables.
 % This is the case when using `bind' operator.
 /-fillp-                0 def           /h              0 def
 /-ox-                   0 def           /half           0 def
diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index d8133cb6b90..281fa3cef72 100644
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -268,12 +268,16 @@ file modes."
        (save-restriction
          (widen)
          (string= "#!" (buffer-substring (point-min) (+ 2 (point-min)))))
-       (let* ((current-mode (file-modes (buffer-file-name)))
-              (add-mode (logand ?\111 (default-file-modes))))
-         (or (/= (logand ?\111 current-mode) 0)
-             (zerop add-mode)
-             (set-file-modes (buffer-file-name)
-                             (logior current-mode add-mode))))))
+       (condition-case nil
+           (let* ((current-mode (file-modes (buffer-file-name)))
+                  (add-mode (logand ?\111 (default-file-modes))))
+             (or (/= (logand ?\111 current-mode) 0)
+                 (zerop add-mode)
+                 (set-file-modes (buffer-file-name)
+                                 (logior current-mode add-mode))))
+         ;; Eg file-modes can return nil (bug#9879).  It should not,
+         ;; in this context, but we should handle it all the same.
+         (error (message "Unable to make file executable")))))
 
 (provide 'executable)
 
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 944a412fb63..543539421fe 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2016,7 +2016,7 @@ extension EXTN.  Normally EXTN is given as the regular expression
            ((looking-at "final")
             (forward-char 5))
 
-           ;; Move point past a ClassDeclaraction, but save the class
+           ;; Move point past a ClassDeclaration, but save the class
            ;; Identifier.
            ((looking-at "class")
             (forward-char 5)
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 18f47d14a3f..453badfa46b 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -959,7 +959,7 @@ IDL has currently stepped.")
   ;; Can not use history expansion because "!" is used for system variables.
   (setq comint-input-autoexpand nil)
   ;; (setq comint-input-ring-size 64)
-  
+
   (set (make-local-variable 'completion-ignore-case) t)
   (set (make-local-variable 'comint-completion-addsuffix) '("/" . ""))
   (setq comint-input-ignoredups t)
@@ -3707,7 +3707,7 @@ Existing overlays are recycled, in order to minimize consumption."
 (defun idlwave-shell-make-new-bp-overlay (&optional type disabled)
   "Make a new overlay for highlighting breakpoints.
 
-This stuff is strongly dependant upon the version of Emacs.  If TYPE
+This stuff is strongly dependent upon the version of Emacs.  If TYPE
 is passed, make an overlay of that type ('bp or 'bp-cond, currently
 only for glyphs)."
   (let ((ov (make-overlay 1 1))
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index c77ee4b76a9..95f67a6bf66 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -8961,7 +8961,7 @@ This expects NAME TYPE IDLWAVE-TWIN-CLASS to be bound to the right values."
     (nth 1 source)))
 
 (defun idlwave-downcase-safe (string)
-  "Donwcase if string, else return unchanged."
+  "Downcase if string, else return unchanged."
   (if (stringp string)
       (downcase string)
     string))
diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index f0b8f7cbca7..0c43a3ed354 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -466,7 +466,7 @@ followed by the first character of the construct.
   '(m2-var) \n _ \n \n
   '(m2-begin)
   '(m2-begin-comment)
-  " Module " str " Initialisation Code "
+  " Module " str " Initialization Code "
   '(m2-end-comment)
   \n \n "END " str "." > \n)
 
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 57ed13969b4..67e3c4a18b4 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -227,7 +227,7 @@ will do all lineups."
   :type '(set :extra-offset 8
               (const :tag "Everything" all)
               (const :tag "Parameter lists" paramlist)
-              (const :tag "Decalrations" declaration)
+              (const :tag "Declarations" declaration)
               (const :tag "Case statements" case))
   :group 'pascal)
 
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index d60e7513651..94d55ee3f61 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -624,7 +624,7 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number
 (defun ps-mode-target-column ()
   "To what column should text on current line be indented?
 
-Identation is increased if the last token on the current line
+Indentation is increased if the last token on the current line
 defines the beginning of a group. These tokens are:  {  [  <<"
   (save-excursion
     (beginning-of-line)
diff --git a/lisp/ses.el b/lisp/ses.el
index 9b2048eae83..b1d7d7bfb9e 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -43,7 +43,7 @@
 ;; working fine in most cases, however failed in some cases of several path
 ;; racing together.
 ;;
-;; The current algorithm is based on Dijksta algorithm.  The ``cycle length'' is
+;; The current algorithm is based on Dijkstra's algorithm.  The cycle length is
 ;; stored in some cell property. In order not to reset in all cells such
 ;; property at each update, the cycle length is stored in this property along
 ;; with some update attempt id that is incremented at each update. The current
diff --git a/lisp/subr.el b/lisp/subr.el
index d5120826812..1cd6598eeb5 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1797,30 +1797,29 @@ This function makes or adds to an entry on `after-load-alist'."
       (push elt after-load-alist))
     ;; Make sure `form' is evalled in the current lexical/dynamic code.
     (setq form `(funcall ',(eval `(lambda () ,form) lexical-binding)))
-    (when (symbolp regexp-or-feature)
-      ;; For features, the after-load-alist elements get run when `provide' is
-      ;; called rather than at the end of the file.  So add an indirection to
-      ;; make sure that `form' is really run "after-load" in case the provide
-      ;; call happens early.
-      (setq form
-            `(when load-file-name
-               (let ((fun (make-symbol "eval-after-load-helper")))
-                 (fset fun `(lambda (file)
-                              (if (not (equal file ',load-file-name))
-                                  nil
-                                (remove-hook 'after-load-functions ',fun)
-                                ,',form)))
-                 (add-hook 'after-load-functions fun)))))
-    ;; Add FORM to the element unless it's already there.
-    (unless (member form (cdr elt))
-      (nconc elt (purecopy (list form))))
-
     ;; Is there an already loaded file whose name (or `provide' name)
     ;; matches FILE?
-    (if (if (stringp file)
-            (load-history-filename-element regexp-or-feature)
-          (featurep file))
-        (eval form))))
+    (prog1 (if (if (stringp file)
+                   (load-history-filename-element regexp-or-feature)
+                 (featurep file))
+               (eval form))
+      (when (symbolp regexp-or-feature)
+        ;; For features, the after-load-alist elements get run when `provide' is
+        ;; called rather than at the end of the file.  So add an indirection to
+        ;; make sure that `form' is really run "after-load" in case the provide
+        ;; call happens early.
+        (setq form
+              `(when load-file-name
+                 (let ((fun (make-symbol "eval-after-load-helper")))
+                   (fset fun `(lambda (file)
+                                (if (not (equal file ',load-file-name))
+                                    nil
+                                  (remove-hook 'after-load-functions ',fun)
+                                  ,',form)))
+                   (add-hook 'after-load-functions fun)))))
+      ;; Add FORM to the element unless it's already there.
+      (unless (member form (cdr elt))
+        (nconc elt (purecopy (list form)))))))
 
 (defvar after-load-functions nil
   "Special hook run after loading a file.
diff --git a/lisp/term.el b/lisp/term.el
index 361ff685396..87e5a734701 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -4249,7 +4249,7 @@ special identifiers such as COM1."
   "History of serial ports used by `serial-read-name'.")
 
 (defvar serial-speed-history
-  ;; Initialised with reasonable values for newbies.
+  ;; Initialized with reasonable values for newbies.
   (list "9600" ;; Given twice because 9600 b/s is the most common speed
         "1200" "2400" "4800" "9600" "14400" "19200"
         "28800" "38400" "57600" "115200")
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 4e6c8bd6b05..5cc5ba45e13 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -417,7 +417,7 @@ See also `conf-space-mode', `conf-colon-mode', `conf-javaprop-mode',
     (run-mode-hooks 'conf-mode-hook)))
 
 (defun conf-mode-initialize (comment &optional font-lock)
-  "Intitializations for sub-modes of conf-mode.
+  "Initializations for sub-modes of conf-mode.
 COMMENT initializes `comment-start' and `comment-start-skip'.
 The optional arg FONT-LOCK is the value for FONT-LOCK-KEYWORDS."
   (set (make-local-variable 'comment-start) comment)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 62f899d1730..d22346b518b 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2783,7 +2783,7 @@ By just answering RET you can find out what the current dictionary is."
                (mapcar 'list (ispell-valid-dictionary-list)))
           nil t)
          current-prefix-arg))
-  (ispell-set-spellchecker-params) ; Initilize variables and dicts alists
+  (ispell-set-spellchecker-params) ; Initialize variables and dicts alists
   (unless arg (ispell-buffer-local-dict 'no-reload))
   (if (equal dict "default") (setq dict nil))
   ;; This relies on completing-read's bug of returning "" for no match
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index be8dd9c9130..871701b7303 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1872,7 +1872,7 @@ This takes effect when first loading the library.")
     ("dir" . "Directory list (obsolete)")
     ("div" . "Generic block-level container")
     ("dl" . "Definition list")
-    ("dt" . "Term to be definined")
+    ("dt" . "Term to be defined")
     ("em" . "Emphasized")
     ("embed" . "Embedded data in foreign format")
     ("fig" . "Figure")
@@ -1897,7 +1897,7 @@ This takes effect when first loading the library.")
     ("input" . "Form input field")
     ("ins" . "Inserted text")
     ("isindex" . "Input field for index search")
-    ("kbd" . "Keybard example face")
+    ("kbd" . "Keyboard example face")
     ("lang" . "Natural language")
     ("li" . "List item")
     ("link" . "Link relationship")
diff --git a/lisp/window.el b/lisp/window.el
index ecd4a62b093..7b16d6b886f 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -292,28 +292,6 @@ is unpredictable."
   (setq window (window-normalize-window window))
   (walk-window-tree-1 proc window any t))
 
-(defun windows-with-parameter (parameter &optional value frame any values)
-  "Return a list of all windows on FRAME with PARAMETER non-nil.
-FRAME defaults to the selected frame.  Optional argument VALUE
-non-nil means only return windows whose window-parameter value of
-PARAMETER equals VALUE \(comparison is done using `equal').
-Optional argument ANY non-nil means consider internal windows
-too.  Optional argument VALUES non-nil means return a list of cons
-cells whose car is the value of the parameter and whose cdr is
-the window."
-  (let (this-value windows)
-    (walk-window-tree
-     (lambda (window)
-       (when (and (setq this-value (window-parameter window parameter))
-                  (or (not value) (or (equal value this-value))))
-           (setq windows
-                 (if values
-                     (cons (cons this-value window) windows)
-                   (cons window windows)))))
-     frame any)
-
-    (nreverse windows)))
-
 (defun window-with-parameter (parameter &optional value frame any)
   "Return first window on FRAME with PARAMETER non-nil.
 FRAME defaults to the selected frame.  Optional argument VALUE
@@ -353,8 +331,8 @@ WINDOW must be an internal window.  Return WINDOW."
      window t)
     window))
 
-(defun window-atom-check-1 (window)
-  "Subroutine of `window-atom-check'."
+(defun window--atom-check-1 (window)
+  "Subroutine of `window--atom-check'."
   (when window
     (if (window-parameter window 'window-atom)
         (let ((count 0))
@@ -375,18 +353,18 @@ WINDOW must be an internal window.  Return WINDOW."
              window t)))
       ;; Check children.
       (unless (window-buffer window)
-        (window-atom-check-1 (window-left-child window))
-        (window-atom-check-1 (window-top-child window))))
+        (window--atom-check-1 (window-left-child window))
+        (window--atom-check-1 (window-top-child window))))
     ;; Check right sibling
-    (window-atom-check-1 (window-right window))))
+    (window--atom-check-1 (window-right window))))
 
-(defun window-atom-check (&optional frame)
+(defun window--atom-check (&optional frame)
   "Check atomicity of all windows on FRAME.
 FRAME defaults to the selected frame.  If an atomic window is
 wrongly configured, reset the atomicity of all its windows on
 FRAME to nil.  An atomic window is wrongly configured if it has
 no child windows or one of its child windows is not atomic."
-  (window-atom-check-1 (frame-root-window frame)))
+  (window--atom-check-1 (frame-root-window frame)))
 
 ;; Side windows.
 (defvar window-sides '(left top right bottom)
@@ -441,7 +419,7 @@ number of slots on that side."
      (integer :tag "Number" :value 3 :size 5)))
   :group 'windows)
 
-(defun window-side-check (&optional frame)
+(defun window--side-check (&optional frame)
   "Check the window-side parameter of all windows on FRAME.
 FRAME defaults to the selected frame.  If the configuration is
 invalid, reset all window-side parameters to nil.
@@ -512,11 +490,11 @@ A valid configuration has to preserve the following invariant:
          (set-window-parameter window 'window-side nil))
        frame t))))
 
-(defun window-check (&optional frame)
+(defun window--check (&optional frame)
   "Check atomic and side windows on FRAME.
 FRAME defaults to the selected frame."
-  (window-side-check frame)
-  (window-atom-check frame))
+  (window--side-check frame)
+  (window--atom-check frame))
 
 ;;; Window sizes.
 (defvar window-size-fixed nil
@@ -530,7 +508,7 @@ unless it has no other choice \(like when deleting a neighboring
 window).")
 (make-variable-buffer-local 'window-size-fixed)
 
-(defun window-size-ignore (window ignore)
+(defun window--size-ignore (window ignore)
   "Return non-nil if IGNORE says to ignore size restrictions for WINDOW."
   (if (window-valid-p ignore) (eq window ignore) ignore))
 
@@ -571,7 +549,7 @@ restrictions for that window only."
           value)
       (with-current-buffer (window-buffer window)
         (cond
-         ((and (not (window-size-ignore window ignore))
+         ((and (not (window--size-ignore window ignore))
                (window-size-fixed-p window horizontal))
           ;; The minimum size of a fixed size window is its size.
           (window-total-size window horizontal))
@@ -600,7 +578,7 @@ restrictions for that window only."
                   (ceiling (or (frame-parameter frame 'scroll-bar-width) 14)
                            (frame-char-width)))
                  (t 0)))
-             (if (and (not (window-size-ignore window ignore))
+             (if (and (not (window--size-ignore window ignore))
                       (numberp window-min-width))
                  window-min-width
                0))))
@@ -610,7 +588,7 @@ restrictions for that window only."
           (max (+ window-safe-min-height
                   (if header-line-format 1 0)
                   (if mode-line-format 1 0))
-               (if (and (not (window-size-ignore window ignore))
+               (if (and (not (window--size-ignore window ignore))
                         (numberp window-min-height))
                    window-min-height
                  0))))))))
@@ -647,7 +625,7 @@ restrictions for that window only."
     (max (- (window-min-size window horizontal ignore)
             (window-total-size window horizontal))
          delta))
-   ((window-size-ignore window ignore)
+   ((window--size-ignore window ignore)
     delta)
    ((> delta 0)
     (if (window-size-fixed-p window horizontal)
@@ -664,7 +642,7 @@ doc-string of `window-sizable'."
       (>= (window-sizable window delta horizontal ignore) delta)
     (<= (window-sizable window delta horizontal ignore) delta)))
 
-(defun window-size-fixed-1 (window horizontal)
+(defun window--size-fixed-1 (window horizontal)
   "Internal function for `window-size-fixed-p'."
   (let ((sub (window-child window)))
     (catch 'fixed
@@ -675,7 +653,7 @@ doc-string of `window-sizable'."
               ;; windows are fixed-size.
               (progn
                 (while sub
-                  (unless (window-size-fixed-1 sub horizontal)
+                  (unless (window--size-fixed-1 sub horizontal)
                     ;; We found a non-fixed-size child window, so
                     ;; WINDOW's size is not fixed.
                     (throw 'fixed nil))
@@ -686,7 +664,7 @@ doc-string of `window-sizable'."
             ;; An ortho-combination is fixed-size if at least one of its
             ;; child windows is fixed-size.
             (while sub
-              (when (window-size-fixed-1 sub horizontal)
+              (when (window--size-fixed-1 sub horizontal)
                 ;; We found a fixed-size child window, so WINDOW's size
                 ;; is fixed.
                 (throw 'fixed t))
@@ -706,7 +684,7 @@ non-nil if WINDOW's width is fixed.
 If this function returns nil, this does not necessarily mean that
 WINDOW can be resized in the desired direction.  The function
 `window-resizable' can tell that."
-  (window-size-fixed-1
+  (window--size-fixed-1
    (window-normalize-window window) horizontal))
 
 (defun window-min-delta-1 (window delta &optional horizontal ignore trail noup)
@@ -728,7 +706,7 @@ WINDOW can be resized in the desired direction.  The function
                  ((eq sub window)
                   (setq skip (eq trail 'before)))
                  (skip)
-                 ((and (not (window-size-ignore window ignore))
+                 ((and (not (window--size-ignore window ignore))
                        (window-size-fixed-p sub horizontal)))
                  (t
                   ;; We found a non-fixed-size child window.
@@ -817,7 +795,7 @@ at least one other window can be enlarged appropriately."
           ;; child window is fixed-size.
           (while sub
             (when (and (not (eq sub window))
-                       (not (window-size-ignore sub ignore))
+                       (not (window--size-ignore sub ignore))
                        (window-size-fixed-p sub horizontal))
               (throw 'fixed delta))
             (setq sub (window-right sub))))
@@ -856,7 +834,7 @@ Optional argument NODOWN non-nil means do not check whether
 WINDOW itself \(and its child windows) can be enlarged; check
 only whether other windows can be shrunk appropriately."
   (setq window (window-normalize-window window))
-  (if (and (not (window-size-ignore window ignore))
+  (if (and (not (window--size-ignore window ignore))
            (not nodown) (window-size-fixed-p window horizontal))
       ;; With IGNORE and NOWDON nil return zero if WINDOW has fixed
       ;; size.
@@ -1106,7 +1084,7 @@ The default value nil is handled like `bottom'."
     (= (nth edge (window-edges window))
        (nth edge (window-edges (frame-root-window window))))))
 
-(defun windows-at-side (&optional frame side)
+(defun window-at-side-list (&optional frame side)
   "Return list of all windows on SIDE of FRAME.
 FRAME must be a live frame and defaults to the selected frame.
 SIDE can be any of the symbols `left', `top', `right' or
@@ -1120,7 +1098,7 @@ SIDE can be any of the symbols `left', `top', `right' or
      frame)
     (nreverse windows)))
 
-(defun window-in-direction-2 (window posn &optional horizontal)
+(defun window--in-direction-2 (window posn &optional horizontal)
   "Support function for `window-in-direction'."
   (if horizontal
       (let ((top (window-top-line window)))
@@ -1190,7 +1168,7 @@ IGNORE, when non-nil means a window can be returned even if its
                   ;; W is to the left or right of WINDOW but does not
                   ;; cover POSN.
                   (setq best-diff-2-new
-                        (window-in-direction-2 w posn hor))
+                        (window--in-direction-2 w posn hor))
                   (or (< best-diff-2-new best-diff-2)
                       (and (= best-diff-2-new best-diff-2)
                            (if (eq direction 'left)
@@ -1215,7 +1193,7 @@ IGNORE, when non-nil means a window can be returned even if its
                       (and (eq direction 'below) (<= last w-top)))
                   ;; W is above or below WINDOW but does not cover POSN.
                   (setq best-diff-2-new
-                        (window-in-direction-2 w posn hor))
+                        (window--in-direction-2 w posn hor))
                   (or (< best-diff-2-new best-diff-2)
                       (and (= best-diff-2-new best-diff-2)
                            (if (eq direction 'above)
@@ -1504,12 +1482,12 @@ instead."
      ((window--resizable-p window delta horizontal ignore)
       (window--resize-reset frame horizontal)
       (window--resize-this-window window delta horizontal ignore t)
-      (if (and (not (window-splits window))
+      (if (and (not window-splits)
                (window-combined-p window horizontal)
                (setq sibling (or (window-right window) (window-left window)))
                (window-sizable-p sibling (- delta) horizontal ignore))
-          ;; If window-splits returns nil for WINDOW, WINDOW is part of
-          ;; an iso-combination, and WINDOW's neighboring right or left
+          ;; If window-splits is nil, WINDOW is part of an
+          ;; iso-combination, and WINDOW's neighboring right or left
           ;; sibling can be resized as requested, resize that sibling.
           (let ((normal-delta
                  (/ (float delta)
@@ -1844,7 +1822,7 @@ preferably only resize windows adjacent to EDGE."
                 ;; Make sure this sibling is left alone when
                 ;; resizing its siblings.
                 (set-window-new-normal sub 'ignore))
-               ((or (window-size-ignore sub ignore)
+               ((or (window--size-ignore sub ignore)
                     (not (window-size-fixed-p sub horizontal)))
                 ;; Set this-delta to t to signal that we found a sibling
                 ;; of WINDOW whose size is not fixed.
@@ -2176,9 +2154,9 @@ WINDOW can be any window and defaults to the selected window."
   "Return non-nil if WINDOW is the root window of its frame."
   (eq window (frame-root-window window)))
 
-(defun window-tree-1 (window &optional next)
-  "Return window tree rooted at WINDOW.
-Optional argument NEXT non-nil means include windows right
+(defun window--subtree (window &optional next)
+  "Return window subtree rooted at WINDOW.
+Optional argument NEXT non-nil means include WINDOW's right
 siblings in the return value.
 
 See the documentation of `window-tree' for a description of the
@@ -2190,10 +2168,10 @@ return value."
              (cond
               ((window-top-child window)
                (cons t (cons (window-edges window)
-                             (window-tree-1 (window-top-child window) t))))
+                             (window--subtree (window-top-child window) t))))
               ((window-left-child window)
                (cons nil (cons (window-edges window)
-                               (window-tree-1 (window-left-child window) t))))
+                               (window--subtree (window-left-child window) t))))
               (t window))
              list))
       (setq window (when next (window-next-sibling window))))
@@ -2215,7 +2193,7 @@ Each of the child windows may again be a window or a list
 representing a window split, and so on.  EDGES is a list \(LEFT
 TOP RIGHT BOTTOM) as returned by `window-edges'."
   (setq frame (window-normalize-frame frame))
-  (window-tree-1 (frame-root-window frame) t))
+  (window--subtree (frame-root-window frame) t))
 
 (defun other-window (count &optional all-frames)
   "Select another window in cyclic ordering of windows.
@@ -2379,7 +2357,7 @@ non-side window, signal an error."
          (function (window-parameter window 'delete-window))
          (parent (window-parent window))
          atom-root)
-    (window-check frame)
+    (window--check frame)
     (catch 'done
       ;; Handle window parameters.
       (cond
@@ -2411,8 +2389,7 @@ non-side window, signal an error."
              (sibling (or (window-left window) (window-right window))))
         (window--resize-reset frame horizontal)
         (cond
-         ((and (not (window-splits window))
-               sibling (window-sizable-p sibling size))
+         ((and (not window-splits) sibling (window-sizable-p sibling size))
           ;; Resize WINDOW's sibling.
           (window--resize-this-window sibling size horizontal nil t)
           (set-window-new-normal
@@ -2433,7 +2410,7 @@ non-side window, signal an error."
           ;; not be selected, fix this here.
           (other-window -1 frame))
         (run-window-configuration-change-hook frame)
-        (window-check frame)
+        (window--check frame)
         ;; Always return nil.
         nil))))
 
@@ -2460,7 +2437,7 @@ window signal an error."
          (function (window-parameter window 'delete-other-windows))
          (window-side (window-parameter window 'window-side))
          atom-root side-main)
-    (window-check frame)
+    (window--check frame)
     (catch 'done
       (cond
        ;; Ignore window parameters if `ignore-window-parameters' is t or
@@ -2484,7 +2461,7 @@ window signal an error."
       (unless (eq window side-main)
         (delete-other-windows-internal window side-main)
         (run-window-configuration-change-hook frame)
-        (window-check frame))
+        (window--check frame))
       ;; Always return nil.
       nil)))
 
@@ -3111,7 +3088,7 @@ frame.  The selected window is not changed by this function."
          (window-nest window-nest)
          atom-root)
 
-    (window-check frame)
+    (window--check frame)
     (catch 'done
       (cond
        ;; Ignore window parameters if either `ignore-window-parameters'
@@ -3265,7 +3242,7 @@ frame.  The selected window is not changed by this function."
             (set-window-parameter new 'window-side window-side))
 
           (run-window-configuration-change-hook frame)
-          (window-check frame)
+          (window--check frame)
           ;; Always return the new window.
           new)))))
 
@@ -3607,7 +3584,6 @@ specific buffers."
             (total-width . ,(window-total-size window t))
             (normal-height . ,(window-normal-size window))
             (normal-width . ,(window-normal-size window t))
-            (splits . ,(window-splits window))
             (nest . ,(window-nest window))
             ,@(let (list)
                 (dolist (parameter (window-parameters window))
@@ -3762,7 +3738,6 @@ value can be also stored on disk and read back in a new session."
           (nest (cdr (assq 'nest item)))
           (parameters (cdr (assq 'parameters item)))
           (state (cdr (assq 'buffer item))))
-      (when splits (set-window-splits window splits))
       (when nest (set-window-nest window nest))
       ;; Process parameters.
       (when parameters
@@ -3850,7 +3825,7 @@ windows can get as small as `window-safe-min-height' and
                   (cdr (assq 'total-width state)))))
          (min-height (cdr (assq 'min-height head)))
          (min-width (cdr (assq 'min-width head)))
-         window-splits selected)
+         selected)
     (if (and (not totals)
              (or (> min-height (window-total-size window))
                  (> min-width (window-total-size window t)))
@@ -3885,7 +3860,7 @@ windows can get as small as `window-safe-min-height' and
         (set-window-buffer window (current-buffer))
         (window-state-put-1 state window nil totals)
         (window-state-put-2 ignore))
-      (window-check frame))))
+      (window--check frame))))
 
 (defun display-buffer-record-window (type window buffer)
   "Record information for window used by `display-buffer'.
diff --git a/nt/ChangeLog b/nt/ChangeLog
index fc612d64fa8..512e08678ff 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-13  Christoph Scholtes  <cschol2112@googlemail.com>
+
+        * inc/stdint.h (UINT64_MAX, UINT32_MAX): Fix values.
+
 2011-11-05  Christoph Scholtes  <cschol2112@googlemail.com>
 
         * inc/stdint.h (UINT64_MAX, UINT64_MIN, INT64_MIN, UINTMAX_MAX)
diff --git a/nt/README.W32 b/nt/README.W32
index e4044e409d4..259a0ea6e41 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -142,7 +142,7 @@ See the end of the file for license conditions.
       the PNG support will not work, and you will have to download
       newer versions.
 
-      JPEG: requires the Independant JPEG Group's libjpeg 6b or later,
+      JPEG: requires the Independent JPEG Group's libjpeg 6b or later,
       which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll.
 
       TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll
diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h
index 5242a45df44..fa2e06f3da9 100644
--- a/nt/inc/stdint.h
+++ b/nt/inc/stdint.h
@@ -29,7 +29,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef _WIN64
 typedef __int64 intptr_t;
-#define UINT64_MAX 18446744073709551616
+#define UINT64_MAX 18446744073709551615
 #define UINT64_MIN 0
 /* "i64" is the non-standard suffix used by MSVC for 64-bit constants.  */
 #define INT64_MAX 9223372036854775807i64
@@ -42,7 +42,7 @@ typedef __int64 intptr_t;
 #else
 typedef int intptr_t;
 typedef unsigned int uint32_t;
-#define UINT32_MAX 4294967296
+#define UINT32_MAX 4294967295
 #define UINT32_MIN 0
 #define INT32_MAX 2147483647
 #define INT32_MIN (~INT32_MAX)
diff --git a/src/ChangeLog b/src/ChangeLog
index 4e56e3c8499..533f5cf4327 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-11-10  Paul Eggert  <eggert@cs.ucla.edu>
+2011-11-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         Standardize on VIRT_ADDR_VARIES behavior; otherwise, valgrind
         does not work on some platforms.  Problem reported by Andreas Schwab in
@@ -17,6 +17,51 @@
         * 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-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (HEAPSIZE): New variable, allows to build temacs
+        with user-defined heap size.  Bump the default size of the temacs
+        heap to 27MB, to avoid memory warning when running temacs.
+        ($(TEMACS)): Use HEAPSIZE instead of a hardcoded value.
+
+        * dispnew.c (scrolling_window): Fix incorrect indices in accessing
+        current_matrix and desired_matrix.  (Bug#9990)
+        (verify_row_hash) [XASSERTS]: New function.
+        (adjust_glyph_matrix, row_equal_p): Use it in xassert to verify
+        that the hash value of glyph rows is correct.
+
+2011-11-12  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.h (window): Remove splits slot.
+        * window.c (Fwindow_splits, Fset_window_splits): Remove.
+        (Fdelete_other_windows_internal, make_parent_window)
+        (make_window, Fsplit_window_internal, Fdelete_window_internal)
+        (Fset_window_configuration, save_window_save): Don't deal with
+        split status of windows.
+        (saved_window): Remove splits slot.
+        (Vwindow_splits): Rewrite doc-string.
+
+2011-11-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c (unwind_create_frame):
+        * nsfns.m (unwind_create_frame):
+        * w32fns.c (unwind_create_frame): Use Fmemq to check if frame is in
+        Vframe_list (Bug#9999).
+
+2011-11-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext.
+
+2011-11-11  Kenichi Handa  <handa@m17n.org>
+
+        * callproc.c (Fcall_process): Set the member dst_multibyte of
+        process_coding.
+
+2011-11-11  Johan Bockgård  <bojohan@gnu.org>
+
+        * xdisp.c (fill_composite_glyph_string): Always set s->face, to
+        avoid a crash (bug#9496).
+
 2011-11-09  Chong Yidong  <cyd@gnu.org>
 
         * window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges)
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 0a9df7d1aee..bd1a6ec5918 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -7949,7 +7949,7 @@
 2010-05-11  Karel Klí�  <kklic@redhat.com>
 
         * ftfont.c: Fix incorrect parentheses of #if condition for
-        definining M17N_FLT_USE_NEW_FEATURE.
+        defining M17N_FLT_USE_NEW_FEATURE.
 
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
@@ -25474,7 +25474,7 @@
 
         * term.c (terminal_encode_buffer): Make externally visible.
 
-        * makefile.w32-in: Add character.h dependancies.
+        * makefile.w32-in: Add character.h dependencies.
         (character.o, chartab.o): New targets.
 
 2008-02-01  Kenichi Handa  <handa@m17n.org>
@@ -29718,7 +29718,7 @@
         * keyboard.c (restore_kboard_configuration): Only define when
         MULTI_KBOARD defined.
 
-        * makefile.w32-in: Update dependancies from Makefile.in.
+        * makefile.w32-in: Update dependencies from Makefile.in.
         (OBJ1): Add terminal.$(O)
 
         * term.c (dissociate_if_controlling_tty) [WINDOWSNT]:
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index beb7a0a2ae1..79a580938d7 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -13393,7 +13393,7 @@
 
         * macros.c (Fstart_kbd_macro): Local cleanup.
 
-        * minibuf.c (read_minibuf): No more delcaration of
+        * minibuf.c (read_minibuf): No more declaration of
         Frestore_screen_configuration.
 
         * search.c (Fregexp_quote): Simplified.
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index d5bebec660f..fa55d6974ad 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -592,7 +592,7 @@
 
         * coding.h (Qemacs_mule): Extern it.
 
-        * process.c (init_process): Initilize Vdefault_process_coding_system.
+        * process.c (init_process): Initialize Vdefault_process_coding_system.
 
 1998-06-26  Kenichi Handa  <handa@etl.go.jp>
 
@@ -972,7 +972,7 @@
 
 1998-06-01  Ken'ichi Handa  <handa@melange.gnu.org>
 
-        * coding.c (detect_coding_mask): Initilize local variable C.
+        * coding.c (detect_coding_mask): Initialize local variable C.
 
 1998-06-01  Richard Stallman  <rms@gnu.org>
 
@@ -6317,7 +6317,7 @@
         (ENCODE_ISO_CHARACTER_DIMENSION2): Likewise.
         (safe_terminal_coding): New variable.
         (Fset_safe_terminal_coding_system_internal): New function.
-        (init_coding_once): Initilize safe_terminal_coding.
+        (init_coding_once): Initialize safe_terminal_coding.
         (syms_of_coding): Declare set-safe-terminal-coding-system as a
         Lisp function.
 
@@ -7399,7 +7399,7 @@
 
 1997-06-18  Kenichi Handa  <handa@etl.go.jp>
 
-        * coding.c (detect_coding_iso2022): Initilize mask correctly.
+        * coding.c (detect_coding_iso2022): Initialize mask correctly.
 
         * fns.c (concat): Pay attention to multibyte characters when
         TARGET_TYPE is Lisp_String.
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 833119c9fcf..6fd4d5dea27 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13404,7 +13404,7 @@
 
 1998-10-20  Jason Rumney  <jasonr@altavista.net>
 
-        * makefile.nt (w32fns.c): Add x-list-font.c to dependancies.
+        * makefile.nt (w32fns.c): Add x-list-font.c to dependencies.
 
         * w32faces.c: Update comments referring to obsolete structs.
         (allocate_face, copy_face, face_eql, load_font)
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index ceec5da3296..1a4abfab61b 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -4617,7 +4617,7 @@
         * lisp.h (detect_coding_system): Prototype adjusted.
 
         * coding.c (ONE_MORE_BYTE_CHECK_MULTIBYTE): New macro.
-        (detect_coding_emacs_mule, detect_coding_iso2022,)
+        (detect_coding_emacs_mule, detect_coding_iso2022)
         (detect_coding_sjis, detect_coding_big5, detect_coding_utf_8)
         (detect_coding_utf_16, detect_coding_ccl): Make them static.
         New argument MULTIBYTEP.  Callers changed.
diff --git a/src/callproc.c b/src/callproc.c
index 0859aaef2e6..01772efce30 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -712,6 +712,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
       /* If BUFFER is nil, we must read process output once and then
          discard it, so setup coding system but with nil.  */
       setup_coding_system (Qnil, &process_coding);
+      process_coding.dst_multibyte = 0;
     }
   else
     {
@@ -747,6 +748,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
           && !NILP (val))
         val = raw_text_coding_system (val);
       setup_coding_system (val, &process_coding);
+      process_coding.dst_multibyte
+        = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
     }
   process_coding.src_multibyte = 0;
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 46d1917b144..7b594c5b4e8 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -429,6 +429,25 @@ margin_glyphs_to_reserve (struct window *w, int total_glyphs, Lisp_Object margin
   return n;
 }
 
+#if XASSERTS
+/* Return non-zero if ROW's hash value is correct, zero if not.  */
+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;
+}
+#endif
 
 /* Adjust glyph matrix MATRIX on window W or on a frame to changed
    window sizes.
@@ -600,6 +619,7 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y
                   row->glyphs[LAST_AREA]
                     = row->glyphs[LEFT_MARGIN_AREA] + dim.width;
                 }
+              xassert (!row->enabled_p || verify_row_hash (row));
               ++row;
             }
         }
@@ -1271,6 +1291,9 @@ line_draw_cost (struct glyph_matrix *matrix, int vpos)
 static inline int
 row_equal_p (struct glyph_row *a, struct glyph_row *b, int mouse_face_p)
 {
+  xassert (verify_row_hash (a));
+  xassert (verify_row_hash (b));
+
   if (a == b)
     return 1;
   else if (a->hash != b->hash)
@@ -4334,10 +4357,10 @@ scrolling_window (struct window *w, int header_line_p)
   j = last_old;
   while (i - 1 > first_new
          && j - 1 > first_old
-         && MATRIX_ROW (current_matrix, i - 1)->enabled_p
-         && (MATRIX_ROW (current_matrix, i - 1)->y
-             == MATRIX_ROW (desired_matrix, j - 1)->y)
-         && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p
+         && MATRIX_ROW (current_matrix, j - 1)->enabled_p
+         && (MATRIX_ROW (current_matrix, j - 1)->y
+             == MATRIX_ROW (desired_matrix, i - 1)->y)
+         && !MATRIX_ROW (desired_matrix, i - 1)->redraw_fringe_bitmaps_p
          && row_equal_p (MATRIX_ROW (desired_matrix, i - 1),
                          MATRIX_ROW (current_matrix, j - 1), 1))
     --i, --j;
diff --git a/src/keyboard.c b/src/keyboard.c
index 11c37d14f64..f8c31af3fbe 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8133,7 +8133,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
   Lisp_Object caption;
   int i, have_label = 0;
 
-  /* Defininition looks like `(menu-item CAPTION BINDING PROPS...)'.
+  /* Definition looks like `(menu-item CAPTION BINDING PROPS...)'.
      Rule out items that aren't lists, don't start with
      `menu-item' or whose rest following `tool-bar-item' is not a
      list.  */
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index e97f7f3aca4..36e4511d845 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -24,6 +24,9 @@ ALL = emacs
 # Set EMACSLOADPATH correctly (in case already defined in environment).
 EMACSLOADPATH=$(CURDIR)/../lisp
 
+# Size in MBs of the static heap in temacs.exe.
+HEAPSIZE = 27
+
 #
 # HAVE_CONFIG_H is required by some generic gnu sources stuck into
 # the emacs source tree.
@@ -177,7 +180,7 @@ temacs:         stamp_BLD $(TEMACS)
 $(TEMACS):      $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \
                   ../nt/$(BLD)/addsection.exe $(GNULIB)
         $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
-        "$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21
+        "$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP $(HEAPSIZE)
 
 # These omit firstfile.${O}, but there's no documentation in there
 # anyways.
diff --git a/src/nsfns.m b/src/nsfns.m
index 23362433a39..20b021c6f5d 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1057,7 +1057,7 @@ unwind_create_frame (Lisp_Object frame)
     return Qnil;
 
   /* If frame is ``official'', nothing to do.  */
-  if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
+  if (NILP (Fmemq (frame, Vframe_list)))
     {
 #if GLYPH_DEBUG && XASSERTS
       struct ns_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 98bee64eb08..be457498add 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -89,7 +89,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef HAVE_RANDOM
 
 
-/* Rainer Malzbender <rainer@displaytech.com> says definining
+/* Rainer Malzbender <rainer@displaytech.com> says defining
    HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC.  */
 #ifndef HAVE_XRMSETDATABASE
 #define HAVE_XRMSETDATABASE
diff --git a/src/w32fns.c b/src/w32fns.c
index 6f32442514a..ffbcff86694 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3986,7 +3986,7 @@ unwind_create_frame (Lisp_Object frame)
   struct frame *f = XFRAME (frame);
 
   /* If frame is ``official'', nothing to do.  */
-  if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
+  if (NILP (Fmemq (frame, Vframe_list)))
     {
 #if GLYPH_DEBUG
       struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f);
diff --git a/src/w32font.c b/src/w32font.c
index 26bf4207de5..365f8b78a5e 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -2221,7 +2221,7 @@ font_supported_scripts (FONTSIGNATURE * sig)
      so don't need to mark them separately.  */
   /* 1: Latin-1 supplement, 2: Latin Extended A, 3: Latin Extended B.  */
   SUBRANGE (4, Qphonetic);
-  /* 5: Spacing and tone modifiers, 6: Combining Diacriticals.  */
+  /* 5: Spacing and tone modifiers, 6: Combining Diacritical Marks.  */
   SUBRANGE (7, Qgreek);
   SUBRANGE (8, Qcoptic);
   SUBRANGE (9, Qcyrillic);
@@ -2311,7 +2311,7 @@ font_supported_scripts (FONTSIGNATURE * sig)
   /* 115: Saurashtra, 116: Kayah Li, 117: Rejang.  */
   SUBRANGE (118, Qcham);
   /* 119: Ancient symbols, 120: Phaistos Disc.  */
-  /* 121: Carian, Lycian, Lydian, 122: Dominos, Mah Jong tiles.  */
+  /* 121: Carian, Lycian, Lydian, 122: Dominoes, Mahjong tiles.  */
   /* 123-127: Reserved.  */
 
   /* There isn't really a main symbol range, so include symbol if any
diff --git a/src/window.c b/src/window.c
index 83a8974e88d..0a780a0170a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -465,41 +465,6 @@ Return nil if WINDOW has no previous sibling.  */)
   return decode_any_window (window)->prev;
 }
 
-DEFUN ("window-splits", Fwindow_splits, Swindow_splits, 0, 1, 0,
-       doc: /* Return splits status for the window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
-
-If the value returned by this function is nil and WINDOW is resized, the
-corresponding space is preferably taken from (or given to) WINDOW's
-right sibling.  When WINDOW is deleted, its space is given to its left
-sibling.
-
-If the value returned by this function is non-nil, resizing and deleting
-WINDOW may resize all windows in the same combination.  */)
-  (Lisp_Object window)
-{
-  return decode_any_window (window)->splits;
-}
-
-DEFUN ("set-window-splits", Fset_window_splits, Sset_window_splits, 2, 2, 0,
-       doc: /* Set splits status of window WINDOW to STATUS.
-If WINDOW is omitted or nil, it defaults to the selected window.
-
-If STATUS is nil and WINDOW is later resized, the corresponding space is
-preferably taken from (or given to) WINDOW's right sibling.  When WINDOW
-is deleted, its space is given to its left sibling.
-
-If STATUS is non-nil, resizing and deleting WINDOW may resize all
-windows in the same combination.  */)
-  (Lisp_Object window, Lisp_Object status)
-{
-  register struct window *w = decode_any_window (window);
-
-  w->splits = status;
-
-  return w->splits;
-}
-
 DEFUN ("window-nest", Fwindow_nest, Swindow_nest, 0, 1, 0,
        doc: /* Return nest status of window WINDOW.
 If WINDOW is omitted or nil, it defaults to the selected window.
@@ -2769,9 +2734,6 @@ window-start value is reasonable when this function is called.  */)
 
   replace_window (root, window, 1);
 
-  /* Reset WINDOW's splits status.  */
-  w->splits = Qnil;
-
   /* This must become SWINDOW anyway ....... */
   if (!NILP (w->buffer) && !resize_failed)
     {
@@ -3286,7 +3248,6 @@ make_parent_window (Lisp_Object window, int horflag)
   p->start = Qnil;
   p->pointm = Qnil;
   p->buffer = Qnil;
-  p->splits = Qnil;
   p->nest = Qnil;
   p->window_parameters = Qnil;
 }
@@ -3334,7 +3295,7 @@ make_window (void)
   w->start_at_line_beg = w->display_table = w->dedicated = Qnil;
   w->base_line_number = w->base_line_pos = w->region_showing = Qnil;
   w->column_number_displayed = w->redisplay_end_trigger = Qnil;
-  w->splits = w->nest = w->window_parameters = Qnil;
+  w->nest = w->window_parameters = Qnil;
   w->prev_buffers = w->next_buffers = Qnil;
   /* Initialize non-Lisp data.  */
   w->desired_matrix = w->current_matrix = 0;
@@ -3776,10 +3737,6 @@ set correctly.  See the code of `split-window' for how this is done.  */)
       p = XWINDOW (o->parent);
       /* Store value of `window-nest' in new parent's nest slot.  */
       p->nest = Vwindow_nest;
-      /* Have PARENT inherit splits slot value from OLD.  */
-      p->splits = o->splits;
-      /* Store value of `window-splits' in OLD's splits slot.  */
-      o->splits = Vwindow_splits;
       /* These get applied below.  */
       p->new_total = horflag ? o->total_cols : o->total_lines;
       p->new_normal = new_normal;
@@ -3830,9 +3787,6 @@ set correctly.  See the code of `split-window' for how this is done.  */)
   n->scroll_bar_width = r->scroll_bar_width;
   n->vertical_scroll_bar_type = r->vertical_scroll_bar_type;
 
-  /* Store `window-splits' in NEW's splits slot.  */
-  n->splits = Vwindow_splits;
-
   /* Directly assign orthogonal coordinates and sizes.  */
   if (horflag)
     {
@@ -3972,7 +3926,6 @@ Signal an error when WINDOW is the only window on its frame.  */)
              PARENT (the nest slot is not inherited).  */
           s->normal_cols = p->normal_cols;
           s->normal_lines = p->normal_lines;
-          s->splits = p->splits;
           /* Mark PARENT as deleted.  */
           p->vchild = p->hchild = Qnil;
           /* Try to merge SIBLING into its new parent.  */
@@ -5359,7 +5312,7 @@ struct saved_window
   Lisp_Object left_margin_cols, right_margin_cols;
   Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins;
   Lisp_Object scroll_bar_width, vertical_scroll_bar_type, dedicated;
-  Lisp_Object splits, nest, window_parameters;
+  Lisp_Object nest, window_parameters;
 };
 
 #define SAVED_WINDOW_N(swv,n) \
@@ -5590,7 +5543,6 @@ the return value is nil.  Otherwise the value is t.  */)
           w->scroll_bar_width = p->scroll_bar_width;
           w->vertical_scroll_bar_type = p->vertical_scroll_bar_type;
           w->dedicated = p->dedicated;
-          w->splits = p->splits;
           w->nest = p->nest;
           w->window_parameters = p->window_parameters;
           XSETFASTINT (w->last_modified, 0);
@@ -5869,7 +5821,6 @@ save_window_save (Lisp_Object window, struct Lisp_Vector *vector, int i)
       p->scroll_bar_width = w->scroll_bar_width;
       p->vertical_scroll_bar_type = w->vertical_scroll_bar_type;
       p->dedicated = w->dedicated;
-      p->splits = w->splits;
       p->nest = w->nest;
       p->window_parameters = w->window_parameters;
       if (!NILP (w->buffer))
@@ -6333,7 +6284,7 @@ freeze_window_starts (struct frame *f, int freeze_p)
    and the like.
 
    This ignores a couple of things like the dedicatedness status of
-   window, splits, nest and the like.  This might have to be fixed.  */
+   window, nest and the like.  This might have to be fixed.  */
 
 int
 compare_window_configurations (Lisp_Object configuration1, Lisp_Object configuration2, int ignore_positions)
@@ -6545,16 +6496,7 @@ variable is non-nil, splitting a window may resize all windows in the
 same combination.  This also allows to split a window that is otherwise
 too small or of fixed size.
 
-The value of this variable is also assigned to the split status of the
-new window and, provided the old and new window form a new combination,
-to the window that was split as well.  The split status of a window can
-be retrieved with the function `window-splits' and altered by the
-function `set-window-splits'.
-
-If the value of the variable `window-nest' is non-nil, the space for the
-new window is exclusively taken from the window that shall be split, but
-the split status of the window that is split as well as that of the new
-window are still set to the value of this variable.  */);
+This variable takes no effect if `window-nest' is non-nil.  */);
   Vwindow_splits = Qnil;
 
   DEFVAR_LISP ("window-nest", Vwindow_nest,
@@ -6591,8 +6533,6 @@ function `window-nest' and altered by the function `set-window-nest'.  */);
   defsubr (&Swindow_left_child);
   defsubr (&Swindow_next_sibling);
   defsubr (&Swindow_prev_sibling);
-  defsubr (&Swindow_splits);
-  defsubr (&Sset_window_splits);
   defsubr (&Swindow_nest);
   defsubr (&Sset_window_nest);
   defsubr (&Swindow_use_time);
diff --git a/src/window.h b/src/window.h
index 6a9641e3e6d..c11235bd67b 100644
--- a/src/window.h
+++ b/src/window.h
@@ -258,10 +258,6 @@ struct window
        must run the redisplay-end-trigger-hook.  */
     Lisp_Object redisplay_end_trigger;
 
-    /* Non-nil means deleting or resizing this window distributes
-       space among all windows in the same combination.  */
-    Lisp_Object splits;
-
     /* Non-nil means this window's child windows are never
        (re-)combined.  */
     Lisp_Object nest;
diff --git a/src/xdisp.c b/src/xdisp.c
index b4eaef9d0c7..dfb794f38d3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22121,6 +22121,12 @@ fill_composite_glyph_string (struct glyph_string *s, struct face *base_face,
     }
   s->cmp_to = i;
 
+  if (s->face == NULL)
+    {
+      s->face = base_face->ascii_face;
+      s->font = s->face->font;
+    }
+
   /* All glyph strings for the same composition has the same width,
      i.e. the width set for the first component of the composition.  */
   s->width = s->first_glyph->pixel_width;
@@ -27968,7 +27974,6 @@ syms_of_xdisp (void)
   DEFSYM (Qhollow, "hollow");
   DEFSYM (Qhand, "hand");
   DEFSYM (Qarrow, "arrow");
-  DEFSYM (Qtext, "text");
   DEFSYM (Qinhibit_free_realized_faces, "inhibit-free-realized-faces");
 
   list_of_error = Fcons (Fcons (intern_c_string ("error"),
diff --git a/src/xfaces.c b/src/xfaces.c
index 9faa7c79e0b..0ed6fa1d8e2 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -27,7 +27,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
    1. Font family name.
 
-   2. Font foundary name.
+   2. Font foundry name.
 
    3. Relative proportionate width, aka character set width or set
    width (swidth), e.g. `semi-compressed'.
diff --git a/src/xfns.c b/src/xfns.c
index 49c4c774cae..2359a1a82c2 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2929,7 +2929,7 @@ unwind_create_frame (Lisp_Object frame)
     return Qnil;
 
   /* If frame is ``official'', nothing to do.  */
-  if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
+  if (NILP (Fmemq (frame, Vframe_list)))
     {
 #if GLYPH_DEBUG && XASSERTS
       struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);