diff options
| author | Paul Eggert | 2011-01-19 15:58:00 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-19 15:58:00 -0800 |
| commit | 38ec24bf555387224ba36a7ead82d6e4d89018ed (patch) | |
| tree | ed9a1478d3050f006639ba2bb329d7ff69e43b49 /src/xselect.c | |
| parent | 0813c96eb2f6af9d6a392243b0d669d38467f23c (diff) | |
| parent | e1ef0dac0866570df62f96fb004de896f6e82397 (diff) | |
| download | emacs-38ec24bf555387224ba36a7ead82d6e4d89018ed.tar.gz emacs-38ec24bf555387224ba36a7ead82d6e4d89018ed.zip | |
Merge from mainline.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/xselect.c b/src/xselect.c index aec216db13e..0f57677a302 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -127,20 +127,6 @@ static Lisp_Object Qforeign_selection; | |||
| 127 | /* Defined in keyboard.c. */ | 127 | /* Defined in keyboard.c. */ |
| 128 | extern unsigned long last_event_timestamp; | 128 | extern unsigned long last_event_timestamp; |
| 129 | 129 | ||
| 130 | /* This is an association list whose elements are of the form | ||
| 131 | ( SELECTION-NAME SELECTION-VALUE SELECTION-TIMESTAMP FRAME) | ||
| 132 | SELECTION-NAME is a lisp symbol, whose name is the name of an X Atom. | ||
| 133 | SELECTION-VALUE is the value that emacs owns for that selection. | ||
| 134 | It may be any kind of Lisp object. | ||
| 135 | SELECTION-TIMESTAMP is the time at which emacs began owning this selection, | ||
| 136 | as a cons of two 16-bit numbers (making a 32 bit time.) | ||
| 137 | FRAME is the frame for which we made the selection. | ||
| 138 | If there is an entry in this alist, then it can be assumed that Emacs owns | ||
| 139 | that selection. | ||
| 140 | The only (eq) parts of this list that are visible from Lisp are the | ||
| 141 | selection-values. */ | ||
| 142 | static Lisp_Object Vselection_alist; | ||
| 143 | |||
| 144 | 130 | ||
| 145 | 131 | ||
| 146 | /* Define a queue to save up SELECTION_REQUEST_EVENT events for later | 132 | /* Define a queue to save up SELECTION_REQUEST_EVENT events for later |
| @@ -2700,4 +2686,3 @@ A value of 0 means wait as long as necessary. This is initialized from the | |||
| 2700 | Qforeign_selection = intern_c_string ("foreign-selection"); | 2686 | Qforeign_selection = intern_c_string ("foreign-selection"); |
| 2701 | staticpro (&Qforeign_selection); | 2687 | staticpro (&Qforeign_selection); |
| 2702 | } | 2688 | } |
| 2703 | |||