[Emacs-diffs] Changes to emacs/src/w32fns.c

[Jason Rumney]

Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.208 emacs/src/w32fns.c:1.209
*** emacs/src/w32fns.c:1.208    Tue Feb  4 09:03:13 2003
--- emacs/src/w32fns.c  Sun Feb 16 17:23:06 2003
***************
*** 7340,7346 ****
          {
            newlist = Fcons (XCAR (tem), newlist);
            n_fonts++;
!           if (n_fonts >= max_names)
              break;
          }
      }
--- 7340,7346 ----
          {
            newlist = Fcons (XCAR (tem), newlist);
            n_fonts++;
!           if (max_names >= 0 && n_fonts >= max_names)
              break;
          }
      }
***************
*** 7354,7360 ****
     to be listed.  Frame F NULL means we have not yet created any
     frame, which means we can't get proper size info, as we don't have
     a device context to use for GetTextMetrics.
!    MAXNAMES sets a limit on how many fonts to match.  */
  
  Lisp_Object
  w32_list_fonts (f, pattern, size, maxnames)
--- 7354,7361 ----
     to be listed.  Frame F NULL means we have not yet created any
     frame, which means we can't get proper size info, as we don't have
     a device context to use for GetTextMetrics.
!    MAXNAMES sets a limit on how many fonts to match.  If MAXNAMES is
!    negative, then all matching fonts are returned.  */
  
  Lisp_Object
  w32_list_fonts (f, pattern, size, maxnames)
***************
*** 7467,7473 ****
              {
                newlist = Fcons (XCAR (tem), newlist);
                n_fonts++;
!               if (n_fonts >= maxnames)
                  break;
                else
                  continue;
--- 7468,7474 ----
              {
                newlist = Fcons (XCAR (tem), newlist);
                n_fonts++;
!               if (maxnames >= 0 && n_fonts >= maxnames)
                  break;
                else
                  continue;
***************
*** 7506,7512 ****
              {
                newlist = Fcons (XCAR (tem), newlist);
                n_fonts++;
!               if (n_fonts >= maxnames)
                  break;
              }
            /* keep track of the closest matching size in case
--- 7507,7513 ----
              {
                newlist = Fcons (XCAR (tem), newlist);
                n_fonts++;
!               if (maxnames >= 0 && n_fonts >= maxnames)
                  break;
              }
            /* keep track of the closest matching size in case
***************
*** 7542,7548 ****
      }
  
    /* Include any bdf fonts.  */
!   if (n_fonts < maxnames)
    {
      Lisp_Object combined[2];
      combined[0] = w32_list_bdf_fonts (pattern, maxnames - n_fonts);
--- 7543,7549 ----
      }
  
    /* Include any bdf fonts.  */
!   if (n_fonts < maxnames || maxnames < 0)
    {
      Lisp_Object combined[2];
      combined[0] = w32_list_bdf_fonts (pattern, maxnames - n_fonts);