diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-06-17 17:41:14 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-06-17 17:41:14 +0400 |
| commit | 3e1fc7fbd10bdf5fc2d4e0c6fdb21c583d445602 (patch) | |
| tree | 7da5181d758e7bd8b719105d6725a8edb1c4c265 /src/ccl.c | |
| parent | 67343d1d9fef95c242a6d050187bb036e4bb82eb (diff) | |
| download | emacs-3e1fc7fbd10bdf5fc2d4e0c6fdb21c583d445602.tar.gz emacs-3e1fc7fbd10bdf5fc2d4e0c6fdb21c583d445602.tar.bz2 emacs-3e1fc7fbd10bdf5fc2d4e0c6fdb21c583d445602.zip | |
* lisp.h (STRING_COPYIN): Remove; unused.
* ccl.c (Fccl_execute_on_string):
* font.c (fon_intern_prop): Use make_specified_string.
Diffstat (limited to 'src/ccl.c')
| -rw-r--r-- | src/ccl.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/ccl.c b/src/ccl.c index 187f6027018..54093bf5677 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -2160,11 +2160,8 @@ usage: (ccl-execute-on-string CCL-PROGRAM STATUS STRING &optional CONTINUE UNIBY ASET (status, i, make_number (ccl.reg[i])); ASET (status, 8, make_number (ccl.ic)); - if (NILP (unibyte_p)) - val = make_multibyte_string ((char *) outbuf, produced_chars, - outp - outbuf); - else - val = make_unibyte_string ((char *) outbuf, produced_chars); + val = make_specified_string ((const char *) outbuf, produced_chars, + outp - outbuf, NILP (unibyte_p)); xfree (outbuf); return val; |