diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-28 22:31:12 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-28 22:31:12 -0700 |
| commit | 18ab493650d648ab8dca651ea2698861f926e895 (patch) | |
| tree | b16ca478db1e96af8d0be9a20ff1361bea6d12ee /src/xfaces.c | |
| parent | 726e0ab18e84ce0df6b9dc1612bf4d92b9d1e52a (diff) | |
| parent | 43dc9f5b0187276c24e1f63f2a23ba4b81c20e07 (diff) | |
| download | emacs-18ab493650d648ab8dca651ea2698861f926e895.tar.gz emacs-18ab493650d648ab8dca651ea2698861f926e895.tar.bz2 emacs-18ab493650d648ab8dca651ea2698861f926e895.zip | |
Merge from trunk.
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 996bcdaf6ad..352fdb4b082 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -1920,7 +1920,8 @@ check_lface_attrs (Lisp_Object *attrs) || IGNORE_DEFFACE_P (attrs[LFACE_FONT_INDEX]) || FONTP (attrs[LFACE_FONT_INDEX])); xassert (UNSPECIFIEDP (attrs[LFACE_FONTSET_INDEX]) - || STRINGP (attrs[LFACE_FONTSET_INDEX])); + || STRINGP (attrs[LFACE_FONTSET_INDEX]) + || NILP (attrs[LFACE_FONTSET_INDEX])); #endif } |