diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-07-12 07:45:46 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-07-12 07:45:46 +0400 |
| commit | 4a7edc24ba4da27f44151df4e4541c86c35d3037 (patch) | |
| tree | 12ec51444ac8e10c3e62f59d1db1da32c3eef3e0 | |
| parent | 42bd17194ca4b88032fb8b74aaf33b94b4353703 (diff) | |
Use empty_unibyte_string where applicable.
* keyboard.c (parse_tool_bar_item): Use empty_unibyte_string.
* lread.c (read1): Likewise.
* xsettings.c (syms_of_xsettings): Likewise.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/keyboard.c | 2 | ||||
| -rw-r--r-- | src/lread.c | 4 | ||||
| -rw-r--r-- | src/xsettings.c | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 52e9364f6e..7b6eaa3820 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2012-07-12 Dmitry Antipov <dmantipov@yandex.ru> + + Use empty_unibyte_string where applicable. + * keyboard.c (parse_tool_bar_item): Use empty_unibyte_string. + * lread.c (read1): Likewise. + * xsettings.c (syms_of_xsettings): Likewise. + 2012-07-12 Glenn Morris <rgm@gnu.org> * s/cygwin.h (G_SLICE_ALWAYS_MALLOC): diff --git a/src/keyboard.c b/src/keyboard.c index 1ef4ac84d0..963f40a2e3 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -8331,7 +8331,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item) if (SCHARS (new_lbl) <= tool_bar_max_label_size) PROP (TOOL_BAR_ITEM_LABEL) = new_lbl; else - PROP (TOOL_BAR_ITEM_LABEL) = make_string ("", 0); + PROP (TOOL_BAR_ITEM_LABEL) = empty_unibyte_string; xfree (buf); } diff --git a/src/lread.c b/src/lread.c index d8a0275bee..39378bb11d 100644 --- a/src/lread.c +++ b/src/lread.c @@ -2670,13 +2670,13 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) /* No symbol character follows, this is the empty symbol. */ UNREAD (c); - return Fmake_symbol (build_string ("")); + return Fmake_symbol (empty_unibyte_string); } goto read_symbol; } /* ## is the empty symbol. */ if (c == '#') - return Fintern (build_string (""), Qnil); + return Fintern (empty_unibyte_string, Qnil); /* Reader forms that can reuse previously read objects. */ if (c >= '0' && c <= '9') { diff --git a/src/xsettings.c b/src/xsettings.c index 6f7b81cbe8..a28d75d942 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -1035,7 +1035,7 @@ If this variable is nil, Emacs ignores system font changes. */); DEFVAR_LISP ("xft-settings", Vxft_settings, doc: /* Font settings applied to Xft. */); - Vxft_settings = make_string ("", 0); + Vxft_settings = empty_unibyte_string; #ifdef HAVE_XFT Fprovide (intern_c_string ("font-render-setting"), Qnil); |