From: yamaoka Date: Tue, 16 Dec 2003 23:36:13 +0000 (+0000) Subject: (mime-edit-normalize-body): Don't use the `(replace-match "\\1\r\n")' form X-Git-Tag: semi-1_14_6~5 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5b8331d526ed5334feb7450638897b1cd81fa581;p=elisp%2Fsemi.git (mime-edit-normalize-body): Don't use the `(replace-match "\\1\r\n")' form since it may convert the unibyte string into multibyte in Emacs 21.4. --- diff --git a/ChangeLog b/ChangeLog index 469c89d..adcf613 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-12-16 Katsumi Yamaoka + + * mime-edit.el (mime-edit-normalize-body): Don't use the + `(replace-match "\\1\r\n")' form since it may convert the unibyte + string into multibyte in Emacs 21.4. + 2003-12-14 Yoichi NAKAYAMA * mime-play.el (mime-mailcap-method-sentinel): Restore deleting @@ -16,7 +22,7 @@ * mime-play.el (mime-activate-mailcap-method): Don't use `binary-to-text-funcall'. (Thanks to TANAKA Shingo) - + 2003-12-14 Tatsuya Kinoshita * mime-edit.el (mime-charset-type-list): Add entry for iso-8859-1[45]. @@ -33,7 +39,7 @@ 2003-12-06 Yuuichi Teranishi - * mime-play.el (mime-require-safe-directory): New function. + * mime-play.el (mime-require-safe-directory): New function. (mime-store-message/partial-piece): Use it. 2003-12-05 Katsumi Yamaoka diff --git a/mime-edit.el b/mime-edit.el index 0548f0f..18263bf 100644 --- a/mime-edit.el +++ b/mime-edit.el @@ -2302,7 +2302,12 @@ Content-Description: S/MIME Encrypted Message][base64]]\n") (narrow-to-region beg (mime-edit-content-end)) (goto-char beg) (while (re-search-forward "\\(\\=\\|[^\r]\\)\n" nil t) - (replace-match "\\1\r\n")))) + ;; Don't use this in the multibyte buffer since it may + ;; convert the unibyte string into multibyte. + ;;;;(replace-match "\\1\r\n")))) + (backward-char 1) + (insert "\r") + (forward-char 1)))) (goto-char beg) (mime-encode-region beg (mime-edit-content-end) (or encoding "7bit"))