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

Diff of /emacs/src/frame.c

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

revision 1.300 by jhd, Thu Jun 26 21:18:45 2003 UTC revision 1.300.2.1 by handa, Mon Sep 8 12:48:11 2003 UTC
# Line 23  Boston, MA 02111-1307, USA.  */ Line 23  Boston, MA 02111-1307, USA.  */
23    
24  #include <stdio.h>  #include <stdio.h>
25  #include "lisp.h"  #include "lisp.h"
26  #include "charset.h"  #include "character.h"
27  #ifdef HAVE_X_WINDOWS  #ifdef HAVE_X_WINDOWS
28  #include "xterm.h"  #include "xterm.h"
29  #endif  #endif
# Line 3063  x_set_font (f, arg, oldval) Line 3063  x_set_font (f, arg, oldval)
3063    
3064    BLOCK_INPUT;    BLOCK_INPUT;
3065    result = (STRINGP (fontset_name)    result = (STRINGP (fontset_name)
3066              ? x_new_fontset (f, SDATA (fontset_name))              ? x_new_fontset (f, fontset_name)
3067              : x_new_font (f, SDATA (arg)));              : x_new_fontset (f, arg));
3068    UNBLOCK_INPUT;    UNBLOCK_INPUT;
3069    
3070    if (EQ (result, Qnil))    if (EQ (result, Qnil))
3071      error ("Font `%s' is not defined", SDATA (arg));      error ("Font `%s' is not defined", SDATA (arg));
3072    else if (EQ (result, Qt))    else if (EQ (result, Qt))
3073      error ("The characters of the given font have varying widths");      error ("The default fontset can't be used for a frame font");
3074    else if (STRINGP (result))    else if (STRINGP (result))
3075      {      {
3076        if (STRINGP (fontset_name))        if (STRINGP (fontset_name))
# Line 3080  x_set_font (f, arg, oldval) Line 3080  x_set_font (f, arg, oldval)
3080            if (old_fontset == FRAME_FONTSET (f))            if (old_fontset == FRAME_FONTSET (f))
3081              return;              return;
3082          }          }
3083        else if (!NILP (Fequal (result, oldval)))        store_frame_param (f, Qfont, result);
3084          if (!NILP (Fequal (result, oldval)))
3085          return;          return;
3086    
       store_frame_param (f, Qfont, result);  
3087        recompute_basic_faces (f);        recompute_basic_faces (f);
3088      }      }
3089    else    else

Legend:
Removed from v.1.300  
changed lines
  Added in v.1.300.2.1

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