merge trunk

31 files changed, 528 insertions, 460 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6cc9cc86515..6df54fb4527 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,120 @@
+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):
+        Call svn via vc-svn-command rather than vc-do-command.
+        (vc-svn-command): Add --non-interactive.  (Bug#9993)
+        (vc-svn-update, vc-svn-merge-news): No need for --non-interactive.
+
+        * emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
+        Add toggle-read-only.  (Bug#7292)
+        * files.el (toggle-read-only): Mention that it should only
+        be used interactively.  (Bug#10006)
+
+2011-11-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Adjust regexp for OCaml warnings.
+
+        * electric.el (electric-pair-post-self-insert-function): Let user
+        turn it off buffer-locally (bug#9932).
+
+        * progmodes/python.el (python-beginning-of-statement):
+        Rewrite (bug#2703).
+
+        * progmodes/compile.el: Better handle TABs (bug#9749).
+        (compilation-internal-error-properties)
+        (compilation-next-error-function): Obey the target buffer's
+        compilation-error-screen-columns.
+
+2011-11-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/meta-mode.el: Remove obsolete comments.
+        (meta-right-comment-regexp, meta-ignore-comment-regexp):
+        Fix typos in docstrings.
+
+2011-11-09  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-size-fixed-p): Rewrite doc-string.
+        (window-resizable-p): Rename to window--resizable-p.  Update callers.
+        (window--resizable): New function.  Make all callers of
+        window-resizable call window--resizable instead.
+        (window-resizable): Rewrite in terms of window--resizable.
+
+2011-11-08  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/delphi.el (delphi-mode-syntax-table):
+        Let define-derived-mode define a proper syntax table.  (Bug#9994)
+
+2011-11-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.el: Stay away from defsubst.
+        (window-list-no-nils): Remove.
+        (window-state-get-1, window-state-get): Use backquote instead.
+
+2011-11-08  thierry  <thierry.volpiatto@gmail.com>
+
+        * emacs-lisp/find-func.el (find-function-read):
+        Fix incorrect use of default argument in `completing-read'.
+
+2011-11-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-function, special-display-function):
+        Mention display-buffer-record-window but do not mention
+        help-setup parameter in doc-strings.
+        (window-min-delta): Fix doc-string typo.
+
+2011-11-08  Chong Yidong  <cyd@gnu.org>
+
+        * window.el (window-total-height, window-total-width): Doc fix.
+        (window-body-size): Move from C.
+        (window-body-height, window-body-width): Move to C.
+
+2011-11-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.el: Make special-display like display-buffer-alist (bug#9532).
+        (display-buffer--special-action): New function, morphed
+        from display-buffer--special.
+        (display-buffer): Use it to handle special-display-buffers at higher
+        priority (just after display-buffer-alist).
+        (display-buffer-fallback-action, display-buffer--other-frame-action)
+        (pop-to-buffer-same-window): Remove display-buffer--special.
+
+2011-11-07  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/cal-menu.el (cal-menu-set-date-title):
+        Do nothing if not in a calendar.  (Bug#9976)
+
+2011-11-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el (find-file): Always use selected-window.
+
+2011-11-07  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-combinations): Make WINDOW argument
+        mandatory.  Rewrite doc-string.
+        (walk-window-subtree, window-atom-check, window-min-delta)
+        (window-max-delta, window--resize-this-window)
+        (window--resize-root-window-vertically, window-tree)
+        (balance-windows, window-state-put): Rewrite doc-strings as to
+        not mention the term "subwindow".
+        (window--resize-subwindows-skip-p): Rename to
+        window--resize-child-windows-skip-p.
+        (window--resize-subwindows-normal): Rename to
+        window--resize-child-windows-normal.
+        (window--resize-subwindows): Rename to
+        window--resize-child-windows.
+        (window-or-subwindow-p): Rename to window--in-subtree-p.
+
+2011-11-07  Mark Lillibridge  <mark.lillibridge@hp.com>  (tiny change)
+
+        * mail/rmail.el (rmail-get-new-mail, rmail-insert-inbox-text):
+        Ensure that mbox format messages end in two newlines (Bug#9974).
+
 2011-11-06  Chong Yidong  <cyd@gnu.org>
 
         * window.el (window-combination-p): Function deleted; its
@@ -11,7 +128,7 @@
         (window-size-ignore, window-state-get): Callers changed.
         (window-normalize-window): Rename from window-normalize-any-window.
         New arg LIVE-ONLY, replacing window-normalize-live-window.
-        (window-normalize-live-window): Deleted.
+        (window-normalize-live-window): Delete.
         (window-combination-p, window-combined-p, window-combinations)
         (walk-window-subtree, window-atom-root, window-min-size)
         (window-sizable, window-sizable-p, window-size-fixed-p)
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index 3ebb7edab3f..d8de171c0a1 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -215,13 +215,15 @@ is non-nil."
 ;; but easymenu does not seem to allow this (?).
 ;; The ignore-errors is because `documentation' can end up calling
 ;; this in a non-calendar buffer where displayed-month is unbound.  (Bug#3862)
+;; This still has issues - bug#9976, so added derived-mode-p call.
 (defun cal-menu-set-date-title (menu)
   "Convert date of last event to title suitable for MENU."
-  (let ((date (ignore-errors (calendar-cursor-to-date nil last-input-event))))
-    (if date
-        (easy-menu-filter-return menu (calendar-date-string date t nil))
-      (message "Not on a date!")
-      nil)))
+  (when (derived-mode-p 'calendar-mode)
+    (let ((date (ignore-errors (calendar-cursor-to-date nil last-input-event))))
+      (if date
+          (easy-menu-filter-return menu (calendar-date-string date t nil))
+        (message "Not on a date!")
+        nil))))
 
 (easy-menu-define cal-menu-context-mouse-menu nil
   "Pop up mouse menu for selected date in the calendar window."
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index d9f8634fb54..ed6ab96107a 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -194,7 +194,7 @@ Any other value is treated as t."
                  :tag "Column Formating"
                  (const :tag "No Formating" nil)
                  (const :tag "Column Alignment" t)
-                 (const :tag "Separator Aligment" separator)
+                 (const :tag "Separator Alignment" separator)
                  (const :tag "Column Padding" padding))
   :group 'columns)
 
diff --git a/lisp/electric.el b/lisp/electric.el
index 26fba20ea12..3d7c1fd8ac4 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -284,6 +284,7 @@ This can be convenient for people who find it easier to hit ) than C-f."
 
 (defun electric-pair-post-self-insert-function ()
   (let* ((syntax (and (eq (char-before) last-command-event) ; Sanity check.
+                      electric-pair-mode
                       (let ((x (assq last-command-event electric-pair-pairs)))
                         (cond
                          (x (if (eq (car x) (cdr x)) ?\" ?\())
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index fae402d4215..84aaf8718ed 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -355,7 +355,7 @@ else the global value will be modified."
 (defvar byte-compile-interactive-only-functions
   '(beginning-of-buffer end-of-buffer replace-string replace-regexp
     insert-file insert-buffer insert-file-literally previous-line next-line
-    goto-line comint-run delete-backward-char)
+    goto-line comint-run delete-backward-char toggle-read-only)
   "List of commands that are not meant to be called from Lisp.")
 
 (defvar byte-compile-not-obsolete-vars nil
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 08e73b32a15..070faca8d91 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -363,29 +363,23 @@ If TYPE is nil, insist on a symbol with a function definition.
 Otherwise TYPE should be `defvar' or `defface'.
 If TYPE is nil, defaults using `function-called-at-point',
 otherwise uses `variable-at-point'."
-  (let ((symb (if (null type)
-                  (function-called-at-point)
-                (if (eq type 'defvar)
-                    (variable-at-point)
-                  (variable-at-point t))))
-        (predicate (cdr (assq type '((nil . fboundp) (defvar . boundp)
-                                     (defface . facep)))))
-        (prompt (cdr (assq type '((nil . "function") (defvar . "variable")
-                                  (defface . "face")))))
-        (enable-recursive-minibuffers t)
-        val)
-    (if (equal symb 0)
-        (setq symb nil))
-    (setq val (completing-read
-               (concat "Find "
-                       prompt
-                       (if symb
-                           (format " (default %s)" symb))
-                       ": ")
-               obarray predicate t nil))
-    (list (if (equal val "")
-              symb
-            (intern val)))))
+  (let* ((symb1 (cond ((null type) (function-called-at-point))
+                      ((eq type 'defvar) (variable-at-point))
+                      (t (variable-at-point t))))
+         (symb  (unless (eq symb1 0) symb1))
+         (predicate (cdr (assq type '((nil . fboundp)
+                                      (defvar . boundp)
+                                      (defface . facep)))))
+         (prompt-type (cdr (assq type '((nil . "function")
+                                        (defvar . "variable")
+                                        (defface . "face")))))
+         (prompt (concat "Find " prompt-type
+                         (and symb (format " (default %s)" symb))
+                         ": "))
+         (enable-recursive-minibuffers t))
+    (list (intern (completing-read
+                   prompt obarray predicate
+                   t nil nil (and symb (symbol-name symb)))))))
 
 (defun find-function-do-it (symbol type switch-fn)
   "Find Emacs Lisp SYMBOL in a buffer and display it.
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 7ed0255d987..acdc3caa449 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -2484,7 +2484,7 @@ Argument GOLD-BINDING is the Emacs function to be bound to GOLD <KEY>."
   F10: Cut Rectangle
 G-F10: Paste Rectangle
   F11: ESC
-  F12: Begining of Line           +----------+----------+----------+----------+
+  F12: Beginning of Line          +----------+----------+----------+----------+
 G-F12: Delete Other Windows       |   GOLD   |   HELP   |  FNDNXT  |  DEL L   |
   F13: Delete to Begin of Word    |   (PF1)  |   (PF2)  |   (PF3)  |  (PF4)   |
  HELP: Keypad Help                |Mark Wisel|Desc Funct|   FIND   |  UND L   |
diff --git a/lisp/files.el b/lisp/files.el
index 40e2df14c1b..aac415c1a96 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1343,7 +1343,7 @@ automatically choosing a major mode, use \\[find-file-literally]."
   (let ((value (find-file-noselect filename nil nil wildcards)))
     (if (listp value)
         (mapcar 'switch-to-buffer (nreverse value))
-      (switch-to-buffer value))))
+      (switch-to-buffer value nil 'force-same-window))))
 
 (defun find-file-other-window (filename &optional wildcards)
   "Edit file FILENAME, in another window.
@@ -4686,7 +4686,15 @@ prints a message in the minibuffer.  Instead, use `set-buffer-modified-p'."
   "Change whether this buffer is read-only.
 With prefix argument ARG, make the buffer read-only if ARG is
 positive, otherwise make it writable.  If buffer is read-only
-and `view-read-only' is non-nil, enter view mode."
+and `view-read-only' is non-nil, enter view mode.
+
+This function is usually the wrong thing to use in a Lisp program.
+It can have side-effects beyond changing the read-only status of a buffer
+\(e.g., enabling view mode), and does not affect read-only regions that
+are caused by text properties.  To make a buffer read-only in Lisp code,
+set `buffer-read-only'.  To ignore read-only status (whether due to text
+properties or buffer state) and make changes, temporarily bind
+`inhibit-read-only'."
   (interactive "P")
   (if (and arg
            (if (> (prefix-numeric-value arg) 0) buffer-read-only
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 5205a6811f6..2c00229c76e 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1436,7 +1436,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     "REGDB_APPPATH"
     "REGDB_BINARY"
     "REGDB_ERR_CONNECTIONEXISTS"
-    "REGDB_ERR_CORRUPTEDREGSITRY"
+    "REGDB_ERR_CORRUPTEDREGISTRY"
     "REGDB_ERR_INITIALIZATION"
     "REGDB_ERR_INVALIDHANDLE"
     "REGDB_ERR_INVALIDNAME"
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c36d4729518..fbbf3bad5a8 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -18491,7 +18491,7 @@
 2004-10-05  Jesper Harder  <harder@ifa.au.dk>
 
         * nnsoup.el (nnsoup-read-active-file): Use dolist, mapc or last
-        where approriate.
+        where appropriate.
 
         * nnml.el (nnml-generate-active-info): do.
 
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 5a7079883e6..f0951b7b803 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -689,7 +689,7 @@ The following commands are available:
       (dolist (key smime-keys)
         (insert
          (format "\t\t%s: %s\n" (car key) (cadr key))))
-      (insert "\nTrusted Certificate Authoritys:\n")
+      (insert "\nTrusted Certificate Authorities:\n")
       (insert "\nKnown Certificates:\n"))))
 
 (defun smime ()
diff --git a/lisp/international/robin.el b/lisp/international/robin.el
index 7e98a507f93..6f78aaede3f 100644
--- a/lisp/international/robin.el
+++ b/lisp/international/robin.el
@@ -22,7 +22,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; Comentary:
+;;; Commentary:
 
 ;; Functionalities
 ;; ---------------
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index a535d3a86db..4b3441a8cdc 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1721,10 +1721,12 @@ not be a new one).  It returns non-nil if it got any new messages."
                 (setq all-files (cdr all-files)))
               ;; Put them back in their original order.
               (setq files (nreverse files))
-              ;; In case of brain damage caused by require-final-newline.
               (goto-char (point-max))
-              (skip-chars-backward " \t\n")
-              (delete-region (point) (point-max))
+              ;; Make sure we end with a blank line unless there are
+              ;; no messages, as required by mbox format (Bug#9974).
+              (unless (bobp)
+                (while (not (looking-back "\n\n"))
+                  (insert "\n")))
               (setq found (or
                            (rmail-get-new-mail-1 file-name files delete-files)
                            found))))
@@ -2024,22 +2026,12 @@ Value is the size of the newly read mail after conversion."
                   (rmail-unrmail-new-mail-maybe
                    tofile
                    (nth 1 (insert-file-contents tofile))))
-            ;; Determine if a pair of newline message separators need
-            ;; to be added to the new collection of messages.  This is
-            ;; the case for all new message collections added to a
-            ;; non-empty mail file.
-            (unless (zerop size)
-              (save-restriction
-                (let ((start (point-min)))
-                  (widen)
-                  (unless (eq start (point-min))
-                    (goto-char start)
-                    (insert "\n\n")
-                    (setq size (+ 2 size))))))
             (goto-char (point-max))
-            (or (= (preceding-char) ?\n)
-                (zerop size)
-                (insert ?\n))
+            ;; Make sure the read-in mbox data properly ends with a
+            ;; blank line unless it is of size 0.
+            (unless (zerop size)
+              (while (not (looking-back "\n\n"))
+                (insert "\n")))
             (if (not (and rmail-preserve-inbox (string= file tofile)))
                 (setq delete-files (cons tofile delete-files)))))
       (message "")
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index 89378497c36..9fa5eb32d43 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -774,7 +774,7 @@ to their attributes."
            (cons
             (1+ (length "password"))
             (mapcar
-             ;; Atribute names have a leading ":", which will be suppressed.
+             ;; Attribute names have a leading ":", which will be suppressed.
              (lambda (attribute) (length (symbol-name (car attribute))))
              attributes)))))
     (cons
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index aea284fe72c..53a0c5587a2 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -764,7 +764,7 @@ because you will take care of it on the day when scheduled."
   :group 'org-agenda-skip
   :group 'org-agenda-daily/weekly
   :type '(choice
-          (const :tag "Alwas show prewarning" nil)
+          (const :tag "Always show prewarning" nil)
           (const :tag "Remove prewarning if entry is scheduled" t)
           (integer :tag "Restart prewarning N days before deadline")))
 
@@ -1388,13 +1388,13 @@ When nil, such items are sorted as 0 minutes effort."
     (tags  . " %i %-12:c")
     (search . " %i %-12:c"))
   "Format specifications for the prefix of items in the agenda views.
-An alist with five entries, each for the different agenda types.  The 
-keys of the sublists are `agenda', `timeline', `todo', `search' and `tags'.  
+An alist with five entries, each for the different agenda types.  The
+keys of the sublists are `agenda', `timeline', `todo', `search' and `tags'.
 The values are format strings.
 
 This format works similar to a printf format, with the following meaning:
 
-  %c   the category of the item, \"Diary\" for entries from the diary, 
+  %c   the category of the item, \"Diary\" for entries from the diary,
        or as given by the CATEGORY keyword or derived from the file name
   %i   the icon category of the item, see `org-agenda-category-icon-alist'
   %T   the last tag of the item (ignore inherited tags, which come first)
@@ -1408,10 +1408,10 @@ contain two additional characters:  a question mark just after the `%'
 and a whitespace/punctuation character just before the final letter.
 
 If the first character after `%' is a question mark, the entire field
-will only be included if the corresponding value applies to the current 
-entry.  This is useful for fields which should have fixed width when 
-present, but zero width when absent.  For example, \"%?-12t\" will 
-result in a 12 character time field if a time of the day is specified, 
+will only be included if the corresponding value applies to the current
+entry.  This is useful for fields which should have fixed width when
+present, but zero width when absent.  For example, \"%?-12t\" will
+result in a 12 character time field if a time of the day is specified,
 but will completely disappear in entries which do not contain a time.
 
 If there is punctuation or whitespace character just before the final
@@ -1420,7 +1420,7 @@ the value is not empty.  For example, the format \"%-12:c\" leads to
 \"Diary: \" if the category is \"Diary\".  If the category were be
 empty, no additional colon would be inserted.
 
-The default value for the agenda sublist is \"  %-12:c%?-12t% s\", 
+The default value for the agenda sublist is \"  %-12:c%?-12t% s\",
 which means:
 
 - Indent the line with two space characters
@@ -1697,7 +1697,7 @@ For example, this value makes those two functions available:
     (?C bulk-cut))
 
 With selected entries in an agenda buffer, `B R' will call
-the custom function `set-category' on the selected entries.  
+the custom function `set-category' on the selected entries.
 Note that functions in this alist don't need to be quoted."
   :type 'alist
   :group 'org-agenda)
@@ -5003,9 +5003,9 @@ See also the user option `org-agenda-clock-consistency-checks'."
                      "\\(-\\{1,3\\}\\(\\[.*?\\]\\)\\)?")) ; group 3 is second
          (tlstart 0.)
          (tlend 0.)
-         (maxtime (org-hh:mm-string-to-minutes 
+         (maxtime (org-hh:mm-string-to-minutes
                    (or (plist-get pl :max-duration) "24:00")))
-         (mintime (org-hh:mm-string-to-minutes 
+         (mintime (org-hh:mm-string-to-minutes
                    (or (plist-get pl :min-duration) 0)))
          (maxgap  (org-hh:mm-string-to-minutes
                    ;; default 30:00 means never complain
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 156c90159cd..3dba1af515a 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -157,7 +157,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 
     (python-tracebacks-and-caml
      "^[ \t]*File \\(\"?\\)\\([^,\" \n\t<>]+\\)\\1, lines? \\([0-9]+\\)-?\\([0-9]+\\)?\\(?:$\\|,\
-\\(?: characters? \\([0-9]+\\)-?\\([0-9]+\\)?:\\)?\\([ \n]Warning:\\)?\\)"
+\\(?: characters? \\([0-9]+\\)-?\\([0-9]+\\)?:\\)?\\([ \n]Warning\\(?: [0-9]+\\)?:\\)?\\)"
      2 (3 . 4) (5 . 6) (7))
 
     (comma
@@ -1056,7 +1056,7 @@ FMTS is a list of format specs for transforming the file name.
           (cadr (compilation--file-struct->loc-tree file-struct)))
          (marker
           (if marker-line (compilation--loc->marker (cadr marker-line))))
-         (compilation-error-screen-columns compilation-error-screen-columns)
+         (screen-columns compilation-error-screen-columns)
          end-marker loc end-loc)
     (if (not (and marker (marker-buffer marker)))
         (setq marker nil)               ; no valid marker for this file
@@ -1064,16 +1064,21 @@ FMTS is a list of format specs for transforming the file name.
       (catch 'marker                    ; find nearest loc, at least one exists
         (dolist (x (cddr (compilation--file-struct->loc-tree
                           file-struct)))        ; Loop over remaining lines.
-          (if (> (car x) loc)           ; still bigger
+          (if (> (car x) loc)           ; Still bigger.
               (setq marker-line x)
             (if (> (- (or (car marker-line) 1) loc)
-                   (- loc (car x)))     ; current line is nearer
+                   (- loc (car x)))     ; Current line is nearer.
                 (setq marker-line x))
             (throw 'marker t))))
       (setq marker (compilation--loc->marker (cadr marker-line))
             marker-line (or (car marker-line) 1))
       (with-current-buffer (marker-buffer marker)
-        (save-excursion
+        (let ((screen-columns
+               ;; Obey the compilation-error-screen-columns of the target
+               ;; buffer if its major mode set it buffer-locally.
+               (if (local-variable-p 'compilation-error-screen-columns)
+                   compilation-error-screen-columns screen-columns)))
+          (save-excursion
           (save-restriction
             (widen)
             (goto-char (marker-position marker))
@@ -1081,17 +1086,15 @@ FMTS is a list of format specs for transforming the file name.
               (beginning-of-line (- (or end-line line) marker-line -1))
               (if (or (null end-col) (< end-col 0))
                   (end-of-line)
-                (compilation-move-to-column
-                 end-col compilation-error-screen-columns))
+                (compilation-move-to-column end-col screen-columns))
               (setq end-marker (point-marker)))
             (beginning-of-line (if end-line
                                    (- line end-line -1)
                                  (- loc marker-line -1)))
             (if col
-                (compilation-move-to-column
-                 col compilation-error-screen-columns)
+                (compilation-move-to-column col screen-columns)
               (forward-to-indentation 0))
-            (setq marker (point-marker))))))
+            (setq marker (point-marker)))))))
 
     (setq loc (compilation-assq line (compilation--file-struct->loc-tree
                                       file-struct)))
@@ -2266,7 +2269,7 @@ This is the value of `next-error-function' in Compilation buffers."
   (interactive "p")
   (when reset
     (setq compilation-current-error nil))
-  (let* ((columns compilation-error-screen-columns) ; buffer's local value
+  (let* ((screen-columns compilation-error-screen-columns)
          (last 1)
          (msg (compilation-next-error (or n 1) nil
                                       (or compilation-current-error
@@ -2301,29 +2304,34 @@ This is the value of `next-error-function' in Compilation buffers."
            marker
            (caar (compilation--loc->file-struct loc))
            (cadr (car (compilation--loc->file-struct loc))))
-        (save-restriction
-          (widen)
-          (goto-char (point-min))
-          ;; Treat file's found lines in forward order, 1 by 1.
-          (dolist (line (reverse (cddr (compilation--loc->file-struct loc))))
-            (when (car line)            ; else this is a filename w/o a line#
-              (beginning-of-line (- (car line) last -1))
-              (setq last (car line)))
-            ;; Treat line's found columns and store/update a marker for each.
-            (dolist (col (cdr line))
-              (if (compilation--loc->col col)
-                  (if (eq (compilation--loc->col col) -1)
-                      ;; Special case for range end.
-                      (end-of-line)
-                    (compilation-move-to-column (compilation--loc->col col)
-                                                columns))
-                (beginning-of-line)
-                (skip-chars-forward " \t"))
-              (if (compilation--loc->marker col)
-                  (set-marker (compilation--loc->marker col) (point))
-                (setf (compilation--loc->marker col) (point-marker)))
-              ;; (setf (compilation--loc->timestamp col) timestamp)
-              )))))
+        (let ((screen-columns
+               ;; Obey the compilation-error-screen-columns of the target
+               ;; buffer if its major mode set it buffer-locally.
+               (if (local-variable-p 'compilation-error-screen-columns)
+                   compilation-error-screen-columns screen-columns)))
+          (save-restriction
+            (widen)
+            (goto-char (point-min))
+            ;; Treat file's found lines in forward order, 1 by 1.
+            (dolist (line (reverse (cddr (compilation--loc->file-struct loc))))
+              (when (car line)          ; else this is a filename w/o a line#
+                (beginning-of-line (- (car line) last -1))
+                (setq last (car line)))
+              ;; Treat line's found columns and store/update a marker for each.
+              (dolist (col (cdr line))
+                (if (compilation--loc->col col)
+                    (if (eq (compilation--loc->col col) -1)
+                        ;; Special case for range end.
+                        (end-of-line)
+                      (compilation-move-to-column (compilation--loc->col col)
+                                                  screen-columns))
+                  (beginning-of-line)
+                  (skip-chars-forward " \t"))
+                (if (compilation--loc->marker col)
+                    (set-marker (compilation--loc->marker col) (point))
+                  (setf (compilation--loc->marker col) (point-marker)))
+                ;; (setf (compilation--loc->timestamp col) timestamp)
+                ))))))
     (compilation-goto-locus marker (compilation--loc->marker loc)
                             (compilation--loc->marker end-loc))
     (setf (compilation--loc->visited loc) t)))
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index ad3b777977c..a79d1a2c064 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -6481,7 +6481,7 @@ are CPerl, PerlStyle, GNU, K&R, BSD, C++ and Whitesmith.
 The current value of style is memorized (unless there is a memorized
 data already), may be restored by `cperl-set-style-back'.
 
-Chosing \"Current\" style will not change style, so this may be used for
+Choosing \"Current\" style will not change style, so this may be used for
 side-effect of memorizing only.  Examples in `cperl-style-examples'."
   (interactive
    (let ((list (mapcar (function (lambda (elt) (list (car elt))))
diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index e8e2f8ffbf0..e513b617022 100644
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -1959,10 +1959,6 @@ comment block.  If not in a // comment, just does a normal newline."
     kmap)
   "Keymap used in Delphi mode.")
 
-(defvar delphi-mode-syntax-table nil
-  "Delphi mode's syntax table.  It is just a standard syntax table.
-This is ok since we do our own keyword/comment/string face coloring.")
-
 ;;;###autoload
 (define-derived-mode delphi-mode prog-mode "Delphi"
   "Major mode for editing Delphi code. \\<delphi-mode-map>
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index f9ddabf1552..e47ba3c92f3 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -1965,7 +1965,7 @@ Sets `gdb-thread-number' to new id."
   (setq gud-running t)
   ;; GDB doesn't seem to respond to -thread-info before first stop or
   ;; thread exit (even in non-stop mode), so this is useless.
-  ;; Behaviour may change in the future.
+  ;; Behavior may change in the future.
   (gdb-emit-signal gdb-buf-publisher 'update-threads))
 
 ;; -break-insert -t didn't give a reason before gdb 6.9
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 7b3a2893610..944a412fb63 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2155,7 +2155,7 @@ during jdb initialization depending on the value of
                    string
                    (concat "[ \t\n\r,\"" path-separator "]+")))))
 
-;; See comentary for other debugger's marker filters - there you will find
+;; See commentary for other debugger's marker filters - there you will find
 ;; important notes about STRING.
 (defun gud-jdb-marker-filter (string)
 
diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el
index ab640c0e270..e15f765ea58 100644
--- a/lisp/progmodes/meta-mode.el
+++ b/lisp/progmodes/meta-mode.el
@@ -27,53 +27,17 @@
 ;;
 ;; This Emacs Lisp package provides a major mode for editing Metafont
 ;; or MetaPost sources.  It includes all the necessary code to set up
-;; a major mode including an approriate syntax table, keymap, and a
+;; a major mode including an appropriate syntax table, keymap, and a
 ;; mode-specific pull-down menu.  It also provides a sophisticated set
 ;; of font-lock patterns, a fancy indentation function adapted from
 ;; AUCTeX's latex.el, and some basic mode-specific editing functions
 ;; such as functions to move to the beginning or end of the enclosing
 ;; environment, or to mark, re-indent, or comment-out environments.
 ;; On the other hand, it doesn't yet provide any functionality for
-;; running Metafont or MetaPost in a shell buffer form within Emacs,
+;; running Metafont or MetaPost in a shell buffer from within Emacs,
 ;; but such functionality might be added later, either as part of this
 ;; package or as a separate Emacs Lisp package.
 
-;; Installation:
-;;
-;; An interface to running Metafont or MetaPost as a shell process
-;; from within Emacs is currently under development as a separate
-;; Emacs Lisp package (meta-buf.el).  In order to have that package
-;; loaded automatically when first entering Metafont or MetaPost mode,
-;; you might use the load-hook provided in this package by adding
-;; these lines to your startup file:
-;;
-;;  (add-hook 'meta-mode-load-hook
-;;            (lambda () (require 'meta-buf)))
-;;
-;; The add-on package loaded this way may in turn make use of the
-;; mode-hooks provided in this package to activate additional features
-;; when entering Metafont or MetaPost mode.
-
-;; Font Lock Support:
-;;
-;; If you are using global-font-lock-mode (introduced in Emacs 19.31),
-;; fontification in Metafont and/or MetaPost mode will be activated
-;; automatically.  To speed up fontification for the rather complex
-;; patterns used in these modes, it may be a good idea to activate
-;; lazy-lock as a font-lock-support-mode (introduced in Emacs 19.32)
-;; by adding these lines to your startup file:
-;;
-;;  (global-font-lock-mode t)
-;;  (setq font-lock-support-mode 'lazy-lock-mode)
-;;
-;; If you are using an older version of Emacs, which doesn't provide
-;; global-font-lock-mode or font-lock-support-mode, you can also
-;; activate fontification in Metafont and/or MetaPost mode by adding
-;; the following lines to your startup file:
-;;
-;;  (add-hook 'meta-common-mode-hook 'turn-on-font-lock)
-;;  (add-hook 'meta-common-mode-hook 'turn-on-lazy-lock)
-
 ;; Customization:
 ;;
 ;; Following the usual Emacs Lisp coding conventions, the major modes
@@ -88,10 +52,6 @@
 
 ;; Availability:
 ;;
-;; This package is currently available via my "TeX Software" WWW page:
-;;
-;;  http://www.thphy.uni-duesseldorf.de/~vieth/subjects/tex/software.html
-;;
 ;; As of this version 1.0, this package will be uploaded to CTAN
 ;; archives, where it shall find a permanent home, presumably in
 ;; tex-archive/support/emacs-modes.  It will also be submitted for
@@ -104,7 +64,7 @@
 ;; v 0.2 -- 1997/02/03  UV  Improved and debugged font-lock patterns.
 ;;                          Added indent-line-function for TAB.
 ;; v 0.3 -- 1997/02/17  UV  Improved font-lock patterns and syntax table.
-;;                          Improved and debbuged indentation function.
+;;                          Improved and debugged indentation function.
 ;; v 0.4 -- 1997/02/18  UV  Added functions to indent regions for M-C-q,
 ;;                          also added a preliminary mode-specific menu.
 ;; v 0.5 -- 1997/02/19  UV  Added functions to skip to next or previous
@@ -513,13 +473,13 @@ If the list was changed, sort the list and remove duplicates first."
   :group 'meta-font)
 
 (defcustom meta-right-comment-regexp nil
-  "Regexp matching comments that should be placed to the right margin."
+  "Regexp matching comments that should be placed on the right margin."
   :type '(choice regexp
                  (const :tag "None" nil))
   :group 'meta-font)
 
 (defcustom meta-ignore-comment-regexp "%[^%]"
-  "Regexp matching comments that whose indentation should not be touched."
+  "Regexp matching comments whose indentation should not be touched."
   :type 'regexp
   :group 'meta-font)
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 38bf9552b2a..8615400bf6a 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -948,22 +948,12 @@ Finds end of innermost nested class or method definition."
   "Go to start of current statement.
 Accounts for continuation lines, multi-line strings, and
 multi-line bracketed expressions."
-  (beginning-of-line)
-  (python-beginning-of-string)
-  (let (point)
-    (while (and (python-continuation-line-p)
-                (if point
-                    (< (point) point)
-                  t))
-      (beginning-of-line)
+  (while
       (if (python-backslash-continuation-line-p)
-          (progn
-            (forward-line -1)
-            (while (python-backslash-continuation-line-p)
-              (forward-line -1)))
-        (python-beginning-of-string)
-        (python-skip-out))
-      (setq point (point))))
+          (progn (forward-line -1) t)
+        (beginning-of-line)
+        (or (python-beginning-of-string)
+            (python-skip-out))))
   (back-to-indentation))
 
 (defun python-skip-out (&optional forward syntax)
@@ -971,6 +961,7 @@ multi-line bracketed expressions."
 Skip forward if FORWARD is non-nil, else backward.
 If SYNTAX is non-nil it is the state returned by `syntax-ppss' at point.
 Return non-nil if and only if skipping was done."
+  ;; FIXME: Use syntax-ppss-toplevel-pos.
   (let ((depth (syntax-ppss-depth (or syntax (syntax-ppss))))
         (forward (if forward -1 1)))
     (unless (zerop depth)
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index d7aa82aee1b..2f06afaa5ef 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -3510,7 +3510,7 @@ STRING are replaced by `-' and substrings are converted to lower case."
                         menu-list))
             (setq comp-alist (cdr comp-alist)))
           (setq menu-list (nreverse menu-list))
-          (vhdl-menu-split menu-list "Compler")))
+          (vhdl-menu-split menu-list "Compiler")))
       ["Use Local Error Regexp"
        (customize-set-variable 'vhdl-compile-use-local-error-regexp
                                (not vhdl-compile-use-local-error-regexp))
diff --git a/lisp/rot13.el b/lisp/rot13.el
index 89b687efdc6..d4885395900 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -32,7 +32,7 @@
 ;; This hack is mainly to show off the char table stuff.
 ;;
 ;; New entry points, `rot13', `rot13-string', and `rot13-region' that
-;; performs Ceasar cipher encrypt/decrypt on buffers and strings, was
+;; performs Caesar cipher encrypt/decrypt on buffers and strings, was
 ;; added by Simon Josefsson.
 
 ;;; Code:
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/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index b0f22085064..4d6b5e5fb83 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -443,7 +443,7 @@ of master file."
 (defvar test-dummy)
 (defun reftex-index-info (file)
   ;; Return an index entry for the current match.
-  ;; Carefull: This function expects the match-data to be still in place!
+  ;; Careful: This function expects the match-data to be still in place!
   (catch 'exit
     (let* ((macro (reftex-match-string 10))
            (bom (match-beginning 10))
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index f9fda7e0a74..0ce71c25ad7 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -476,8 +476,8 @@ for modes derived from Text mode, like Mail mode."
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Section Decoration Adjusment
-;; ============================
+;; Section Decoration Adjustment
+;; =============================
 ;;
 ;; The following functions implement a smart automatic title sectioning feature.
 ;; The idea is that with the cursor sitting on a section title, we try to get as
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 557ef33919c..6e192cd5aae 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -257,7 +257,7 @@ request.")
     (if (not (equal extra-headers ""))
         (setq extra-headers (concat extra-headers "\r\n")))
 
-    ;; This was done with a call to `format'.  Concatting parts has
+    ;; This was done with a call to `format'.  Concatenating parts has
     ;; the advantage of keeping the parts of each header together and
     ;; allows us to elide null lines directly, at the cost of making
     ;; the layout less clear.
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index 7362258a42d..dc4e179e060 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -263,8 +263,8 @@ RESULT is a list of conses (FILE . STATE) for directory DIR."
 (defun vc-svn-create-repo ()
   "Create a new SVN repository."
   (vc-do-command "*vc*" 0 "svnadmin" '("create" "SVN"))
-  (vc-do-command "*vc*" 0 vc-svn-program '(".")
-                 "checkout" (concat "file://" default-directory "SVN")))
+  (vc-svn-command "*vc*" 0 "." "checkout"
+                  (concat "file://" default-directory "SVN")))
 
 (defun vc-svn-register (files &optional rev comment)
   "Register FILES into the SVN version-control system.
@@ -334,7 +334,6 @@ This is only possible if SVN is responsible for FILE's directory.")
     ;; Check out a particular version (or recreate the file).
     (vc-file-setprop file 'vc-working-revision nil)
     (apply 'vc-svn-command nil 0 file
-           "--non-interactive"          ; bug#4280
            "update"
            (cond
             ((null rev) "-rBASE")
@@ -373,7 +372,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
   (message "Merging changes into %s..." file)
   ;; (vc-file-setprop file 'vc-working-revision nil)
   (vc-file-setprop file 'vc-checkout-time 0)
-  (vc-svn-command nil 0 file "--non-interactive" "update") ; see bug#7152
+  (vc-svn-command nil 0 file "update")
   ;; Analyze the merge result reported by SVN, and set
   ;; file properties accordingly.
   (with-current-buffer (get-buffer "*vc*")
@@ -425,7 +424,7 @@ This is only supported if the repository access method is either file://
 or svn+ssh://."
   (let (tempfile host remotefile directory fileurl-p)
     (with-temp-buffer
-      (vc-do-command (current-buffer) 0 vc-svn-program nil "info")
+      (vc-svn-command (current-buffer) 0 nil "info")
       (goto-char (point-min))
       (unless (re-search-forward "Repository Root: \\(file://\\(/.*\\)\\)\\|\\(svn\\+ssh://\\([^/]+\\)\\(/.*\\)\\)" nil t)
         (error "Repository information is unavailable"))
@@ -581,12 +580,19 @@ NAME is assumed to be a URL."
 (defun vc-svn-command (buffer okstatus file-or-list &rest flags)
   "A wrapper around `vc-do-command' for use in vc-svn.el.
 The difference to vc-do-command is that this function always invokes `svn',
-and that it passes `vc-svn-global-switches' to it before FLAGS."
-  (apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list
-         (if (stringp vc-svn-global-switches)
+and that it passes \"--non-interactive\" and `vc-svn-global-switches' to
+it before FLAGS."
+  ;; Might be nice if svn defaulted to non-interactive if stdin not tty.
+  ;; http://svn.haxx.se/dev/archive-2008-05/0762.shtml
+  ;; http://svn.haxx.se/dev/archive-2009-04/0094.shtml
+  ;; Maybe newer ones do?
+  (or (member "--non-interactive"
+              (setq flags (if (stringp vc-svn-global-switches)
              (cons vc-svn-global-switches flags)
-           (append vc-svn-global-switches
-                   flags))))
+                            (append vc-svn-global-switches flags))))
+      (setq flags (cons "--non-interactive" flags)))
+  (apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list
+         flags))
 
 (defun vc-svn-repository-hostname (dirname)
   (with-temp-buffer
diff --git a/lisp/window.el b/lisp/window.el
index 1b51bde36bd..ecd4a62b093 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -68,19 +68,19 @@ are not altered by this macro (unless they are altered in BODY)."
 ;; they don't substitute the selected window for nil), and they return
 ;; nil when WINDOW doesn't have a parent (like a frame's root window or
 ;; a minibuffer window).
-(defsubst window-right (window)
+(defun window-right (window)
   "Return WINDOW's right sibling.
 Return nil if WINDOW is the root window of its frame.  WINDOW can
 be any window."
   (and window (window-parent window) (window-next-sibling window)))
 
-(defsubst window-left (window)
+(defun window-left (window)
   "Return WINDOW's left sibling.
 Return nil if WINDOW is the root window of its frame.  WINDOW can
 be any window."
   (and window (window-parent window) (window-prev-sibling window)))
 
-(defsubst window-child (window)
+(defun window-child (window)
   "Return WINDOW's first child window."
   (or (window-top-child window) (window-left-child window)))
 
@@ -100,7 +100,7 @@ be any window."
       (setq window (window-next-sibling window))))
   window)
 
-(defsubst window-valid-p (object)
+(defun window-valid-p (object)
   "Return t if OBJECT denotes a live window or internal window.
 Otherwise, return nil; this includes the case where OBJECT is a
 deleted window."
@@ -108,7 +108,7 @@ deleted window."
        (or (window-buffer object) (window-child object))
        t))
 
-(defsubst window-normalize-buffer (buffer-or-name)
+(defun window-normalize-buffer (buffer-or-name)
   "Return buffer specified by BUFFER-OR-NAME.
 BUFFER-OR-NAME must be either a buffer or a string naming a live
 buffer and defaults to the current buffer."
@@ -123,7 +123,7 @@ buffer and defaults to the current buffer."
    (t
     (error "No such buffer %s" buffer-or-name))))
 
-(defsubst window-normalize-frame (frame)
+(defun window-normalize-frame (frame)
   "Return frame specified by FRAME.
 FRAME must be a live frame and defaults to the selected frame."
   (if frame
@@ -132,7 +132,7 @@ FRAME must be a live frame and defaults to the selected frame."
         (error "%s is not a live frame" frame))
     (selected-frame)))
 
-(defsubst window-normalize-window (window &optional live-only)
+(defun window-normalize-window (window &optional live-only)
   "Return window specified by WINDOW.
 If WINDOW is nil, return `selected-window'.
 If WINDOW is a live window or internal window, return WINDOW;
@@ -195,7 +195,7 @@ narrower, explictly specify the SIZE argument of that function."
   :version "24.1"
   :group 'windows)
 
-(defsubst window-combined-p (&optional window horizontal)
+(defun window-combined-p (&optional window horizontal)
   "Return non-nil if WINDOW has siblings in a given direction.
 If WINDOW is omitted or nil, it defaults to the selected window.
 
@@ -211,11 +211,11 @@ horizontal window combination."
              (window-left-child parent)
            (window-top-child parent)))))
 
-(defun window-combinations (&optional window horizontal)
-  "Return largest number of vertically arranged subwindows of WINDOW.
+(defun window-combinations (window &optional horizontal)
+  "Return largest number of windows vertically arranged within WINDOW.
 If WINDOW is omitted or nil, it defaults to the selected window.
 If HORIZONTAL is non-nil, return the largest number of
-horizontally arranged subwindows of WINDOW."
+windows horizontally arranged within WINDOW."
   (setq window (window-normalize-window window))
   (cond
    ((window-live-p window)
@@ -225,7 +225,7 @@ horizontally arranged subwindows of WINDOW."
         (window-left-child window)
       (window-top-child window))
     ;; If WINDOW is iso-combined, return the sum of the values for all
-    ;; subwindows of WINDOW.
+    ;; child windows of WINDOW.
     (let ((child (window-child window))
           (count 0))
       (while child
@@ -236,7 +236,7 @@ horizontally arranged subwindows of WINDOW."
       count))
    (t
     ;; If WINDOW is not iso-combined, return the maximum value of any
-    ;; subwindow of WINDOW.
+    ;; child window of WINDOW.
     (let ((child (window-child window))
           (count 1))
       (while child
@@ -279,14 +279,16 @@ unpredictable."
      proc (frame-root-window walk-window-tree-frame) any)))
 
 (defun walk-window-subtree (proc &optional window any)
-  "Run function PROC on each live subwindow of WINDOW.
+  "Run function PROC on the subtree of windows rooted at WINDOW.
 WINDOW defaults to the selected window.  PROC must be a function
-with one argument - a window.  ANY, if non-nil means to run PROC
-on all live and internal subwindows of WINDOW.
+with one argument - a window.  By default, run PROC only on live
+windows of the subtree.  If the optional argument ANY is non-nil,
+run PROC on all live and internal windows of the subtree.  If
+WINDOW is live, run PROC on WINDOW only.
 
 This function performs a pre-order, depth-first traversal of the
-window tree rooted at WINDOW.  If PROC changes that window tree,
-the result is unpredictable."
+subtree rooted at WINDOW.  If PROC changes that tree, the result
+is unpredictable."
   (setq window (window-normalize-window window))
   (walk-window-tree-1 proc window any t))
 
@@ -381,9 +383,9 @@ WINDOW must be an internal window.  Return WINDOW."
 (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 subwindows to
-nil.  An atomic window is wrongly configured if it has no
-subwindows or one of its subwindows is not atomic."
+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)))
 
 ;; Side windows.
@@ -528,7 +530,7 @@ unless it has no other choice \(like when deleting a neighboring
 window).")
 (make-variable-buffer-local 'window-size-fixed)
 
-(defsubst 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))
 
@@ -555,13 +557,13 @@ restrictions for that window only."
           ;; WINDOW is an internal window.
           (if (window-combined-p sub horizontal)
               ;; The minimum size of an iso-combination is the sum of
-              ;; the minimum sizes of its subwindows.
+              ;; the minimum sizes of its child windows.
               (while sub
                 (setq value (+ value
                                (window-min-size-1 sub horizontal ignore)))
                 (setq sub (window-right sub)))
             ;; The minimum size of an ortho-combination is the maximum of
-            ;; the minimum sizes of its subwindows.
+            ;; the minimum sizes of its child windows.
             (while sub
               (setq value (max value
                                (window-min-size-1 sub horizontal ignore)))
@@ -619,8 +621,9 @@ Optional argument HORIZONTAL non-nil means return DELTA if DELTA
 columns can be added to WINDOW.  A return value of zero means
 that no lines (or columns) can be added to WINDOW.
 
-This function looks only at WINDOW and its subwindows.  The
-function `window-resizable' looks at other windows as well.
+This function looks only at WINDOW and, recursively, its child
+windows.  The function `window-resizable' looks at other windows
+as well.
 
 DELTA positive means WINDOW shall be enlarged by DELTA lines or
 columns.  If WINDOW cannot be enlarged by DELTA lines or columns
@@ -652,7 +655,7 @@ restrictions for that window only."
       delta))
    (t 0)))
 
-(defsubst window-sizable-p (window delta &optional horizontal ignore)
+(defun window-sizable-p (window delta &optional horizontal ignore)
   "Return t if WINDOW can be resized by DELTA lines.
 For the meaning of the arguments of this function see the
 doc-string of `window-sizable'."
@@ -668,24 +671,24 @@ doc-string of `window-sizable'."
       (if sub
           ;; WINDOW is an internal window.
           (if (window-combined-p sub horizontal)
-              ;; An iso-combination is fixed size if all its subwindows
-              ;; are fixed-size.
+              ;; An iso-combination is fixed size if all its child
+              ;; windows are fixed-size.
               (progn
                 (while sub
                   (unless (window-size-fixed-1 sub horizontal)
-                    ;; We found a non-fixed-size subwindow, so WINDOW's
-                    ;; size is not fixed.
+                    ;; We found a non-fixed-size child window, so
+                    ;; WINDOW's size is not fixed.
                     (throw 'fixed nil))
                   (setq sub (window-right sub)))
-                ;; All subwindows are fixed-size, so WINDOW's size is
+                ;; All child windows are fixed-size, so WINDOW's size is
                 ;; fixed.
                 (throw 'fixed t))
             ;; An ortho-combination is fixed-size if at least one of its
-            ;; subwindows is fixed-size.
+            ;; child windows is fixed-size.
             (while sub
               (when (window-size-fixed-1 sub horizontal)
-                ;; We found a fixed-size subwindow, so WINDOW's size is
-                ;; fixed.
+                ;; We found a fixed-size child window, so WINDOW's size
+                ;; is fixed.
                 (throw 'fixed t))
               (setq sub (window-right sub))))
         ;; WINDOW is a live window.
@@ -701,8 +704,8 @@ window.  Optional argument HORIZONTAL non-nil means return
 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 functions
-`window-resizable' and `window-resizable-p' will tell that."
+WINDOW can be resized in the desired direction.  The function
+`window-resizable' can tell that."
   (window-size-fixed-1
    (window-normalize-window window) horizontal))
 
@@ -717,8 +720,8 @@ WINDOW can be resized in the desired direction.  The functions
       (catch 'done
         (if (window-combined-p sub horizontal)
             ;; In an iso-combination throw DELTA if we find at least one
-            ;; subwindow and that subwindow is either not of fixed-size
-            ;; or we can ignore fixed-sizeness.
+            ;; child window and that window is either not fixed-size or
+            ;; we can ignore fixed-sizeness.
             (let ((skip (eq trail 'after)))
               (while sub
                 (cond
@@ -728,11 +731,11 @@ WINDOW can be resized in the desired direction.  The functions
                  ((and (not (window-size-ignore window ignore))
                        (window-size-fixed-p sub horizontal)))
                  (t
-                  ;; We found a non-fixed-size subwindow.
+                  ;; We found a non-fixed-size child window.
                   (throw 'done delta)))
                 (setq sub (window-right sub))))
           ;; In an ortho-combination set DELTA to the minimum value by
-          ;; which other subwindows can shrink.
+          ;; which other child windows can shrink.
           (while sub
             (unless (eq sub window)
               (setq delta
@@ -768,8 +771,8 @@ Optional argument NOUP non-nil means don't go up in the window
 tree but try to enlarge windows within WINDOW's combination only.
 
 Optional argument NODOWN non-nil means don't check whether WINDOW
-itself \(and its subwindows) can be shrunk; check only whether at
-least one other windows can be enlarged appropriately."
+itself \(and its child windows) can be shrunk; check only whether
+at least one other window can be enlarged appropriately."
   (setq window (window-normalize-window window))
   (let ((size (window-total-size window horizontal))
         (minimum (window-min-size window horizontal ignore)))
@@ -797,7 +800,7 @@ least one other windows can be enlarged appropriately."
       (catch 'fixed
         (if (window-combined-p sub horizontal)
             ;; For an iso-combination calculate how much we can get from
-            ;; other subwindows.
+            ;; other child windows.
             (let ((skip (eq trail 'after)))
               (while sub
                 (cond
@@ -811,7 +814,7 @@ least one other windows can be enlarged appropriately."
                               (window-min-size sub horizontal ignore))))))
                 (setq sub (window-right sub))))
           ;; For an ortho-combination throw DELTA when at least one
-          ;; subwindow is fixed-size.
+          ;; child window is fixed-size.
           (while sub
             (when (and (not (eq sub window))
                        (not (window-size-ignore sub ignore))
@@ -850,8 +853,8 @@ tree but try to obtain the entire space from windows within
 WINDOW's combination.
 
 Optional argument NODOWN non-nil means do not check whether
-WINDOW itself \(and its subwindows) can be enlarged; check only
-whether other windows can be shrunk appropriately."
+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))
            (not nodown) (window-size-fixed-p window horizontal))
@@ -862,14 +865,14 @@ whether other windows can be shrunk appropriately."
     (window-max-delta-1 window 0 horizontal ignore trail noup)))
 
 ;; Make NOUP also inhibit the min-size check.
-(defun window-resizable (window delta &optional horizontal ignore trail noup nodown)
+(defun window--resizable (window delta &optional horizontal ignore trail noup nodown)
   "Return DELTA if WINDOW can be resized vertically by DELTA lines.
 Optional argument HORIZONTAL non-nil means return DELTA if WINDOW
 can be resized horizontally by DELTA columns.  A return value of
 zero means that WINDOW is not resizable.
 
 DELTA positive means WINDOW shall be enlarged by DELTA lines or
-columns.  If WINDOW cannot be enlarged by DELTA lines or columns
+columns.  If WINDOW cannot be enlarged by DELTA lines or columns,
 return the maximum value in the range 0..DELTA by which WINDOW
 can be enlarged.
 
@@ -891,11 +894,12 @@ of or below WINDOW can be shrunk.  Optional argument TRAIL
 shrunk.
 
 Optional argument NOUP non-nil means don't go up in the window
-tree but try to distribute the space among the other windows
-within WINDOW's combination.
+tree but check only whether space can be obtained from (or given
+to) WINDOW's siblings.
 
-Optional argument NODOWN non-nil means don't check whether WINDOW
-and its subwindows can be resized."
+Optional argument NODOWN non-nil means don't go down in the
+window tree.  This means do not check whether resizing would
+violate size restrictions of WINDOW or its child windows."
   (setq window (window-normalize-window window))
   (cond
    ((< delta 0)
@@ -906,34 +910,58 @@ and its subwindows can be resized."
          delta))
    (t 0)))
 
-(defun window-resizable-p (window delta &optional horizontal ignore trail noup nodown)
+(defun window--resizable-p (window delta &optional horizontal ignore trail noup nodown)
   "Return t if WINDOW can be resized vertically by DELTA lines.
 For the meaning of the arguments of this function see the
-doc-string of `window-resizable'."
+doc-string of `window--resizable'."
   (setq window (window-normalize-window window))
   (if (> delta 0)
-      (>= (window-resizable window delta horizontal ignore trail noup nodown)
+      (>= (window--resizable window delta horizontal ignore trail noup nodown)
           delta)
-    (<= (window-resizable window delta horizontal ignore trail noup nodown)
+    (<= (window--resizable window delta horizontal ignore trail noup nodown)
         delta)))
 
-(defsubst window-total-height (&optional window)
-  "Return the total number of lines of WINDOW.
-WINDOW can be any window and defaults to the selected one.  The
-return value includes WINDOW's mode line and header line, if any.
-If WINDOW is internal the return value is the sum of the total
-number of lines of WINDOW's child windows if these are vertically
-combined and the height of WINDOW's first child otherwise.
+(defun window-resizable (window delta &optional horizontal ignore)
+  "Return DELTA if WINDOW can be resized vertically by DELTA lines.
+Optional argument HORIZONTAL non-nil means return DELTA if WINDOW
+can be resized horizontally by DELTA columns.  A return value of
+zero means that WINDOW is not resizable.
+
+DELTA positive means WINDOW shall be enlarged by DELTA lines or
+columns.  If WINDOW cannot be enlarged by DELTA lines or columns
+return the maximum value in the range 0..DELTA by which WINDOW
+can be enlarged.
+
+DELTA negative means WINDOW shall be shrunk by -DELTA lines or
+columns.  If WINDOW cannot be shrunk by -DELTA lines or columns,
+return the minimum value in the range DELTA..0 that can be used
+for shrinking WINDOW.
+
+Optional argument IGNORE non-nil means ignore any restrictions
+imposed by fixed size windows, `window-min-height' or
+`window-min-width' settings.  IGNORE a window means ignore
+restrictions for that window only.  IGNORE equal `safe' means
+live windows may get as small as `window-safe-min-height' lines
+and `window-safe-min-width' columns."
+  (setq window (window-normalize-window window))
+  (window--resizable window delta horizontal ignore))
 
-Note: This function does not take into account the value of
-`line-spacing' when calculating the number of lines in WINDOW."
-  (window-total-size window))
+(defun window-total-size (&optional window horizontal)
+  "Return the total height or width of window WINDOW.
+If WINDOW is omitted or nil, it defaults to the selected window.
+
+If HORIZONTAL is omitted or nil, return the total height of
+WINDOW, in lines, like `window-total-height'.  Otherwise return
+the total width, in columns, like `window-total-width'."
+  (if horizontal
+      (window-total-width window)
+    (window-total-height window)))
 
 ;; Eventually we should make `window-height' obsolete.
 (defalias 'window-height 'window-total-height)
 
 ;; See discussion in bug#4543.
-(defsubst window-full-height-p (&optional window)
+(defun window-full-height-p (&optional window)
   "Return t if WINDOW is as high as the containing frame.
 More precisely, return t if and only if the total height of
 WINDOW equals the total height of the root window of WINDOW's
@@ -943,17 +971,7 @@ one."
   (= (window-total-size window)
      (window-total-size (frame-root-window window))))
 
-(defsubst window-total-width (&optional window)
-  "Return the total number of columns of WINDOW.
-WINDOW can be any window and defaults to the selected one.  The
-return value includes any vertical dividers or scrollbars of
-WINDOW.  If WINDOW is internal, the return value is the sum of
-the total number of columns of WINDOW's child windows if these
-are horizontally combined and the width of WINDOW's first child
-otherwise."
-  (window-total-size window t))
-
-(defsubst window-full-width-p (&optional window)
+(defun window-full-width-p (&optional window)
   "Return t if WINDOW is as wide as the containing frame.
 More precisely, return t if and only if the total width of WINDOW
 equals the total width of the root window of WINDOW's frame.
@@ -962,40 +980,17 @@ WINDOW can be any window and defaults to the selected one."
   (= (window-total-size window t)
      (window-total-size (frame-root-window window) t)))
 
-(defsubst window-body-height (&optional window)
-  "Return the number of lines of WINDOW's body.
-WINDOW must be a live window and defaults to the selected one.
-
-The return value does not include WINDOW's mode line and header
-line, if any.  If a line at the bottom of the window is only
-partially visible, that line is included in the return value.  If
-you do not want to include a partially visible bottom line in the
-return value, use `window-text-height' instead.
-
-Note that the return value is measured in canonical units, i.e. for
-the default frame's face.  If the window shows some characters with
-non-default face, e.g., if the font of some characters is larger or
-smaller than the default font, the value returned by this function
-will not match the actual number of lines shown in the window.  To
-get the actual number of lines, use `posn-at-point'."
-  (window-body-size window))
-
-(defsubst window-body-width (&optional window)
-  "Return the number of columns of WINDOW's body.
-WINDOW must be a live window and defaults to the selected one.
-
-The return value does not include any vertical dividers or scroll
-bars owned by WINDOW.  On a window-system the return value does
-not include the number of columns used for WINDOW's fringes or
-display margins either.
+(defun window-body-size (&optional window horizontal)
+  "Return the height or width of WINDOW's text area.
+If WINDOW is omitted or nil, it defaults to the selected window.
+Signal an error if the window is not live.
 
-Note that the return value is measured in canonical units, i.e. for
-the default frame's face.  If the window shows some characters with
-non-default face, e.g., if the font of some characters is larger or
-smaller than the default font, the value returned by this function
-will not match the actual number of characters per line shown in the
-window.  To get the actual number of columns, use `posn-at-point'."
-  (window-body-size window t))
+If HORIZONTAL is omitted or nil, return the height of the text
+area, like `window-body-height'.  Otherwise, return the width of
+the text area, like `window-body-width'."
+  (if horizontal
+      (window-body-width window)
+    (window-body-height window)))
 
 ;; Eventually we should make `window-height' obsolete.
 (defalias 'window-width 'window-body-width)
@@ -1463,9 +1458,9 @@ as small) as possible but don't signal an error."
 
       ;; Resize now.
       (window--resize-reset frame)
-      ;; Ideally we should be able to resize just the last subwindow of
-      ;; root here.  See the comment in `resize-root-window-vertically'
-      ;; for why we do not do that.
+      ;; Ideally we should be able to resize just the last child of root
+      ;; here.  See the comment in `resize-root-window-vertically' for
+      ;; why we do not do that.
       (window--resize-this-window root (- delta) nil nil t)
       (set-window-new-total window (+ height delta))
       ;; The following routine catches the case where we want to resize
@@ -1506,7 +1501,7 @@ instead."
       (error "Cannot resize the root window of a frame"))
      ((window-minibuffer-p window)
       (window--resize-mini-window window delta))
-     ((window-resizable-p window delta horizontal ignore)
+     ((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))
@@ -1532,14 +1527,14 @@ instead."
      (t
       (error "Cannot resize window %s" window)))))
 
-(defsubst window--resize-subwindows-skip-p (window)
+(defun window--resize-child-windows-skip-p (window)
   "Return non-nil if WINDOW shall be skipped by resizing routines."
   (memq (window-new-normal window) '(ignore stuck skip)))
 
-(defun window--resize-subwindows-normal (parent horizontal window this-delta &optional trail other-delta)
-  "Set the new normal height of subwindows of window PARENT.
+(defun window--resize-child-windows-normal (parent horizontal window this-delta &optional trail other-delta)
+  "Recursively set new normal height of child windows of window PARENT.
 HORIZONTAL non-nil means set the new normal width of these
-windows.  WINDOW specifies a subwindow of PARENT that has been
+windows.  WINDOW specifies a child window of PARENT that has been
 resized by THIS-DELTA lines \(columns).
 
 Optional argument TRAIL either 'before or 'after means set values
@@ -1561,8 +1556,8 @@ PARENT in order to resize WINDOW."
          (parent-normal 0.0)
          (skip (eq trail 'after)))
 
-    ;; Set parent-normal to the sum of the normal sizes of all
-    ;; subwindows of PARENT that shall be resized, excluding only WINDOW
+    ;; Set parent-normal to the sum of the normal sizes of all child
+    ;; windows of PARENT that shall be resized, excluding only WINDOW
     ;; and any windows specified by the optional TRAIL argument.
     (while sub
       (cond
@@ -1574,7 +1569,7 @@ PARENT in order to resize WINDOW."
               (+ parent-normal (window-normal-size sub horizontal)))))
       (setq sub (window-right sub)))
 
-    ;; Set the new normal size of all subwindows of PARENT from what
+    ;; Set the new normal size of all child windows of PARENT from what
     ;; they should have contributed for recovering THIS-DELTA lines
     ;; (columns).
     (setq sub (window-child parent))
@@ -1633,11 +1628,11 @@ PARENT in order to resize WINDOW."
        ;; Don't get larger than 1 or smaller than 0.
        (min 1.0 (max (- 1.0 sum) 0.0))))))
 
-(defun window--resize-subwindows (parent delta &optional horizontal window ignore trail edge)
-  "Resize subwindows of window PARENT vertically by DELTA lines.
+(defun window--resize-child-windows (parent delta &optional horizontal window ignore trail edge)
+  "Resize child windows of window PARENT vertically by DELTA lines.
 PARENT must be a vertically combined internal window.
 
-Optional argument HORIZONTAL non-nil means resize subwindows of
+Optional argument HORIZONTAL non-nil means resize child windows of
 PARENT horizontally by DELTA columns.  In this case PARENT must
 be a horizontally combined internal window.
 
@@ -1669,10 +1664,10 @@ already set by this routine."
                (setq sub first)
                (while (and (window-right sub)
                            (or (and (eq trail 'before)
-                                    (not (window--resize-subwindows-skip-p
+                                    (not (window--resize-child-windows-skip-p
                                           (window-right sub))))
                                (and (eq trail 'after)
-                                    (window--resize-subwindows-skip-p sub))))
+                                    (window--resize-child-windows-skip-p sub))))
                  (setq sub (window-right sub)))
                sub)
              (if horizontal
@@ -1700,7 +1695,7 @@ already set by this routine."
                  window (- (window-normal-size window horizontal)
                            (- (window-new-normal sub)
                               (window-normal-size sub horizontal)))))
-            (window--resize-subwindows-normal
+            (window--resize-child-windows-normal
              parent horizontal sub 0 trail delta))
           ;; Return 'normalized to notify `window--resize-siblings' that
           ;; normal sizes have been already set.
@@ -1709,9 +1704,9 @@ already set by this routine."
       (setq sub first)
       (while sub
         (cond
-         ((or (window--resize-subwindows-skip-p sub)
-              ;; Ignore windows to skip and fixed-size subwindows - in
-              ;; the latter case make it a window to skip.
+         ((or (window--resize-child-windows-skip-p sub)
+              ;; Ignore windows to skip and fixed-size child windows -
+              ;; in the latter case make it a window to skip.
               (and (not ignore)
                    (window-size-fixed-p sub horizontal)
                    (set-window-new-normal sub 'ignore))))
@@ -1799,7 +1794,7 @@ already set by this routine."
             (set-window-new-normal sub))
 
           (unless (eq (window-new-normal sub) 'ignore)
-            ;; Resize this subwindow's subwindows (back-engineering
+            ;; Resize this window's child windows (back-engineering
             ;; delta from sub's old and new total sizes).
             (let ((delta (- (window-new-total sub)
                             (window-total-size sub horizontal))))
@@ -1860,7 +1855,7 @@ preferably only resize windows adjacent to EDGE."
             ;; Set this-delta to what we can get from WINDOW's siblings.
             (if (= (- delta) (window-total-size window horizontal))
                 ;; A deletion, presumably.  We must handle this case
-                ;; specially since `window-resizable' can't be used.
+                ;; specially since `window--resizable' can't be used.
                 (if this-delta
                     ;; There's at least one resizable sibling we can
                     ;; give WINDOW's size to.
@@ -1869,7 +1864,7 @@ preferably only resize windows adjacent to EDGE."
                   (setq this-delta 0))
               ;; Any other form of resizing.
               (setq this-delta
-                    (window-resizable window delta horizontal ignore trail t)))
+                    (window--resizable window delta horizontal ignore trail t)))
 
             ;; Set other-delta to what we still have to get from
             ;; ancestor windows of parent.
@@ -1882,19 +1877,19 @@ preferably only resize windows adjacent to EDGE."
             (if (zerop this-delta)
                 ;; We haven't got anything from WINDOW's siblings but we
                 ;; must update the normal sizes to respect other-delta.
-                (window--resize-subwindows-normal
+                (window--resize-child-windows-normal
                  parent horizontal window this-delta trail other-delta)
               ;; We did get something from WINDOW's siblings which means
-              ;; we have to resize their subwindows.
-              (unless (eq (window--resize-subwindows
+              ;; we have to resize their child windows.
+              (unless (eq (window--resize-child-windows
                            parent (- this-delta) horizontal
                            window ignore trail edge)
-                          ;; If `window--resize-subwindows' returns
+                          ;; If `window--resize-child-windows' returns
                           ;; 'normalized, this means it has set the
                           ;; normal sizes already.
                           'normalized)
                 ;; Set the normal sizes.
-                (window--resize-subwindows-normal
+                (window--resize-child-windows-normal
                  parent horizontal window this-delta trail other-delta))
               ;; Set DELTA to what we still have to get from ancestor
               ;; windows.
@@ -1934,8 +1929,8 @@ resize only windows on the left or above EDGE.  If TRAIL equals
 `after', resize only windows on the right or below EDGE.  Also,
 preferably only resize windows adjacent to EDGE.
 
-This function recursively resizes WINDOW's subwindows to fit the
-new size.  Make sure that WINDOW is `window-resizable' before
+This function recursively resizes WINDOW's child windows to fit the
+new size.  Make sure that WINDOW is `window--resizable' before
 calling this function.  Note that this function does not resize
 siblings of WINDOW or WINDOW's parent window.  You have to
 eventually call `window-resize-apply' in order to make resizing
@@ -1948,11 +1943,11 @@ actually take effect."
     (cond
      ((not sub))
      ((window-combined-p sub horizontal)
-      ;; In an iso-combination resize subwindows according to their
+      ;; In an iso-combination resize child windows according to their
       ;; normal sizes.
-      (window--resize-subwindows
+      (window--resize-child-windows
        window delta horizontal nil ignore trail edge))
-     ;; In an ortho-combination resize each subwindow by DELTA.
+     ;; In an ortho-combination resize each child window by DELTA.
      (t
       (while sub
         (window--resize-this-window
@@ -1978,7 +1973,7 @@ resizes windows proportionally and never deletes any windows."
   "Resize root window WINDOW vertically by DELTA lines.
 If DELTA is less than zero and we can't shrink WINDOW by DELTA
 lines, shrink it as much as possible.  If DELTA is greater than
-zero, this function can resize fixed-size subwindows in order to
+zero, this function can resize fixed-size windows in order to
 recover the necessary lines.
 
 Return the number of lines that were recovered.
@@ -2075,7 +2070,7 @@ move it as far as possible in the desired direction."
           ;; Start resizing.
           (window--resize-reset frame horizontal)
           ;; Try to enlarge LEFT first.
-          (setq this-delta (window-resizable left delta horizontal))
+          (setq this-delta (window--resizable left delta horizontal))
           (unless (zerop this-delta)
             (window--resize-this-window
              left this-delta horizontal nil t 'before
@@ -2098,7 +2093,7 @@ move it as far as possible in the desired direction."
           ;; Start resizing.
           (window--resize-reset frame horizontal)
           ;; Try to enlarge RIGHT.
-          (setq this-delta (window-resizable right (- delta) horizontal))
+          (setq this-delta (window--resizable right (- delta) horizontal))
           (unless (zerop this-delta)
             (window--resize-this-window
              right this-delta horizontal nil t 'after
@@ -2129,7 +2124,7 @@ Return nil."
    ((zerop delta))
    ((window-size-fixed-p nil horizontal)
     (error "Selected window has fixed size"))
-   ((window-resizable-p nil delta horizontal)
+   ((window--resizable-p nil delta horizontal)
     (window-resize nil delta horizontal))
    (t
     (window-resize
@@ -2150,7 +2145,7 @@ Return nil."
    ((zerop delta))
    ((window-size-fixed-p nil horizontal)
     (error "Selected window has fixed size"))
-   ((window-resizable-p nil (- delta) horizontal)
+   ((window--resizable-p nil (- delta) horizontal)
     (window-resize nil (- delta) horizontal))
    (t
     (window-resize
@@ -2177,7 +2172,7 @@ WINDOW can be any window and defaults to the selected window."
   (window-resize window (- (window-min-delta window)))
   (window-resize window (- (window-min-delta window t)) t))
 
-(defsubst frame-root-window-p (window)
+(defun frame-root-window-p (window)
   "Return non-nil if WINDOW is the root window of its frame."
   (eq window (frame-root-window window)))
 
@@ -2214,9 +2209,9 @@ is the frame's minibuffer window.
 If the root window is not split, ROOT is the root window itself.
 Otherwise, ROOT is a list (DIR EDGES W1 W2 ...) where DIR is nil
 for a horizontal split, and t for a vertical split.  EDGES gives
-the combined size and position of the subwindows in the split,
-and the rest of the elements are the subwindows in the split.
-Each of the subwindows may again be a window or a list
+the combined size and position of the child windows in the split,
+and the rest of the elements are the child windows in the split.
+Each of the child windows may again be a window or a list
 representing a window split, and so on.  EDGES is a list \(LEFT
 TOP RIGHT BOTTOM) as returned by `window-edges'."
   (setq frame (window-normalize-frame frame))
@@ -2352,13 +2347,13 @@ frame."
       ;; frame.
       t))))
 
-(defun window-or-subwindow-p (subwindow window)
-  "Return t if SUBWINDOW is either WINDOW or a subwindow of WINDOW."
-  (or (eq subwindow window)
-      (let ((parent (window-parent subwindow)))
+(defun window--in-subtree-p (window root)
+  "Return t if WINDOW is either ROOT or a member of ROOT's subtree."
+  (or (eq window root)
+      (let ((parent (window-parent window)))
         (catch 'done
           (while parent
-            (if (eq parent window)
+            (if (eq parent root)
                 (throw 'done t)
               (setq parent (window-parent parent))))))))
 
@@ -2410,7 +2405,7 @@ non-side window, signal an error."
       (let* ((horizontal (window-left-child parent))
              (size (window-total-size window horizontal))
              (frame-selected
-              (window-or-subwindow-p (frame-selected-window frame) window))
+              (window--in-subtree-p (frame-selected-window frame) window))
              ;; Emacs 23 preferably gives WINDOW's space to its left
              ;; sibling.
              (sibling (or (window-left window) (window-right window))))
@@ -2423,7 +2418,7 @@ non-side window, signal an error."
           (set-window-new-normal
            sibling (+ (window-normal-size sibling horizontal)
                       (window-normal-size window horizontal))))
-         ((window-resizable-p window (- size) horizontal nil nil nil t)
+         ((window--resizable-p window (- size) horizontal nil nil nil t)
           ;; Can do without resizing fixed-size windows.
           (window--resize-siblings window (- size) horizontal))
          (t
@@ -3050,7 +3045,7 @@ showing BUFFER-OR-NAME."
         (unrecord-window-buffer window buffer)))))
 
 ;;; Splitting windows.
-(defsubst window-split-min-size (&optional horizontal)
+(defun window-split-min-size (&optional horizontal)
   "Return minimum height of any window when splitting windows.
 Optional argument HORIZONTAL non-nil means return minimum width."
   (if horizontal
@@ -3126,8 +3121,8 @@ frame.  The selected window is not changed by this function."
         ;; The `split-window' parameter specifies the function to call.
         ;; If that function is `ignore', do nothing.
         (throw 'done (funcall function window size side)))
-       ;; If WINDOW is a subwindow of an atomic window, split the root
-       ;; window of that atomic window instead.
+       ;; If WINDOW is part of an atomic window, split the root window
+       ;; of that atomic window instead.
        ((and (window-parameter window 'window-atom)
              (setq atom-root (window-atom-root window))
              (not (eq atom-root window)))
@@ -3249,7 +3244,7 @@ frame.  The selected window is not changed by this function."
             ;; we won't be able to return space to those windows when we
             ;; delete the one we create here.  Hence we do not go up.
             (progn
-              (window--resize-subwindows parent (- new-size) horizontal)
+              (window--resize-child-windows parent (- new-size) horizontal)
               (let* ((normal (- 1.0 new-normal))
                      (sub (window-child parent)))
                 (while sub
@@ -3365,8 +3360,8 @@ right, if any."
 ;;; Balancing windows.
 
 ;; The following routine uses the recycled code from an old version of
-;; `window--resize-subwindows'.  It's not very pretty, but coding it the way the
-;; new `window--resize-subwindows' code does would hardly make it any shorter or
+;; `window--resize-child-windows'.  It's not very pretty, but coding it the way the
+;; new `window--resize-child-windows' code does would hardly make it any shorter or
 ;; more readable (FWIW we'd need three loops - one to calculate the
 ;; minimum sizes per window, one to enlarge or shrink windows until the
 ;; new parent-size matches, and one where we shrink the largest/enlarge
@@ -3395,14 +3390,14 @@ is non-nil."
       (setq failed nil)
       (setq sub first)
       (while (and sub (not failed))
-        ;; Ignore subwindows that should be ignored or are stuck.
-        (unless (window--resize-subwindows-skip-p sub)
+        ;; Ignore child windows that should be ignored or are stuck.
+        (unless (window--resize-child-windows-skip-p sub)
           (setq found t)
           (setq sub-total (window-total-size sub horizontal))
           (setq sub-delta (- size sub-total))
           (setq sub-amount
                 (window-sizable sub sub-delta horizontal))
-          ;; Register the new total size for this subwindow.
+          ;; Register the new total size for this child window.
           (set-window-new-total sub (+ sub-total sub-amount))
           (unless (= sub-amount sub-delta)
             (setq total-sum (- total-sum sub-total sub-amount))
@@ -3417,7 +3412,7 @@ is non-nil."
     ;; (column) until `rest' is zero.
     (setq sub first)
     (while (and sub (> rest 0))
-      (unless (window--resize-subwindows-skip-p window)
+      (unless (window--resize-child-windows-skip-p window)
         (set-window-new-total sub 1 t)
         (setq rest (1- rest)))
       (setq sub (window-right sub)))
@@ -3439,7 +3434,7 @@ is non-nil."
                   (window-total-size sub horizontal)
                 (window-new-total sub))
               (float parent-size)))
-      ;; Recursively balance each subwindow's subwindows.
+      ;; Recursively balance each window's child windows.
       (balance-windows-1 sub horizontal)
       (setq sub (window-right sub)))))
 
@@ -3456,11 +3451,11 @@ is non-nil."
               (setq sub (window-right sub))))))))
 
 (defun balance-windows (&optional window-or-frame)
-  "Balance the sizes of subwindows of WINDOW-OR-FRAME.
+  "Balance the sizes of windows of WINDOW-OR-FRAME.
 WINDOW-OR-FRAME is optional and defaults to the selected frame.
 If WINDOW-OR-FRAME denotes a frame, balance the sizes of all
-subwindows of that frame's root window.  If WINDOW-OR-FRAME
-denots a window, balance the sizes of all subwindows of that
+windows of that frame.  If WINDOW-OR-FRAME denots a window,
+recursively balance the sizes of all child windows of that
 window."
   (interactive)
   (let* ((window
@@ -3593,10 +3588,6 @@ specific buffers."
     ))
 
 ;;; Window states, how to get them and how to put them in a window.
-(defsubst window-list-no-nils (&rest args)
-  "Like LIST but do not add nil elements of ARGS."
-  (delq nil (apply 'list args)))
-
 (defvar window-state-ignored-parameters '(quit-restore)
   "List of window parameters ignored by `window-state-get'.")
 
@@ -3610,46 +3601,47 @@ specific buffers."
          (buffer (window-buffer window))
          (selected (eq window (selected-window)))
          (head
-          (window-list-no-nils
-           type
-           (unless (window-next-sibling window) (cons 'last t))
-           (cons 'total-height (window-total-size window))
-           (cons 'total-width (window-total-size window t))
-           (cons 'normal-height (window-normal-size window))
-           (cons 'normal-width (window-normal-size window t))
-           (cons 'splits (window-splits window))
-           (cons 'nest (window-nest window))
-           (let (list)
-             (dolist (parameter (window-parameters window))
-               (unless (memq (car parameter)
-                             window-state-ignored-parameters)
-                 (setq list (cons parameter list))))
-             (unless (window-parameter window 'clone-of)
-               ;; Make a clone-of parameter.
-               (setq list (cons (cons 'clone-of window) list)))
-             (when list
-               (cons 'parameters list)))
-           (when buffer
-             ;; All buffer related things go in here - make the buffer
-             ;; current when retrieving `point' and `mark'.
-             (with-current-buffer (window-buffer window)
-               (let ((point (window-point-1 window))
-                     (start (window-start window))
-                     (mark (mark)))
-                 (window-list-no-nils
-                  'buffer (buffer-name buffer)
-                  (cons 'selected selected)
-                  (when window-size-fixed (cons 'size-fixed window-size-fixed))
-                  (cons 'hscroll (window-hscroll window))
-                  (cons 'fringes (window-fringes window))
-                  (cons 'margins (window-margins window))
-                  (cons 'scroll-bars (window-scroll-bars window))
-                  (cons 'vscroll (window-vscroll window))
-                  (cons 'dedicated (window-dedicated-p window))
-                  (cons 'point (if markers (copy-marker point) point))
-                  (cons 'start (if markers (copy-marker start) start))
-                  (when mark
-                    (cons 'mark (if markers (copy-marker mark) mark)))))))))
+          `(,type
+            ,@(unless (window-next-sibling window) `((last . t)))
+            (total-height . ,(window-total-size window))
+            (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))
+                  (unless (memq (car parameter)
+                                window-state-ignored-parameters)
+                    (setq list (cons parameter list))))
+                (unless (window-parameter window 'clone-of)
+                  ;; Make a clone-of parameter.
+                  (setq list (cons (cons 'clone-of window) list)))
+                (when list
+                  `((parameters . ,list))))
+            ,@(when buffer
+                ;; All buffer related things go in here - make the buffer
+                ;; current when retrieving `point' and `mark'.
+                (with-current-buffer (window-buffer window)
+                  (let ((point (window-point-1 window))
+                        (start (window-start window))
+                        (mark (mark)))
+                    `((buffer
+                       ,(buffer-name buffer)
+                       (selected . ,selected)
+                       ,@(when window-size-fixed
+                           `((size-fixed . ,window-size-fixed)))
+                       (hscroll . ,(window-hscroll window))
+                       (fringes . ,(window-fringes window))
+                       (margins . ,(window-margins window))
+                       (scroll-bars . ,(window-scroll-bars window))
+                       (vscroll . ,(window-vscroll window))
+                       (dedicated . ,(window-dedicated-p window))
+                       (point . ,(if markers (copy-marker point) point))
+                       (start . ,(if markers (copy-marker start) start))
+                       ,@(when mark
+                           `((mark . ,(if markers
+                                          (copy-marker mark) mark)))))))))))
          (tail
           (when (memq type '(vc hc))
             (let (list)
@@ -3680,21 +3672,20 @@ value can be also stored on disk and read back in a new session."
               (error "%s is not a live or internal window" window))
           (frame-root-window)))
   ;; The return value is a cons whose car specifies some constraints on
-  ;; the size of WINDOW.  The cdr lists the states of the subwindows of
-  ;; WINDOW.
+  ;; the size of WINDOW.  The cdr lists the states of the child windows
+  ;; of WINDOW.
   (cons
    ;; Frame related things would go into a function, say `frame-state',
    ;; calling `window-state-get' to insert the frame's root window.
-   (window-list-no-nils
-    (cons 'min-height (window-min-size window))
-    (cons 'min-width (window-min-size window t))
-    (cons 'min-height-ignore (window-min-size window nil t))
-    (cons 'min-width-ignore (window-min-size window t t))
-    (cons 'min-height-safe (window-min-size window nil 'safe))
-    (cons 'min-width-safe (window-min-size window t 'safe))
-    ;; These are probably not needed.
-    (when (window-size-fixed-p window) (cons 'fixed-height t))
-    (when (window-size-fixed-p window t) (cons 'fixed-width t)))
+   `((min-height        . ,(window-min-size window))
+     (min-width         . ,(window-min-size window t))
+     (min-height-ignore . ,(window-min-size window nil t))
+     (min-width-ignore  . ,(window-min-size window t t))
+     (min-height-safe   . ,(window-min-size window nil 'safe))
+     (min-width-safe    . ,(window-min-size window t 'safe))
+     ;; These are probably not needed.
+     ,@(when (window-size-fixed-p window) `((fixed-height . t)))
+     ,@(when (window-size-fixed-p window t) `((fixed-width . t))))
    (window-state-get-1 window markers)))
 
 (defvar window-state-put-list nil
@@ -3798,13 +3789,13 @@ value can be also stored on disk and read back in a new session."
               (let ((delta (- (cdr (assq 'total-height item))
                               (window-total-height window)))
                     window-size-fixed)
-                (when (window-resizable-p window delta)
+                (when (window--resizable-p window delta)
                   (window-resize window delta)))
             ;; Else check whether the window is not high enough.
             (let* ((min-size (window-min-size window nil ignore))
                    (delta (- min-size (window-total-size window))))
               (when (and (> delta 0)
-                         (window-resizable-p window delta nil ignore))
+                         (window--resizable-p window delta nil ignore))
                 (window-resize window delta nil ignore))))
           ;; Adjust horizontally.
           (if (memq window-size-fixed '(t width))
@@ -3812,13 +3803,13 @@ value can be also stored on disk and read back in a new session."
               (let ((delta (- (cdr (assq 'total-width item))
                               (window-total-width window)))
                     window-size-fixed)
-                (when (window-resizable-p window delta)
+                (when (window--resizable-p window delta)
                   (window-resize window delta)))
             ;; Else check whether the window is not wide enough.
             (let* ((min-size (window-min-size window t ignore))
                    (delta (- min-size (window-total-size window t))))
               (when (and (> delta 0)
-                         (window-resizable-p window delta t ignore))
+                         (window--resizable-p window delta t ignore))
                 (window-resize window delta t ignore))))
           ;; Set dedicated status.
           (set-window-dedicated-p window (cdr (assq 'dedicated state)))
@@ -3843,7 +3834,7 @@ specify a live window and defaults to the selected one.
 
 Optional argument IGNORE non-nil means ignore minimum window
 sizes and fixed size restrictions.  IGNORE equal `safe' means
-subwindows can get as small as `window-safe-min-height' and
+windows can get as small as `window-safe-min-height' and
 `window-safe-min-width'."
   (setq window (window-normalize-window window t))
   (let* ((frame (window-frame window))
@@ -3948,8 +3939,9 @@ means that the currently selected window is not acceptable.  It
 should choose or create a window, display the specified buffer in
 it, and return the window.
 
-The function specified here is responsible for setting the
-quit-restore and help-setup parameters of the window used."
+The specified function should call `display-buffer-record-window'
+with corresponding arguments to set up the quit-restore parameter
+of the window used."
   :type '(choice
           (const nil)
           (function :tag "function"))
@@ -4202,6 +4194,7 @@ and (cdr ARGS) as second."
                  (make-frame (append args special-display-frame-alist))))
               (window (frame-selected-window frame)))
          (display-buffer-record-window 'frame window buffer)
+         ;; FIXME: Use window--display-buffer-2?
          (set-window-buffer window buffer)
          ;; Reset list of WINDOW's previous buffers to nil.
          (set-window-prev-buffers window nil)
@@ -4221,8 +4214,9 @@ A buffer is special when its name is either listed in
 `special-display-buffer-names' or matches a regexp in
 `special-display-regexps'.
 
-The function specified here is responsible for setting the
-quit-restore and help-setup parameters of the window used."
+The specified function should call `display-buffer-record-window'
+with corresponding arguments to set up the quit-restore parameter
+of the window used."
   :type 'function
   :group 'frames)
 
@@ -4622,9 +4616,8 @@ See `display-buffer' for details."
   :group 'windows)
 
 (defconst display-buffer-fallback-action
-  '((display-buffer--maybe-same-window
+  '((display-buffer--maybe-same-window  ;FIXME: why isn't this redundant?
      display-buffer-reuse-window
-     display-buffer--special
      display-buffer--maybe-pop-up-frame-or-window
      display-buffer-use-some-window
      ;; If all else fails, pop up a new frame.
@@ -4655,7 +4648,6 @@ specified, e.g. by the user options `display-buffer-alist' or
 
 (defvar display-buffer--other-frame-action
   '((display-buffer-reuse-window
-     display-buffer--special
      display-buffer-pop-up-frame)
     (reusable-frames . 0)
     (inhibit-same-window . t))
@@ -4721,6 +4713,7 @@ search for a window that is already displaying the buffer.  See
       (let* ((user-action
               (display-buffer-assq-regexp (buffer-name buffer)
                                           display-buffer-alist))
+             (special-action (display-buffer--special-action buffer))
              ;; Extra actions from the arguments to this function:
              (extra-action
               (cons nil (append (if inhibit-same-window
@@ -4729,7 +4722,7 @@ search for a window that is already displaying the buffer.  See
                                     `((reusable-frames . ,frame))))))
              ;; Construct action function list and action alist.
              (actions (list display-buffer-overriding-action
-                            user-action action extra-action
+                            user-action special-action action extra-action
                             display-buffer-base-action
                             display-buffer-fallback-action))
              (functions (apply 'append
@@ -4812,7 +4805,7 @@ terminal if either of those variables is non-nil."
       (display-buffer-record-window 'reuse window buffer)
       (window--display-buffer-1 window))))
 
-(defun display-buffer--special (buffer alist)
+(defun display-buffer--special-action (buffer)
   "Try to display BUFFER using `special-display-function'.
 Call `special-display-p' on BUFFER's name, and if that returns
 non-nil, call `special-display-function' on BUFFER."
@@ -4821,8 +4814,10 @@ non-nil, call `special-display-function' on BUFFER."
        ;; parameters to pass to `special-display-function'.
        (let ((pars (special-display-p (buffer-name buffer))))
          (when pars
-           (funcall special-display-function
-                    buffer (if (listp pars) pars))))))
+           (list (list #'display-buffer-reuse-window
+                       `(lambda (buffer _alist)
+                          (funcall special-display-function
+                                   buffer ',(if (listp pars) pars)))))))))
 
 (defun display-buffer-pop-up-frame (buffer alist)
   "Display BUFFER in a new frame.
@@ -4970,8 +4965,7 @@ the buffer.
 NORECORD, if non-nil means do not put this buffer at the front of
 the list of recently selected ones."
   (pop-to-buffer buffer
-                 '((display-buffer--special
-                    display-buffer-same-window)
+                 '(display-buffer-same-window
                    (inhibit-same-window . nil))
                  norecord))
 
@@ -5435,8 +5429,8 @@ by `recenter-positions'."
 
 ;;; Scrolling commands.
 
-;;; Scrolling commands which does not signal errors at top/bottom
-;;; of buffer at first key-press (instead moves to top/bottom
+;;; Scrolling commands which do not signal errors at top/bottom
+;;; of buffer at first key-press (instead move to top/bottom
 ;;; of buffer).
 
 (defcustom scroll-error-top-bottom nil
diff --git a/lisp/woman.el b/lisp/woman.el
index 7b530d1004f..078acfc0362 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1440,7 +1440,7 @@ The cdr of each alist element is the path-index / filename."
                 files))
       (setq path-index (1+ path-index)))
     ;; Uniquefy topics:
-    ;; Concate all lists with a single nconc call to
+    ;; Concatenate all lists with a single nconc call to
     ;; avoid retraversing the first lists repeatedly  -- dak
     (woman-topic-all-completions-merge
      (apply #'nconc files))))