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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 52e9364f6ea0610918aa62e32317b708601707a7..7b6eaa3820ae6d30f4b292f3140c6fe8efcf7a21 100644 (file)
--- 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 1ef4ac84d0ccc4785c2f7f2578ed478c4f787443..963f40a2e32a471ae7309d84bdcff7bf35ff5916 100644 (file)
--- 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 d8a0275bee7ca7c56e115ddf5e1523c10056c5b8..39378bb11dd40144f821c695b9eb942346740559 100644 (file)
--- 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 6f7b81cbe872931afc168051958e303257c7d6e6..a28d75d9422b8759442fee46f08ff0ae3cf158b5 100644 (file)
--- 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);