[Emacs-diffs] /srv/bzr/emacs/trunk r110535: coding.c (detect_coding): Set coding->id before calling this->detector.

[Kenichi Handa]

------------------------------------------------------------
revno: 110535 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-13 22:12:01 +0900
message:
  coding.c (detect_coding): Set coding->id before calling this->detector.
modified:
  src/ChangeLog
  src/coding.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-13 08:55:26 +0000
+++ b/src/ChangeLog     2012-10-13 13:11:40 +0000
@@ -1,3 +1,8 @@
+2012-10-13  HANATAKA, Shinya  <address@hidden>  (tiny change)
+
+       * coding.c (detect_coding): Set coding->id before calling
+       this->detector.
+
 2012-10-13  Andreas Schwab  <address@hidden>
 
        * fileio.c: Formatting fixes.

=== modified file 'src/coding.c'
--- a/src/coding.c      2012-10-01 06:36:54 +0000
+++ b/src/coding.c      2012-10-13 12:58:52 +0000
@@ -6301,6 +6301,9 @@
                {
                  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.  */