Remove stale references to help-setup parameter in doc-strings.

* window.el (display-buffer-function, special-display-function):
Mention display-buffer-record-window but do not mention
help-setup parameter in doc-strings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 394559563e9d08a1842efada34af38647f6fe643..3a23d232034a12aa0bcfbb81bd7626c09f5ddfe9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-08  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.el (display-buffer-function, special-display-function):
+       Mention display-buffer-record-window but do not mention
+       help-setup parameter in doc-strings.
+
 2011-11-08  Chong Yidong  <cyd@gnu.org>
 
        * window.el (window-total-height, window-total-width): Doc fix.

diff --git a/lisp/window.el b/lisp/window.el
index 2f1b2a99a416d45b346bd83db21336a09b9470ef..d0ad4239a184f6fea77d3ae9a16b202020cbe057 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3917,8 +3917,9 @@ means that the currently selected window is not acceptable.  It
 should choose or create a window, display the specified buffer in
 it, and return the window.
 
-The function specified here is responsible for setting the
-quit-restore and help-setup parameters of the window used."
+The specified function should call `display-buffer-record-window'
+with corresponding arguments to set up the quit-restore parameter
+of the window used."
   :type '(choice
          (const nil)
          (function :tag "function"))
@@ -4190,8 +4191,9 @@ A buffer is special when its name is either listed in
 `special-display-buffer-names' or matches a regexp in
 `special-display-regexps'.
 
-The function specified here is responsible for setting the
-quit-restore and help-setup parameters of the window used."
+The specified function should call `display-buffer-record-window'
+with corresponding arguments to set up the quit-restore parameter
+of the window used."
   :type 'function
   :group 'frames)