aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1994-02-14 21:41:46 +0000
committerKarl Heuer1994-02-14 21:41:46 +0000
commit7fc9de26baa03fa20749aaeec68c09a4652c9160 (patch)
tree00d5b610b0cdd72a3c217830844a734d5e1d8484 /src
parent703e0710e9be8a3043a7e3e47edc90676ec4065e (diff)
downloademacs-7fc9de26baa03fa20749aaeec68c09a4652c9160.tar.gz
emacs-7fc9de26baa03fa20749aaeec68c09a4652c9160.zip
(check_x): Make it global.
(x-parse-geometry, x-list-fonts): call check_x.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 940826f3136..e6b6c43a497 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -234,7 +234,7 @@ extern Lisp_Object Vwindow_system_version;
234 234
235 235
236/* Error if we are not connected to X. */ 236/* Error if we are not connected to X. */
237static void 237void
238check_x () 238check_x ()
239{ 239{
240 if (x_current_display == 0) 240 if (x_current_display == 0)
@@ -1487,6 +1487,7 @@ Returns an alist of the form ((top . TOP), (left . LEFT) ... ).")
1487 unsigned int width, height; 1487 unsigned int width, height;
1488 Lisp_Object values[4]; 1488 Lisp_Object values[4];
1489 1489
1490 check_x ();
1490 CHECK_STRING (string, 0); 1491 CHECK_STRING (string, 0);
1491 1492
1492 geometry = XParseGeometry ((char *) XSTRING (string)->data, 1493 geometry = XParseGeometry ((char *) XSTRING (string)->data,
@@ -2525,6 +2526,7 @@ fonts), even if they match PATTERN and FACE.")
2525 XFontStruct *size_ref; 2526 XFontStruct *size_ref;
2526 Lisp_Object list; 2527 Lisp_Object list;
2527 2528
2529 check_x ();
2528 CHECK_STRING (pattern, 0); 2530 CHECK_STRING (pattern, 0);
2529 if (!NILP (face)) 2531 if (!NILP (face))
2530 CHECK_SYMBOL (face, 1); 2532 CHECK_SYMBOL (face, 1);