diff options
| author | K. Handa <handa@gnu.org> | 2015-10-05 22:56:26 +0900 |
|---|---|---|
| committer | K. Handa <handa@gnu.org> | 2015-10-05 22:56:26 +0900 |
| commit | 47e9556c70a7009d7c750fd7bf10a0e6cf41cdce (patch) | |
| tree | 4e944bd68080adee76291dd7d4f34103e2b55d50 /src/coding.c | |
| parent | 52beda922d2cb523a03661bf74b8678c8b45e440 (diff) | |
| parent | ef171d1d0b42758b5f705847d558436e867372f4 (diff) | |
| download | emacs-47e9556c70a7009d7c750fd7bf10a0e6cf41cdce.tar.gz | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/coding.c b/src/coding.c index 3fc6fb684c6..c5099a7b0b9 100644 --- a/src/coding.c +++ b/src/coding.c @@ -6004,6 +6004,8 @@ coding_inherit_eol_type (Lisp_Object coding_system, Lisp_Object parent) if (NILP (coding_system)) coding_system = Qraw_text; + else + CHECK_CODING_SYSTEM (coding_system); spec = CODING_SYSTEM_SPEC (coding_system); eol_type = AREF (spec, 2); if (VECTORP (eol_type)) @@ -6014,6 +6016,7 @@ coding_inherit_eol_type (Lisp_Object coding_system, Lisp_Object parent) { Lisp_Object parent_spec; + CHECK_CODING_SYSTEM (parent); parent_spec = CODING_SYSTEM_SPEC (parent); parent_eol_type = AREF (parent_spec, 2); if (VECTORP (parent_eol_type)) |