diff options
| author | Alan Mackenzie | 2017-02-12 10:59:03 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2017-02-12 10:59:03 +0000 |
| commit | f4d5b687150810129b7a1d5b006e31ccf82b691b (patch) | |
| tree | 4229b13800349032697daae3904dc3773e6b7a80 /src/xselect.c | |
| parent | d5514332d4a6092673ce1f78fadcae0c57f7be64 (diff) | |
| parent | 148100d98319499f0ac6f57b8be08cbd14884a5c (diff) | |
| download | emacs-f4d5b687150810129b7a1d5b006e31ccf82b691b.tar.gz emacs-f4d5b687150810129b7a1d5b006e31ccf82b691b.zip | |
Merge branch 'master' into comment-cachecomment-cache
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 47ccf6886bf..2249828fb4e 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -329,7 +329,7 @@ x_own_selection (Lisp_Object selection_name, Lisp_Object selection_value, | |||
| 329 | Fcons (selection_data, dpyinfo->terminal->Vselection_alist)); | 329 | Fcons (selection_data, dpyinfo->terminal->Vselection_alist)); |
| 330 | 330 | ||
| 331 | /* If we already owned the selection, remove the old selection | 331 | /* If we already owned the selection, remove the old selection |
| 332 | data. Don't use Fdelq as that may QUIT. */ | 332 | data. Don't use Fdelq as that may quit. */ |
| 333 | if (!NILP (prev_value)) | 333 | if (!NILP (prev_value)) |
| 334 | { | 334 | { |
| 335 | /* We know it's not the CAR, so it's easy. */ | 335 | /* We know it's not the CAR, so it's easy. */ |
| @@ -929,7 +929,7 @@ x_handle_selection_clear (struct selection_input_event *event) | |||
| 929 | && local_selection_time > changed_owner_time) | 929 | && local_selection_time > changed_owner_time) |
| 930 | return; | 930 | return; |
| 931 | 931 | ||
| 932 | /* Otherwise, really clear. Don't use Fdelq as that may QUIT;. */ | 932 | /* Otherwise, really clear. Don't use Fdelq as that may quit. */ |
| 933 | Vselection_alist = dpyinfo->terminal->Vselection_alist; | 933 | Vselection_alist = dpyinfo->terminal->Vselection_alist; |
| 934 | if (EQ (local_selection_data, CAR (Vselection_alist))) | 934 | if (EQ (local_selection_data, CAR (Vselection_alist))) |
| 935 | Vselection_alist = XCDR (Vselection_alist); | 935 | Vselection_alist = XCDR (Vselection_alist); |