diff options
| author | Glenn Morris | 2013-02-12 20:31:09 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-02-12 20:31:09 -0800 |
| commit | 01fcc3a532872b29784a4d888ab9cc1aef0eed01 (patch) | |
| tree | e1fba1dfe3ec5b61ddc3e5e3824e4536b2c39429 /src/coding.c | |
| parent | d0009c7351874e853c63ce67cea6103f33afa60b (diff) | |
| parent | 1a359750bbac95fd6bf8fe1233e747a1d26f0082 (diff) | |
| download | emacs-01fcc3a532872b29784a4d888ab9cc1aef0eed01.tar.gz emacs-01fcc3a532872b29784a4d888ab9cc1aef0eed01.zip | |
Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index b881f162ab9..868fb7df0ea 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -10712,7 +10712,7 @@ reading if you suppress escape sequence detection. | |||
| 10712 | 10712 | ||
| 10713 | The other way to read escape sequences in a file without decoding is | 10713 | The other way to read escape sequences in a file without decoding is |
| 10714 | to explicitly specify some coding system that doesn't use ISO-2022 | 10714 | to explicitly specify some coding system that doesn't use ISO-2022 |
| 10715 | escape sequence (e.g `latin-1') on reading by \\[universal-coding-system-argument]. */); | 10715 | escape sequence (e.g., `latin-1') on reading by \\[universal-coding-system-argument]. */); |
| 10716 | inhibit_iso_escape_detection = 0; | 10716 | inhibit_iso_escape_detection = 0; |
| 10717 | 10717 | ||
| 10718 | DEFVAR_BOOL ("inhibit-null-byte-detection", | 10718 | DEFVAR_BOOL ("inhibit-null-byte-detection", |