*** bdf.c	1997/07/02 17:47:55	1.22
--- bdf.c	1997/07/10 16:40:45
***************
*** 1033,1039 ****
  #define ACMSG4 "Font left bearing != actual left bearing.  Old: %hd New: %hd."
  #define ACMSG5 "Font ascent != actual ascent.  Old: %hd New: %hd."
  #define ACMSG6 "Font descent != actual descent.  Old: %hd New: %hd."
! #define ACMSG7 "Font height adjusted. Old: %hd New: %hd."
  #define ACMSG8 "Glyph scalable width (SWIDTH) adjustments made."
  #define ACMSG9 "SWIDTH field missing at line %ld.  Set automatically."
  #define ACMSG10 "DWIDTH field missing at line %ld.  Set to glyph width."
--- 1033,1039 ----
  #define ACMSG4 "Font left bearing != actual left bearing.  Old: %hd New: %hd."
  #define ACMSG5 "Font ascent != actual ascent.  Old: %hd New: %hd."
  #define ACMSG6 "Font descent != actual descent.  Old: %hd New: %hd."
! #define ACMSG7 "Font height != actual height. Old: %hd New: %hd."
  #define ACMSG8 "Glyph scalable width (SWIDTH) adjustments made."
  #define ACMSG9 "SWIDTH field missing at line %ld.  Set automatically."
  #define ACMSG10 "DWIDTH field missing at line %ld.  Set to glyph width."
***************
*** 2046,2051 ****
--- 2046,2058 ----
              p.cb.errlineno = lineno;
              (*callback)(&p.cb, data);
          }
+     } else if (callback != 0 && p.cb.current != p.cb.total) {
+         /*
+          * This forces the progress bar to always finish if the BDF font has
+          * fewer glyphs than reported in the CHARS field.
+          */
+         p.cb.current = p.cb.total;
+         (*p.callback)(&p.cb, p.client_data);
      }
  
      /*