Mercurial > emacs
comparison src/w32fns.c @ 90970:3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 29 Jun 2007 03:37:33 +0000 |
| parents | 2f257010ddd5 |
| children | a66921565bcb |
comparison
equal
deleted
inserted
replaced
| 90969:0848217e8e8a | 90970:3371fc48749b |
|---|---|
| 384 HWND wdesc; | 384 HWND wdesc; |
| 385 { | 385 { |
| 386 Lisp_Object tail, frame; | 386 Lisp_Object tail, frame; |
| 387 struct frame *f; | 387 struct frame *f; |
| 388 | 388 |
| 389 for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail)) | 389 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
| 390 { | 390 { |
| 391 frame = XCAR (tail); | 391 frame = XCAR (tail); |
| 392 if (!GC_FRAMEP (frame)) | 392 if (!FRAMEP (frame)) |
| 393 continue; | 393 continue; |
| 394 f = XFRAME (frame); | 394 f = XFRAME (frame); |
| 395 if (!FRAME_W32_P (f) || FRAME_W32_DISPLAY_INFO (f) != dpyinfo) | 395 if (!FRAME_W32_P (f) || FRAME_W32_DISPLAY_INFO (f) != dpyinfo) |
| 396 continue; | 396 continue; |
| 397 if (f->output_data.w32->hourglass_window == wdesc) | 397 if (f->output_data.w32->hourglass_window == wdesc) |
| 2464 register_hot_keys (hwnd) | 2464 register_hot_keys (hwnd) |
| 2465 HWND hwnd; | 2465 HWND hwnd; |
| 2466 { | 2466 { |
| 2467 Lisp_Object keylist; | 2467 Lisp_Object keylist; |
| 2468 | 2468 |
| 2469 /* Use GC_CONSP, since we are called asynchronously. */ | 2469 /* Use CONSP, since we are called asynchronously. */ |
| 2470 for (keylist = w32_grabbed_keys; GC_CONSP (keylist); keylist = XCDR (keylist)) | 2470 for (keylist = w32_grabbed_keys; CONSP (keylist); keylist = XCDR (keylist)) |
| 2471 { | 2471 { |
| 2472 Lisp_Object key = XCAR (keylist); | 2472 Lisp_Object key = XCAR (keylist); |
| 2473 | 2473 |
| 2474 /* Deleted entries get set to nil. */ | 2474 /* Deleted entries get set to nil. */ |
| 2475 if (!INTEGERP (key)) | 2475 if (!INTEGERP (key)) |
| 2484 unregister_hot_keys (hwnd) | 2484 unregister_hot_keys (hwnd) |
| 2485 HWND hwnd; | 2485 HWND hwnd; |
| 2486 { | 2486 { |
| 2487 Lisp_Object keylist; | 2487 Lisp_Object keylist; |
| 2488 | 2488 |
| 2489 /* Use GC_CONSP, since we are called asynchronously. */ | 2489 for (keylist = w32_grabbed_keys; CONSP (keylist); keylist = XCDR (keylist)) |
| 2490 for (keylist = w32_grabbed_keys; GC_CONSP (keylist); keylist = XCDR (keylist)) | |
| 2491 { | 2490 { |
| 2492 Lisp_Object key = XCAR (keylist); | 2491 Lisp_Object key = XCAR (keylist); |
| 2493 | 2492 |
| 2494 if (!INTEGERP (key)) | 2493 if (!INTEGERP (key)) |
| 2495 continue; | 2494 continue; |