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'.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 19501d78ca086e0bc70316dbeecf1160d30fa027..18db253a714e9bcb35f8bf66bcbe461c83b9568d 100644 (file)
--- 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:
 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 957009e4b34d6cb6ea5e71322a27ed2315ea52ac..a41a2023a4538db3a8b0a79a3b141704f77bb70d 100644 (file)
--- 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}).
 @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
 
 
 @end table
 
 

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1ade749427f2874cea7fdf1988d23872a46a0ee4..9f0e17924d44ceacf5e603ea3a452e0690f2f6e2 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,21 @@
+2012-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * 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  <schwab@suse.de>
 
        * shr.el (shr-tag-em): Render em as italic, not bold.
 2012-12-23  Andreas Schwab  <schwab@suse.de>
 
        * 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 8c7d0165976bdfb0ae8b82adacad56ff30c4a031..2fc87f097f945d393cdfd665b075b5d3bebd997a 100644 (file)
--- 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))))
   (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
     (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
     (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.
     (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 f58cb80311adf5afacbbc2249428ebf0034d8d0e..ad86ef2c634ba2297689fb5cb2a2eb4926e3d47e 100644 (file)
--- 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
     "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
 
     "\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))
 
   (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)
 (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 1d4f470aea26064492b39751362eeadb0567c3c1..d8cdd16dedb27c8a26c2d5ee0e2e157a09c2aa7f 100644 (file)
--- 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)
 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)))
   (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))
     ;; 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 0e2c5debe4dde95c25a30dd15274bba69d6e614e..24159d4c2a3ad16a456143553142dfe279fcd521 100644 (file)
--- 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
   :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
   "*Regexp of headers to be removed unconditionally before posting."
   :group 'message-news
   :group 'message-headers