From: Juanma Barranquero Date: Fri, 8 Jun 2007 20:06:31 +0000 (+0000) Subject: (x_term_init): Use empty_unibyte_string. X-Git-Tag: emacs-pretest-23.0.90~12392 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e78bf986eb6dbabe55981757e77af35865859319;p=emacs.git (x_term_init): Use empty_unibyte_string. --- diff --git a/src/xterm.c b/src/xterm.c index bc4fd366796..154465b7758 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8357,7 +8357,7 @@ wm_supports (f, atomname) prop_atom, 0, max_len, False, target_type, &actual_type, &actual_format, &actual_size, &bytes_remaining, &tmp_data); - + if (rc != Success || actual_type != XA_WINDOW || x_had_errors_p (dpy)) { if (tmp_data) XFree (tmp_data); @@ -8412,7 +8412,7 @@ wm_supports (f, atomname) rc = 0; want_atom = XInternAtom (dpy, atomname, False); - for (i = 0; rc == 0 && i < dpyinfo->nr_net_supported_atoms; ++i) + for (i = 0; rc == 0 && i < dpyinfo->nr_net_supported_atoms; ++i) rc = dpyinfo->net_supported_atoms[i] == want_atom; x_uncatch_errors (); @@ -10649,7 +10649,7 @@ x_term_init (display_name, xrm_option, resource_name) UNBLOCK_INPUT; dpyinfo->kboard->Vsystem_key_alist = call1 (Qvendor_specific_keysyms, - build_string (vendor ? vendor : "")); + vendor ? build_string (vendor) : empty_unibyte_string); BLOCK_INPUT; }