From 77f1f99cb0d69c1cddb0f1c5ef264fe5cd62d210 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 26 Aug 2012 21:42:18 +0800 Subject: [PATCH] Make special-display-* and display-buffer-reuse-frames obsolete. * lisp/window.el (special-display-regexps, special-display-frame-alist) (special-display-buffer-names, special-display-function) (display-buffer-reuse-frames): Mark as obsolete. * lisp/progmodes/compile.el: Don't use display-buffer-reuse-frames. * help.el (help-print-return-message): Don't treat display-buffer-reuse-frames specially. --- etc/NEWS | 10 ++++++++++ lisp/ChangeLog | 11 +++++++++++ lisp/help.el | 4 ---- lisp/progmodes/compile.el | 5 +---- lisp/window.el | 8 ++++++-- 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 3c2857f3a8c..fb8722ab8f8 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -622,6 +622,16 @@ display action functions to avoid changing which frame is selected. *** New display action alist `pop-up-frame-parameters', if non-nil, specifies frame parameters to give any newly-created frame. +*** The following variables are obsolete, as they can be replaced by +appropriate entries in the `display-buffer-alist' function introduced +in Emacs 24.1: + +**** `display-buffer-reuse-frames' +**** `special-display-regexps' +**** `special-display-frame-alist' +**** `special-display-buffer-names' +**** `special-display-function' + ** Completion *** New function `completion-table-with-quoting' to handle completion diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 193665f908b..90df0479fac 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2012-08-26 Chong Yidong + + * window.el (special-display-regexps, special-display-frame-alist) + (special-display-buffer-names, special-display-function) + (display-buffer-reuse-frames): Mark as obsolete. + + * progmodes/compile.el: Don't use display-buffer-reuse-frames. + + * help.el (help-print-return-message): Don't treat + display-buffer-reuse-frames specially. + 2012-08-26 Chong Yidong * progmodes/gdb-mi.el (gdb-display-buffer-other-frame-action): New diff --git a/lisp/help.el b/lisp/help.el index 19cb811bcf5..19db7c255d1 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -145,10 +145,6 @@ specifies what to do when the user exits the help buffer." ;; Secondly, the buffer has not been displayed yet, ;; so we don't know whether its frame will be selected. nil) - (display-buffer-reuse-frames - (setq help-return-method (cons (selected-window) - 'quit-window)) - nil) ((not (one-window-p t)) (setq help-return-method (cons (selected-window) 'quit-window)) diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 21a323d8b45..eb966e8a90d 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -2461,10 +2461,7 @@ and overlay is highlighted between MK and END-MK." ;; the error location if the two buffers are in two ;; different frames. So don't do it if it's not necessary. pre-existing - (let ((display-buffer-reuse-frames t) - (pop-up-windows t)) - ;; Pop up a window. - (display-buffer (marker-buffer msg))))) + (display-buffer (marker-buffer msg)))) (highlight-regexp (with-current-buffer (marker-buffer msg) ;; also do this while we change buffer (compilation-set-window w msg) diff --git a/lisp/window.el b/lisp/window.el index 16230003751..3599ff5527f 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -4460,8 +4460,7 @@ See also `special-display-regexps'." (repeat :tag "Arguments" (sexp))))) :group 'windows :group 'frames) - -;;;###autoload +(make-obsolete-variable 'special-display-buffer-names 'display-buffer-alist "24.3") (put 'special-display-buffer-names 'risky-local-variable t) (defcustom special-display-regexps nil @@ -4528,6 +4527,8 @@ See also `special-display-buffer-names'." (repeat :tag "Arguments" (sexp))))) :group 'windows :group 'frames) +(make-obsolete-variable 'special-display-regexps 'display-buffer-alist "24.3") +(put 'special-display-regexps 'risky-local-variable t) (defun special-display-p (buffer-name) "Return non-nil if a buffer named BUFFER-NAME gets a special frame. @@ -4569,6 +4570,7 @@ These supersede the values given in `default-frame-alist'." (symbol :tag "Parameter") (sexp :tag "Value"))) :group 'frames) +(make-obsolete-variable 'special-display-frame-alist 'display-buffer-alist "24.3") (defun special-display-popup-frame (buffer &optional args) "Pop up a frame displaying BUFFER and return its window. @@ -4635,6 +4637,7 @@ with corresponding arguments to set up the quit-restore parameter of the window used." :type 'function :group 'frames) +(make-obsolete-variable 'special-display-function 'display-buffer-alist "24.3") (defcustom same-window-buffer-names nil "List of names of buffers that should appear in the \"same\" window. @@ -4707,6 +4710,7 @@ that frame." :type 'boolean :version "21.1" :group 'windows) +(make-obsolete-variable 'display-buffer-reuse-frames 'display-buffer-alist "24.3") (defcustom pop-up-windows t "Non-nil means `display-buffer' should make a new window." -- 2.39.2