summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-09-16 12:52:38 +0800
committerChong Yidong <cyd@gnu.org>2012-09-16 12:52:38 +0800
commit71ce58e752dfb8d384eddf2d40ee9d5861ede5e5 (patch)
tree0245fca5e4b1ac82b759183f447597b6bbff2291 /lisp
parentfdc2806d0b023bc6a3c6c8abf8cfc72b8214a68b (diff)
downloademacs-71ce58e752dfb8d384eddf2d40ee9d5861ede5e5.tar.gz
emacs-71ce58e752dfb8d384eddf2d40ee9d5861ede5e5.tar.bz2
emacs-71ce58e752dfb8d384eddf2d40ee9d5861ede5e5.zip
Mark display-buffer-function as obsolete.
* lisp/window.el (display-buffer-function): Mark as obsolete. Fixes: debbugs:12166
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/window.el3
2 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 936a451ccb4..a7538e50d82 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
2012-09-16 Chong Yidong <cyd@gnu.org>
* window.el (special-display-popup-frame): Doc fix (Bug#8853).
+ (display-buffer-function): Mark as obsolete.
* progmodes/compile.el (compilation-parse-errors): Accept list
values similar to font-lock-keywords (Bug#12136). Suggested by
diff --git a/lisp/window.el b/lisp/window.el
index d9f3ccbd5c2..fccb68bd94a 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4551,6 +4551,9 @@ of the window used."
(function :tag "function"))
:group 'windows)
+(make-obsolete-variable 'display-buffer-function
+ 'display-buffer-alist "24.3")
+
;; Eventually, we want to turn this into a defvar; instead of
;; customizing this, the user should use a `pop-up-frame-parameters'
;; alist entry in `display-buffer-base-action'.