Mercurial > emacs
comparison src/dispnew.c @ 40656:cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
author | Pavel Janík <Pavel@Janik.cz> |
---|---|
date | Fri, 02 Nov 2001 20:46:55 +0000 |
parents | d256f6fc9c05 |
children | a3a3b477c670 |
comparison
equal
deleted
inserted
replaced
40655:45453187feeb | 40656:cdfd4d09b79a |
---|---|
3298 (frame) | 3298 (frame) |
3299 Lisp_Object frame; | 3299 Lisp_Object frame; |
3300 { | 3300 { |
3301 struct frame *f; | 3301 struct frame *f; |
3302 | 3302 |
3303 CHECK_LIVE_FRAME (frame, 0); | 3303 CHECK_LIVE_FRAME (frame); |
3304 f = XFRAME (frame); | 3304 f = XFRAME (frame); |
3305 | 3305 |
3306 /* Ignore redraw requests, if frame has no glyphs yet. | 3306 /* Ignore redraw requests, if frame has no glyphs yet. |
3307 (Implementation note: It still has to be checked why we are | 3307 (Implementation note: It still has to be checked why we are |
3308 called so early here). */ | 3308 called so early here). */ |
6021 Control characters in STRING will have terminal-dependent effects. */) | 6021 Control characters in STRING will have terminal-dependent effects. */) |
6022 (string) | 6022 (string) |
6023 Lisp_Object string; | 6023 Lisp_Object string; |
6024 { | 6024 { |
6025 /* ??? Perhaps we should do something special for multibyte strings here. */ | 6025 /* ??? Perhaps we should do something special for multibyte strings here. */ |
6026 CHECK_STRING (string, 0); | 6026 CHECK_STRING (string); |
6027 fwrite (XSTRING (string)->data, 1, STRING_BYTES (XSTRING (string)), stdout); | 6027 fwrite (XSTRING (string)->data, 1, STRING_BYTES (XSTRING (string)), stdout); |
6028 fflush (stdout); | 6028 fflush (stdout); |
6029 if (termscript) | 6029 if (termscript) |
6030 { | 6030 { |
6031 fwrite (XSTRING (string)->data, 1, STRING_BYTES (XSTRING (string)), | 6031 fwrite (XSTRING (string)->data, 1, STRING_BYTES (XSTRING (string)), |
6088 int sec, usec; | 6088 int sec, usec; |
6089 | 6089 |
6090 if (NILP (milliseconds)) | 6090 if (NILP (milliseconds)) |
6091 XSETINT (milliseconds, 0); | 6091 XSETINT (milliseconds, 0); |
6092 else | 6092 else |
6093 CHECK_NUMBER (milliseconds, 1); | 6093 CHECK_NUMBER (milliseconds); |
6094 usec = XINT (milliseconds) * 1000; | 6094 usec = XINT (milliseconds) * 1000; |
6095 | 6095 |
6096 { | 6096 { |
6097 double duration = extract_float (seconds); | 6097 double duration = extract_float (seconds); |
6098 sec = (int) duration; | 6098 sec = (int) duration; |
6215 int sec, usec; | 6215 int sec, usec; |
6216 | 6216 |
6217 if (NILP (milliseconds)) | 6217 if (NILP (milliseconds)) |
6218 XSETINT (milliseconds, 0); | 6218 XSETINT (milliseconds, 0); |
6219 else | 6219 else |
6220 CHECK_NUMBER (milliseconds, 1); | 6220 CHECK_NUMBER (milliseconds); |
6221 usec = XINT (milliseconds) * 1000; | 6221 usec = XINT (milliseconds) * 1000; |
6222 | 6222 |
6223 { | 6223 { |
6224 double duration = extract_float (seconds); | 6224 double duration = extract_float (seconds); |
6225 sec = (int) duration; | 6225 sec = (int) duration; |
6534 if (!redisplaying_p) | 6534 if (!redisplaying_p) |
6535 { | 6535 { |
6536 if (NILP (window)) | 6536 if (NILP (window)) |
6537 window = selected_window; | 6537 window = selected_window; |
6538 else | 6538 else |
6539 CHECK_WINDOW (window, 2); | 6539 CHECK_WINDOW (window); |
6540 | 6540 |
6541 XWINDOW (window)->cursor_off_p = NILP (show); | 6541 XWINDOW (window)->cursor_off_p = NILP (show); |
6542 } | 6542 } |
6543 | 6543 |
6544 return Qnil; | 6544 return Qnil; |
6555 struct window *w; | 6555 struct window *w; |
6556 | 6556 |
6557 if (NILP (window)) | 6557 if (NILP (window)) |
6558 window = selected_window; | 6558 window = selected_window; |
6559 else | 6559 else |
6560 CHECK_WINDOW (window, 2); | 6560 CHECK_WINDOW (window); |
6561 | 6561 |
6562 w = XWINDOW (window); | 6562 w = XWINDOW (window); |
6563 return w->cursor_off_p ? Qnil : Qt; | 6563 return w->cursor_off_p ? Qnil : Qt; |
6564 } | 6564 } |
6565 | 6565 |