Mercurial > emacs
comparison src/xfns.c @ 45968:6bf20f37b7c7
(check_x_display_info): Use check_x_frame.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sat, 22 Jun 2002 21:13:11 +0000 |
parents | 97212b1039e9 |
children | 3f111801efb4 |
comparison
equal
deleted
inserted
replaced
45967:5568001934d1 | 45968:6bf20f37b7c7 |
---|---|
299 } | 299 } |
300 else if (STRINGP (frame)) | 300 else if (STRINGP (frame)) |
301 dpyinfo = x_display_info_for_name (frame); | 301 dpyinfo = x_display_info_for_name (frame); |
302 else | 302 else |
303 { | 303 { |
304 FRAME_PTR f; | 304 FRAME_PTR f = check_x_frame (frame); |
305 | |
306 CHECK_LIVE_FRAME (frame); | |
307 f = XFRAME (frame); | |
308 if (! FRAME_X_P (f)) | |
309 error ("Non-X frame used"); | |
310 dpyinfo = FRAME_X_DISPLAY_INFO (f); | 305 dpyinfo = FRAME_X_DISPLAY_INFO (f); |
311 } | 306 } |
312 | 307 |
313 return dpyinfo; | 308 return dpyinfo; |
314 } | 309 } |