merge trunk

1 files changed, 3 insertions, 0 deletions

diff --git a/src/coding.c b/src/coding.c
index d9606cf5710..412d7245223 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6301,6 +6301,9 @@ detect_coding (struct coding_system *coding)
                 {
                   category = coding_priorities[i];
                   this = coding_categories + category;
+                  /* Some of this->detector (e.g. detect_coding_sjis)
+                     require this information.  */
+                  coding->id = this->id;
                   if (this->id < 0)
                     {
                       /* No coding system of this category is defined.  */