procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix problems when editing raw undecoded message (Bug#28671)

Browse source 
* lisp/mail/rmailedit.el (rmail-cease-edit): If rmail-old-mime-state
is set, meaning that we are editing the raw message, do not
encode it again.  Delete old body after, not before, inserting
new, to avoid moving marker at beginning of next message.
This commit is contained in:
Ken Olum 2017-10-09 16:54:00 +03:00 • committed by Eli Zaretskii
parent aca5f0072b
commit 7ed7360855
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lisp/mail/rmailedit.el
View file

@ -312,26 +312,34 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'.
(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-edit-update-headers (rmail-edit-diff-headers
rmail-old-headers new-headers))
;; Re-apply content-transfer-encoding, if any, on the message body.
(cond
(mime-state) ; if set, already transfer-encoded
((string= character-coding "quoted-printable")
(mail-quote-printable-region start (point-max)))
(mail-quote-printable-region start end))
((and (string= character-coding "base64") is-text-message)
(base64-encode-region start (point-max)))
(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)