aboutsummaryrefslogtreecommitdiffstats
path: root/src/xselect.c
diff options
context:
space:
mode:
authorMiles Bader2007-06-11 01:00:07 +0000
committerMiles Bader2007-06-11 01:00:07 +0000
commit67f3ad67ee317226cb5d1bb139de0cfd883fdc5e (patch)
tree58a0e1bea7a1d8728fd32e6127a44434e7eac006 /src/xselect.c
parentd17cf4eb2024cf54e4a216312184665094ee3df4 (diff)
parent2d715b39ea1c89066f469405d065dd1a6631d28e (diff)
downloademacs-67f3ad67ee317226cb5d1bb139de0cfd883fdc5e.tar.gz
emacs-67f3ad67ee317226cb5d1bb139de0cfd883fdc5e.zip
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
Diffstat (limited to 'src/xselect.c')
-rw-r--r--src/xselect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xselect.c b/src/xselect.c
index 5ce6763cd30..e491e5b661e 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2712,7 +2712,7 @@ If the value is 0 or the atom is not known, return the empty string. */)
2712 ret = make_string (name, strlen (name)); 2712 ret = make_string (name, strlen (name));
2713 2713
2714 if (atom && name) XFree (name); 2714 if (atom && name) XFree (name);
2715 if (NILP (ret)) ret = make_string ("", 0); 2715 if (NILP (ret)) ret = empty_unibyte_string;
2716 2716
2717 UNBLOCK_INPUT; 2717 UNBLOCK_INPUT;
2718 2718