Merge changes made in Gnus master

gnus-srvr.el (gnus-browse-delete-group): Fix syntax error.
message.el (message-ignored-news-headers): Always remove
  X-Message-SMTP-Method to avoid information leakage if the user
  mistakenly inserts the header into news messages.
gnus-srvr.el (gnus-browse-delete-group): New command and keystroke.
gnus-sum.el (gnus-summary-hide-thread): If point were further to the
  right than four characters, this command would move point to
  `point-max'.  Don't do that.
gnus-group.el (gnus-group-read-ephemeral-group): Set the active data
  to nil to allow re-selecting groups that gain articles.
  (gnus-bug-group-download-format-alist): Update the URL.
gnus.texi (Browse Foreign Server): Document `gnus-browse-delete-group'.

2 files changed, 14 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 19501d78ca0..18db253a714 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Browse Foreign Server): Document
+        `gnus-browse-delete-group'.
+
 2012-12-22  Glenn Morris  <rgm@gnu.org>
 
         * ada-mode.texi, ebrowse.texi, ediff.texi, ert.texi, eshell.texi:
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 957009e4b34..a41a2023a45 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -3645,6 +3645,15 @@ Describe the current group (@code{gnus-browse-describe-group}).
 @findex gnus-browse-describe-briefly
 Describe browse mode briefly (well, there's not much to describe, is
 there) (@code{gnus-browse-describe-briefly}).
+
+@item DEL
+@kindex DEL (Browse)
+@findex gnus-browse-delete-group
+This function will delete the current group
+(@code{gnus-browse-delete-group}).  If given a prefix, this function
+will actually delete all the articles in the group, and forcibly
+remove the group itself from the face of the Earth.  Use a prefix only
+if you are absolutely sure of what you are doing.
 @end table