diff options
| author | Eli Zaretskii | 2012-04-25 11:07:57 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-04-25 11:07:57 +0300 |
| commit | afc6df87865adae50b4ad2eea12d0771a144ee06 (patch) | |
| tree | c97a6f9b5c49d519fef9493d49abffdd17faa540 | |
| parent | 0268cf45a7bb9dc1f62af9e19198cf93479b53b6 (diff) | |
| download | emacs-afc6df87865adae50b4ad2eea12d0771a144ee06.tar.gz emacs-afc6df87865adae50b4ad2eea12d0771a144ee06.zip | |
Force interactive-mode in GDB on MS-Windows.
lisp/progmodes/gdb-mi.el (gdb-init-1): Condition Windows-specific
settings on 'system-type', not on 'window-system'. On MS-Windows,
set interactive-mode on in GDB.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/gdb-mi.el | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bdf6c7a1ac7..e93cd07bda0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-04-25 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/gdb-mi.el (gdb-init-1): Condition Windows-specific | ||
| 4 | settings on 'system-type', not on 'window-system'. On MS-Windows, | ||
| 5 | set interactive-mode on in GDB. | ||
| 6 | |||
| 1 | 2012-04-24 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2012-04-24 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * progmodes/ruby-mode.el: Simplify last change, and cleanup code. | 9 | * progmodes/ruby-mode.el: Simplify last change, and cleanup code. |
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 1be74ff544b..9f9551cc5d8 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el | |||
| @@ -862,8 +862,13 @@ detailed description of this mode. | |||
| 862 | (gdb-clear-inferior-io) | 862 | (gdb-clear-inferior-io) |
| 863 | (gdb-inferior-io--init-proc (get-process "gdb-inferior")) | 863 | (gdb-inferior-io--init-proc (get-process "gdb-inferior")) |
| 864 | 864 | ||
| 865 | (if (eq window-system 'w32) | 865 | (when (eq system-type 'windows-nt) |
| 866 | (gdb-input "-gdb-set new-console off" 'ignore)) | 866 | ;; Don't create a separate console window for the debuggee. |
| 867 | (gdb-input "-gdb-set new-console off" 'ignore) | ||
| 868 | ;; Force GDB to behave as if its input and output stream were | ||
| 869 | ;; connected to a TTY device (since on Windows we use pipes for | ||
| 870 | ;; communicating with GDB). | ||
| 871 | (gdb-input "-gdb-set interactive-mode on" 'ignore)) | ||
| 867 | (gdb-input "-gdb-set height 0" 'ignore) | 872 | (gdb-input "-gdb-set height 0" 'ignore) |
| 868 | 873 | ||
| 869 | (when gdb-non-stop | 874 | (when gdb-non-stop |