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/replace.el | |
| parent | 919a69aa0814937507f12851bdd277cb279faf6f (diff) | |
| download | emacs-3199b96fc585576ffb2ced6542a2bc2d6172f510.tar.gz | |
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/replace.el')
| -rw-r--r-- | lisp/replace.el | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index fb98a714dff..ee430fd9855 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -928,7 +928,7 @@ To return to ordinary Occur mode, use \\[occur-mode]." (defalias 'occur-mode-mouse-goto 'occur-mode-goto-occurrence) (defun occur-mode-goto-occurrence (&optional event) - "Go to the occurrence the current line describes." + "Go to the occurrence on the current line." (interactive (list last-nonmenu-event)) (let ((pos (if (null event) @@ -939,10 +939,8 @@ To return to ordinary Occur mode, use \\[occur-mode]." (with-current-buffer (window-buffer (posn-window (event-end event))) (save-excursion (goto-char (posn-point (event-end event))) - (occur-mode-find-occurrence))))) - same-window-buffer-names - same-window-regexps) - (pop-to-buffer (marker-buffer pos)) + (occur-mode-find-occurrence)))))) + (pop-to-buffer (marker-buffer pos) t) (goto-char pos) (run-hooks 'occur-mode-find-occurrence-hook))) @@ -958,11 +956,8 @@ To return to ordinary Occur mode, use \\[occur-mode]." "Display in another window the occurrence the current line describes." (interactive) (let ((pos (occur-mode-find-occurrence)) - window - ;; Bind these to ensure `display-buffer' puts it in another window. - same-window-buffer-names - same-window-regexps) - (setq window (display-buffer (marker-buffer pos))) + window) + (setq window (display-buffer (marker-buffer pos) t)) ;; This is the way to set point in the proper window. (save-selected-window (select-window window) |
