+2006-04-12 Reiner Steib <Reiner.Steib@gmx.de>
+
+ * smiley.el: Revert previous change.
+ (smiley-data-directory): defvar it before using it in the
+ defcustom of `smiley-style'.
+
2006-04-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
+ * message.el (message-newline-and-indent): New function.
+
+ * ecomplete.el: Implement more bits.
+
+ * message.el (message-put-addresses-in-ecomplete): Clean up the
+ string.
+
* ecomplete.el (ecomplete-add-item): Chop off decimals.
* gnus-sum.el (gnus-summary-save-parts): Bind
* smiley.el (smiley-style): Move definition later to avoid a
compilation warning.
+2006-04-12 Kenichi Handa <handa@m17n.org>
+
+ * 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 <yamaoka@jpl.org>
* gnus-art.el (gnus-mime-copy-part): Find name parameter in
* gnus-sum.el (gnus-map-articles): Don't funcall symbol macro.
Reported by Ralf Wachinger <rwachinger@gmx.de>.
-<<<<<<< TREE
-=======
-2006-03-23 Kenichi Handa <handa@m17n.org>
-
- * rfc2231.el (rfc2231-encode-string): Use mm-disable-multibyte
- instead of set-buffer-multibyte.
-
-2006-03-23 Kenichi Handa <handa@m17n.org>
-
- * 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 <jas@extundo.com>
* pgg-gpg.el: Ideas below based on patch from Sascha Wilde
projects / gnus / blobdiff