diff options
| author | Joakim Verona | 2011-06-23 01:28:30 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-06-23 01:28:30 +0200 |
| commit | c5082a753011dacef505e91f1fc30a84fa75a2eb (patch) | |
| tree | 2c995eff276b6e9e68f54b4ebe76bf012231c86d /src/xselect.c | |
| parent | 787c27e81f046cfa1c457ed405551f8ca0ddb0e8 (diff) | |
| parent | 297dde5a97c0c5c8020db72213c7f84067f1ee21 (diff) | |
| download | emacs-c5082a753011dacef505e91f1fc30a84fa75a2eb.tar.gz emacs-c5082a753011dacef505e91f1fc30a84fa75a2eb.zip | |
merge upstream
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xselect.c b/src/xselect.c index 5b01fc22a42..7f4e0b40f62 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -2361,7 +2361,7 @@ If the value is 0 or the atom is not known, return the empty string. */) | |||
| 2361 | x_uncatch_errors (); | 2361 | x_uncatch_errors (); |
| 2362 | 2362 | ||
| 2363 | if (!had_errors) | 2363 | if (!had_errors) |
| 2364 | ret = make_string (name, strlen (name)); | 2364 | ret = build_string (name); |
| 2365 | 2365 | ||
| 2366 | if (atom && name) XFree (name); | 2366 | if (atom && name) XFree (name); |
| 2367 | if (NILP (ret)) ret = empty_unibyte_string; | 2367 | if (NILP (ret)) ret = empty_unibyte_string; |