aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
authorJoakim Verona2015-01-22 08:27:13 +0100
committerJoakim Verona2015-01-22 08:27:13 +0100
commit5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315 (patch)
treec9e3511c8164d2154c91820e0d90521762dc7bdf /src/coding.c
parentd6ada5ae0fad7a5c85eb28b102bc460e9fe0aceb (diff)
parent7f4e7dd378c456b498c270b47b46aaae365a72ab (diff)
downloademacs-5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315.tar.gz
emacs-5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315.zip
merge master
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c
index b95c0a5f825..43ebbe06856 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -11273,7 +11273,7 @@ internal character representation. */);
11273 11273
11274 { 11274 {
11275 Lisp_Object args[coding_arg_undecided_max]; 11275 Lisp_Object args[coding_arg_undecided_max];
11276 memsetnil (args, ARRAYELTS (args)); 11276 memclear (args, sizeof 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");