diff options
| author | Joakim Verona | 2015-01-15 14:54:25 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-15 14:54:25 +0100 |
| commit | 0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d (patch) | |
| tree | 6c7ea25ac137f5764d931e841598a3c1ea434ab0 /src/coding.c | |
| parent | a1124bc117e41019de49c82d13d1a72a50df977d (diff) | |
| parent | 0e97c44c3699c4606a04f589828acdf9c03f447e (diff) | |
| download | emacs-0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d.tar.gz emacs-0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d.zip | |
merge master
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 20c64762160..b11143a32fb 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -10671,7 +10671,7 @@ Any alias or subsidiary coding system is not a base coding system. */) | |||
| 10671 | 10671 | ||
| 10672 | DEFUN ("coding-system-plist", Fcoding_system_plist, Scoding_system_plist, | 10672 | DEFUN ("coding-system-plist", Fcoding_system_plist, Scoding_system_plist, |
| 10673 | 1, 1, 0, | 10673 | 1, 1, 0, |
| 10674 | doc: "Return the property list of CODING-SYSTEM.") | 10674 | doc: /* Return the property list of CODING-SYSTEM. */) |
| 10675 | (Lisp_Object coding_system) | 10675 | (Lisp_Object coding_system) |
| 10676 | { | 10676 | { |
| 10677 | Lisp_Object spec, attrs; | 10677 | Lisp_Object spec, attrs; |