upstream

27 files changed, 553 insertions, 296 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index efe1d4b4a42..103d7b25518 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,149 @@
+2011-10-10  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (special-display-buffer-names)
+        (special-display-regexps): Remove some remnants of earlier
+        changes from doc-strings.
+
+2011-10-09  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (frame-auto-hide-function): Add version tag.
+        (Bug#9699)
+
+2011-10-09  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-file-name-handler): Add 'debug to the error
+        condition.
+
+2011-10-09  Leo Liu  <sdl.web@gmail.com>
+
+        * mail/smtpmail.el (smtpmail-send-data): Add a missing space.
+        (Bug#9701)
+
+2011-10-08  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/f90.el (f90-calculate-indent): Give preprocessor lines
+        before the first code statement zero indent.  (Bug#9690)
+
+2011-10-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (count-words-region): Always count in the region.
+        Report the number of lines and characters too.
+        (count-words): New command, which counts in the buffer if the
+        region is inactive, as count-words-region used to.
+        (count-words--message): New function.  Handle plurals.
+        (count-lines-region): Make it an alias for count-words-region.
+
+        * bindings.el (esc-map): Replace count-lines-region with
+        count-words-region.
+
+2011-10-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window--delete): Delete dedicated frame
+        unconditionally when argument KILL is non-nil.  (Bug#9699)
+        (switch-to-buffer): Fix doc-string typo.
+
+2011-10-08  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+        * lisp/eshell/eshell.el (eshell-command): Avoid using hooks.
+
+2011-10-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * bindings.el ([M-left],[M-right]): Bind to left-word and
+        right-word respectively.
+
+2011-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * cus-start.el (debug-on-quit): Fix custom type.
+
+2011-10-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * subr.el (define-key-after): Clarify that the function is not
+        useful for non-menu keymaps.
+
+        * progmodes/gdb-mi.el (gdb): Fix typo in doc string.
+
+2011-10-06  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+        * eshell/eshell.el (eshell-command): Enable `eshell-mode' only
+        in current minibuffer (Fix bug with recursive minibuffers).
+
+2011-10-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/gdb-mi.el (gdb): Doc fix.
+
+2011-10-05  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (frame-auto-hide-function): New option replacing
+        frame-auto-delete.  Suggested by Stefan Monnier.
+        (window--delete): Call frame-auto-hide-function instead of
+        investigating frame-auto-delete.
+        (window-point-1, set-window-point-1): New functions.
+        (window-in-direction, record-window-buffer, window-state-get-1)
+        (display-buffer-record-window): Use window-point-1 instead of
+        window-point.
+        (set-window-buffer-start-and-point): Use set-window-point-1.
+
+2011-10-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/edebug.el: Heed checkdoc recommendations.
+
+2011-10-05  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/perl-mode.el (perl-electric-terminator): Doc fix.
+        (perl-calculate-indent): Suppress scan errors.  (Bug#2205)
+
+2011-10-05  Leo Liu  <sdl.web@gmail.com>
+
+        * subr.el (read-char-choice): Fix argument to buffer-live-p which
+        works with buffer object.
+
+2011-10-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mpc.el (mpc-tool-bar-map): Add labels.
+
+2011-10-04  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/holidays.el (calendar-check-holidays): Doc fix.
+
+2011-10-04  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window--delete): New function.
+        (frame-auto-delete): Resuscitate option.
+        (bury-buffer, replace-buffer-in-windows)
+        (quit-window): Rewrite using window--delete.
+        (display-buffer-pop-up-frame, display-buffer-pop-up-window):
+        Pass display-buffer-mark-dedicated to window--display-buffer-2
+        (Bug#9639).
+
+2011-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcmpl-unix.el (pcomplete/scp): Don't assume pcomplete-all-entries
+        returns a list (bug#9554).  Add remote file name completion.
+        * comint.el (comint--table-subvert): Curry and get quote&unquote
+        functions as arguments.
+        (comint--complete-file-name-data): Adjust call accordingly.
+        * pcomplete.el (pcomplete--table-subvert): Remove.
+        (pcomplete-completions-at-point): Use comint--table-subvert instead.
+
+        * minibuffer.el (completion-table-case-fold): Use currying.
+        (completion--styles-type, completion--cycling-threshold-type):
+        New constants.
+        (completion-styles, completion-category-overrides)
+        (completion-cycle-threshold): Use them.
+        * pcomplete.el (pcomplete-completions-at-point): Adjust call to
+        completion-table-case-fold.
+
+2011-10-03  Stephen Berman  <stephen.berman@gmx.net>
+
+        * minibuffer.el (completion-category-overrides): Fix type of styles
+        and add more user friendly tags (bug#9660).
+
+2011-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * international/mule-cmds.el: Fix abuses of apply-partially (bug#9661).
+        (mule-input-method-string): New widget.
+        (default-input-method, language-info-custom-alist): Use it.
+
 2011-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * pcomplete.el: Require comint.
@@ -12,8 +158,8 @@
         * pcmpl-gnu.el (pcmpl-gnu-with-file-buffer): New macro (bug#9643).
         (pcmpl-gnu-tar-buffer): Remove.
         (pcmpl-gnu-with-file-buffer): Use it to avoid leaving the tar's buffer
-        avoid.  Make sure pcomplete-suffix-list is only changed temporarily.
-        Don't look inside the tar's file is it's too large.
+        around.  Make sure pcomplete-suffix-list is only changed temporarily.
+        Don't look inside the tar's file if it's too large.
 
 2011-10-01  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 57bfeb60f82..1a10d117987 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -773,7 +773,7 @@ if `inhibit-field-text-motion' is non-nil."
 (define-key ctl-x-map "\C-o" 'delete-blank-lines)
 (define-key esc-map " " 'just-one-space)
 (define-key esc-map "z" 'zap-to-char)
-(define-key esc-map "=" 'count-lines-region)
+(define-key esc-map "=" 'count-words-region)
 (define-key ctl-x-map "=" 'what-cursor-position)
 (define-key esc-map ":" 'eval-expression)
 ;; Define ESC ESC : like ESC : for people who type ESC ESC out of habit.
@@ -1103,9 +1103,9 @@ if `inhibit-field-text-motion' is non-nil."
   "Keymap for characters following C-c.")
 (define-key global-map "\C-c" 'mode-specific-command-prefix)
 
-(global-set-key [M-right]  'forward-word)
+(global-set-key [M-right]  'right-word)
 (define-key esc-map [right] 'forward-word)
-(global-set-key [M-left]   'backward-word)
+(global-set-key [M-left]   'left-word)
 (define-key esc-map [left] 'backward-word)
 ;; ilya@math.ohio-state.edu says these bindings are standard on PC editors.
 (global-set-key [C-right]  'right-word)
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 695f9b92712..3ba1078f62d 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -632,8 +632,9 @@ The optional LABEL is used to label the buffer created."
 ;;;###diary-autoload
 (defun calendar-check-holidays (date)
   "Check the list of holidays for any that occur on DATE.
-The value returned is a list of strings of relevant holiday descriptions.
-The holidays are those in the list `calendar-holidays'."
+DATE is a list (month day year).  This function considers the
+holidays from the list `calendar-holidays', and returns a list of
+strings describing those holidays that apply on DATE."
   (let ((displayed-month (calendar-extract-month date))
         (displayed-year (calendar-extract-year date))
         holiday-list)
diff --git a/lisp/comint.el b/lisp/comint.el
index 59feab82e44..52580db6186 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -3040,8 +3040,9 @@ Returns t if successful."
     (comint--complete-file-name-data)))
 
 ;; FIXME: comint--common-suffix, comint--common-quoted-suffix, and
-;; comint--table-subvert copied from pcomplete.  And they don't fully solve
-;; the problem, since selecting a file from *Completions* won't quote it.
+;; comint--table-subvert don't fully solve the problem, since
+;; selecting a file from *Completions* won't quote it, among several
+;; other problems.
 
 (defun comint--common-suffix (s1 s2)
   (assert (not (or (string-match "\n" s1) (string-match "\n" s2))))
@@ -3076,43 +3077,45 @@ SS1 = (unquote SS2)."
       (cons (substring s1 0 (- (length s1) cs))
             (substring s2 0 (- (length s2) cs))))))
 
-(defun comint--table-subvert (table s1 s2 string pred action)
+(defun comint--table-subvert (table s1 s2 &optional quote-fun unquote-fun)
   "Completion table that replaces the prefix S1 with S2 in STRING.
 When TABLE, S1 and S2 are provided by `apply-partially', the result
 is a completion table which completes strings of the form (concat S1 S)
 in the same way as TABLE completes strings of the form (concat S2 S)."
-  (let* ((str (if (eq t (compare-strings string 0 (length s1) s1 nil nil
-                                         completion-ignore-case))
-                  (concat s2 (comint-unquote-filename
-                              (substring string (length s1))))))
-         (res (if str (complete-with-action action table str pred))))
-    (when res
-      (cond
-       ((and (eq (car-safe action) 'boundaries))
-        (let ((beg (or (and (eq (car-safe res) 'boundaries) (cadr res)) 0)))
-          (list* 'boundaries
-                 (max (length s1)
-                      ;; FIXME: Adjust because of quoting/unquoting.
-                      (+ beg (- (length s1) (length s2))))
-                 (and (eq (car-safe res) 'boundaries) (cddr res)))))
-       ((stringp res)
-        (if (eq t (compare-strings res 0 (length s2) s2 nil nil
-                                   completion-ignore-case))
-            (concat s1 (comint-quote-filename
-                        (substring res (length s2))))))
-       ((eq action t)
-        (let ((bounds (completion-boundaries str table pred "")))
-          (if (>= (car bounds) (length s2))
-              res
-            (let ((re (concat "\\`"
-                              (regexp-quote (substring s2 (car bounds))))))
-              (delq nil
-                    (mapcar (lambda (c)
-                              (if (string-match re c)
-                                  (substring c (match-end 0))))
-                            res))))))
-       ;; E.g. action=nil and it's the only completion.
-       (res)))))
+  (lambda (string pred action)
+    (let* ((str (if (eq t (compare-strings string 0 (length s1) s1 nil nil
+                                           completion-ignore-case))
+                    (let ((rest (substring string (length s1))))
+                      (concat s2 (if unquote-fun
+                                     (funcall unquote-fun rest) rest)))))
+           (res (if str (complete-with-action action table str pred))))
+      (when res
+        (cond
+         ((and (eq (car-safe action) 'boundaries))
+          (let ((beg (or (and (eq (car-safe res) 'boundaries) (cadr res)) 0)))
+            (list* 'boundaries
+                   (max (length s1)
+                        ;; FIXME: Adjust because of quoting/unquoting.
+                        (+ beg (- (length s1) (length s2))))
+                   (and (eq (car-safe res) 'boundaries) (cddr res)))))
+         ((stringp res)
+          (if (eq t (compare-strings res 0 (length s2) s2 nil nil
+                                     completion-ignore-case))
+              (let ((rest (substring res (length s2))))
+                (concat s1 (if quote-fun (funcall quote-fun rest) rest)))))
+         ((eq action t)
+          (let ((bounds (completion-boundaries str table pred "")))
+            (if (>= (car bounds) (length s2))
+                res
+              (let ((re (concat "\\`"
+                                (regexp-quote (substring s2 (car bounds))))))
+                (delq nil
+                      (mapcar (lambda (c)
+                                (if (string-match re c)
+                                    (substring c (match-end 0))))
+                              res))))))
+         ;; E.g. action=nil and it's the only completion.
+         (res))))))
 
 (defun comint-completion-file-name-table (string pred action)
   (if (not (file-name-absolute-p string))
@@ -3146,10 +3149,10 @@ in the same way as TABLE completes strings of the form (concat S2 S)."
          (table
           (let ((prefixes (comint--common-quoted-suffix
                            unquoted filename)))
-            (apply-partially
-             #'comint--table-subvert
+            (comint--table-subvert
              #'comint-completion-file-name-table
-             (cdr prefixes) (car prefixes)))))
+             (cdr prefixes) (car prefixes)
+             #'comint-quote-filename #'comint-unquote-filename))))
     (nconc
      (list
       filename-beg filename-end
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 232c6c3808e..3760a7a9d74 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -180,12 +180,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                              (symbol :format "%v"))
                                      (const :tag "always" t)))
              (debug-ignored-errors debug (repeat (choice symbol regexp)))
-             (debug-on-quit debug
-                            (choice (const :tag "off")
-                                    (repeat :menu-tag "When"
-                                            :value (nil)
-                                            (symbol :format "%v"))
-                                    (const :tag "always" t)))
+             (debug-on-quit debug boolean)
              ;; fileio.c
              (delete-by-moving-to-trash auto-save boolean "23.1")
              (auto-save-visited-file-name auto-save boolean)
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 57d25c9e169..176b906632c 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1557,7 +1557,7 @@ expressions; a `progn' form will be returned enclosing these forms."
   ;; The first spec is handled and the remainder-handler handles the rest.
   (let ((edebug-matching-depth
          (if (> edebug-matching-depth edebug-max-depth)
-             (error "too deep - perhaps infinite loop in spec?")
+             (error "Too deep - perhaps infinite loop in spec?")
            (1+ edebug-matching-depth))))
     (cond
      ((null specs) nil)
@@ -3201,7 +3201,7 @@ before returning.  The default is one second."
   "Modify the breakpoint for the form at point or after it.
 Set it if FLAG is non-nil, clear it otherwise.  Then move to that point.
 If CONDITION or TEMPORARY are non-nil, add those attributes to
-the breakpoint.  "
+the breakpoint."
   (let ((edebug-stop-point (edebug-find-stop-point)))
     (if edebug-stop-point
         (let* ((edebug-def-name (car edebug-stop-point))
@@ -3879,24 +3879,23 @@ Global commands prefixed by `global-edebug-prefix':
 \\{global-edebug-map}
 
 Options:
-edebug-setup-hook
-edebug-all-defs
-edebug-all-forms
-edebug-save-windows
-edebug-save-displayed-buffer-points
-edebug-initial-mode
-edebug-trace
-edebug-test-coverage
-edebug-continue-kbd-macro
-edebug-print-length
-edebug-print-level
-edebug-print-circle
-edebug-on-error
-edebug-on-quit
-edebug-on-signal
-edebug-unwrap-results
-edebug-global-break-condition
-"
+`edebug-setup-hook'
+`edebug-all-defs'
+`edebug-all-forms'
+`edebug-save-windows'
+`edebug-save-displayed-buffer-points'
+`edebug-initial-mode'
+`edebug-trace'
+`edebug-test-coverage'
+`edebug-continue-kbd-macro'
+`edebug-print-length'
+`edebug-print-level'
+`edebug-print-circle'
+`edebug-on-error'
+`edebug-on-quit'
+`edebug-on-signal'
+`edebug-unwrap-results'
+`edebug-global-break-condition'"
   ;; If the user kills the buffer in which edebug is currently active,
   ;; exit to top level, because the edebug command loop can't usefully
   ;; continue running in such a case.
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 1a9d7c97b83..c33c2ccf9d1 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -344,16 +344,16 @@ With prefix ARG, insert output into the current buffer at point."
   (require 'esh-cmd)
   (unless arg
     (setq arg current-prefix-arg))
-  (unwind-protect
-      (let ((eshell-non-interactive-p t))
-        (add-hook 'minibuffer-setup-hook 'eshell-mode)
-        (add-hook 'minibuffer-exit-hook 'eshell-add-command-to-history)
-        (add-hook 'eshell-mode-hook 'eshell-return-exits-minibuffer)
-        (unless command
-          (setq command (read-from-minibuffer "Emacs shell command: "))))
-    (remove-hook 'eshell-mode-hook 'eshell-return-exits-minibuffer)
-    (remove-hook 'minibuffer-exit-hook 'eshell-add-command-to-history)
-    (remove-hook 'minibuffer-setup-hook 'eshell-mode))
+  (let ((eshell-non-interactive-p t))
+    ;; Enable `eshell-mode' only in this minibuffer.
+    (minibuffer-with-setup-hook #'(lambda ()
+                                    (eshell-mode)
+                                    (eshell-return-exits-minibuffer))
+      (unwind-protect
+           (unless command
+             (setq command (read-from-minibuffer "Emacs shell command: ")))
+        (when command
+          (eshell-add-input-to-history command)))))
   (unless command
     (error "No command specified!"))
   ;; redirection into the current buffer is achieved by adding an
diff --git a/lisp/faces.el b/lisp/faces.el
index 9a14e832065..d5f0ef90ee0 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2065,9 +2065,9 @@ terminal type to a different value."
     (((supports :underline t))
      :underline t)
     (t
-     ;; default to italic, even it doesn't appear to be supported,
-     ;; because in some cases the display engine will do it's own
-     ;; workaround (to `dim' on ttys)
+     ;; Default to italic, even if it doesn't appear to be supported,
+     ;; because in some cases the display engine will do its own
+     ;; workaround (to `dim' on ttys).
      :slant italic))
   "Basic italic face."
   :group 'basic-faces)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a330d5c6be8..9c76635fb63 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,32 @@
+2011-10-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * html2text.el (html2text-get-attr): Correctly handle attribute values
+        containing "=".
+
+2011-09-22  Kan-Ru Chen  <kanru@kanru.info>
+
+        * ecomplete.el (ecomplete-display-matches): Use a local keymap to
+        handle bindings.
+
+2011-10-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-win.el (gnus-configure-windows): Protect against reading
+        ephemeral groups outside of Gnus.
+
+2011-10-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * shr.el (shr-tag-img): Don't get images displayed in tables.
+
+2011-10-03  Glenn Morris  <rgm@gnu.org>
+
+        * gnus-group.el (gnus-bug-group-download-format-alist): Once again get
+        the "maintainer" version of debbugs.gnu.org reports.
+
+2011-10-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * shr.el (shr-tag-img): Add a space at the end of an ALT image text to
+        make asynchronous adjacent image insertion work better.
+
 2011-09-27  Daiki Ueno  <ueno@unixuser.org>
 
         * plstore.el (plstore-select-keys, plstore-encrypt-to): Clarify
diff --git a/lisp/gnus/ecomplete.el b/lisp/gnus/ecomplete.el
index 6a47b119f10..5d1c46bc2f6 100644
--- a/lisp/gnus/ecomplete.el
+++ b/lisp/gnus/ecomplete.el
@@ -27,6 +27,11 @@
 (eval-when-compile
   (require 'cl))
 
+(eval-when-compile
+  (when (featurep 'xemacs)
+    ;; The `kbd' macro requires that the `read-kbd-macro' macro is available.
+    (require 'edmacro)))
+
 (defgroup ecomplete nil
   "Electric completion of email addresses and the like."
   :group 'mail)
@@ -123,15 +128,24 @@
             (message "%s" matches)
             nil)
         (setq highlight (ecomplete-highlight-match-line matches line))
-        (while (not (memq (setq command (read-event highlight)) '(? return)))
-          (cond
-           ((eq command ?\M-n)
-            (setq line (min (1+ line) max-lines)))
-           ((eq command ?\M-p)
-            (setq line (max (1- line) 0))))
-          (setq highlight (ecomplete-highlight-match-line matches line)))
-        (when (eq command 'return)
-          (nth line (split-string matches "\n")))))))
+        (let ((local-map (make-sparse-keymap))
+              selected)
+          (define-key local-map (kbd "RET")
+            (lambda () (setq selected (nth line (split-string matches "\n")))))
+          (define-key local-map (kbd "M-n")
+            (lambda () (setq line (min (1+ line) max-lines))))
+          (define-key local-map (kbd "M-p")
+            (lambda () (setq line (max (1- line) 0))))
+          (let ((overriding-local-map local-map))
+            (while (and (null selected)
+                        (setq command (read-key-sequence highlight))
+                        (lookup-key local-map command))
+              (apply (key-binding command) nil)
+              (setq highlight (ecomplete-highlight-match-line matches line))))
+          (if selected
+              (message selected)
+            (message "Abort"))
+          selected)))))
 
 (defun ecomplete-highlight-match-line (matches line)
   (with-temp-buffer
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 720881acd98..4c527caff5c 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2429,7 +2429,7 @@ Valid input formats include:
     (gnus-read-ephemeral-gmane-group group start range)))
 
 (defcustom gnus-bug-group-download-format-alist
-  '((emacs . "http://debbugs.gnu.org/%s;mboxstat=yes")
+  '((emacs . "http://debbugs.gnu.org/%s;mboxmaint=yes;mboxstat=yes")
     (debian
      . "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s&mbox=yes;mboxmaint=yes"))
   "Alist of symbols for bug trackers and the corresponding URL format string.
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index c38f57d96cb..a1a8abc3086 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -358,8 +358,13 @@ See the Gnus manual for an explanation of the syntax used.")
 (defvar gnus-frame-split-p nil)
 
 (defun gnus-configure-windows (setting &optional force)
-  (if (window-configuration-p setting)
-      (set-window-configuration setting)
+  (cond
+   ((null setting)
+    ;; Do nothing.
+    )
+   ((window-configuration-p setting)
+    (set-window-configuration setting))
+   (t
     (setq gnus-current-window-configuration setting)
     (setq force (or force gnus-always-force-window-configuration))
     (let ((split (if (symbolp setting)
@@ -410,7 +415,7 @@ See the Gnus manual for an explanation of the syntax used.")
           (run-hooks 'gnus-configure-windows-hook)
           (when gnus-window-frame-focus
             (gnus-select-frame-set-input-focus
-             (window-frame gnus-window-frame-focus))))))))
+             (window-frame gnus-window-frame-focus)))))))))
 
 (defun gnus-delete-windows-in-gnusey-frames ()
   "Do a `delete-other-windows' in all frames that have Gnus windows."
diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el
index 0635ab0afc6..7e699827141 100644
--- a/lisp/gnus/html2text.el
+++ b/lisp/gnus/html2text.el
@@ -193,7 +193,7 @@ formatting, and then moved afterward.")
      ;; size=3
      ((string-match "[^ ]=[^ ]" prev)
       (let ((attr  (nth 0 (split-string prev "=")))
-            (value (nth 1 (split-string prev "="))))
+            (value (substring prev (1+ (string-match "=" prev)))))
         (setq attr-list (cons (list attr value) attr-list))))
      ;; size= 3
      ((string-match "[^ ]=\\'" prev)
@@ -204,7 +204,7 @@ formatting, and then moved afterward.")
        ;; size=3
        ((string-match "[^ ]=[^ ]" this)
         (let ((attr  (nth 0 (split-string this "=")))
-              (value (nth 1 (split-string this "="))))
+              (value (substring prev (1+ (string-match "=" this)))))
           (setq attr-list (cons (list attr value) attr-list))))
        ;; size =3
        ((string-match "\\`=[^ ]" this)
@@ -358,7 +358,7 @@ formatting, and then moved afterward.")
     (delete-region p1 p4)
     (when href
       (goto-char p1)
-      (insert (substring href 1 -1 ))
+      (insert (substring href 1 -1))
       (put-text-property p1 (point) 'face 'bold))))
 
 ;;
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index f49bbd69da3..7b9af3302af 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -901,7 +901,7 @@ ones, in case fg and bg are nil."
                (url-is-cached (shr-encode-url url)))
           (funcall shr-put-image-function (shr-get-image-data url) alt))
          (t
-          (insert alt)
+          (insert alt " ")
           (when (and shr-ignore-cache
                      (url-is-cached (shr-encode-url url)))
             (let ((file (url-cache-create-filename (shr-encode-url url))))
@@ -912,14 +912,15 @@ ones, in case fg and bg are nil."
                'url-queue-retrieve
              'url-retrieve)
            (shr-encode-url url) 'shr-image-fetched
-           (list (current-buffer) start (point-marker))
+           (list (current-buffer) start (set-marker (make-marker) (1- (point))))
            t)))
-        (put-text-property start (point) 'keymap shr-map)
-        (put-text-property start (point) 'shr-alt alt)
-        (put-text-property start (point) 'image-url url)
-        (put-text-property start (point) 'image-displayer
-                           (shr-image-displayer shr-content-function))
-        (put-text-property start (point) 'help-echo alt)
+        (when (zerop shr-table-depth) ;; We are not in a table.
+          (put-text-property start (point) 'keymap shr-map)
+          (put-text-property start (point) 'shr-alt alt)
+          (put-text-property start (point) 'image-url url)
+          (put-text-property start (point) 'image-displayer
+                             (shr-image-displayer shr-content-function))
+          (put-text-property start (point) 'help-echo alt))
         (setq shr-state 'image)))))
 
 (defun shr-tag-pre (cont)
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 3276447e72f..0a5d6ed954c 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1306,17 +1306,22 @@ If nil, that means no input method is activated now.")
 (make-variable-buffer-local 'current-input-method-title)
 (put 'current-input-method-title 'permanent-local t)
 
+(define-widget 'mule-input-method-string 'string
+  "String widget with completion for input method."
+  :completions
+  (lambda (string pred action)
+    (let ((completion-ignore-case t))
+      (complete-with-action action input-method-alist string pred)))
+  :prompt-history 'input-method-history)
+
 (defcustom default-input-method nil
   "Default input method for multilingual text (a string).
 This is the input method activated automatically by the command
 `toggle-input-method' (\\[toggle-input-method])."
   :link  '(custom-manual "(emacs)Input Methods")
   :group 'mule
-  :type '(choice (const nil)
-          (string
-           :completions (apply-partially
-                         #'completion-table-case-fold input-method-alist)
-           :prompt-history input-method-history))
+  :type `(choice (const nil)
+                 mule-input-method-string)
   :set-after '(current-language-environment))
 
 (put 'input-method-function 'permanent-local t)
@@ -1879,10 +1884,11 @@ specifies the character set for the major languages of Western Europe."
 (define-widget 'charset 'symbol
   "An Emacs charset."
   :tag "Charset"
-  :completions (apply-partially #'completion-table-with-predicate
-                                (apply-partially #'completion-table-case-fold
-                                                 obarray)
-                                #'charsetp 'strict)
+  :completions
+  (lambda (string pred action)
+    (let ((completion-ignore-case t))
+      (completion-table-with-predicate
+       obarray #'charsetp 'strict string pred action)))
   :value 'ascii
   :validate (lambda (widget)
               (unless (charsetp (widget-value widget))
@@ -1917,8 +1923,10 @@ See `set-language-info-alist' for use in programs."
   :type `(alist
           :key-type (string :tag "Language environment"
                             :completions
-                            (apply-partially #'completion-table-case-fold
-                                             language-info-alist))
+                            (lambda (string pred action)
+                              (let ((completion-ignore-case t))
+                                (complete-with-action
+                                 action language-info-alist string pred))))
           :value-type
           (alist :key-type symbol
                  :options ((documentation string)
@@ -1929,12 +1937,7 @@ See `set-language-info-alist' for use in programs."
                            (coding-system (repeat coding-system))
                            (coding-priority (repeat coding-system))
                            (nonascii-translation charset)
-                           (input-method
-                            (string
-                             :completions
-                             (apply-partially #'completion-table-case-fold
-                                              input-method-alist)
-                             :prompt-history input-method-history))
+                           (input-method mule-input-method-string)
                            (features (repeat symbol))
                            (unibyte-display coding-system)))))
 
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index edcc82011af..026b03e350f 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -924,7 +924,7 @@ The list is in preference order.")
 (defun smtpmail-send-data (process buffer)
   (let ((data-continue t) sending-data
         (pr (with-current-buffer buffer
-              (make-progress-reporter "Sending email"
+              (make-progress-reporter "Sending email "
                                       (point-min) (point-max)))))
     (with-current-buffer buffer
       (goto-char (point-min)))
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 021e46d5053..e2ed07f1ef1 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -216,9 +216,13 @@ You should give VAR a non-nil `risky-local-variable' property."
           (setq ,var (,fun)))
         ,var))))
 
-(defun completion-table-case-fold (table string pred action)
-  (let ((completion-ignore-case t))
-    (complete-with-action action table string pred)))
+(defun completion-table-case-fold (table &optional dont-fold)
+  "Return new completion TABLE that is case insensitive.
+If DONT-FOLD is non-nil, return a completion table that is
+case sensitive instead."
+  (lambda (string pred action)
+    (let ((completion-ignore-case (not dont-fold)))
+      (complete-with-action action table string pred))))
 
 (defun completion-table-with-context (prefix table string pred action)
   ;; TODO: add `suffix' maybe?
@@ -468,6 +472,15 @@ ALL-COMPLETIONS is the function that lists the completions (it should
 follow the calling convention of `completion-all-completions'),
 and DOC describes the way this style of completion works.")
 
+(defconst completion--styles-type
+  `(repeat :tag "insert a new menu to add more styles"
+           (choice ,@(mapcar (lambda (x) (list 'const (car x)))
+                             completion-styles-alist))))
+(defconst completion--cycling-threshold-type
+  '(choice (const :tag "No cycling" nil)
+           (const :tag "Always cycle" t)
+           (integer :tag "Threshold")))
+
 (defcustom completion-styles
   ;; First, use `basic' because prefix completion has been the standard
   ;; for "ever" and works well in most cases, so using it first
@@ -486,8 +499,7 @@ The available styles are listed in `completion-styles-alist'.
 
 Note that `completion-category-overrides' may override these
 styles for specific categories, such as files, buffers, etc."
-  :type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x)))
-                                   completion-styles-alist)))
+  :type completion--styles-type
   :group 'minibuffer
   :version "23.1")
 
@@ -498,18 +510,19 @@ Each override has the shape (CATEGORY . ALIST) where ALIST is
 an association list that can specify properties such as:
 - `styles': the list of `completion-styles' to use for that category.
 - `cycle': the `completion-cycle-threshold' to use for that category."
-  :type `(alist :key-type (choice (const buffer)
+  :type `(alist :key-type (choice :tag "Category"
+                                  (const buffer)
                                   (const file)
+                                  (const unicode-name)
                                   symbol)
           :value-type
-          (set
-           (cons (const style)
-                 (repeat ,@(mapcar (lambda (x) (list 'const (car x)))
-                                   completion-styles-alist)))
-           (cons (const cycle)
-                 (choice (const :tag "No cycling" nil)
-                         (const :tag "Always cycle" t)
-                         (integer :tag "Threshold"))))))
+          (set :tag "Properties to override"
+           (cons :tag "Completion Styles"
+                 (const :tag "Select a style from the menu;" styles)
+                 ,completion--styles-type)
+           (cons :tag "Completion Cycling"
+                 (const :tag "Select one value from the menu." cycle)
+                 ,completion--cycling-threshold-type))))
 
 (defun completion--styles (metadata)
   (let* ((cat (completion-metadata-get metadata 'category))
@@ -595,9 +608,7 @@ If nil, cycling is never used.
 If t, cycling is always used.
 If an integer, cycling is used as soon as there are fewer completion
 candidates than this number."
-  :type '(choice (const :tag "No cycling" nil)
-          (const :tag "Always cycle" t)
-          (integer :tag "Threshold")))
+  :type completion--cycling-threshold-type)
 
 (defun completion--cycle-threshold (metadata)
   (let* ((cat (completion-metadata-get metadata 'category))
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 8854d4e908f..251e1864927 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -1089,10 +1089,12 @@ If PLAYLIST is t or nil or missing, use the main playlist."
 (defvar mpc-tool-bar-map
   (let ((map (make-sparse-keymap)))
     (tool-bar-local-item "mpc/prev" 'mpc-prev 'prev map
-     :enable '(not (equal (cdr (assq 'state mpc-status)) "stop")))
+     :enable '(not (equal (cdr (assq 'state mpc-status)) "stop"))
+     :label "Prev" :vert-only t)
     ;; FIXME: how can we bind it to the down-event?
     (tool-bar-local-item "mpc/rewind" 'mpc-rewind 'rewind map
      :enable '(not (equal (cdr (assq 'state mpc-status)) "stop"))
+     :label "Rew" :vert-only t
      :button '(:toggle . (and mpc--faster-toggle-timer
                              (not mpc--faster-toggle-forward))))
     ;; We could use a single toggle command for pause/play, with 2 different
@@ -1100,20 +1102,26 @@ If PLAYLIST is t or nil or missing, use the main playlist."
     ;; to be a toggle-button, thus displayed depressed in one of the
     ;; two states :-(
     (tool-bar-local-item "mpc/pause" 'mpc-pause 'pause map
+     :label "Pause" :vert-only t
      :visible '(equal (cdr (assq 'state mpc-status)) "play")
      :help "Pause/play")
     (tool-bar-local-item "mpc/play" 'mpc-play 'play map
+     :label "Play" :vert-only t
      :visible '(not (equal (cdr (assq 'state mpc-status)) "play"))
      :help "Play/pause")
     ;; FIXME: how can we bind it to the down-event?
     (tool-bar-local-item "mpc/ffwd" 'mpc-ffwd 'ffwd map
      :enable '(not (equal (cdr (assq 'state mpc-status)) "stop"))
+     :label "Ffwd" :vert-only t
      :button '(:toggle . (and mpc--faster-toggle-timer
                              mpc--faster-toggle-forward)))
     (tool-bar-local-item "mpc/next" 'mpc-next 'next map
+     :label "Next" :vert-only t
      :enable '(not (equal (cdr (assq 'state mpc-status)) "stop")))
-    (tool-bar-local-item "mpc/stop" 'mpc-stop 'stop map)
+    (tool-bar-local-item "mpc/stop" 'mpc-stop 'stop map
+     :label "Stop" :vert-only t)
     (tool-bar-local-item "mpc/add" 'mpc-playlist-add 'add map
+     :label "Add" :vert-only t
      :help "Append to the playlist")
     map))
 
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1381d33efa2..7ace2911501 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1886,7 +1886,7 @@ Falls back to normal file name handler if no Tramp file name handler exists."
                       (apply foreign operation args))
 
                   ;; Trace that somebody has interrupted the operation.
-                  (quit
+                  ((debug quit)
                    (let (tramp-message-show-message)
                      (tramp-message
                       v 1 "Interrupt received in operation %s"
@@ -1898,6 +1898,9 @@ Falls back to normal file name handler if no Tramp file name handler exists."
                   ;; operations shall return at least a default value
                   ;; in order to give the user a chance to correct the
                   ;; file name in the minibuffer.
+                  ;; We cannot use 'debug as error handler.  In order
+                  ;; to get a full backtrace, one could apply
+                  ;;   (setq debug-on-error t debug-on-signal t)
                   (error
                    (cond
                     ((and completion (zerop (length localname))
@@ -3850,9 +3853,9 @@ Only works for Bourne-like shells."
 ;; * Run emerge on two remote files.  Bug is described here:
 ;;   <http://www.mail-archive.com/tramp-devel@nongnu.org/msg01041.html>.
 ;;   (Bug#6850)
-
-;; Functions for file-name-handler-alist:
-;; diff-latest-backup-file -- in diff.el
+;; * It would be very useful if it were possible to load or save a
+;;   buffer using Tramp in a non-blocking way so that use of Emacs on
+;;   other buffers could continue.  (Bug#9617)
 
 ;;; tramp.el ends here
 
diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index e947bfe1da6..b466c2cd899 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -193,10 +193,25 @@ Uses both `pcmpl-ssh-config-file' and `pcmpl-ssh-known-hosts-file'."
   "Completion rules for the `scp' command.
 Includes files as well as host names followed by a colon."
   (pcomplete-opt "1246BCpqrvcFiloPS")
-  (while t (pcomplete-here (append (pcomplete-all-entries)
-                                   (mapcar (lambda (host)
-                                             (concat host ":"))
-                                           (pcmpl-ssh-hosts))))))
+  (while t (pcomplete-here
+            (lambda (string pred action)
+              (let ((table
+                     (cond
+                      ((string-match "\\`[^:/]+:" string) ; Remote file name.
+                       (if (and (eq action 'lambda)
+                                (eq (match-end 0) (length string)))
+                           ;; Avoid connecting to the remote host when we're
+                           ;; only completing the host name.
+                           (list string)
+                         (comint--table-subvert (pcomplete-all-entries)
+                                                "" "/ssh:")))
+                      ((string-match "/" string) ; Local file name.
+                       (pcomplete-all-entries))
+                      (t                ;Host name or local file name.
+                       (append (all-completions string (pcomplete-all-entries))
+                               (mapcar (lambda (host) (concat host ":"))
+                                       (pcmpl-ssh-hosts)))))))
+                (complete-with-action action table string pred))))))
 
 (provide 'pcmpl-unix)
 
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 4ac69df8e3a..8ae1e203849 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -370,7 +370,7 @@ modified to be an empty string, or the desired separation string."
 ;; it pretty much impossible to have completion other than
 ;; prefix-completion.
 ;;
-;; pcomplete--common-quoted-suffix and pcomplete--table-subvert try to
+;; pcomplete--common-quoted-suffix and comint--table-subvert try to
 ;; work around this difficulty with heuristics, but it's
 ;; really a hack.
 
@@ -408,45 +408,6 @@ SS1 = (unquote SS2)."
       (cons (substring s1 0 (- (length s1) cs))
             (substring s2 0 (- (length s2) cs))))))
 
-(defun pcomplete--table-subvert (table s1 s2 string pred action)
-  ;; FIXME: Copied in comint.el.
-  "Completion table that replaces the prefix S1 with S2 in STRING.
-When TABLE, S1 and S2 are provided by `apply-partially', the result
-is a completion table which completes strings of the form (concat S1 S)
-in the same way as TABLE completes strings of the form (concat S2 S)."
-  (let* ((str (if (eq t (compare-strings string 0 (length s1) s1 nil nil
-                                         completion-ignore-case))
-                  (concat s2 (pcomplete-unquote-argument
-                              (substring string (length s1))))))
-         (res (if str (complete-with-action action table str pred))))
-    (when res
-      (cond
-       ((and (eq (car-safe action) 'boundaries))
-        (let ((beg (or (and (eq (car-safe res) 'boundaries) (cadr res)) 0)))
-          (list* 'boundaries
-                 (max (length s1)
-                      ;; FIXME: Adjust because of quoting/unquoting.
-                      (+ beg (- (length s1) (length s2))))
-                 (and (eq (car-safe res) 'boundaries) (cddr res)))))
-       ((stringp res)
-        (if (eq t (compare-strings res 0 (length s2) s2 nil nil
-                                   completion-ignore-case))
-            (concat s1 (pcomplete-quote-argument
-                        (substring res (length s2))))))
-       ((eq action t)
-        (let ((bounds (completion-boundaries str table pred "")))
-          (if (>= (car bounds) (length s2))
-              res
-            (let ((re (concat "\\`"
-                              (regexp-quote (substring s2 (car bounds))))))
-              (delq nil
-                    (mapcar (lambda (c)
-                              (if (string-match re c)
-                                  (substring c (match-end 0))))
-                            res))))))
-       ;; E.g. action=nil and it's the only completion.
-       (res)))))
-
 ;; I don't think such commands are usable before first setting up buffer-local
 ;; variables to parse args, so there's no point autoloading it.
 ;; ;;;###autoload
@@ -480,7 +441,7 @@ Same as `pcomplete' but using the standard completion UI."
            ;; pcomplete-stub and works from the buffer's text instead,
            ;; we need to trick minibuffer-complete, into using
            ;; pcomplete-stub without its knowledge.  To that end, we
-           ;; use pcomplete--table-subvert to construct a completion
+           ;; use comint--table-subvert to construct a completion
            ;; table which expects strings using a prefix from the
            ;; buffer's text but internally uses the corresponding
            ;; prefix from pcomplete-stub.
@@ -498,9 +459,9 @@ Same as `pcomplete' but using the standard completion UI."
                  ;; practice it should work just fine (fingers crossed).
                  (let ((prefixes (pcomplete--common-quoted-suffix
                                   pcomplete-stub buftext)))
-                   (apply-partially #'pcomplete--table-subvert
-                                    completions
-                                    (cdr prefixes) (car prefixes))))
+                   (comint--table-subvert
+                    completions (cdr prefixes) (car prefixes)
+                    #'pcomplete-quote-argument #'pcomplete-unquote-argument)))
                 (t
                  (lambda (string pred action)
                    (let ((res (complete-with-action
@@ -523,8 +484,7 @@ Same as `pcomplete' but using the standard completion UI."
                            (funcall norm-func (directory-file-name f))
                            seen)))))))
           (when pcomplete-ignore-case
-            (setq table
-                  (apply-partially #'completion-table-case-fold table)))
+            (setq table (completion-table-case-fold table)))
           (list beg (point) table
                 :predicate pred
                 :exit-function
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index eb33822ce55..3d5c8a97835 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1489,14 +1489,19 @@ Does not check type and subprogram indentation."
       (if (not (f90-previous-statement))
           ;; If f90-previous-statement returns nil, we must have been
           ;; called from on or before the first line of the first statement.
-          (setq icol (if (save-excursion
-                           ;; f90-previous-statement has moved us over
-                           ;; comment/blank lines, so we need to get
-                           ;; back to the first code statement.
-                           (when (looking-at "[ \t]*\\([!#]\\|$\\)")
-                             (f90-next-statement))
-                           (skip-chars-forward " \t0-9")
-                           (f90-looking-at-program-block-start))
+          (setq icol (if (or (save-excursion
+                               (goto-char pnt)
+                               (beginning-of-line)
+                               ;; Preprocessor line before code statement.
+                               (looking-at "[ \t]*#"))
+                             (progn
+                               ;; f90-previous-statement has moved us over
+                               ;; comment/blank lines, so we need to get
+                               ;; back to the first code statement.
+                               (when (looking-at "[ \t]*\\([!#]\\|$\\)")
+                                 (f90-next-statement))
+                               (skip-chars-forward " \t0-9")
+                               (f90-looking-at-program-block-start)))
                          0
                        ;; No explicit PROGRAM start statement.
                        f90-program-indent))
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index a4d7cff4127..22db7b2e5f4 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -605,6 +605,12 @@ NOARG must be t when this macro is used outside `gud-def'"
 The directory containing FILE becomes the initial working directory
 and source-file directory for your debugger.
 
+COMMAND-LINE is the shell command for starting the gdb session.
+It should be a string consisting of the name of the gdb
+executable followed by command-line options.  The command-line
+options should include \"-i=mi\" to use gdb's MI text interface.
+Note that the old \"--annotate\" option is no longer supported.
+
 If `gdb-many-windows' is nil (the default value) then gdb just
 pops up the GUD buffer unless `gdb-show-main' is t.  In this case
 it starts with two windows: one displaying the GUD buffer and the
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 933f004bb5d..f051b49fe2a 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -633,8 +633,8 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'."
 
 (defalias 'electric-perl-terminator 'perl-electric-terminator)
 (defun perl-electric-terminator (arg)
-  "Insert character and adjust indentation.
-If at end-of-line, and not in a comment or a quote, correct the's indentation."
+  "Insert character and maybe adjust indentation.
+If at end-of-line, and not in a comment or a quote, correct the indentation."
   (interactive "P")
   (let ((insertpos (point)))
     (and (not arg)                      ; decide whether to indent
@@ -832,7 +832,11 @@ Optional argument PARSE-START should be the position of `beginning-of-defun'."
                   (save-excursion
                     (beginning-of-line)
                     (looking-at "\\s-+sub\\>"))
-                  (> indent-point (save-excursion (forward-sexp 1) (point))))
+                  (> indent-point (save-excursion
+                                    (condition-case nil
+                                        (forward-sexp 1)
+                                      (scan-error nil))
+                                    (point))))
         (perl-beginning-of-function))
       (while (< (point) indent-point)   ;repeat until right sexp
         (setq state (parse-partial-sexp (point) indent-point 0))
diff --git a/lisp/simple.el b/lisp/simple.el
index c81385680bf..af6d855d9c0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -945,28 +945,46 @@ rather than line counts."
       (forward-line (1- line)))))
 
 (defun count-words-region (start end)
-  "Count the number of words in the active region.
-If the region is not active, counts the number of words in the buffer."
-  (interactive (if (use-region-p) (list (region-beginning) (region-end))
-                 (list (point-min) (point-max))))
-  (let ((count 0))
+  "Return the number of words between START and END.
+If called interactively, print a message reporting the number of
+lines, words, and characters in the region."
+  (interactive "r")
+  (let ((words 0))
     (save-excursion
       (save-restriction
         (narrow-to-region start end)
         (goto-char (point-min))
         (while (forward-word 1)
-          (setq count (1+ count)))))
+          (setq words (1+ words)))))
     (when (called-interactively-p 'interactive)
-      (message "%s has %d words"
-               (if (use-region-p) "Region" "Buffer")
-               count))
-    count))
-
-(defun count-lines-region (start end)
-  "Print number of lines and characters in the region."
-  (interactive "r")
-  (message "Region has %d lines, %d characters"
-           (count-lines start end) (- end start)))
+      (count-words--message "Region"
+                            (count-lines start end)
+                            words
+                            (- end start)))
+    words))
+
+(defun count-words ()
+  "Display the number of lines, words, and characters in the buffer.
+In Transient Mark mode when the mark is active, display the
+number of lines, words, and characters in the region."
+  (interactive)
+  (if (use-region-p)
+      (call-interactively 'count-words-region)
+    (let* ((beg (point-min))
+           (end (point-max))
+           (lines (count-lines beg end))
+           (words (count-words-region beg end))
+           (chars (- end beg)))
+      (count-words--message "Buffer" lines words chars))))
+
+(defun count-words--message (str lines words chars)
+  (message "%s has %d line%s, %d word%s, and %d character%s."
+           str
+           lines (if (= lines 1) "" "s")
+           words (if (= words 1) "" "s")
+           chars (if (= chars 1) "" "s")))
+
+(defalias 'count-lines-region 'count-words-region)
 
 (defun what-line ()
   "Print the current buffer line number and narrowed line number of point."
diff --git a/lisp/subr.el b/lisp/subr.el
index 4946f3eef7a..05ac198dd13 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -552,7 +552,8 @@ AFTER should be a single event type--a symbol or a character, not a sequence.
 
 Bindings are always added before any inherited map.
 
-The order of bindings in a keymap matters when it is used as a menu."
+The order of bindings in a keymap only matters when it is used as
+a menu, so this function is not useful for non-menu keymaps."
   (unless after (setq after t))
   (or (keymapp keymap)
       (signal 'wrong-type-argument (list 'keymapp keymap)))
@@ -2170,7 +2171,7 @@ keyboard-quit events while waiting for a valid input."
             (setq prompt (propertize prompt 'face 'minibuffer-prompt)))
           (setq char (let ((inhibit-quit inhibit-keyboard-quit))
                        (read-key prompt)))
-          (and show-help (buffer-live-p helpbuf)
+          (and show-help (buffer-live-p (get-buffer helpbuf))
                (kill-buffer helpbuf))
           (cond
            ((not (numberp char)))
diff --git a/lisp/window.el b/lisp/window.el
index c6722a62c74..7241e148dae 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1058,6 +1058,32 @@ windows nor the buffer list."
     (dolist (walk-windows-window (window-list-1 nil minibuf all-frames))
       (funcall proc walk-windows-window))))
 
+(defun window-point-1 (&optional window)
+  "Return value of WINDOW's point.
+WINDOW can be any live window and defaults to the selected one.
+
+This function is like `window-point' with one exception: If
+WINDOW is selected, it returns the value of `point' of WINDOW's
+buffer regardless of whether that buffer is current or not."
+  (setq window (window-normalize-live-window window))
+  (if (eq window (selected-window))
+      (with-current-buffer (window-buffer window)
+        (point))
+    (window-point window)))
+
+(defun set-window-point-1 (window pos)
+  "Set value of WINDOW's point to POS.
+WINDOW can be any live window and defaults to the selected one.
+
+This function is like `set-window-point' with one exception: If
+WINDOW is selected, it moves `point' of WINDOW's buffer to POS
+regardless of whether that buffer is current or not."
+  (setq window (window-normalize-live-window window))
+  (if (eq window (selected-window))
+      (with-current-buffer (window-buffer window)
+        (goto-char pos))
+    (set-window-point window pos)))
+
 (defun window-in-direction-2 (window posn &optional horizontal)
   "Support function for `window-in-direction'."
   (if horizontal
@@ -1087,7 +1113,7 @@ IGNORE, when non-nil means a window can be returned even if its
          (last (+ first (if hor
                             (window-total-width window)
                           (window-total-height window))))
-         (posn-cons (nth 6 (posn-at-point (window-point window) window)))
+         (posn-cons (nth 6 (posn-at-point (window-point-1 window) window)))
          ;; The column / row value of `posn-at-point' can be nil for the
          ;; mini-window, guard against that.
          (posn (if hor
@@ -2492,7 +2518,7 @@ WINDOW must be a live window and defaults to the selected one."
       ;; Add an entry for buffer to WINDOW's previous buffers.
       (with-current-buffer buffer
         (let ((start (window-start window))
-              (point (window-point window)))
+              (point (window-point-1 window)))
           (setq entry
                 (cons buffer
                       (if entry
@@ -2534,10 +2560,7 @@ before was current this also makes BUFFER the current buffer."
       ;; Don't force window-start here (even if POINT is nil).
       (set-window-start window start t))
     (when point
-      (if selected
-          (with-current-buffer buffer
-            (goto-char point))
-        (set-window-point window point)))))
+      (set-window-point-1 window point))))
 
 (defun switch-to-prev-buffer (&optional window bury-or-kill)
   "In WINDOW switch to previous buffer.
@@ -2738,6 +2761,44 @@ the buffer `*scratch*', creating it if necessary."
         (set-buffer-major-mode scratch)
         scratch)))
 
+(defcustom frame-auto-hide-function #'iconify-frame
+  "Function called to automatically hide frames.
+The function is called with one argument - a frame.
+
+Functions affected by this option are those that bury a buffer
+shown in a separate frame like `quit-window' and `bury-buffer'."
+  :type '(choice (const :tag "Iconify" iconify-frame)
+                 (const :tag "Delete" delete-frame)
+                 (const :tag "Do nothing" ignore)
+                 function)
+  :group 'windows
+  :group 'frames
+  :version "24.1")
+
+(defun window--delete (&optional window dedicated-only kill)
+  "Delete WINDOW if possible.
+WINDOW must be a live window and defaults to the selected one.
+Optional argument DEDICATED-ONLY non-nil means to delete WINDOW
+only if it's dedicated to its buffer.  Optional argument KILL
+means the buffer shown in window will be killed.  Return non-nil
+if WINDOW gets deleted or its frame is auto-hidden."
+  (setq window (window-normalize-live-window window))
+  (unless (and dedicated-only (not (window-dedicated-p window)))
+    (let* ((buffer (window-buffer window))
+           (deletable (window-deletable-p window)))
+      (cond
+       ((eq deletable 'frame)
+        (let ((frame (window-frame window)))
+          (cond
+           (kill
+            (delete-frame frame))
+           ((functionp frame-auto-hide-function)
+            (funcall frame-auto-hide-function frame))))
+        'frame)
+       (deletable
+        (delete-window window)
+        t)))))
+
 (defun bury-buffer (&optional buffer-or-name)
   "Put BUFFER-OR-NAME at the end of the list of all buffers.
 There it is the least likely candidate for `other-buffer' to
@@ -2758,14 +2819,11 @@ displayed there."
     ;; is shown in the selected window.
     (cond
      ((or buffer-or-name (not (eq buffer (window-buffer)))))
-     ((not (window-dedicated-p))
-      (switch-to-prev-buffer nil 'bury))
-     ((and (frame-root-window-p (selected-window))
-           ;; Don't iconify if it's the only frame.
-           (not (eq (next-frame nil 0) (selected-frame))))
-      (iconify-frame (window-frame (selected-window))))
-     ((eq (window-deletable-p) t)
-      (delete-window)))
+     ((window--delete nil t))
+     (t
+      ;; Switch to another buffer in window.
+      (set-window-dedicated-p nil nil)
+      (switch-to-prev-buffer nil 'kill)))
 
     ;; Always return nil.
     nil))
@@ -2840,30 +2898,21 @@ frames left."
 BUFFER-OR-NAME may be a buffer or the name of an existing buffer
 and defaults to the current buffer.
 
-When a window showing BUFFER-OR-NAME is either dedicated, or the
-window has no previous buffer, that window is deleted.  If that
-window is the only window on its frame, the frame is deleted too
-when there are other frames left.  If there are no other frames
-left, some other buffer is displayed in that window.
+When a window showing BUFFER-OR-NAME is dedicated, that window is
+deleted.  If that window is the only window on its frame, the
+frame is deleted too when there are other frames left.  If there
+are no other frames left, some other buffer is displayed in that
+window.
 
 This function removes the buffer denoted by BUFFER-OR-NAME from
 all window-local buffer lists."
   (let ((buffer (window-normalize-buffer buffer-or-name)))
     (dolist (window (window-list-1 nil nil t))
       (if (eq (window-buffer window) buffer)
-          (let ((deletable (and (window-dedicated-p window)
-                                (window-deletable-p window))))
-            (cond
-             ((eq deletable 'frame)
-              ;; Delete frame.
-              (delete-frame (window-frame window)))
-             (deletable
-              ;; Delete window.
-              (delete-window window))
-             (t
-              ;; Switch to another buffer in window.
-              (set-window-dedicated-p window nil)
-              (switch-to-prev-buffer window 'kill))))
+          (unless (window--delete window t t)
+            ;; Switch to another buffer in window.
+            (set-window-dedicated-p window nil)
+            (switch-to-prev-buffer window 'kill))
         ;; Unrecord BUFFER in WINDOW.
         (unrecord-window-buffer window buffer)))))
 
@@ -2893,20 +2942,10 @@ one.  If non-nil, reset `quit-restore' parameter to nil."
          quad resize)
     (cond
      ((and (not prev-buffer)
-           (eq (nth 1 quit-restore) 'frame)
-           (eq (window-deletable-p window) 'frame)
-           (eq (nth 3 quit-restore) buffer))
-      ;; WINDOW's frame can be deleted.
-      (delete-frame (window-frame window))
-      ;; If the previously selected window is still alive, select it.
-      (when (window-live-p (nth 2 quit-restore))
-        (select-window (nth 2 quit-restore))))
-     ((and (not prev-buffer)
-           (eq (nth 1 quit-restore) 'window)
-           (eq (window-deletable-p window) t)
-           (eq (nth 3 quit-restore) buffer))
-      ;; WINDOW can be deleted.
-      (delete-window window)
+           (memq (nth 1 quit-restore) '(window frame))
+           (eq (nth 3 quit-restore) buffer)
+           ;; Delete WINDOW if possible.
+           (window--delete window nil kill))
       ;; If the previously selected window is still alive, select it.
       (when (window-live-p (nth 2 quit-restore))
         (select-window (nth 2 quit-restore))))
@@ -3538,7 +3577,7 @@ specific buffers."
              ;; All buffer related things go in here - make the buffer
              ;; current when retrieving `point' and `mark'.
              (with-current-buffer (window-buffer window)
-               (let ((point (if selected (point) (window-point window)))
+               (let ((point (window-point-1 window))
                      (start (window-start window))
                      (mark (mark)))
                  (window-list-no-nils
@@ -3833,14 +3872,7 @@ element is BUFFER."
        (list 'other
              ;; A quadruple of WINDOW's buffer, start, point and height.
              (list (window-buffer window) (window-start window)
-                   (if (eq window (selected-window))
-                       ;; When WINDOW is the selected window use its
-                       ;; buffer's `point' instead of `window-point'
-                       ;; (Bug#9626).
-                       (with-current-buffer (window-buffer window)
-                         (point))
-                     (window-point window))
-                   (window-total-size window))
+                   (window-point-1 window) (window-total-size window))
              (selected-window) buffer))))
    ((eq type 'window)
     ;; WINDOW has been created on an existing frame.
@@ -3927,12 +3959,10 @@ Finally, an element of this list can be also specified as
 \(BUFFER-NAME FUNCTION OTHER-ARGS).  In that case,
 `special-display-popup-frame' will call FUNCTION with the buffer
 named BUFFER-NAME as first argument, and OTHER-ARGS as the
-second.  If `special-display-function' specifies some other
-function, that function is called with the buffer named
-BUFFER-NAME as first, and the element's cdr as second argument.
-In any case, that function is responsible for setting the value
-The function specified here is responsible for setting the
-quit-restore and help-setup parameters of the window used.
+second.
+
+Any alternative function specified here is responsible for
+setting up the quit-restore parameter of the window used.
 
 If this variable appears \"not to work\", because you added a
 name to it but the corresponding buffer is displayed in the
@@ -3997,10 +4027,10 @@ as second argument.
 Finally, an element of this list can be also specified as
 \(REGEXP FUNCTION OTHER-ARGS).  `special-display-popup-frame'
 will then call FUNCTION with the buffer whose name matched
-REGEXP as first, and OTHER-ARGS as second argument.  If
-`special-display-function' specifies some other function, that
-function is called with the buffer whose name matched REGEXP
-as first, and the element's cdr as second argument.
+REGEXP as first, and OTHER-ARGS as second argument.
+
+Any alternative function specified here is responsible for
+setting up the quit-restore parameter of the window used.
 
 If this variable appears \"not to work\", because you added a
 name to it but the corresponding buffer is displayed in the
@@ -4748,7 +4778,7 @@ return the window used; otherwise return nil."
                (setq frame (funcall fun))
                (setq window (frame-selected-window frame)))
       (display-buffer-record-window 'frame window buffer)
-      (window--display-buffer-2 buffer window)
+      (window--display-buffer-2 buffer window display-buffer-mark-dedicated)
       ;; Reset list of WINDOW's previous buffers to nil.
       (set-window-prev-buffers window nil)
       window)))
@@ -4774,7 +4804,7 @@ If sucessful, return the new window; otherwise return nil."
                                 (window--try-to-split-window
                                  (get-lru-window frame t)))))
       (display-buffer-record-window 'window window buffer)
-      (window--display-buffer-2 buffer window)
+      (window--display-buffer-2 buffer window display-buffer-mark-dedicated)
       ;; Reset list of WINDOW's previous buffers to nil.
       (set-window-prev-buffers window nil)
       window)))
@@ -4946,7 +4976,7 @@ one.
 If FORCE-SAME-WINDOW is non-nil, BUFFER-OR-NAME must be displayed
 in the selected window; signal an error if that is
 impossible (e.g. if the selected window is minibuffer-only).  If
-non-nil, BUFFER-OR-NAME may be displayed in another window.
+nil, BUFFER-OR-NAME may be displayed in another window.
 
 Return the buffer switched to."
   (interactive