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

[YAMAMOTO Mitsuharu]

Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.128 emacs/src/macterm.c:1.129
*** emacs/src/macterm.c:1.128   Tue Sep  6 08:07:32 2005
--- emacs/src/macterm.c Thu Sep 22 07:53:29 2005
***************
*** 6277,6283 ****
  xlfdpat_exact_p (pat)
       struct xlfdpat *pat;
  {
!   return (pat)->blocks == NULL;
  }
  
  /* Return the first string in STRING + 0, ..., STRING + START_MAX such
--- 6277,6283 ----
  xlfdpat_exact_p (pat)
       struct xlfdpat *pat;
  {
!   return pat->blocks == NULL;
  }
  
  /* Return the first string in STRING + 0, ..., STRING + START_MAX such
***************
*** 6295,6301 ****
  
    xassert (blk->len > 0);
    xassert (start_max + blk->len <= strlen (string));
!   xassert (blk->pattern[blk->len - 1] != '?');
  
    /* See the comments in the function `boyer_moore' (search.c) for the
       use of `infinity'.  */
--- 6295,6301 ----
  
    xassert (blk->len > 0);
    xassert (start_max + blk->len <= strlen (string));
!   xassert (blk->last_char != '?');
  
    /* See the comments in the function `boyer_moore' (search.c) for the
       use of `infinity'.  */
***************
*** 6683,6710 ****
        {
          Lisp_Object rest = XCDR (XCDR (text_encoding_info));
  
!         for (; !NILP (rest); rest = XCDR (rest))
!           {
!             char *cs = SDATA (XCAR (rest));
! 
!             if (size == 0)
!               {
!                 add_font_name_table_entry (mac_to_x_fontname (name, size,
!                                                               style, cs));
!                 add_font_name_table_entry (mac_to_x_fontname (name, size,
!                                                               italic, cs));
!                 add_font_name_table_entry (mac_to_x_fontname (name, size,
!                                                               bold, cs));
!                 add_font_name_table_entry (mac_to_x_fontname (name, size,
!                                                               italic | bold,
!                                                               cs));
!               }
!             else
!               {
!                 add_font_name_table_entry (mac_to_x_fontname (name, size,
!                                                               style, cs));
!               }
!           }
        }
      }
  
--- 6683,6711 ----
        {
          Lisp_Object rest = XCDR (XCDR (text_encoding_info));
  
!         if (size > 0 || style == normal)
!           for (; !NILP (rest); rest = XCDR (rest))
!             {
!               char *cs = SDATA (XCAR (rest));
! 
!               if (size == 0)
!                 {
!                   add_font_name_table_entry (mac_to_x_fontname (name, size,
!                                                                 style, cs));
!                   add_font_name_table_entry (mac_to_x_fontname (name, size,
!                                                                 italic, cs));
!                   add_font_name_table_entry (mac_to_x_fontname (name, size,
!                                                                 bold, cs));
!                   add_font_name_table_entry (mac_to_x_fontname (name, size,
!                                                                 italic | bold,
!                                                                 cs));
!                 }
!               else
!                 {
!                   add_font_name_table_entry (mac_to_x_fontname (name, size,
!                                                                 style, cs));
!                 }
!             }
        }
      }