summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-int.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org.noreply>2013-08-01 22:58:40 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2013-08-01 22:58:40 +0000
commit89cccc2f3dc32af8e3cb047edb9c2d4df55ca962 (patch)
treece04a5daa511e1bb38883c24565f2147c91bb897 /lisp/gnus/gnus-int.el
parent44e18199d98d8d7a465f438d37280acfa42bad38 (diff)
downloademacs-89cccc2f3dc32af8e3cb047edb9c2d4df55ca962.tar.gz
Merge changes made in Gnus master
2013-08-01 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus.texi (Basic Usage): Mention that warp means jump here. (The notmuch Engine): Mention notmuch. 2013-08-01 Lars Magne Ingebrigtsen <larsi@gnus.org> * message.el (message-ignored-news-headers): Delete X-Gnus-Delayed before sending. * dgnushack.el (dgnushack-compile): Add a temporary check for gnus-icalendar. * mm-decode.el (mm-command-output): New face. (mm-display-external): Use it. 2013-08-01 Kan-Ru Chen (陳侃如) <kanru@kanru.info> (tiny change) * nnmbox.el (nnmbox-request-article): Don't change point. 2013-08-01 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus-icalendar.el (gnus-icalendar-event:inline-reply-buttons): Include `handle' parameter. 2013-08-01 Jan Tatarik <jan.tatarik@gmail.com> * gnus-icalendar.el: New file. 2013-08-01 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus-int.el (gnus-warp-to-article): Mention that warp means jump. * gnus-uu.el (gnus-uu-mark-thread, gnus-uu-unmark-thread): Work with dummy roots, too. 2013-08-01 David Edmondson <dme@dme.org> * mml2015.el (mml2015-epg-key-image-to-string): Protect against bugging out on ttys. 2013-08-01 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus-start.el (gnus-dribble-save): Only save the dribble file if it's not empty.
Diffstat (limited to 'lisp/gnus/gnus-int.el')
-rw-r--r--lisp/gnus/gnus-int.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index 2378b598eeb..6aa874f0347 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -582,8 +582,8 @@ This is the string that Gnus uses to identify the group."
(gnus-group-method group)))
(defun gnus-warp-to-article ()
- "Warps from an article in a virtual group to the article in its
-real group. Does nothing on a real group."
+ "Jump from an article in a virtual group to the article in its real group.
+Does nothing in a real group."
(interactive)
(when (gnus-virtual-group-p gnus-newsgroup-name)
(let ((gnus-command-method