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/font.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/font.c')
| -rw-r--r-- | src/font.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/font.c b/src/font.c index 5a3f271ef85..a5e5b6a5b9d 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -1893,7 +1893,7 @@ otf_tag_symbol (OTF_Tag tag) | |||
| 1893 | static OTF * | 1893 | static OTF * |
| 1894 | otf_open (Lisp_Object file) | 1894 | otf_open (Lisp_Object file) |
| 1895 | { | 1895 | { |
| 1896 | Lisp_Object val = Fassoc (file, otf_list); | 1896 | Lisp_Object val = Fassoc (file, otf_list, Qnil); |
| 1897 | OTF *otf; | 1897 | OTF *otf; |
| 1898 | 1898 | ||
| 1899 | if (! NILP (val)) | 1899 | if (! NILP (val)) |