diff options
| author | Dmitry Antipov | 2016-06-30 08:37:46 +0300 |
|---|---|---|
| committer | Dmitry Antipov | 2016-06-30 08:37:46 +0300 |
| commit | 4bd3503991e501690b30c3415d4641efb6e1de3a (patch) | |
| tree | 07be08f92ed57419d6179cf7de3e97b74cee2dbe /src | |
| parent | 681d3f1f582d9b549f41ef1eacff42abb98f878d (diff) | |
| download | emacs-4bd3503991e501690b30c3415d4641efb6e1de3a.tar.gz emacs-4bd3503991e501690b30c3415d4641efb6e1de3a.zip | |
Cleanup around mature character manipulation functions
* lisp/international/mule-diag.el (decode-codepage-char): Remove.
* lisp/ldefs-boot.el (toplevel): Adjust accordingly.
* lisp/subr.el (toplevel): Do not advertise calling conventions
for 'decode-char' and 'encode-char'.
* src/charset.c (Fdecode_char, Fencode_char): Remove unused 3rd arg.
Diffstat (limited to 'src')
| -rw-r--r-- | src/charset.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/charset.c b/src/charset.c index 688205245a9..95a9c577d52 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -1839,12 +1839,12 @@ encode_char (struct charset *charset, int c) | |||
| 1839 | } | 1839 | } |
| 1840 | 1840 | ||
| 1841 | 1841 | ||
| 1842 | DEFUN ("decode-char", Fdecode_char, Sdecode_char, 2, 3, 0, | 1842 | DEFUN ("decode-char", Fdecode_char, Sdecode_char, 2, 2, 0, |
| 1843 | doc: /* Decode the pair of CHARSET and CODE-POINT into a character. | 1843 | doc: /* Decode the pair of CHARSET and CODE-POINT into a character. |
| 1844 | Return nil if CODE-POINT is not valid in CHARSET. | 1844 | Return nil if CODE-POINT is not valid in CHARSET. |
| 1845 | 1845 | ||
| 1846 | CODE-POINT may be a cons (HIGHER-16-BIT-VALUE . LOWER-16-BIT-VALUE). */) | 1846 | CODE-POINT may be a cons (HIGHER-16-BIT-VALUE . LOWER-16-BIT-VALUE). */) |
| 1847 | (Lisp_Object charset, Lisp_Object code_point, Lisp_Object restriction) | 1847 | (Lisp_Object charset, Lisp_Object code_point) |
| 1848 | { | 1848 | { |
| 1849 | int c, id; | 1849 | int c, id; |
| 1850 | unsigned code; | 1850 | unsigned code; |
| @@ -1858,10 +1858,10 @@ CODE-POINT may be a cons (HIGHER-16-BIT-VALUE . LOWER-16-BIT-VALUE). */) | |||
| 1858 | } | 1858 | } |
| 1859 | 1859 | ||
| 1860 | 1860 | ||
| 1861 | DEFUN ("encode-char", Fencode_char, Sencode_char, 2, 3, 0, | 1861 | DEFUN ("encode-char", Fencode_char, Sencode_char, 2, 2, 0, |
| 1862 | doc: /* Encode the character CH into a code-point of CHARSET. | 1862 | doc: /* Encode the character CH into a code-point of CHARSET. |
| 1863 | Return nil if CHARSET doesn't include CH. */) | 1863 | Return nil if CHARSET doesn't include CH. */) |
| 1864 | (Lisp_Object ch, Lisp_Object charset, Lisp_Object restriction) | 1864 | (Lisp_Object ch, Lisp_Object charset) |
| 1865 | { | 1865 | { |
| 1866 | int c, id; | 1866 | int c, id; |
| 1867 | unsigned code; | 1867 | unsigned code; |