Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 781-792)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 33-41)
 * gnus--rel--5.10  (patch 226-228)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21

1 files changed, 3 insertions, 3 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 6fcaa3d1294..9f392710270 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8397,7 +8397,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);
@@ -8452,7 +8452,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 ();
@@ -10699,7 +10699,7 @@ x_term_init (display_name, xrm_option, resource_name)
             UNBLOCK_INPUT;
             terminal->kboard->Vsystem_key_alist
               = call1 (Qvendor_specific_keysyms,
-                       build_string (vendor ? vendor : ""));
+                       vendor ? build_string (vendor) : empty_unibyte_string);
             BLOCK_INPUT;
           }