diff options
| author | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
| commit | df1a71272e5cdd10b511e2ffd702ca50ddd8a773 (patch) | |
| tree | 9b9ac725394ee80891e2bff57b6407d0e491e71a /src/fontset.c | |
| parent | eb27fc4d49e8c914cd0e6a8a2d02159601542141 (diff) | |
| parent | 32daa3cb54523006c88717cbeac87964cd687a1b (diff) | |
| download | emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.tar.gz emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fontset.c b/src/fontset.c index 850558b08a0..74018060b85 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -1186,7 +1186,7 @@ fs_query_fontset (Lisp_Object name, int name_pattern) | |||
| 1186 | { | 1186 | { |
| 1187 | tem = Frassoc (name, Vfontset_alias_alist); | 1187 | tem = Frassoc (name, Vfontset_alias_alist); |
| 1188 | if (NILP (tem)) | 1188 | if (NILP (tem)) |
| 1189 | tem = Fassoc (name, Vfontset_alias_alist); | 1189 | tem = Fassoc (name, Vfontset_alias_alist, Qnil); |
| 1190 | if (CONSP (tem) && STRINGP (XCAR (tem))) | 1190 | if (CONSP (tem) && STRINGP (XCAR (tem))) |
| 1191 | name = XCAR (tem); | 1191 | name = XCAR (tem); |
| 1192 | else if (name_pattern == 0) | 1192 | else if (name_pattern == 0) |