diff options
| author | Eli Zaretskii | 2014-10-14 21:10:37 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-10-14 21:10:37 +0300 |
| commit | e3060a0c4d2f418ac786775109d71e5843ccf42e (patch) | |
| tree | 347b37fc39d0db9cd23b3e9f79ee81b4bbc40f08 /src/msdos.c | |
| parent | 1a3eca0656bdb764200e10a4f264138e94b1f3ce (diff) | |
| parent | 980d78b3587560c13a46aef352ed8d5ed744acf6 (diff) | |
| download | emacs-e3060a0c4d2f418ac786775109d71e5843ccf42e.tar.gz emacs-e3060a0c4d2f418ac786775109d71e5843ccf42e.zip | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'src/msdos.c')
| -rw-r--r-- | src/msdos.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/msdos.c b/src/msdos.c index dae86b5a3b2..14c2624114d 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -1792,7 +1792,7 @@ internal_terminal_init (void) | |||
| 1792 | } | 1792 | } |
| 1793 | 1793 | ||
| 1794 | Vinitial_window_system = Qpc; | 1794 | Vinitial_window_system = Qpc; |
| 1795 | Vwindow_system_version = make_number (24); /* RE Emacs version */ | 1795 | Vwindow_system_version = make_number (25); /* RE Emacs version */ |
| 1796 | tty->terminal->type = output_msdos_raw; | 1796 | tty->terminal->type = output_msdos_raw; |
| 1797 | 1797 | ||
| 1798 | /* If Emacs was dumped on DOS/V machine, forget the stale VRAM | 1798 | /* If Emacs was dumped on DOS/V machine, forget the stale VRAM |