diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-04-17 09:32:40 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-04-17 09:32:40 -0700 |
| commit | 0797897f34467272b150eba54aa3bbff19e92aa1 (patch) | |
| tree | de30b455898572def032c92a57955ebc36d2b496 /src | |
| parent | 41d9004e1cf50aa18720b52c6228b06e35ca96f5 (diff) | |
| parent | a1c53d4294550380de76d6a6c4e29e9e8f6f9133 (diff) | |
| download | emacs-0797897f34467272b150eba54aa3bbff19e92aa1.tar.gz | |
Merge from origin/emacs-26
a1c53d4 (origin/emacs-26) * admin/admin.el (make-manuals-dist--1): Up...
d0f745f Document some compilation-mode faces
23ccba0 Mention the assignment form in "Copyright Assignment"
0f5568e Fix confusing wording in the user manual
70ec392 Fix the MSDOS build when running under CWSDPMI
7a608fc * lisp/progmodes/python.el: Be more careful about temp file r...
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispnew.c | 1 | ||||
| -rw-r--r-- | src/frame.c | 1 | ||||
| -rw-r--r-- | src/msdos.c | 3 | ||||
| -rw-r--r-- | src/msdos.h | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index ccb08ec1b95..cf3bfaaca41 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -6142,6 +6142,7 @@ init_display_interactive (void) t->reference_count++; #ifdef MSDOS + f->output_data.tty = &the_only_tty_output; f->output_data.tty->display_info = &the_only_display_info; #else if (f->output_method == output_termcap) diff --git a/src/frame.c b/src/frame.c index 192ef4244fb..7e29e69928e 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1118,6 +1118,7 @@ make_terminal_frame (struct terminal *terminal) f->terminal = terminal; f->terminal->reference_count++; #ifdef MSDOS + f->output_data.tty = &the_only_tty_output; f->output_data.tty->display_info = &the_only_display_info; if (!inhibit_window_system && (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame)) diff --git a/src/msdos.c b/src/msdos.c index 7dd5f5747aa..d13f2304852 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -420,6 +420,9 @@ static unsigned short outside_cursor; /* The only display since MS-DOS does not support multiple ones. */ struct tty_display_info the_only_display_info; +/* The only tty_output, since MS-DOS supports only 1 display. */ +struct tty_output the_only_tty_output; + /* Support for DOS/V (allows Japanese characters to be displayed on standard, non-Japanese, ATs). Only supported for DJGPP v2 and later. */ diff --git a/src/msdos.h b/src/msdos.h index ff756f8f634..0d15df7a331 100644 --- a/src/msdos.h +++ b/src/msdos.h @@ -93,6 +93,7 @@ typedef int XRectangle; typedef struct tty_display_info Display_Info; extern struct tty_display_info the_only_display_info; +extern struct tty_output the_only_tty_output; #define FRAME_X_DISPLAY(f) ((Display *) 0) #define FRAME_FONT(f) ((f)->output_data.tty->font) |