[Emacs-diffs] /srv/bzr/emacs/trunk r109787: Make special-display-* and display-buffer-reuse-frames obsolete.

[Chong Yidong]

------------------------------------------------------------
revno: 109787
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-08-26 21:42:18 +0800
message:
  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.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/help.el
  lisp/progmodes/compile.el
  lisp/window.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-08-26 10:29:37 +0000
+++ b/etc/NEWS  2012-08-26 13:42:18 +0000
@@ -622,6 +622,16 @@
 *** 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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-26 09:16:48 +0000
+++ b/lisp/ChangeLog    2012-08-26 13:42:18 +0000
@@ -1,5 +1,16 @@
 2012-08-26  Chong Yidong  <address@hidden>
 
+       * 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  <address@hidden>
+
        * progmodes/gdb-mi.el (gdb-display-buffer-other-frame-action): New
        variable, replacing gdb-frame-parameters.
        (gdb-frame-io-buffer, gdb-frame-breakpoints-buffer)

=== modified file 'lisp/help.el'
--- a/lisp/help.el      2012-08-15 16:29:11 +0000
+++ b/lisp/help.el      2012-08-26 13:42:18 +0000
@@ -145,10 +145,6 @@
                     ;; 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))

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2012-08-15 16:29:11 +0000
+++ b/lisp/progmodes/compile.el 2012-08-26 13:42:18 +0000
@@ -2461,10 +2461,7 @@
                 ;; 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)

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2012-08-26 09:16:48 +0000
+++ b/lisp/window.el    2012-08-26 13:42:18 +0000
@@ -4460,8 +4460,7 @@
                        (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 @@
                        (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 @@
                         (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 @@
 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 @@
   :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."