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/w32font.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/w32font.c')
| -rw-r--r-- | src/w32font.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32font.c b/src/w32font.c index 67d2f6d666d..314d7acdcc6 100644 --- a/src/w32font.c +++ b/src/w32font.c | |||
| @@ -1627,7 +1627,7 @@ x_to_w32_charset (char * lpcs) | |||
| 1627 | Format of each entry is | 1627 | Format of each entry is |
| 1628 | (CHARSET_NAME . (WINDOWS_CHARSET . CODEPAGE)). | 1628 | (CHARSET_NAME . (WINDOWS_CHARSET . CODEPAGE)). |
| 1629 | */ | 1629 | */ |
| 1630 | this_entry = Fassoc (build_string (charset), Vw32_charset_info_alist); | 1630 | this_entry = Fassoc (build_string (charset), Vw32_charset_info_alist, Qnil); |
| 1631 | 1631 | ||
| 1632 | if (NILP (this_entry)) | 1632 | if (NILP (this_entry)) |
| 1633 | { | 1633 | { |