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/font.c | |
| parent | 67343d1d9fef95c242a6d050187bb036e4bb82eb (diff) | |
| download | emacs-3e1fc7fbd10bdf5fc2d4e0c6fdb21c583d445602.tar.gz | |
* 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/font.c')
| -rw-r--r-- | src/font.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/font.c b/src/font.c index 6113e1c3e71..9e472fb3e3b 100644 --- a/src/font.c +++ b/src/font.c @@ -279,10 +279,8 @@ font_intern_prop (const char *str, ptrdiff_t len, bool force_symbol) if (SYMBOLP (tem)) return tem; - if (len == nchars || len != nbytes) - tem = make_unibyte_string (str, len); - else - tem = make_multibyte_string (str, nchars, len); + tem = make_specified_string (str, nchars, len, + len != nchars && len == nbytes); return Fintern (tem, obarray); } |