Merge from emacs--devo--0

[gnu-emacs] / src / xselect.c

diff --git a/src/xselect.c b/src/xselect.c
index 5ce6763cd30f467f526b2b1005e69dba4cb99e2f..7e77df0d6c3aaeb6429a896965f56d583c35c454 100644 (file)
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -2712,7 +2712,7 @@ If the value is 0 or the atom is not known, return the empty string.  */)
     ret = make_string (name, strlen (name));
 
   if (atom && name) XFree (name);
-  if (NILP (ret)) ret = make_string ("", 0);
+  if (NILP (ret)) ret = empty_unibyte_string;
 
   UNBLOCK_INPUT;