diff options
| author | Karoly Lorentey | 2004-02-19 02:27:31 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-02-19 02:27:31 +0000 |
| commit | 24268213e13b61f2cb8f88e69164161e84f08f5f (patch) | |
| tree | 345c35035ee3fa165851e2d68011ff8c1de8304b /src | |
| parent | 029f9b85acbb82934121c602d64a4a058982a600 (diff) | |
| download | emacs-24268213e13b61f2cb8f88e69164161e84f08f5f.tar.gz emacs-24268213e13b61f2cb8f88e69164161e84f08f5f.zip | |
Fix list-colors-display and other functions on a termcap frame
src/term.c (get_tty_display): Fall back to the current device if
display is nil. (Reported by Dan Nicolaescu <dann at ics dot uci dot edu>.)
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-81
Diffstat (limited to 'src')
| -rw-r--r-- | src/term.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/term.c b/src/term.c index ddca41f3173..b345211b91c 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -1882,14 +1882,18 @@ tty_capable_p (tty, caps, fg, bg) | |||
| 1882 | return 1; | 1882 | return 1; |
| 1883 | } | 1883 | } |
| 1884 | 1884 | ||
| 1885 | /* Return the tty display object specified by DISPLAY. | 1885 | /* Return the tty display object specified by DISPLAY. DISPLAY may be |
| 1886 | DISPLAY may be a frame or a string. */ | 1886 | a frame, a string, or nil for the display device of the current |
| 1887 | frame. */ | ||
| 1887 | 1888 | ||
| 1888 | static struct display * | 1889 | static struct display * |
| 1889 | get_tty_display (Lisp_Object display) | 1890 | get_tty_display (Lisp_Object display) |
| 1890 | { | 1891 | { |
| 1891 | struct display *d; | 1892 | struct display *d; |
| 1892 | 1893 | ||
| 1894 | if (NILP (display)) | ||
| 1895 | display = selected_frame; | ||
| 1896 | |||
| 1893 | if (! FRAMEP (display) && ! STRINGP (display)) | 1897 | if (! FRAMEP (display) && ! STRINGP (display)) |
| 1894 | return 0; | 1898 | return 0; |
| 1895 | 1899 | ||