changeset 25668:99290b59352d

(Ffont_info): Change for Lisp_Object selected_frame. (Ffontset_info): DItto.
author Gerd Moellmann <gerd@gnu.org>
date Mon, 13 Sep 1999 11:13:31 +0000
parents 7300ea0dd52c
children 97d5951366cd
files src/fontset.c
diffstat 1 files changed, 6 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/fontset.c	Mon Sep 13 11:13:29 1999 +0000
+++ b/src/fontset.c	Mon Sep 13 11:13:31 1999 +0000
@@ -709,12 +709,9 @@
 
   CHECK_STRING (name, 0);
   if (NILP (frame))
-    f = selected_frame;
-  else
-    {
-      CHECK_LIVE_FRAME (frame, 1);
-      f = XFRAME (frame);
-    }
+    frame = selected_frame;
+  CHECK_LIVE_FRAME (frame, 1);
+  f = XFRAME (frame);
 
   if (!query_font_func)
     error ("Font query function is not supported");
@@ -761,12 +758,9 @@
 
   CHECK_STRING(name, 0);
   if (NILP (frame))
-    f = selected_frame;
-  else
-    {
-      CHECK_LIVE_FRAME (frame, 1);
-      f = XFRAME (frame);
-    }
+    frame = selected_frame;
+  CHECK_LIVE_FRAME (frame, 1);
+  f = XFRAME (frame);
 
   fontset = fs_query_fontset (f, XSTRING (name)->data);
   if (fontset < 0)