diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-09-10 14:52:37 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-09-10 14:52:37 -0400 |
| commit | 8319e0bf55c9058f723ed150605d4614f79b0d5e (patch) | |
| tree | ff7b8bc95b7f006914077712737163defd061f70 /lisp/progmodes/inf-lisp.el | |
| parent | 3134906c9184b5b525d1b2f3251dcbd0c3c6ab71 (diff) | |
| download | emacs-8319e0bf55c9058f723ed150605d4614f79b0d5e.tar.gz emacs-8319e0bf55c9058f723ed150605d4614f79b0d5e.tar.bz2 emacs-8319e0bf55c9058f723ed150605d4614f79b0d5e.zip | |
Tweaks to display-buffer default actions; remove same-window-* autoload forms.
* lisp/window.el (display-buffer-alist): Add entry for buffers
previously handled same-window-*.
(display-buffer-alist, display-buffer-default-action)
(display-buffer-overriding-action): Mark as risky.
(display-buffer-alist): Document action function changes.
(display-buffer--same-window-action)
(display-buffer--other-frame-action): New variables.
(switch-to-buffer, display-buffer-other-frame): Use them.
(display-buffer): Rename reuse-frame entry to reusable-frames.
(display-buffer-reuse-selected-window): Function deleted.
(display-buffer-reuse-window): Handle reusable-frames alist entry.
If it's omitted, check pop-up-frames/display-buffer-reuse-frames.
(display-buffer-special): New function.
(display-buffer--maybe-pop-up-frame-or-window): Rename from
display-buffer-reuse-or-pop-window. Split off special-display
part into display-buffer-special.
(display-buffer-use-some-window): Don't perform any special
pop-up-frames handling.
(pop-to-buffer): Use window-normalize-buffer-to-switch-to.
* lisp/cmuscheme.el:
* lisp/ielm.el:
* lisp/shell.el:
* lisp/mail/sendmail.el:
* lisp/progmodes/inf-lisp.el: Don't set same-window-buffer-names.
* lisp/cus-edit.el:
* lisp/info.el:
* lisp/net/rlogin.el:
* lisp/net/telnet.el:
* lisp/progmodes/gud.el: Don't set same-window-regexps.
Diffstat (limited to 'lisp/progmodes/inf-lisp.el')
| -rw-r--r-- | lisp/progmodes/inf-lisp.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el index e4e56054f9d..6a222d091bc 100644 --- a/lisp/progmodes/inf-lisp.el +++ b/lisp/progmodes/inf-lisp.el @@ -298,7 +298,6 @@ of `inferior-lisp-program'). Runs the hooks from (inferior-lisp-mode))) (setq inferior-lisp-buffer "*inferior-lisp*") (pop-to-buffer "*inferior-lisp*")) -;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*inferior-lisp*")) ;;;###autoload (defalias 'run-lisp 'inferior-lisp) |