Merge from trunk.

24 files changed, 269 insertions, 96 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66783b9a5ed..15f742ed91a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,87 @@
+2011-07-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/gnutls.el (gnutls-log-level): Removed.
+
+        * textmodes/fill.el (adaptive-fill-regexp): Include EN DASH as an
+        indentation character (bug#6380).
+
+        * files.el (buffer-offer-save): Made permanently local (bug#6241).
+
+        * doc-view.el (doc-view-make-safe-dir): Rewrite the error message
+        to clarify what the problem is (bug#4291).
+
+        * simple.el (current-kill): Clarify what
+        `interprogram-paste-function' does (bug#7500).
+        (auto-fill-mode): Document `auto-fill-function' in relation to
+        `auto-fill-mode' (bug#2470).
+
+2011-07-16  Lawrence Mitchell  <wence@gmx.li>
+
+        * emacs-lisp/cl-macs.el (defstruct): Ignore argument to setf
+        method if slot is read-only (bug#9035).
+
+2011-07-16  Martin Rudalics  <rudalics@gmx.at>
+
+        * frame.el (select-frame-set-input-focus): New argument
+        NORECORD.
+        * window.el (pop-to-buffer): Select window used even if it was
+        selected before, see discussion of (Bug#8615), (Bug#6954).  Pass
+        argument NORECORD on to select-frame-set-input-focus.
+
+2011-07-15  Glenn Morris  <rgm@gnu.org>
+
+        * subr.el (read-char-choice): Allow quitting.  (Bug#9001)
+        Respect help-form.
+
+2011-07-09  Lawrence Mitchell  <wence@gmx.li>
+
+        * net/gnutls.el (gnutls-min-prime-bits): New variable.
+        (gnutls-negotiate): Use it.
+
+2011-07-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/gnutls.el (gnutls-negotiate): Upcase
+        `gnutls-algorithm-priority'.
+
+2011-07-15  Glenn Morris  <rgm@gnu.org>
+
+        * jka-compr.el (jka-compr-verbose): Move from here...
+        * jka-cmpr-hook.el (jka-compr-verbose): ... to here.  (Bug#9090)
+        Add missing :version tag.
+        * info.el: No need to require jka-compr when compiling.
+
+2011-07-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/gnutls.el (gnutls-algorithm-priority): New variable.
+        (gnutls-negotiate): Use it.
+
+        * emacs-lisp/cl-macs.el (declare): Link to the "Declarations" node.
+
+        * info.el (Info-beginning-of-buffer): New command.
+        (Info-mode-map): Use it instead of `beginning-of-buffer' to allow
+        announcing `b' as the key (bug#8325).
+        (Info-mode-menu): Use `Info-beginning-of-buffer' for consistency.
+
+        * emacs-lisp/cl-macs.el (declare): Doc string fix-up.
+
+        * international/mule-cmds.el
+        (describe-specified-language-support): Make the error message
+        clearer (bug#8905).
+
+        * emacs-lisp/cl-macs.el (declare): Add a doc string (bug#8690).
+
+        * isearch.el (isearch-barrier): Add a doc string, since it's
+        mentioned in a function doc string (bug#8678).
+
+2011-07-15  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (switch-to-buffer): Call pop-to-buffer with normalized
+        buffer argument (Bug#9083) and self-identifying label argument.
+
+2011-07-15  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/debug.el (debug): Doc fix.  (Bug#8273)
+
 2011-07-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * man.el (Man-fontify-manpage): Fix message when formatting the
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 666c6a8b034..872b2172c7e 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -569,18 +569,18 @@ at the top edge of the page moves to the previous page."
 (defun doc-view-make-safe-dir (dir)
   (condition-case nil
       (let ((umask (default-file-modes)))
-        (unwind-protect
-            (progn
-              ;; Create temp files with strict access rights.  It's easy to
-              ;; loosen them later, whereas it's impossible to close the
-              ;; time-window of loose permissions otherwise.
-              (set-default-file-modes #o0700)
-              (make-directory dir))
-          ;; Reset the umask.
-          (set-default-file-modes umask)))
+        (unwind-protect
+            (progn
+              ;; Create temp files with strict access rights.  It's easy to
+              ;; loosen them later, whereas it's impossible to close the
+              ;; time-window of loose permissions otherwise.
+              (set-default-file-modes #o0700)
+              (make-directory dir))
+          ;; Reset the umask.
+          (set-default-file-modes umask)))
     (file-already-exists
-     (if (file-symlink-p dir)
-         (error "Danger: %s points to a symbolic link" dir))
+     (when (file-symlink-p dir)
+       (error "Danger: %s points to a symbolic link" dir))
      ;; In case it was created earlier with looser rights.
      ;; We could check the mode info returned by file-attributes, but it's
      ;; a pain to parse and it may not tell you what we want under
@@ -589,7 +589,12 @@ at the top edge of the page moves to the previous page."
      ;; This also ends up checking a bunch of useful conditions: it makes
      ;; sure we have write-access to the directory and that we own it, thus
      ;; closing a bunch of security holes.
-     (set-file-modes dir #o0700))))
+     (condition-case error
+         (set-file-modes dir #o0700)
+       (file-error
+        (error
+         (format "Unable to use temporary directory %s: %s"
+                 dir (mapconcat 'identity (cdr error) " "))))))))
 
 (defun doc-view-current-cache-dir ()
   "Return the directory where the png files of the current doc should be saved.
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 48c7386bd43..f0c72a0b269 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -282,7 +282,7 @@ Not documented
 ;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
 ;;;;;;  do* do loop return-from return block etypecase typecase ecase
 ;;;;;;  case load-time-value eval-when destructuring-bind function*
-;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "9f551dc739a39b3c8b420fbd1ab71879")
+;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "2261724608e3223036b863d214f7dc0c")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\
@@ -541,7 +541,13 @@ values.  For compatibility, (values A B C) is a synonym for (list A B C).
 \(fn TYPE FORM)" nil (quote macro))
 
 (autoload 'declare "cl-macs" "\
+Declare SPECS about the current function while compiling.
+For instance
 
+  (declare (warn 0))
+
+will turn off byte-compile warnings in the function.
+See Info node `(cl)Declarations' for details.
 
 \(fn &rest SPECS)" nil (quote macro))
 
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 2813cc4f065..d6b4643d6a4 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1601,6 +1601,13 @@ values.  For compatibility, (values A B C) is a synonym for (list A B C).
 
 ;;;###autoload
 (defmacro declare (&rest specs)
+  "Declare SPECS about the current function while compiling.
+For instance
+
+  \(declare (warn 0))
+
+will turn off byte-compile warnings in the function.
+See Info node `(cl)Declarations' for details."
   (if (cl-compiling-file)
       (while specs
         (if (listp cl-declare-stack) (push (car specs) cl-declare-stack))
@@ -2389,8 +2396,10 @@ value, that slot cannot be set via `setf'.
               (push (cons accessor t) side-eff)
               (push (list 'define-setf-method accessor '(cl-x)
                              (if (cadr (memq :read-only (cddr desc)))
-                                 (list 'error (format "%s is a read-only slot"
-                                                      accessor))
+                                 (list 'progn '(ignore cl-x)
+                                       (list 'error
+                                             (format "%s is a read-only slot"
+                                                     'accessor)))
                                ;; If cl is loaded only for compilation,
                                ;; the call to cl-struct-setf-expander would
                                ;; cause a warning because it may not be
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 2fa339e62fe..157749500e7 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -102,7 +102,7 @@ and `debugger-reenable' to temporarily disable debug-on-entry.")
 (setq debugger 'debug)
 ;;;###autoload
 (defun debug (&rest debugger-args)
-  "Enter debugger.  To return, type \\<debugger-mode-map>`\\[debugger-continue]'.
+  "Enter debugger.  \\<debugger-mode-map>`\\[debugger-continue]' returns from the debugger.
 Arguments are mainly for use when this is called from the internals
 of the evaluator.
 
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index 200b3a6389b..c65cbc39eab 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -100,7 +100,7 @@ Put first the functions more likely to cause a change and cheaper to compute.")
   (cons beg end))
 
 (defvar syntax-propertize--done -1
-  "Position upto which syntax-table properties have been set.")
+  "Position up to which syntax-table properties have been set.")
 (make-variable-buffer-local 'syntax-propertize--done)
 
 (defun syntax-propertize--shift-groups (re n)
@@ -283,7 +283,7 @@ The return value is a function suitable for `syntax-propertize-function'."
           (setq keywords font-lock-syntactic-keywords))))))
 
 (defun syntax-propertize (pos)
-  "Ensure that syntax-table properties are set upto POS."
+  "Ensure that syntax-table properties are set until POS."
   (when (and syntax-propertize-function
              (< syntax-propertize--done pos))
     ;; (message "Needs to syntax-propertize from %s to %s"
diff --git a/lisp/files.el b/lisp/files.el
index 0b253fcc297..6b8a352f20c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -151,6 +151,7 @@ Automatically local in all buffers."
   :type 'boolean
   :group 'backup)
 (make-variable-buffer-local 'buffer-offer-save)
+(put 'buffer-offer-save 'permanent-local t)
 
 (defcustom find-file-existing-other-name t
   "Non-nil means find a file under alternative names, in existing buffers.
diff --git a/lisp/frame.el b/lisp/frame.el
index d6f82750347..8fea4f05147 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -747,12 +747,15 @@ the user during startup."
 
 (declare-function x-focus-frame "xfns.c" (frame))
 
-(defun select-frame-set-input-focus (frame)
+(defun select-frame-set-input-focus (frame &optional norecord)
   "Select FRAME, raise it, and set input focus, if possible.
 If `mouse-autoselect-window' is non-nil, also move mouse pointer
 to FRAME's selected window.  Otherwise, if `focus-follows-mouse'
-is non-nil, move mouse cursor to FRAME."
-  (select-frame frame)
+is non-nil, move mouse cursor to FRAME.
+
+Optional argument NORECORD means to neither change the order of
+recently selected windows nor the buffer list."
+  (select-frame frame norecord)
   (raise-frame frame)
   ;; Ensure, if possible, that FRAME gets input focus.
   (when (memq (window-system frame) '(x w32 ns))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7c887dc5450..32f5b702c6f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,18 @@
+2011-07-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * message.el (message-auto-save-directory): If the ~/Mail directory
+        doesn't exist, use ~ as the auto-save directory (bug#4432).
+
+        * gnus-group.el (gnus-group-read-ephemeral-group): Start Gnus if it
+        hasn't already been started.
+
+2011-07-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.el (debbugs-gnu): Renamed from debbugs-emacs.
+
+        * message.el (message-reply): Work around mysterious bug where
+        `message-mode' seems to overwrite the locally bound `subject' variable.
+
 2011-07-14  Andrew Cohen  <cohen@andy.bu.edu>
 
         * nnimap.el (nnimap-request-thread): Ensure search is performed in
@@ -5,7 +20,7 @@
 
         * gnus-int.el (gnus-request-thread): Add group argument.
 
-        * gnus-sum.el (gnus-request-thread): Use it.
+        * gnus-sum.el (gnus-summary-refer-thread): Use it.
 
 2011-07-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 2ea2a5c9bc7..b4dca3e1fc4 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2282,6 +2282,8 @@ Return the name of the group if selection was successful."
     (gnus-group-completing-read)
     (gnus-read-method "From method")))
   ;; Transform the select method into a unique server.
+  (unless (gnus-alive-p)
+    (gnus-no-server))
   (when (stringp method)
     (setq method (gnus-server-to-method method)))
   (setq method
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index ac7db0e1d69..b66d5f22474 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -4381,12 +4381,11 @@ prompt the user for the name of an NNTP server to use."
     (gnus-1 arg dont-connect slave)
     (gnus-final-warning)))
 
-(autoload 'debbugs-emacs "debbugs-gnu")
+(autoload 'debbugs-gnu "debbugs-gnu")
 (defun gnus-list-debbugs ()
   "List all open Gnus bug reports."
   (interactive)
-  (debbugs-emacs '("important" "normal" "minor" "wishlist")
-                 "gnus"))
+  (debbugs-gnu nil "gnus"))
 
 ;; Allow redefinition of Gnus functions.
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 7d7cc01225b..ff013e5b291 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1310,7 +1310,9 @@ text and it replaces `self-insert-command' with the other command, e.g.
   :type '(repeat function))
 
 (defcustom message-auto-save-directory
-  (file-name-as-directory (expand-file-name "drafts" message-directory))
+  (if (file-exists-p message-directory)
+      (file-name-as-directory (expand-file-name "drafts" message-directory))
+    "~/")
   "*Directory where Message auto-saves buffers if Gnus isn't running.
 If nil, Message won't auto-save."
   :group 'message-buffers
@@ -6878,20 +6880,19 @@ Useful functions to put in this list include:
       (unless follow-to
         (setq follow-to (message-get-reply-headers wide to-address))))
 
-    (unless (message-mail-user-agent)
-      (message-pop-to-buffer
-       (message-buffer-name
-        (if wide "wide reply" "reply") from
-        (if wide to-address nil))
-       switch-function))
-
-    (setq message-reply-headers
-          (vector 0 subject from date message-id references 0 0 ""))
-
-    (message-setup
-     `((Subject . ,subject)
-       ,@follow-to)
-     cur)))
+    (let ((headers
+           `((Subject . ,subject)
+             ,@follow-to)))
+      (unless (message-mail-user-agent)
+        (message-pop-to-buffer
+         (message-buffer-name
+          (if wide "wide reply" "reply") from
+          (if wide to-address nil))
+         switch-function))
+      (setq message-reply-headers
+            (vector 0 (cdr (assq 'Subject headers))
+                    from date message-id references 0 0 ""))
+      (message-setup headers cur))))
 
 ;;;###autoload
 (defun message-wide-reply (&optional to-address)
diff --git a/lisp/info.el b/lisp/info.el
index cbdc8cc7ab3..a4826ee8c2c 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -32,7 +32,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'jka-compr) (require 'cl))
+(eval-when-compile (require 'cl))
 
 (defgroup info nil
   "Info subsystem."
@@ -2789,6 +2789,11 @@ N is the digit argument used to invoke this command."
                (goto-char (point-max)))))
         (t (error "No previous nodes"))))
 
+(defun Info-beginning-of-buffer ()
+  "Go to the beginnning of the buffer."
+  (interactive)
+  (goto-char (point-min)))
+
 (defun Info-scroll-up ()
   "Scroll one screenful forward in Info, considering all nodes as one sequence.
 Once you scroll far enough in a node that its menu appears on the screen
@@ -3650,7 +3655,7 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
 (defvar Info-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map)
-    (define-key map "." 'beginning-of-buffer)
+    (define-key map "." 'Info-beginning-of-buffer)
     (define-key map " " 'Info-scroll-up)
     (define-key map "\C-m" 'Info-follow-nearest-node)
     (define-key map "\t" 'Info-next-reference)
@@ -3671,7 +3676,8 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
     (define-key map "[" 'Info-backward-node)
     (define-key map "<" 'Info-top-node)
     (define-key map ">" 'Info-final-node)
-    (define-key map "b" 'beginning-of-buffer)
+    (define-key map "b" 'Info-beginning-of-buffer)
+    (put 'Info-beginning-of-buffer :advertised-binding "b")
     (define-key map "d" 'Info-directory)
     (define-key map "e" 'Info-edit)
     (define-key map "f" 'Info-follow-reference)
@@ -3725,7 +3731,7 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
     :help "Go backward one node, considering all as a sequence"]
    ["Forward" Info-forward-node
     :help "Go forward one node, considering all as a sequence"]
-   ["Beginning" beginning-of-buffer
+   ["Beginning" Info-beginning-of-buffer
     :help "Go to beginning of this node"]
    ["Top" Info-top-node
     :help "Go to top node of file"]
@@ -3931,7 +3937,7 @@ Moving within a node:
 \\[Info-scroll-down]    Normally, scroll backward.  If the beginning of the buffer is
           already visible, try to go to the previous menu entry, or up
           if there is none.
-\\[beginning-of-buffer] Go to beginning of node.
+\\[Info-beginning-of-buffer]    Go to beginning of node.
 
 Advanced commands:
 \\[Info-search] Search through this Info file for specified regexp,
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 6a73aaaa838..128fb86b7b4 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2059,7 +2059,7 @@ See `set-language-info-alist' for use in programs."
                   (or (not (eq last-command-event 'Default))
                       (setq last-command-event 'English))
                   (setq language-name (symbol-name last-command-event))))
-        (error "Bogus calling sequence"))
+        (error "This command should only be called from the menu bar"))
     (describe-language-environment language-name)))
 
 (defun describe-language-environment (language-name)
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 50e7b331c85..1942641fae9 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -549,7 +549,8 @@ Each set is a vector of the form:
 (defvar isearch-error nil)      ; Error message for failed search.
 (defvar isearch-other-end nil)  ; Start (end) of match if forward (backward).
 (defvar isearch-wrapped nil)    ; Searching restarted from the top (bottom).
-(defvar isearch-barrier 0)
+(defvar isearch-barrier 0
+  "Recorded minimum/maximal point for the current search.")
 (defvar isearch-just-started nil)
 (defvar isearch-start-hscroll 0)        ; hscroll when starting the search.
 
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index e1cf2a661ed..d28fde0b214 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -39,6 +39,12 @@
   "jka-compr customization."
   :group 'compression)
 
+(defcustom jka-compr-verbose t
+  "If non-nil, output messages whenever compressing or uncompressing files."
+  :version "24.1"
+  :type 'boolean
+  :group 'jka-compr)
+
 ;; List of all the elements we actually added to file-coding-system-alist.
 (defvar jka-compr-added-to-file-coding-system-alist nil)
 
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 1893e982bbb..cd769885cc6 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -97,11 +97,6 @@ NOTE: Not used in MS-DOS and Windows systems."
   :type 'string
   :group 'jka-compr)
 
-(defcustom jka-compr-verbose t
-  "If non-nil, output messages whenever compressing or uncompressing files."
-  :type 'boolean
-  :group 'jka-compr)
-
 (defvar jka-compr-use-shell
   (not (memq system-type '(ms-dos windows-nt))))
 
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index df4edcc75e1..431c15b2346 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-16  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.2.92.
+
+        * mh-e.el (Version, mh-version): Update for release 8.2.92.
+
 2011-07-12  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 8.2.91.
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 51b41e854b0..1e7b07eb6dc 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -5,7 +5,7 @@
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
-;; Version: 8.2.91
+;; Version: 8.2.92
 ;; Keywords: mail
 
 ;; This file is part of GNU Emacs.
@@ -127,7 +127,7 @@
 ;; Try to keep variables local to a single file. Provide accessors if
 ;; variables are shared. Use this section as a last resort.
 
-(defconst mh-version "8.2.91" "Version number of MH-E.")
+(defconst mh-version "8.2.92" "Version number of MH-E.")
 
 ;; Variants
 
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 67d7b2d20d3..9cb071b185d 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -42,9 +42,24 @@
   :prefix "gnutls-"
   :group 'net-utils)
 
-(defcustom gnutls-log-level 0
-  "Logging level to be used by `starttls-negotiate' and GnuTLS."
-  :type 'integer
+(defcustom gnutls-algorithm-priority nil
+  "If non-nil, this should be a TLS priority string.
+For instance, if you want to skip the \"dhe-rsa\" algorithm,
+set this variable to \"normal:-dhe-rsa\"."
+  :type '(choice (const nil)
+                 string))
+
+;;;###autoload
+(defcustom gnutls-min-prime-bits nil
+  "The minimum number of bits to be used in Diffie-Hellman key exchange.
+
+This sets the minimum accepted size of the key to be used in a
+client-server handshake.  If the server sends a prime with fewer than
+the specified number of bits the handshake will fail.
+
+A value of nil says to use the default gnutls value."
+  :type '(choice (const :tag "Use default value" nil)
+                 (integer :tag "Number of bits" 512))
   :group 'gnutls)
 
 (defun open-gnutls-stream (name buffer host service)
@@ -90,8 +105,8 @@ trust and key files, and priority string."
 (defun* gnutls-negotiate
     (&rest spec
            &key process type hostname priority-string
-           trustfiles crlfiles keylist verify-flags
-           verify-error verify-hostname-error
+           trustfiles crlfiles keylist min-prime-bits
+           verify-flags verify-error verify-hostname-error
            &allow-other-keys)
   "Negotiate a SSL/TLS connection.  Returns proc. Signals gnutls-error.
 
@@ -104,6 +119,9 @@ PRIORITY-STRING is as per the GnuTLS docs, default is \"NORMAL\".
 TRUSTFILES is a list of CA bundles.
 CRLFILES is a list of CRL files.
 KEYLIST is an alist of (client key file, client cert file) pairs.
+MIN-PRIME-BITS is the minimum acceptable size of Diffie-Hellman keys
+\(see `gnutls-min-prime-bits' for more information).  Use nil for the
+default.
 
 When VERIFY-HOSTNAME-ERROR is not nil, an error will be raised
 when the hostname does not match the presented certificate's host
@@ -145,10 +163,14 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
                                ((eq type 'gnutls-anon)
                                 "NORMAL:+ANON-DH:!ARCFOUR-128")
                                ((eq type 'gnutls-x509pki)
-                                "NORMAL"))))
+                                (if gnutls-algorithm-priority
+                                    (upcase gnutls-algorithm-priority)
+                                  "NORMAL")))))
+         (min-prime-bits (or min-prime-bits gnutls-min-prime-bits))
          (params `(:priority ,priority-string
                              :hostname ,hostname
                              :loglevel ,gnutls-log-level
+                             :min-prime-bits ,min-prime-bits
                              :trustfiles ,trustfiles
                              :crlfiles ,crlfiles
                              :keylist ,keylist
diff --git a/lisp/simple.el b/lisp/simple.el
index 64333402924..7fd7e20b499 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3056,10 +3056,11 @@ If `interprogram-cut-function' is set, pass the resulting kill to it."
 
 (defun current-kill (n &optional do-not-move)
   "Rotate the yanking point by N places, and then return that kill.
-If N is zero, `interprogram-paste-function' is set, and calling
-it returns a string or list of strings, then that string (or
-list) is added to the front of the kill ring and the string (or
-first string in the list) is returned as the latest kill.
+If N is zero and `interprogram-paste-function' is set to a
+function that returns a string or a list of strings, and if that
+function doesn't return nil, then that string (or list) is added
+to the front of the kill ring and the string (or first string in
+the list) is returned as the latest kill.
 
 If N is not zero, and if `yank-pop-change-selection' is
 non-nil, use `interprogram-cut-function' to transfer the
@@ -5236,14 +5237,16 @@ Some major modes set this.")
 ;; auto-fill-function to nil in a file-local setting is safe and
 ;; can be useful to prevent auto-filling.
 (put 'auto-fill-function 'safe-local-variable 'null)
-;; FIXME: turn into a proper minor mode.
-;; Add a global minor mode version of it.
+
 (define-minor-mode auto-fill-mode
   "Toggle Auto Fill mode.
 With ARG, turn Auto Fill mode on if and only if ARG is positive.
 In Auto Fill mode, inserting a space at a column beyond `current-fill-column'
 automatically breaks the line at a previous space.
 
+When `auto-fill-mode' is on, the `auto-fill-function' variable is
+non-`nil'.
+
 The value of `normal-auto-fill-function' specifies the function to use
 for `auto-fill-function' when turning Auto Fill mode on."
   :variable (eq auto-fill-function normal-auto-fill-function))
diff --git a/lisp/subr.el b/lisp/subr.el
index 94b28c007d1..ef19797012a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2145,23 +2145,34 @@ If optional argument INHIBIT-KEYBOARD-QUIT is non-nil, ignore
 keyboard-quit events while waiting for a valid input."
   (unless (consp chars)
     (error "Called `read-char-choice' without valid char choices"))
-  (let (char done)
+  (let (char done show-help (helpbuf " *Char Help*"))
     (let ((cursor-in-echo-area t)
           (executing-kbd-macro executing-kbd-macro))
-      (while (not done)
-        (unless (get-text-property 0 'face prompt)
-          (setq prompt (propertize prompt 'face 'minibuffer-prompt)))
-        (setq char (let ((inhibit-quit inhibit-keyboard-quit))
-                     (read-key prompt)))
-        (cond
-         ((not (numberp char)))
-         ((memq char chars)
-          (setq done t))
-         ((and executing-kbd-macro (= char -1))
-          ;; read-event returns -1 if we are in a kbd macro and
-          ;; there are no more events in the macro.  Attempt to
-          ;; get an event interactively.
-          (setq executing-kbd-macro nil)))))
+      (save-window-excursion          ; in case we call help-form-show
+        (while (not done)
+          (unless (get-text-property 0 'face prompt)
+            (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)
+               (kill-buffer helpbuf))
+          (cond
+           ((not (numberp char)))
+           ;; If caller has set help-form, that's enough.
+           ;; They don't explicitly have to add help-char to chars.
+           ((and help-form
+                 (eq char help-char)
+                 (setq show-help t)
+                 (help-form-show)))
+           ((memq char chars)
+            (setq done t))
+           ((and executing-kbd-macro (= char -1))
+            ;; read-event returns -1 if we are in a kbd macro and
+            ;; there are no more events in the macro.  Attempt to
+            ;; get an event interactively.
+            (setq executing-kbd-macro nil))
+           ((and (not inhibit-keyboard-quit) (eq char ?\C-g))
+            (keyboard-quit))))))
     ;; Display the question with the answer.  But without cursor-in-echo-area.
     (message "%s%s" prompt (char-to-string char))
     char))
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index b264cc30850..52f6e5b4889 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -93,7 +93,7 @@ reinserts the fill prefix in each resulting line."
   ;; Added `!' for doxygen comments starting with `//!' or `/*!'.
   ;; Added `%' for TeX comments.
   ;; RMS: deleted the code to match `1.' and `(1)'.
-  (purecopy "[ \t]*\\([-!|#%;>*·•‣⁃◦]+[ \t]*\\)*")
+  (purecopy "[ \t]*\\([-–!|#%;>*·•‣⁃◦]+[ \t]*\\)*")
   "Regexp to match text at start of line that constitutes indentation.
 If Adaptive Fill mode is enabled, a prefix matching this pattern
 on the first and second lines of a paragraph is used as the
diff --git a/lisp/window.el b/lisp/window.el
index 0302a672521..b4b900287e1 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3272,7 +3272,7 @@ window."
 (defun split-window-side-by-side (&optional size)
   "Split selected window into two windows side by side.
 The selected window becomes the left one and gets SIZE columns.
-SIZE negative means the right window gets -SIZE lines.
+SIZE negative means the right window gets -SIZE columns.
 
 SIZE includes the width of the window's scroll bar; if there are
 no scroll bars, it includes the width of the divider column to
@@ -5836,15 +5836,13 @@ additional information."
         new-window new-frame)
     (set-buffer buffer)
     (setq new-window (display-buffer buffer specifiers label))
-    (unless (eq new-window old-window)
-      ;; `display-buffer' has chosen another window, select it.
-      (select-window new-window norecord)
-      (setq new-frame (window-frame new-window))
-      (unless (eq new-frame old-frame)
-        ;; `display-buffer' has chosen another frame, make sure it gets
-        ;; input focus and is risen.
-        (select-frame-set-input-focus new-frame)))
-
+    (setq new-frame (window-frame new-window))
+    (if (eq old-frame new-frame)
+        ;; Make sure new-window gets selected (Bug#8615), (Bug#6954).
+        (select-window new-window norecord)
+      ;; `display-buffer' has chosen another frame, make sure it gets
+      ;; input focus and is risen.
+      (select-frame-set-input-focus new-frame norecord))
     buffer))
 
 (defsubst pop-to-buffer-same-window (&optional buffer-or-name norecord label)
@@ -5953,13 +5951,13 @@ Return the buffer switched to."
    (list (read-buffer-to-switch "Switch to buffer: ") nil nil))
   (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)))
     (if (null force-same-window)
-        (pop-to-buffer buffer-or-name
-                       '(same-window (reuse-window-dedicated . weak))
-                       norecord nil)
+        (pop-to-buffer
+         buffer '(same-window (reuse-window-dedicated . weak))
+         norecord 'switch-to-buffer)
       (cond
        ;; Don't call set-window-buffer if it's not needed since it
        ;; might signal an error (e.g. if the window is dedicated).
-       ((eq buffer (window-buffer)) nil)
+       ((eq buffer (window-buffer)))
        ((window-minibuffer-p)
         (error "Cannot switch buffers in minibuffer window"))
        ((eq (window-dedicated-p) t)