diff options
| author | Joakim Verona | 2012-09-10 16:03:53 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-09-10 16:03:53 +0200 |
| commit | b035a30e5cd2f34fedc04c253eeb5a11afed8145 (patch) | |
| tree | b9350cce389602f4967bdc1beed745929155ad5d /src/xselect.c | |
| parent | 4a37733c693d59a9b83a3fb2d0c7f9461d149f60 (diff) | |
| parent | a31a4cdacb196cc96dcb9bd229edb1d635e01344 (diff) | |
| download | emacs-b035a30e5cd2f34fedc04c253eeb5a11afed8145.tar.gz emacs-b035a30e5cd2f34fedc04c253eeb5a11afed8145.zip | |
upstream
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xselect.c b/src/xselect.c index 463bd6e37b0..5a3b7452c6d 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -193,7 +193,7 @@ static void | |||
| 193 | x_start_queuing_selection_requests (void) | 193 | x_start_queuing_selection_requests (void) |
| 194 | { | 194 | { |
| 195 | if (x_queue_selection_requests) | 195 | if (x_queue_selection_requests) |
| 196 | abort (); | 196 | emacs_abort (); |
| 197 | 197 | ||
| 198 | x_queue_selection_requests++; | 198 | x_queue_selection_requests++; |
| 199 | TRACE1 ("x_start_queuing_selection_requests %d", x_queue_selection_requests); | 199 | TRACE1 ("x_start_queuing_selection_requests %d", x_queue_selection_requests); |
| @@ -245,7 +245,7 @@ symbol_to_x_atom (struct x_display_info *dpyinfo, Lisp_Object sym) | |||
| 245 | if (EQ (sym, QEMACS_TMP)) return dpyinfo->Xatom_EMACS_TMP; | 245 | if (EQ (sym, QEMACS_TMP)) return dpyinfo->Xatom_EMACS_TMP; |
| 246 | if (EQ (sym, QTARGETS)) return dpyinfo->Xatom_TARGETS; | 246 | if (EQ (sym, QTARGETS)) return dpyinfo->Xatom_TARGETS; |
| 247 | if (EQ (sym, QNULL)) return dpyinfo->Xatom_NULL; | 247 | if (EQ (sym, QNULL)) return dpyinfo->Xatom_NULL; |
| 248 | if (!SYMBOLP (sym)) abort (); | 248 | if (!SYMBOLP (sym)) emacs_abort (); |
| 249 | 249 | ||
| 250 | TRACE1 (" XInternAtom %s", SSDATA (SYMBOL_NAME (sym))); | 250 | TRACE1 (" XInternAtom %s", SSDATA (SYMBOL_NAME (sym))); |
| 251 | BLOCK_INPUT; | 251 | BLOCK_INPUT; |
| @@ -1138,7 +1138,7 @@ wait_for_property_change (struct prop_location *location) | |||
| 1138 | ptrdiff_t count = SPECPDL_INDEX (); | 1138 | ptrdiff_t count = SPECPDL_INDEX (); |
| 1139 | 1139 | ||
| 1140 | if (property_change_reply_object) | 1140 | if (property_change_reply_object) |
| 1141 | abort (); | 1141 | emacs_abort (); |
| 1142 | 1142 | ||
| 1143 | /* Make sure to do unexpect_property_change if we quit or err. */ | 1143 | /* Make sure to do unexpect_property_change if we quit or err. */ |
| 1144 | record_unwind_protect (wait_for_property_change_unwind, | 1144 | record_unwind_protect (wait_for_property_change_unwind, |