[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 8986f16 08/12: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 8986f16 08/12: Merge from origin/emacs-25 |
Date: |
Tue, 09 Feb 2016 22:34:34 +0000 |
branch: master
commit 8986f1674c2338761a30bfe0b8ee353d0cd6778e
Merge: a9650e9 4feb962
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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
---
etc/NEWS | 4 ++++
lisp/comint.el | 8 ++++----
lisp/epg-config.el | 7 ++++---
lisp/gnus/gnus-sum.el | 8 ++++----
lisp/gnus/gnus-uu.el | 4 ++--
5 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index d6ffb38..717c6bc 100644
--- 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 afbaef1..dcd4a5a 100644
--- 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 e92bcd6..c41d97d 100644
--- 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 c8f0fa3..d675d2f 100644
--- 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 83f817f..416567e 100644
--- 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))
- [Emacs-diffs] master updated (53f3d4a -> 8456ba1), Paul Eggert, 2016/02/09
- [Emacs-diffs] master f414fe6 01/12: ; make change-history-commit, Paul Eggert, 2016/02/09
- [Emacs-diffs] master fdc2da4 02/12: Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master 44f853c 03/12: ; Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master f55fc92 04/12: Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master c71e7cc 05/12: ; Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master b3fc7a3 06/12: Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master a9650e9 07/12: ; Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master 8986f16 08/12: Merge from origin/emacs-25,
Paul Eggert <=
- [Emacs-diffs] master 8fa67e9 09/12: ; Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master 05595c2 10/12: -, Paul Eggert, 2016/02/09
- [Emacs-diffs] master 0e7b901 11/12: ; Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master 8456ba1 12/12: -, Paul Eggert, 2016/02/09