From 61bbede67cdcfde1fc6ae8fcb3d5146c7980353d Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Mon, 24 Dec 2012 22:56:47 +0000 Subject: [PATCH] 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'. --- doc/misc/ChangeLog | 5 +++++ doc/misc/gnus.texi | 9 +++++++++ lisp/gnus/ChangeLog | 18 ++++++++++++++++++ lisp/gnus/gnus-group.el | 3 ++- lisp/gnus/gnus-srvr.el | 11 +++++++++++ lisp/gnus/gnus-sum.el | 2 +- lisp/gnus/message.el | 2 +- 7 files changed, 47 insertions(+), 3 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 + + * gnus.texi (Browse Foreign Server): Document + `gnus-browse-delete-group'. + 2012-12-22 Glenn Morris * 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 diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 1ade749427f..9f0e17924d4 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,21 @@ +2012-12-24 Lars Ingebrigtsen + + * 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. + 2012-12-23 Andreas Schwab * shr.el (shr-tag-em): Render em as italic, not bold. diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 8c7d0165976..2fc87f097f9 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -2310,6 +2310,7 @@ Return the name of the group if selection was successful." (let ((group (if (gnus-group-foreign-p group) group (gnus-group-prefixed-name (gnus-group-real-name group) method)))) + (gnus-set-active group nil) (gnus-sethash group `(-1 nil (,group @@ -2441,7 +2442,7 @@ Valid input formats include: (gnus-read-ephemeral-gmane-group group start range))) (defcustom gnus-bug-group-download-format-alist - '((emacs . "http://debbugs.gnu.org/%s;mboxmaint=yes;mboxstat=yes") + '((emacs . "http://debbugs.gnu.org/cgi/bugreport.cgi?bug=%s;mboxmaint=yes;mboxstat=yes") (debian . "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s&mbox=yes;mboxmaint=yes")) "Alist of symbols for bug trackers and the corresponding URL format string. 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) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 1d4f470aea2..d8cdd16dedb 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -11647,10 +11647,10 @@ If PREDICATE is supplied, threads that satisfy this predicate will not be hidden. Returns nil if no threads were there to be hidden." (interactive) + (beginning-of-line) (let ((start (point)) (starteol (line-end-position)) (article (gnus-summary-article-number))) - (goto-char start) ;; Go forward until either the buffer ends or the subthread ends. (when (and (not (eobp)) (or (zerop (gnus-summary-next-thread 1 t)) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 0e2c5debe4d..24159d4c2a3 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -264,7 +264,7 @@ This is a list of regexps and regexp matches." :type 'sexp) (defcustom message-ignored-news-headers - "^NNTP-Posting-Host:\\|^Xref:\\|^[BGF]cc:\\|^Resent-Fcc:\\|^X-Draft-From:\\|^X-Gnus-Agent-Meta-Information:" + "^NNTP-Posting-Host:\\|^Xref:\\|^[BGF]cc:\\|^Resent-Fcc:\\|^X-Draft-From:\\|^X-Gnus-Agent-Meta-Information:\\|^X-Message-SMTP-Method:" "*Regexp of headers to be removed unconditionally before posting." :group 'message-news :group 'message-headers -- 2.39.5