From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 17 Jan 2001 13:00:16 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.96~249
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e37d1417a6bbb66f4d341331647fee301cc16b95;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cd4d6477401..e5f944066a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-01-17  Gerd Moellmann  <gerd@gnu.org>
 
+	* xdisp.c (redisplay_tool_bar): Change tool bar's height when
+	not everything could be displayed.
+
 	* line.h, x-list-font.c: Files removed because unused.
 
 2001-01-17  Andrew Innes  <andrewi@gnu.org>
diff --git a/src/line.h b/src/line.h
deleted file mode 100644
index e3441aaaa93..00000000000
--- a/src/line.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#define line_width 30
-#define line_height 10
-static char line_bits[] = {
-   0xf0, 0xff, 0xff, 0x03, 0x08, 0x00, 0x00, 0x04, 0x44, 0x48, 0xf4, 0x08,
-   0x42, 0xc8, 0x14, 0x10, 0x41, 0x48, 0x75, 0x20, 0x41, 0x48, 0x15, 0x20,
-   0x42, 0x48, 0x16, 0x10, 0xc4, 0x4b, 0xf4, 0x08, 0x08, 0x00, 0x00, 0x04,
-   0xf0, 0xff, 0xff, 0x03};
diff --git a/src/x-list-font.c b/src/x-list-font.c
deleted file mode 100644
index 861a61dac81..00000000000
--- a/src/x-list-font.c
+++ /dev/null
@@ -1,91 +0,0 @@
-DEFUN ("x-list-fonts", Fx_list_fonts, Sx_list_fonts, 1, 5, 0,
-  "Return a list of the names of available fonts matching PATTERN.\n\
-If optional arguments FACE and FRAME are specified, return only fonts\n\
-the same size as FACE on FRAME.\n\
-PATTERN is a string, perhaps with wildcard characters;\n\
-  the * character matches any substring, and\n\
-  the ? character matches any single character.\n\
-  PATTERN is case-insensitive.\n\
-FACE is a face name--a symbol.\n\
-\n\
-The return value is a list of strings, suitable as arguments to\n\
-set-face-font.\n\
-\n\
-Fonts Emacs can't use (i.e. proportional fonts) may or may not be excluded\n\
-even if they match PATTERN and FACE.\n\
-The optional fourth argument MAXIMUM sets a limit on how many\n\
-fonts to match.  The first MAXIMUM fonts are reported.\n\
-The optional fifth argument WIDTH, if specified, is a number of columns\n\
-occupied by a character of a font.  In that case, return only fonts\n\
-the WIDTH times as wide as FACE on FRAME.")
-  (pattern, face, frame, maximum, width)
-    Lisp_Object pattern, face, frame, maximum, width;
-{
-  FRAME_PTR f;
-  int size, cols;
-  int maxnames;
-
-  (*check_window_system_func) ();
-  CHECK_STRING (pattern, 0);
-  if (!NILP (face))
-    CHECK_SYMBOL (face, 1);
-
-  if (NILP (maximum))
-    maxnames = 2000;
-  else
-    {
-      CHECK_NATNUM (maximum, 0);
-      maxnames = XINT (maximum);
-    }
-
-  if (!NILP (width))
-    CHECK_NUMBER (width, 4);
-
-  /* We can't simply call check_x_frame because this function may be
-     called before any frame is created.  */
-  if (NILP (frame))
-    f = selected_frame;
-  else
-    {
-      CHECK_LIVE_FRAME (frame, 0);
-      f = XFRAME (frame);
-    }
-  if (! FRAME_WINDOW_P (f))
-    {
-      /* Perhaps we have not yet created any frame.  */
-      f = NULL;
-      face = Qnil;
-    }
-
-  /* Determine the width standard for comparison with the fonts we find.  */
-
-  if (NILP (face))
-    size = 0;
-  else
-    {
-      int face_id;
-
-      face_id = face_name_id_number (f, face);
-
-      if (face_id < 0 || face_id >= FRAME_N_PARAM_FACES (f)
-	  || FRAME_PARAM_FACES (f) [face_id] == 0
-	  || FRAME_PARAM_FACES (f) [face_id]->font == (XFontStruct *) (~0))
-	size = FONT_WIDTH (FRAME_FONT (f));
-      else
-	size = FONT_WIDTH (FRAME_PARAM_FACES (f) [face_id]->font);
-
-      if (!NILP (width))
-	  size *= XINT (width);
-    }
-
-  {
-    Lisp_Object args[2];
-
-    args[0] = (*list_fonts_func) (f, pattern, size, maxnames);
-    if (f == NULL)
-      /* We don't have to check fontsets.  */
-      return args[0];
-    args[1] = list_fontsets (f, pattern, size);
-    return Fnconc (2, args);
-  }
-}