diff options
| author | Oleh Krehel | 2015-02-12 11:22:16 +0100 |
|---|---|---|
| committer | Oleh Krehel | 2015-02-12 11:22:16 +0100 |
| commit | e39d96ebe4c342885433afc28232197ce398fe71 (patch) | |
| tree | 09993bf863802951c8470a3952191e69d1cb60b7 | |
| parent | c7d9dec837b0e372032ce2f103967e120729c7b4 (diff) | |
| download | emacs-e39d96ebe4c342885433afc28232197ce398fe71.tar.gz emacs-e39d96ebe4c342885433afc28232197ce398fe71.zip | |
gdb-mi.el (gdb-display-io-nopopup): New defcustom.
* lisp/progmodes/gdb-mi.el (gdb-inferior-filter): Don't pop up the
buried output buffer when `gdb-display-io-nopopup' is non-nil.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/gdb-mi.el | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b56a5d1f512..ff2755df630 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2015-02-12 Oleh Krehel <ohwoeowho@gmail.com> | ||
| 2 | |||
| 3 | * progmodes/gdb-mi.el (gdb-display-io-nopopup): New defcustom. | ||
| 4 | (gdb-inferior-filter): Don't pop up the buried output buffer when | ||
| 5 | `gdb-display-io-nopopup' is non-nil. | ||
| 6 | |||
| 1 | 2015-02-12 Fabián Ezequiel Gallina <fgallina@gnu.org> | 7 | 2015-02-12 Fabián Ezequiel Gallina <fgallina@gnu.org> |
| 2 | 8 | ||
| 3 | python.el: Allow killing shell buffer if process is dead. (Bug#19823) | 9 | python.el: Allow killing shell buffer if process is dead. (Bug#19823) |
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 27846ede332..486d67297a9 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el | |||
| @@ -1629,9 +1629,19 @@ this trigger is subscribed to `gdb-buf-publisher' and called with | |||
| 1629 | :syntax-table nil :abbrev-table nil | 1629 | :syntax-table nil :abbrev-table nil |
| 1630 | (make-comint-in-buffer "gdb-inferior" (current-buffer) nil)) | 1630 | (make-comint-in-buffer "gdb-inferior" (current-buffer) nil)) |
| 1631 | 1631 | ||
| 1632 | (defcustom gdb-display-io-nopopup nil | ||
| 1633 | "When non-nil, and the 'gdb-inferior-io buffer is buried, don't pop it up." | ||
| 1634 | :type 'boolean | ||
| 1635 | :group 'gdb | ||
| 1636 | :version "25.1") | ||
| 1637 | |||
| 1632 | (defun gdb-inferior-filter (proc string) | 1638 | (defun gdb-inferior-filter (proc string) |
| 1633 | (unless (string-equal string "") | 1639 | (unless (string-equal string "") |
| 1634 | (gdb-display-buffer (gdb-get-buffer-create 'gdb-inferior-io))) | 1640 | (let (buf) |
| 1641 | (unless (and gdb-display-io-nopopup | ||
| 1642 | (setq buf (gdb-get-buffer 'gdb-inferior-io)) | ||
| 1643 | (null (get-buffer-window buf))) | ||
| 1644 | (gdb-display-buffer (gdb-get-buffer-create 'gdb-inferior-io))))) | ||
| 1635 | (with-current-buffer (gdb-get-buffer-create 'gdb-inferior-io) | 1645 | (with-current-buffer (gdb-get-buffer-create 'gdb-inferior-io) |
| 1636 | (comint-output-filter proc string))) | 1646 | (comint-output-filter proc string))) |
| 1637 | 1647 | ||