diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2011-09-10 17:15:28 -0400 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2011-09-10 17:15:28 -0400 |
commit | 3199b96fc585576ffb2ced6542a2bc2d6172f510 (patch) | |
tree | 6f74f43a90022b2a0973688356159f9452f38e7d /lisp/progmodes | |
parent | 919a69aa0814937507f12851bdd277cb279faf6f (diff) | |
download | emacs-3199b96fc585576ffb2ced6542a2bc2d6172f510.tar.gz emacs-3199b96fc585576ffb2ced6542a2bc2d6172f510.tar.bz2 emacs-3199b96fc585576ffb2ced6542a2bc2d6172f510.zip |
Fix various uses of display-buffer and pop-to-buffer
to avoid using special-display-* and same-window-* variables.
* lisp/buff-menu.el (Buffer-menu-switch-other-window): Use second arg
of display-buffer.
(Buffer-menu-2-window): Use switch-to-buffer-other-window.
* lisp/replace.el (occur-mode-goto-occurrence)
(occur-mode-display-occurrence) Use second arg of pop-to-buffer
and display-buffer.
* lisp/window.el (display-buffer-alist): Add *Python*.
* lisp/mail/reporter.el (reporter-submit-bug-report): Use second arg of
display-buffer.
* lisp/mail/sendmail.el (sendmail-user-agent-compose): Don't bind the
special-display and same-window variables.
(mail-other-window): Use switch-to-buffer-other-window.
(mail-other-frame): USe switch-to-buffer-other-frame.
* lisp/progmodes/gdb-mi.el (gdb-frame-gdb-buffer): Use
display-buffer-other-frame.
(gdb-display-gdb-buffer): Use pop-to-buffer.
* lisp/progmodes/gud.el (gud-goto-info): Use info-other-window.
* lisp/progmodes/python.el: Don't set same-window-buffer-names.
* lisp/textmodes/bibtex.el (bibtex-search-entry): Use switch-to-buffer.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r-- | lisp/progmodes/compile.el | 5 | ||||
-rw-r--r-- | lisp/progmodes/gdb-mi.el | 10 | ||||
-rw-r--r-- | lisp/progmodes/gud.el | 17 | ||||
-rw-r--r-- | lisp/progmodes/python.el | 1 |
4 files changed, 7 insertions, 26 deletions
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index cd891a8df60..619c423902c 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -2408,9 +2408,8 @@ and overlay is highlighted between MK and END-MK." ;; also do this while we change buffer (compilation-set-window w msg) compilation-highlight-regexp))) - ;; Ideally, the window-size should be passed to `display-buffer' (via - ;; something like special-display-buffer) so it's only used when - ;; creating a new window. + ;; Ideally, the window-size should be passed to `display-buffer' + ;; so it's only used when creating a new window. (unless pre-existing (compilation-set-window-height w)) (if from-compilation-buffer diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 87209a78ffb..d55a9eed3f0 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -3980,18 +3980,12 @@ SPLIT-HORIZONTAL and show BUF in the new window." (defun gdb-frame-gdb-buffer () "Display GUD buffer in a new frame." (interactive) - (let ((special-display-regexps (append special-display-regexps '(".*"))) - (special-display-frame-alist - (remove '(menu-bar-lines) (remove '(tool-bar-lines) - gdb-frame-parameters))) - (same-window-regexps nil)) - (display-buffer gud-comint-buffer))) + (display-buffer-other-frame gud-comint-buffer)) (defun gdb-display-gdb-buffer () "Display GUD buffer." (interactive) - (let ((same-window-regexps nil)) - (select-window (display-buffer gud-comint-buffer nil 0)))) + (pop-to-buffer gud-comint-buffer nil 0)) (defun gdb-set-window-buffer (name &optional ignore-dedicated window) "Set buffer of selected window to NAME and dedicate window. diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 3c7addee3b8..534082544b6 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -112,20 +112,9 @@ Used to grey out relevant toolbar icons.") (defun gud-goto-info () "Go to relevant Emacs info node." (interactive) - (let ((same-window-regexps same-window-regexps) - (display-buffer-reuse-frames t)) - (catch 'info-found - (walk-windows - (lambda (window) - (if (eq (window-buffer window) (get-buffer "*info*")) - (progn - (setq same-window-regexps nil) - (throw 'info-found nil)))) - nil 0) - (select-frame (make-frame))) - (if (eq gud-minor-mode 'gdbmi) - (info "(emacs)GDB Graphical Interface") - (info "(emacs)Debuggers")))) + (if (eq gud-minor-mode 'gdbmi) + (info-other-window "(emacs)GDB Graphical Interface") + (info-other-window "(emacs)Debuggers"))) (defun gud-tool-bar-item-visible-no-fringe () (not (or (eq (buffer-local-value 'major-mode (window-buffer)) 'speedbar-mode) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 3f923f496b9..38bf9552b2a 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -86,7 +86,6 @@ (add-to-list 'interpreter-mode-alist (cons (purecopy "python") 'python-mode)) ;;;###autoload (add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'") 'python-mode)) -(add-to-list 'same-window-buffer-names (purecopy "*Python*")) ;;;; Font lock |