diff options
| author | Paul Eggert | 2012-01-09 09:36:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-01-09 09:36:10 -0800 |
| commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
| tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /src/xselect.c | |
| parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
| parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) | |
| download | emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.gz emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.zip | |
Merge from trunk.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xselect.c b/src/xselect.c index 099b1670e4d..f7b65809443 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* X Selection processing for Emacs. | 1 | /* X Selection processing for Emacs. |
| 2 | Copyright (C) 1993-1997, 2000-2011 Free Software Foundation, Inc. | 2 | Copyright (C) 1993-1997, 2000-2012 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -756,7 +756,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 756 | /* The window we're communicating with may have been deleted | 756 | /* The window we're communicating with may have been deleted |
| 757 | in the meantime (that's a real situation from a bug report). | 757 | in the meantime (that's a real situation from a bug report). |
| 758 | In this case, there may be events in the event queue still | 758 | In this case, there may be events in the event queue still |
| 759 | refering to the deleted window, and we'll get a BadWindow error | 759 | referring to the deleted window, and we'll get a BadWindow error |
| 760 | in XTread_socket when processing the events. I don't have | 760 | in XTread_socket when processing the events. I don't have |
| 761 | an idea how to fix that. gerd, 2001-01-98. */ | 761 | an idea how to fix that. gerd, 2001-01-98. */ |
| 762 | /* 2004-09-10: XSync and UNBLOCK so that possible protocol errors are | 762 | /* 2004-09-10: XSync and UNBLOCK so that possible protocol errors are |