[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111510: Fix bug that f in Rmail, in
From: |
Richard Stallman |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111510: Fix bug that f in Rmail, in some situations, would insert entire Rmail file. |
Date: |
Sun, 13 Jan 2013 14:46:27 -0500 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111510
committer: Richard Stallman <address@hidden>
branch nick: trunk
timestamp: Sun 2013-01-13 14:46:27 -0500
message:
Fix bug that f in Rmail, in some situations, would insert entire Rmail file.
modified:
lisp/ChangeLog
lisp/gnus/ChangeLog
lisp/gnus/message.el
lisp/mail/rmailmm.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-01-13 17:47:45 +0000
+++ b/lisp/ChangeLog 2013-01-13 19:46:27 +0000
@@ -1,3 +1,9 @@
+2013-01-13 Richard Stallman <address@hidden>
+
+ * mail/rmailmm.el (rmail-insert-mime-forwarded-message): Get
+ current message boundaries and pass them to
+ message-forward-make-body-mime. Minor style changes.
+
2013-01-13 Eli Zaretskii <address@hidden>
* cus-start.el (all): Avoid warnings about
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2013-01-11 23:08:55 +0000
+++ b/lisp/gnus/ChangeLog 2013-01-13 19:46:27 +0000
@@ -1,3 +1,9 @@
+2013-01-13 Richard Stallman <address@hidden>
+
+ * message.el (message-forward-make-body-mime): New args BEG, END
+ specify what part of FORWARD-BUFFER to use. Do the work directly
+ instead of calling `mml-insert-buffer'.
+
2013-01-11 Aaron S. Hawley <address@hidden>
* gnus-start.el (gnus-check-new-newsgroups): Fix ambiguous doc string
@@ -37,6 +43,7 @@
(mml-smime-epg-find-usable-secret-key): New helper function copied from
mml2015.el.
+>>>>>>> MERGE-SOURCE
2012-12-31 Lars Magne Ingebrigtsen <address@hidden>
* gnus-msg.el (gnus-inews-insert-gcc): Don't insert Gcc headers if Gnus
=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el 2013-01-02 16:13:04 +0000
+++ b/lisp/gnus/message.el 2013-01-13 19:46:27 +0000
@@ -7376,12 +7376,13 @@
(dolist (elem ignored)
(message-remove-header elem t))))))
-(defun message-forward-make-body-mime (forward-buffer)
+(defun message-forward-make-body-mime (forward-buffer &optional beg end)
(let ((b (point)))
(insert "\n\n<#part type=message/rfc822 disposition=inline raw=t>\n")
(save-restriction
(narrow-to-region (point) (point))
- (mml-insert-buffer forward-buffer)
+ (insert-buffer-substring forward-buffer beg end)
+ (mml-quote-region (point-min) (point-max))
(goto-char (point-min))
(when (looking-at "From ")
(replace-match "X-From-Line: "))
=== modified file 'lisp/mail/rmailmm.el'
--- a/lisp/mail/rmailmm.el 2013-01-01 09:11:05 +0000
+++ b/lisp/mail/rmailmm.el 2013-01-13 19:46:27 +0000
@@ -1365,14 +1365,15 @@
(defun rmail-insert-mime-forwarded-message (forward-buffer)
"Insert the message in FORWARD-BUFFER as a forwarded message.
This is the usual value of `rmail-insert-mime-forwarded-message-function'."
- (let ((message-buffer
- (with-current-buffer forward-buffer
- (if rmail-buffer-swapped
- rmail-view-buffer
- forward-buffer))))
- (save-restriction
- (narrow-to-region (point) (point))
- (message-forward-make-body-mime message-buffer))))
+ (let (contents-buffer start end)
+ (with-current-buffer forward-buffer
+ (setq contents-buffer
+ (if rmail-buffer-swapped
+ rmail-view-buffer
+ forward-buffer)
+ start (rmail-msgbeg rmail-current-message)
+ end (rmail-msgend rmail-current-message)))
+ (message-forward-make-body-mime contents-buffer start end)))
(setq rmail-insert-mime-forwarded-message-function
'rmail-insert-mime-forwarded-message)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111510: Fix bug that f in Rmail, in some situations, would insert entire Rmail file.,
Richard Stallman <=