diff options
| author | Kenichi Handa | 2009-02-19 02:43:38 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2009-02-19 02:43:38 +0000 |
| commit | 73cce38dbc5538677306b542aa8e037dfc5e16ee (patch) | |
| tree | bac0d19fb61b379877b15470c2eba6f4c21b0ed5 /src | |
| parent | 1e3d93868651e1b0233df524027589a8fb34c528 (diff) | |
| download | emacs-73cce38dbc5538677306b542aa8e037dfc5e16ee.tar.gz emacs-73cce38dbc5538677306b542aa8e037dfc5e16ee.zip | |
(detect_coding): Preserve coding->mode.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/coding.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b9708132984..53a03e984d7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-02-19 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * coding.c (detect_coding): Preserve coding->mode. | ||
| 4 | |||
| 1 | 2009-02-18 Dan Nicolaescu <dann@ics.uci.edu> | 5 | 2009-02-18 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 6 | ||
| 3 | * m/ibmrs6000.h (ADDR_CORRECT): Restore, removed by mistake on 2008-07-23. | 7 | * m/ibmrs6000.h (ADDR_CORRECT): Restore, removed by mistake on 2008-07-23. |
diff --git a/src/coding.c b/src/coding.c index fff4d01d890..ec57467f023 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -5955,6 +5955,7 @@ detect_coding (coding) | |||
| 5955 | struct coding_system *coding; | 5955 | struct coding_system *coding; |
| 5956 | { | 5956 | { |
| 5957 | const unsigned char *src, *src_end; | 5957 | const unsigned char *src, *src_end; |
| 5958 | int saved_mode = coding->mode; | ||
| 5958 | 5959 | ||
| 5959 | coding->consumed = coding->consumed_char = 0; | 5960 | coding->consumed = coding->consumed_char = 0; |
| 5960 | coding->produced = coding->produced_char = 0; | 5961 | coding->produced = coding->produced_char = 0; |
| @@ -6125,6 +6126,7 @@ detect_coding (coding) | |||
| 6125 | setup_coding_system (XCDR (coding_systems), coding); | 6126 | setup_coding_system (XCDR (coding_systems), coding); |
| 6126 | } | 6127 | } |
| 6127 | } | 6128 | } |
| 6129 | coding->mode = saved_mode; | ||
| 6128 | } | 6130 | } |
| 6129 | 6131 | ||
| 6130 | 6132 | ||