[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 37358dd 2/2: Make Gnus stop clobbering the M-s search prefix key

From: Lars Ingebrigtsen
Subject: master 37358dd 2/2: Make Gnus stop clobbering the M-s search prefix key binding
Date: Sat, 15 Aug 2020 08:20:31 -0400 (EDT)

branch: master
commit 37358dd43cf6bda238b1861cdbe55aedfcb1740e
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Make Gnus stop clobbering the M-s search prefix key binding
    * doc/emacs/misc.texi (Gnus Summary Buffer): Ditto.
    * doc/misc/gnus.texi (Searching for Articles): Document moved M-s
    * lisp/gnus/gnus-sum.el (gnus-summary-mode-map): Move
    gnus-summary-search-article-forward to M-s M-s, and add M-s M-r
    for gnus-summary-search-article-backward.
 admin/release-process | 8 +++-----
 doc/emacs/misc.texi   | 4 ++--
 doc/misc/gnus.texi    | 8 ++++----
 etc/NEWS              | 7 +++++++
 lisp/gnus/gnus-sum.el | 3 ++-
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/admin/release-process b/admin/release-process
index 1ed7a2e..b8587e6 100644
--- a/admin/release-process
+++ b/admin/release-process
@@ -192,16 +192,14 @@ sk        Miroslav Vaško
 ** Check for modes which bind M-s that conflicts with a new global binding M-s
 and change key bindings where necessary.  The current list of modes:
-1. Gnus binds 'M-s' to 'gnus-summary-search-article-forward'.
-2. Minibuffer binds 'M-s' to 'next-matching-history-element'
+1. Minibuffer binds 'M-s' to 'next-matching-history-element'
    (not useful any more since C-s can now search in the history).
-3. PCL-CVS binds 'M-s' to 'cvs-status', and log-edit-mode binds it to
+2. PCL-CVS binds 'M-s' to 'cvs-status', and log-edit-mode binds it to
    'log-edit-comment-search-forward'.  Perhaps search commands
    on the global key binding 'M-s' are useless in these modes.
-4. Rmail binds '\es' to 'rmail-search'/'rmail-summary-search'.
+3. Rmail binds '\es' to 'rmail-search'/'rmail-summary-search'.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index f3c9d76..317a197 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -245,13 +245,13 @@ Do an incremental search on the selected article buffer
 (@code{gnus-summary-isearch-article}), as if you switched to the
 buffer and typed @kbd{C-s} (@pxref{Incremental Search}).
-@kindex M-s @r{(Gnus Summary mode)}
+@kindex M-s M-s @r{(Gnus Summary mode)}
 @findex gnus-summary-search-article-forward
 @item M-s @var{regexp} @key{RET}
 Search forward for articles containing a match for @var{regexp}
-@kindex M-r @r{(Gnus Summary mode)}
+@kindex M-s M-r @r{(Gnus Summary mode)}
 @findex gnus-summary-search-article-backward
 @item M-r @var{regexp} @key{RET}
 Search back for articles containing a match for @var{regexp}
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 584c546..332926a 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -11029,14 +11029,14 @@ Go to the Gnus info node (@code{gnus-info-find-node}).
 @table @kbd
-@item M-s
-@kindex M-s @r{(Summary)}
+@item M-s M-s
+@kindex M-s M-s @r{(Summary)}
 @findex gnus-summary-search-article-forward
 Search through all subsequent (raw) articles for a regexp
-@item M-r
-@kindex M-r @r{(Summary)}
+@item M-s M-r
+@kindex M-s M-r @r{(Summary)}
 @findex gnus-summary-search-article-backward
 Search through all previous (raw) articles for a regexp
diff --git a/etc/NEWS b/etc/NEWS
index 66f4f71..b9063aa 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -262,6 +262,13 @@ invoke 'C-u C-x v s' ('vc-create-tag').
 ** Gnus
+*** The key binding of 'gnus-summary-search-article-forward' has changed.
+This command was previously on 'M-s' and shadowed the global 'M-s'
+search prefix.  The command has now been moved to 'M-s M-s'.  (For
+consistency, the 'M-s M-r' key binding has been added for the
+'gnus-summary-search-article-backward' command.)
 *** The value of "all" in the 'large-newsgroup-initial' group parameter 
 It was previously nil, which didn't work, because nil is
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 4363860..c53f81f 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1913,7 +1913,8 @@ increase the score of each group you read."
   "," gnus-summary-best-unread-article
   "[" gnus-summary-prev-unseen-article
   "]" gnus-summary-next-unseen-article
-  "\M-s" gnus-summary-search-article-forward
+  "\M-s\M-s" gnus-summary-search-article-forward
+  "\M-s\M-r" gnus-summary-search-article-backward
   "\M-r" gnus-summary-search-article-backward
   "\M-S" gnus-summary-repeat-search-article-forward
   "\M-R" gnus-summary-repeat-search-article-backward

reply via email to

[Prev in Thread] Current Thread [Next in Thread]