diff options
| author | Joakim Verona | 2015-01-21 00:26:56 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-21 00:26:56 +0100 |
| commit | 8628a48fec7fcd8bdbbf6ce5808fc574631d1541 (patch) | |
| tree | 3dfc3b71850123e7514ddb149a0ba768618cfddf /src/coding.c | |
| parent | ffd9ee1d6412a6e61383930562e6167a458f0d5f (diff) | |
| parent | 0dd19ac82662c5710e73852f438fd55e1d9225b7 (diff) | |
| download | emacs-8628a48fec7fcd8bdbbf6ce5808fc574631d1541.tar.gz emacs-8628a48fec7fcd8bdbbf6ce5808fc574631d1541.zip | |
Merge branch 'master' into xwidget
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c index 77cea77cef5..b95c0a5f825 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -11272,8 +11272,8 @@ internal character representation. */); | |||
| 11272 | Vtranslation_table_for_input = Qnil; | 11272 | Vtranslation_table_for_input = Qnil; |
| 11273 | 11273 | ||
| 11274 | { | 11274 | { |
| 11275 | verify (NIL_IS_ZERO); | 11275 | Lisp_Object args[coding_arg_undecided_max]; |
| 11276 | Lisp_Object args[coding_arg_undecided_max] = { LISP_INITIALLY_ZERO, }; | 11276 | memsetnil (args, ARRAYELTS (args)); |
| 11277 | 11277 | ||
| 11278 | Lisp_Object plist[16]; | 11278 | Lisp_Object plist[16]; |
| 11279 | plist[0] = intern_c_string (":name"); | 11279 | plist[0] = intern_c_string (":name"); |