[Emacs-diffs] /srv/bzr/emacs/trunk r104590: Don't encourage the use of display-buffer-alist from Elisp code.

[Stefan Monnier]

------------------------------------------------------------
revno: 104590
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2011-06-15 13:20:36 -0400
message:
  Don't encourage the use of display-buffer-alist from Elisp code.
  * lisp/window.el (same-window-buffer-names, same-window-regexps)
  (special-display-frame-alist, special-display-popup-frame)
  (special-display-function, special-display-buffer-names)
  (special-display-regexps, pop-up-frame-alist)
  (pop-up-frame-function, pop-up-frames, display-buffer-reuse-frames)
  (pop-up-windows, split-window-preferred-function)
  (split-height-threshold, split-width-threshold, even-window-heights)
  (display-buffer-mark-dedicated): Fix obsolescence info.
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-15 14:47:57 +0000
+++ b/lisp/ChangeLog    2011-06-15 17:20:36 +0000
@@ -1,3 +1,15 @@
+2011-06-15  Stefan Monnier  <address@hidden>
+
+       * window.el (same-window-buffer-names, same-window-regexps)
+       (special-display-frame-alist, special-display-popup-frame)
+       (special-display-function, special-display-buffer-names)
+       (special-display-regexps, pop-up-frame-alist)
+       (pop-up-frame-function, pop-up-frames, display-buffer-reuse-frames)
+       (pop-up-windows, split-window-preferred-function)
+       (split-height-threshold, split-width-threshold, even-window-heights)
+       (display-buffer-mark-dedicated): Don't encourage the use of
+       display-buffer-alist from Elisp code.
+
 2011-06-15  Dan Nicolaescu  <address@hidden>
 
        * progmodes/python.el (python-mode): Derive from prog-mode.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-06-15 07:09:47 +0000
+++ b/lisp/window.el    2011-06-15 17:20:36 +0000
@@ -5581,7 +5581,7 @@
  :group 'windows)
 (make-obsolete-variable
  'same-window-buffer-names
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom same-window-regexps nil
   "List of regexps saying which buffers should appear in the \"same\" window.
@@ -5599,7 +5599,7 @@
   :group 'windows)
 (make-obsolete-variable
  'same-window-regexps
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun same-window-p (buffer-name)
   "Return non-nil if a buffer named BUFFER-NAME would be shown in the \"same\" 
window.
@@ -5645,7 +5645,7 @@
   :group 'frames)
 (make-obsolete-variable
  'special-display-frame-alist
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun special-display-popup-frame (buffer &optional args)
   "Display BUFFER in a special frame and return the window chosen.
@@ -5693,7 +5693,7 @@
         (frame-selected-window frame))))))
 (make-obsolete
  'special-display-popup-frame
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom special-display-function 'special-display-popup-frame
   "Function to call for displaying special buffers.
@@ -5712,7 +5712,7 @@
   :group 'frames)
 (make-obsolete-variable
  'special-display-function
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom special-display-buffer-names nil
   "List of names of buffers that should be displayed specially.
@@ -5779,7 +5779,7 @@
   :group 'frames)
 (make-obsolete-variable
  'special-display-buffer-names
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 ;;;###autoload
 (put 'special-display-buffer-names 'risky-local-variable t)
@@ -5850,7 +5850,7 @@
   :group 'frames)
 (make-obsolete-variable
  'special-display-regexps
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun special-display-p (buffer-name)
   "Return non-nil if a buffer named BUFFER-NAME gets a special frame.
@@ -5902,7 +5902,7 @@
   :group 'frames)
 (make-obsolete-variable
  'pop-up-frame-alist
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom pop-up-frame-function
   (lambda () (make-frame pop-up-frame-alist))
@@ -5914,7 +5914,7 @@
   :group 'frames)
 (make-obsolete-variable
  'pop-up-frame-function
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom pop-up-frames 'unset ; nil
   "Whether `display-buffer' should make a separate frame.
@@ -5934,7 +5934,7 @@
   :group 'frames)
 (make-obsolete-variable
  'pop-up-frames
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom display-buffer-reuse-frames 'unset ; nil
   "Set and non-nil means `display-buffer' should reuse frames.
@@ -5946,7 +5946,7 @@
   :group 'frames)
 (make-obsolete-variable
  'display-buffer-reuse-frames
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom pop-up-windows 'unset ; t
   "Set and non-nil means `display-buffer' should make a new window."
@@ -5955,7 +5955,7 @@
   :group 'windows)
 (make-obsolete-variable
  'pop-up-windows
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom split-window-preferred-function 'split-window-sensibly
   "Function called by `display-buffer' to split a window.
@@ -5984,7 +5984,7 @@
   :group 'windows)
 (make-obsolete-variable
  'split-window-preferred-function
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom split-height-threshold 80
   "Minimum height for splitting a window to display a buffer.
@@ -5998,7 +5998,7 @@
   :group 'windows)
 (make-obsolete-variable
  'split-height-threshold
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom split-width-threshold 160
   "Minimum width for splitting a window to display a buffer.
@@ -6010,7 +6010,7 @@
   :group 'windows)
 (make-obsolete-variable
  'split-width-threshold
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom even-window-heights t
   "If non-nil `display-buffer' will try to even window heights.
@@ -6022,7 +6022,7 @@
   :group 'windows)
 (make-obsolete-variable
  'even-window-heights
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defvar display-buffer-mark-dedicated 'unset ; nil
   "Set and non-nil means `display-buffer' marks the windows it creates as 
dedicated.
@@ -6030,7 +6030,7 @@
 `window-dedicated-p' flag.")
 (make-obsolete-variable
  'display-buffer-mark-dedicated
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun window-splittable-p (window &optional horizontal)
   "Return non-nil if `split-window-sensibly' may split WINDOW.