Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-289
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-290
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-291
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-292
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-293
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-567

1 files changed, 4 insertions, 1 deletions

diff --git a/src/coding.h b/src/coding.h
index be68753acb2..81dcb7f08ad 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -462,7 +462,10 @@ struct coding_system
    || (coding)->common_flags & CODING_REQUIRE_DECODING_MASK)
 
 /* Return 1 if the coding system CODING requires code conversion on
-   encoding.  */
+   encoding.
+   The non-multibyte part of the condition is to support encoding of
+   unibyte strings/buffers generated by string-as-unibyte or
+   (set-buffer-multibyte nil) from multibyte strings/buffers.  */
 #define CODING_REQUIRE_ENCODING(coding) \
   ((coding)->src_multibyte              \
    || (coding)->common_flags & CODING_REQUIRE_ENCODING_MASK)