unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Katsumi Yamaoka <yamaoka@jpl.org>
To: Glenn Morris <rgm@gnu.org>
Cc: 25896@debbugs.gnu.org
Subject: bug#25896: gnus-read-ephemeral-bug-group can modify message body
Date: Wed, 01 Mar 2017 14:23:07 +0900	[thread overview]
Message-ID: <b4mpoi1fu4k.fsf@jpl.org> (raw)
In-Reply-To: <kv60juzt5y.fsf@fencepost.gnu.org>

[-- Attachment #1: Type: text/plain, Size: 636 bytes --]

On Tue, 28 Feb 2017 02:11:21 -0500, Glenn Morris wrote:
> emacs -Q -l gnus
> M-x gnus-read-ephemeral-emacs-bug-group RET 25891 RET:

> I noticed that the To: lines in the examples quoted in the message body
> (eg "To: Victor Lazzarini <Victor.Lazzarini AT nuim.ie>") are modified,
> by having 25891@debbugs added to them.

How about a diff below?  This version doesn't add the debbugs
address if it already exists in To: or Cc: field in a message
header, otherwise it adds the address to the To header, or adds
the To header along with the address if the To header is absent.
All are done in each narrowed message header of mbox data.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1566 bytes --]

--- lisp/gnus/gnus-group.el~	2017-01-04 22:16:44.000000000 +0000
+++ lisp/gnus/gnus-group.el	2017-03-01 05:06:46.565658800 +0000
@@ -2464,14 +2464,33 @@
 		     (file-exists-p file))
 		(insert-file-contents file)
 	      (url-insert-file-contents (format mbox-url id)))))
-	(goto-char (point-min))
 	;; Add the debbugs address so that we can respond to reports easily.
-	(while (re-search-forward "^To: " nil t)
-	  (end-of-line)
-	  (insert (format ", %s@%s" (car ids)
-			  (replace-regexp-in-string
-			   "/.*$" ""
-			   (replace-regexp-in-string "^http://" "" mbox-url)))))))
+	(let ((address
+	       (format "%s@%s" (car ids)
+		       (replace-regexp-in-string
+			"/.*$" ""
+			(replace-regexp-in-string "^http://" "" mbox-url)))))
+	  (goto-char (point-min))
+	  (while (re-search-forward (concat "^" message-unix-mail-delimiter)
+				    nil t)
+	    (narrow-to-region (point)
+			      (if (search-forward "\n\n" nil t)
+				  (1- (point))
+				(point-max)))
+	    (unless (string-match (concat "\\(?:\\`\\|[ ,<]\\)"
+					  (regexp-quote address)
+					  "\\(?:\\'\\|[ ,>]\\)")
+				  (concat (message-fetch-field "to") " "
+					  (message-fetch-field "cc")))
+	      (goto-char (point-min))
+	      (if (re-search-forward "^To:" nil t)
+		  (progn
+		    (message-next-header)
+		    (skip-chars-backward "\t\n ")
+		    (insert ", " address))
+		(insert "To: " address "\n")))
+	    (goto-char (point-max))
+	    (widen)))))
     (gnus-group-read-ephemeral-group
      (format "nndoc+ephemeral:bug#%s"
 	     (mapconcat 'number-to-string ids ","))

  reply	other threads:[~2017-03-01  5:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-28  7:11 bug#25896: gnus-read-ephemeral-bug-group can modify message body Glenn Morris
2017-03-01  5:23 ` Katsumi Yamaoka [this message]
2017-03-01 23:35   ` Glenn Morris
2017-03-02  7:56     ` Katsumi Yamaoka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b4mpoi1fu4k.fsf@jpl.org \
    --to=yamaoka@jpl.org \
    --cc=25896@debbugs.gnu.org \
    --cc=rgm@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).