summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-srvr.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2012-12-24 22:56:47 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2012-12-24 22:56:47 +0000
commit61bbede67cdcfde1fc6ae8fcb3d5146c7980353d (patch)
treeceea945d39b8d2d87ec0e7a376b5d50235acc38f /lisp/gnus/gnus-srvr.el
parentdc646358274fbfdab6ef3dfb7717bc4a52f607f3 (diff)
downloademacs-61bbede67cdcfde1fc6ae8fcb3d5146c7980353d.tar.gz
emacs-61bbede67cdcfde1fc6ae8fcb3d5146c7980353d.tar.bz2
emacs-61bbede67cdcfde1fc6ae8fcb3d5146c7980353d.zip
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'.
Diffstat (limited to 'lisp/gnus/gnus-srvr.el')
-rw-r--r--lisp/gnus/gnus-srvr.el11
1 files changed, 11 insertions, 0 deletions
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index f58cb80311a..ad86ef2c634 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -713,6 +713,7 @@ claim them."
"q" gnus-browse-exit
"Q" gnus-browse-exit
"d" gnus-browse-describe-group
+ [delete] gnus-browse-delete-group
"\C-c\C-c" gnus-browse-exit
"?" gnus-browse-describe-briefly
@@ -964,6 +965,16 @@ how new groups will be entered into the group buffer."
(interactive (list (gnus-browse-group-name)))
(gnus-group-describe-group nil group))
+(defun gnus-browse-delete-group (group force)
+ "Delete the current group. Only meaningful with editable groups.
+If FORCE (the prefix) is non-nil, all the articles in the group will
+be deleted. This is \"deleted\" as in \"removed forever from the face
+of the Earth\". There is no undo. The user will be prompted before
+doing the deletion."
+ (interactive (list (gnus-browse-group-name)
+ current-prefix-arg))
+ (gnus-group-delete-group group force))
+
(defun gnus-browse-unsubscribe-group ()
"Toggle subscription of the current group in the browse buffer."
(let ((sub nil)