Mercurial > emacs
comparison src/xselect.c @ 83632:cc587bfd19ca
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
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 11 Jun 2007 01:00:07 +0000 |
parents | 7d63b897231b b65a4afd46bd |
children | 65663fcd2caa |
comparison
equal
deleted
inserted
replaced
83631:7d63b897231b | 83632:cc587bfd19ca |
---|---|
2710 | 2710 |
2711 if (!had_errors) | 2711 if (!had_errors) |
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 |
2719 return ret; | 2719 return ret; |
2720 } | 2720 } |