[Emacs-diffs] /srv/bzr/emacs/trunk r111322: Merge changes made in Gnus master

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 111322
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2012-12-24 22:56:47 +0000
message:
  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'.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-group.el
  lisp/gnus/gnus-srvr.el
  lisp/gnus/gnus-sum.el
  lisp/gnus/message.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-12-22 20:29:16 +0000
+++ b/doc/misc/ChangeLog        2012-12-24 22:56:47 +0000
@@ -1,3 +1,8 @@
+2012-12-24  Lars Ingebrigtsen  <address@hidden>
+
+       * gnus.texi (Browse Foreign Server): Document
+       `gnus-browse-delete-group'.
+
 2012-12-22  Glenn Morris  <address@hidden>
 
        * ada-mode.texi, ebrowse.texi, ediff.texi, ert.texi, eshell.texi:

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2012-12-22 19:09:52 +0000
+++ b/doc/misc/gnus.texi        2012-12-24 22:56:47 +0000
@@ -3645,6 +3645,15 @@
 @findex gnus-browse-describe-briefly
 Describe browse mode briefly (well, there's not much to describe, is
 there) (@code{gnus-browse-describe-briefly}).
+
address@hidden DEL
address@hidden DEL (Browse)
address@hidden 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
 
 

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-12-24 13:28:39 +0000
+++ b/lisp/gnus/ChangeLog       2012-12-24 22:56:47 +0000
@@ -1,3 +1,21 @@
+2012-12-24  Lars Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * shr.el (shr-tag-em): Render em as italic, not bold.

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2012-09-07 04:07:00 +0000
+++ b/lisp/gnus/gnus-group.el   2012-12-24 22:56:47 +0000
@@ -2310,6 +2310,7 @@
   (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 @@
     (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.

=== modified file 'lisp/gnus/gnus-srvr.el'
--- a/lisp/gnus/gnus-srvr.el    2012-09-05 22:35:32 +0000
+++ b/lisp/gnus/gnus-srvr.el    2012-12-24 22:56:47 +0000
@@ -713,6 +713,7 @@
     "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 @@
   (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)

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2012-12-02 11:45:36 +0000
+++ b/lisp/gnus/gnus-sum.el     2012-12-24 22:56:47 +0000
@@ -11647,10 +11647,10 @@
 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))

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2012-12-06 04:28:00 +0000
+++ b/lisp/gnus/message.el      2012-12-24 22:56:47 +0000
@@ -264,7 +264,7 @@
   :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