diff options
| author | Paul Eggert | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/xselect.c | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/xselect.c b/src/xselect.c index cca4117cb37..da562609b9c 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -2714,5 +2714,3 @@ A value of 0 means wait as long as necessary. This is initialized from the | |||
| 2714 | staticpro (&Qforeign_selection); | 2714 | staticpro (&Qforeign_selection); |
| 2715 | } | 2715 | } |
| 2716 | 2716 | ||
| 2717 | /* arch-tag: 7c293b0f-9918-4f69-8ac7-03e142307236 | ||
| 2718 | (do not change this comment) */ | ||