diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/dosfns.c | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/dosfns.c')
| -rw-r--r-- | src/dosfns.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/dosfns.c b/src/dosfns.c index 8c0fed2230f..e506e9fbe14 100644 --- a/src/dosfns.c +++ b/src/dosfns.c | |||
| @@ -409,8 +409,6 @@ msdos_stdcolor_idx (const char *name) | |||
| 409 | Lisp_Object | 409 | Lisp_Object |
| 410 | msdos_stdcolor_name (int idx) | 410 | msdos_stdcolor_name (int idx) |
| 411 | { | 411 | { |
| 412 | extern Lisp_Object Qunspecified; | ||
| 413 | |||
| 414 | if (idx == FACE_TTY_DEFAULT_FG_COLOR) | 412 | if (idx == FACE_TTY_DEFAULT_FG_COLOR) |
| 415 | return build_string (unspecified_fg); | 413 | return build_string (unspecified_fg); |
| 416 | else if (idx == FACE_TTY_DEFAULT_BG_COLOR) | 414 | else if (idx == FACE_TTY_DEFAULT_BG_COLOR) |