/[emacs]/emacs/src/xfns.c
ViewVC logotype

Diff of /emacs/src/xfns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.539.2.2 by handa, Tue May 14 13:02:54 2002 UTC revision 1.539.2.3 by handa, Fri Jul 26 04:07:58 2002 UTC
# Line 1989  x_set_font (f, arg, oldval) Line 1989  x_set_font (f, arg, oldval)
1989    BLOCK_INPUT;    BLOCK_INPUT;
1990    result = (STRINGP (fontset_name)    result = (STRINGP (fontset_name)
1991              ? x_new_fontset (f, XSTRING (fontset_name)->data)              ? x_new_fontset (f, XSTRING (fontset_name)->data)
1992              : x_new_font (f, XSTRING (arg)->data));              : x_new_fontset (f, XSTRING (arg)->data));
1993    UNBLOCK_INPUT;    UNBLOCK_INPUT;
1994        
1995    if (EQ (result, Qnil))    if (EQ (result, Qnil))
# Line 2005  x_set_font (f, arg, oldval) Line 2005  x_set_font (f, arg, oldval)
2005            if (old_fontset == f->output_data.x->fontset)            if (old_fontset == f->output_data.x->fontset)
2006              return;              return;
2007          }          }
2008        else if (!NILP (Fequal (result, oldval)))        store_frame_param (f, Qfont, result);
2009          if (!NILP (Fequal (result, oldval)))
2010          return;          return;
2011                
       store_frame_param (f, Qfont, result);  
2012        recompute_basic_faces (f);        recompute_basic_faces (f);
2013      }      }
2014    else    else
# Line 4429  This function is an internal primitive-- Line 4429  This function is an internal primitive--
4429      BLOCK_INPUT;      BLOCK_INPUT;
4430      /* First, try whatever font the caller has specified.  */      /* First, try whatever font the caller has specified.  */
4431      if (STRINGP (font))      if (STRINGP (font))
4432        {        font = x_new_fontset (f, XSTRING (font)->data);
         tem = Fquery_fontset (font, Qnil);  
         if (STRINGP (tem))  
           font = x_new_fontset (f, XSTRING (tem)->data);  
         else  
           font = x_new_font (f, XSTRING (font)->data);  
       }  
4433            
4434      /* Try out a font which we hope has bold and italic variations.  */      /* Try out a font which we hope has bold and italic variations.  */
4435      if (!STRINGP (font))      if (!STRINGP (font))
4436        font = x_new_font (f, "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1");        font = x_new_fontset (f, "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1");
4437      if (!STRINGP (font))      if (!STRINGP (font))
4438        font = x_new_font (f, "-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1");        font = x_new_fontset (f, "-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1");
4439      if (! STRINGP (font))      if (! STRINGP (font))
4440        font = x_new_font (f, "-*-*-medium-r-normal-*-*-140-*-*-c-*-iso8859-1");        font = x_new_fontset (f, "-*-*-medium-r-normal-*-*-140-*-*-c-*-iso8859-1");
4441      if (! STRINGP (font))      if (! STRINGP (font))
4442        /* This was formerly the first thing tried, but it finds too many fonts        /* This was formerly the first thing tried, but it finds too many fonts
4443           and takes too long.  */           and takes too long.  */
4444        font = x_new_font (f, "-*-*-medium-r-*-*-*-*-*-*-c-*-iso8859-1");        font = x_new_fontset (f, "-*-*-medium-r-*-*-*-*-*-*-c-*-iso8859-1");
4445      /* If those didn't work, look for something which will at least work.  */      /* If those didn't work, look for something which will at least work.  */
4446      if (! STRINGP (font))      if (! STRINGP (font))
4447        font = x_new_font (f, "-*-fixed-*-*-*-*-*-140-*-*-c-*-iso8859-1");        font = x_new_fontset (f, "-*-fixed-*-*-*-*-*-140-*-*-c-*-iso8859-1");
4448      UNBLOCK_INPUT;      UNBLOCK_INPUT;
4449      if (! STRINGP (font))      if (! STRINGP (font))
4450        font = build_string ("fixed");        font = build_string ("fixed");
# Line 12098  meaning don't clear the cache.  */); Line 12092  meaning don't clear the cache.  */);
12092    find_ccl_program_func = x_find_ccl_program;    find_ccl_program_func = x_find_ccl_program;
12093    query_font_func = x_query_font;    query_font_func = x_query_font;
12094    set_frame_fontset_func = x_set_font;    set_frame_fontset_func = x_set_font;
12095      get_font_repertory_func = x_get_font_repertory;
12096    check_window_system_func = check_x;    check_window_system_func = check_x;
12097    
12098    /* Images.  */    /* Images.  */

Legend:
Removed from v.1.539.2.2  
changed lines
  Added in v.1.539.2.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26