diff options
| author | Kenichi Handa | 2012-10-13 21:58:52 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-10-13 21:58:52 +0900 |
| commit | 0ba06a77fd4ccf92f1106b8ab7d8d64d6d812a1d (patch) | |
| tree | 182e4f1a5eaddbbc5ed921fc4feda85a07e88151 | |
| parent | 06485aa8215af39f9f5f999933aa39d349a2bdf9 (diff) | |
| download | emacs-0ba06a77fd4ccf92f1106b8ab7d8d64d6d812a1d.tar.gz emacs-0ba06a77fd4ccf92f1106b8ab7d8d64d6d812a1d.zip | |
coding.c (detect_coding): Set coding->id before calling this->detector.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/coding.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d753221b996..3787e006c4f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-10-13 HANATAKA, Shinya <bogytech@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * coding.c (detect_coding): Set coding->id before calling | ||
| 4 | this->detector. | ||
| 5 | |||
| 1 | 2012-10-12 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2012-10-12 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * doc.c (get_doc_string): Don't signal an error if the file is missing. | 8 | * doc.c (get_doc_string): Don't signal an error if the file is missing. |
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) | |||
| 6301 | { | 6301 | { |
| 6302 | category = coding_priorities[i]; | 6302 | category = coding_priorities[i]; |
| 6303 | this = coding_categories + category; | 6303 | this = coding_categories + category; |
| 6304 | /* Some of this->detector (e.g. detect_coding_sjis) | ||
| 6305 | require this information. */ | ||
| 6306 | coding->id = this->id; | ||
| 6304 | if (this->id < 0) | 6307 | if (this->id < 0) |
| 6305 | { | 6308 | { |
| 6306 | /* No coding system of this category is defined. */ | 6309 | /* No coding system of this category is defined. */ |