all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* bug#28671: 25.2; double transfer-encoding in rmailedit for complex mime messages
@ 2017-10-02 15:37 Ken Olum
  2017-10-02 16:37 ` Eli Zaretskii
  0 siblings, 1 reply; 4+ messages in thread
From: Ken Olum @ 2017-10-02 15:37 UTC (permalink / raw)
  To: 28671; +Cc: kdo

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

When rmail-edit-current-message gets a mime message which is too complex
for it to handle (i.e., anything but one "text/plain" part), it just
gives you the raw message to edit.  If you do so, rmail-cease-edit then
applies the transfer-encoding even though the message wasn't decoded,
and so on.  It also in some circumstances it also moves the marker for
the beginning of the following message.

The attached patch modifies rmail-cease-edit to check the
rmail-old-mime-state flag set by rmail-edit-current-message when it is
editing the raw message.  If set, rmail-cease-edit inserts the
already-encoded body without further processing.  It also deletes the
old body after inserting the new, rather than before, to avoid moving
the next message's marker.

                                        Ken

In GNU Emacs 25.2.2 (x86_64-unknown-linux-gnu, X toolkit, Xaw scroll bars)
 of 2017-05-29 built on olum.org
Windowing system distributor 'The X.Org Foundation', version 11.0.11804000
System Description:	Ubuntu 16.04.3 LTS

Configured features:
XPM JPEG TIFF GIF PNG SOUND NOTIFY FREETYPE XFT ZLIB TOOLKIT_SCROLL_BARS
LUCID X11


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

--- lisp/mail/rmailedit.el	2017-07-06 10:27:25.654906559 -0400
+++ lisp/mail/rmailedit.new.el	2017-09-26 12:00:45.498641338 -0400
@@ -312,26 +312,34 @@
             (data-buffer (current-buffer))
             (start (copy-marker (point) nil)) ; new body will be between
             (end (copy-marker (point) t)))    ; these two markers
-        (with-current-buffer rmail-view-buffer
-          (encode-coding-region headers-end (point-max) coding-system
-                                data-buffer))
-        (delete-region end (point-max))
+        (if mime-state
+            ;; Message is already in encoded state
+            (insert-buffer-substring rmail-view-buffer headers-end
+                                     (with-current-buffer rmail-view-buffer
+                                       (point-max)))
+          (with-current-buffer rmail-view-buffer
+            (encode-coding-region headers-end (point-max) coding-system
+                                  data-buffer)))
 	;; Apply to the mbox buffer any changes in header fields
 	;; that the user made while editing in the view buffer.
 	(rmail-edit-update-headers (rmail-edit-diff-headers
 				    rmail-old-headers new-headers))
 	;; Re-apply content-transfer-encoding, if any, on the message body.
-	(cond
-	 ((string= character-coding "quoted-printable")
-	  (mail-quote-printable-region start (point-max)))
-	 ((and (string= character-coding "base64") is-text-message)
-	  (base64-encode-region start (point-max)))
-	 ((and (eq character-coding 'uuencode) is-text-message)
-	  (error "uuencoded messages are not supported")))
+        (unless mime-state              ; if set, already transfer-encoded
+          (cond
+           ((string= character-coding "quoted-printable")
+            (mail-quote-printable-region start end))
+           ((and (string= character-coding "base64") is-text-message)
+            (base64-encode-region start end))
+           ((and (eq character-coding 'uuencode) is-text-message)
+            (error "uuencoded messages are not supported"))))
         ;; After encoding, make sure buffer ends with a blank line so as not to
         ;; run this message together with the following one.
-        (goto-char (point-max))
-        (rmail-ensure-blank-line))
+        (goto-char end)
+        (rmail-ensure-blank-line)
+        ;; Delete previous body.  This must be after all insertions at the end,
+        ;; so the marker for the beginning of the next message isn't messed up.
+        (delete-region end (point-max)))
       (rmail-set-attribute rmail-edited-attr-index t))
 ;;;??? BROKEN perhaps.
 ;;;    (if (boundp 'rmail-summary-vector)

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-10-09 13:55 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-02 15:37 bug#28671: 25.2; double transfer-encoding in rmailedit for complex mime messages Ken Olum
2017-10-02 16:37 ` Eli Zaretskii
2017-10-02 17:47   ` Ken Olum
2017-10-09 13:55     ` Eli Zaretskii

Code repositories for project(s) associated with this external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.