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/w32fns.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/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index b0842b5ee6c..457599fce0e 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -467,7 +467,7 @@ if the entry is new. */) | |||
| 467 | block_input (); | 467 | block_input (); |
| 468 | 468 | ||
| 469 | /* replace existing entry in w32-color-map or add new entry. */ | 469 | /* replace existing entry in w32-color-map or add new entry. */ |
| 470 | entry = Fassoc (name, Vw32_color_map); | 470 | entry = Fassoc (name, Vw32_color_map, Qnil); |
| 471 | if (NILP (entry)) | 471 | if (NILP (entry)) |
| 472 | { | 472 | { |
| 473 | entry = Fcons (name, rgb); | 473 | entry = Fcons (name, rgb); |