Merge from origin/emacs-25

4feb962 * lisp/comint.el (comint-prompt-read-only): Clean tabs in docstring
cc419fb Don't inloop gnus-uu-mark-thread on the last thread
51c77a2 Display non-ASCII group names better in prompts
f93d669 Default to gpg2 instead of gpg

diff --git a/etc/NEWS b/etc/NEWS
index d6ffb3879bcae9517924efef21979b28e90a5709..717c6bc89ab086664a4bc88a3a002197b64cb0ee 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -816,6 +816,10 @@ at BOL or EOL, or in whitespace there.  To enable these, customize,
 respectively, `show-paren-when-point-inside-paren' or
 `show-paren-when-point-in-periphery'.
 
+---
+** If gpg2 exists on the system, it is now used as the default value
+of `epg-gpg-program' (instead of gpg).
+
 ** Lisp mode
 
 ---

diff --git a/lisp/comint.el b/lisp/comint.el
index afbaef1baf2d5ab99bccc873cef58278bcb80d15..dcd4a5ae4cfeae0c583472ef1b65567d9488ac43 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -185,10 +185,10 @@ the remaining prompts will be accidentally messed up.  You may
 wish to put something like the following in your init file:
 
 \(add-hook \\='comint-mode-hook
-         (lambda ()
-           (define-key comint-mode-map [remap kill-region] \\='comint-kill-region)
-           (define-key comint-mode-map [remap kill-whole-line]
-             \\='comint-kill-whole-line)))
+          (lambda ()
+            (define-key comint-mode-map [remap kill-region] \\='comint-kill-region)
+            (define-key comint-mode-map [remap kill-whole-line]
+              \\='comint-kill-whole-line)))
 
 If you sometimes use comint-mode on text-only terminals or with `emacs -nw',
 you might wish to use another binding for `comint-kill-whole-line'."

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index e92bcd62a668bcb4a39a279310bcc063946267b3..c41d97dbfacbd1d8c9ee98de17060be1f59e373b 100644 (file)
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -39,10 +39,11 @@
   :group 'data
   :group 'external)
 
-(defcustom epg-gpg-program (cond ((executable-find "gpg") "gpg")
-                                ((executable-find "gpg2") "gpg2")
-                                (t "gpg"))
+(defcustom epg-gpg-program (if (executable-find "gpg2")
+                               "gpg2"
+                             "gpg")
   "The `gpg' executable."
+  :version "25.1"
   :group 'epg
   :type 'string)
 

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index c8f0fa31300af8f2e8a1e68b7db7cb12d5f635c5..d675d2f68288d93d8919d1e5dd2e7db2cdba791e 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -5903,13 +5903,13 @@ If SELECT-ARTICLES, only select those articles from GROUP."
                           (if only-read-p
                               (format
                                "How many articles from %s (available %d, default %d): "
-                               (gnus-group-decoded-name
-                                (gnus-group-real-name gnus-newsgroup-name))
+                               (gnus-group-real-name
+                                (gnus-group-decoded-name gnus-newsgroup-name))
                                number default)
                             (format
                              "How many articles from %s (%d default): "
-                             (gnus-group-decoded-name
-                              (gnus-group-real-name gnus-newsgroup-name))
+                             (gnus-group-real-name
+                              (gnus-group-decoded-name gnus-newsgroup-name))
                              default))
                           nil
                           nil

diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el
index 83f817fd8e9904d4d43acafaf117ebec31314eb9..416567ed28571bebebdcabc4cf0d2f0d2bba9848 100644 (file)
--- a/lisp/gnus/gnus-uu.el
+++ b/lisp/gnus/gnus-uu.el
@@ -641,9 +641,9 @@ When called interactively, prompt for REGEXP."
   (interactive)
   (gnus-save-hidden-threads
     (let ((level (gnus-summary-thread-level)))
-      (while (and (gnus-summary-set-process-mark
-                  (gnus-summary-article-number))
+      (while (and (gnus-summary-set-process-mark (gnus-summary-article-number))
                  (zerop (forward-line 1))
+                 (not (eobp))
                  (> (gnus-summary-thread-level) level)))))
   (gnus-summary-position-point))