From a6abc7bab722cf23b7dceabf485d023e44c14392 Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Wed, 12 Apr 2006 12:33:38 +0000 Subject: [PATCH] Remove conflict markers. Adjust date: 2006-03-23 -> 2006-04-12 --- lisp/ChangeLog | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d23c69b92..aac5ee254 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -26,6 +26,14 @@ * smiley.el (smiley-style): Move definition later to avoid a compilation warning. +2006-04-12 Kenichi Handa + + * rfc2231.el (rfc2231-decode-encoded-string): Work on unibyte + buffer and then decode the buffer text if necessary. + (rfc2231-encode-string): Be sure to work on multibyte buffer at + first, and after mm-encode-body, change the buffer to unibyte. + Use mm-disable-multibyte instead of set-buffer-multibyte. + 2006-04-12 Katsumi Yamaoka * gnus-art.el (gnus-mime-copy-part): Find name parameter in @@ -224,21 +232,6 @@ * gnus-sum.el (gnus-map-articles): Don't funcall symbol macro. Reported by Ralf Wachinger . -<<<<<<< TREE -======= -2006-03-23 Kenichi Handa - - * rfc2231.el (rfc2231-encode-string): Use mm-disable-multibyte - instead of set-buffer-multibyte. - -2006-03-23 Kenichi Handa - - * rfc2231.el (rfc2231-decode-encoded-string): Work on unibyte - buffer and then decode the buffer text if necessary. - (rfc2231-encode-string): Be sure to work on multibyte buffer at - first, and after mm-encode-body, change the buffer to unibyte. - ->>>>>>> MERGE-SOURCE 2006-03-21 Simon Josefsson * pgg-gpg.el: Ideas below based on patch from Sascha Wilde -- 2.34.1