3 files changed, 5 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 4c6ceae1688..3344158b73c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -735,6 +735,7 @@ in Emacs 24.1:
 **** `special-display-frame-alist'
 **** `special-display-buffer-names'
 **** `special-display-function'
+**** `display-buffer-function'
 
 ** Completion
 
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'.