diff options
| author | Jan D <jan.h.d@swipnet.se> | 2015-04-03 12:32:13 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2015-04-03 12:32:13 +0200 |
| commit | 75c8741afba2321add3ad52c5143b4fdb1d63e18 (patch) | |
| tree | 3a125791aba92eb58bee81163a93c3246f275a54 /src/coding.c | |
| parent | 734900695acbe17bc7c52c85133918b8949fd2d3 (diff) | |
| parent | 0b914bada39e4577cd9e9209a15c44cc1f83294d (diff) | |
| download | emacs-75c8741afba2321add3ad52c5143b4fdb1d63e18.tar.gz emacs-75c8741afba2321add3ad52c5143b4fdb1d63e18.tar.bz2 emacs-75c8741afba2321add3ad52c5143b4fdb1d63e18.zip | |
Merge branch 'master' into cairo
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/coding.c b/src/coding.c index 1a0e1279648..4b41355595c 100644 --- a/src/coding.c +++ b/src/coding.c @@ -11281,15 +11281,15 @@ internal character representation. */); Lisp_Object plist[] = { - intern_c_string (":name"), + QCname, args[coding_arg_name] = Qno_conversion, - intern_c_string (":mnemonic"), + QCmnemonic, args[coding_arg_mnemonic] = make_number ('='), intern_c_string (":coding-type"), args[coding_arg_coding_type] = Qraw_text, - intern_c_string (":ascii-compatible-p"), + QCascii_compatible_p, args[coding_arg_ascii_compatible_p] = Qt, - intern_c_string (":default-char"), + QCdefault_char, args[coding_arg_default_char] = make_number (0), intern_c_string (":for-unibyte"), args[coding_arg_for_unibyte] = Qt, |