* lisp/window.el (display-buffer--action-function-custom-type):

Don't include internal functions in the Custom interface.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c16a44722a6630034dedddedc6d1c39ea7495fd..710cbcf8efa16dfee4a8e1fbd492304ce5b64e00 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * window.el (display-buffer--action-function-custom-type):
+       Don't include internal functions in the Custom interface.
+
 2011-09-20  Juri Linkov  <juri@jurta.org>
 
        * info.el (Info-history-skip-intermediate-nodes): New defcustom.
@@ -130,8 +135,8 @@
        * net/tramp.el (top): Don't require 'shell.
        (tramp-methods): Fix docstring.
        (tramp-get-remote-tmpdir): New defun, moved from tramp-sh.el.
-       Return complete remote file name.  Handle "smb" case.  Use
-       `tramp-tmpdir', if defined for the respective method.
+       Return complete remote file name.  Handle "smb" case.
+       Use `tramp-tmpdir', if defined for the respective method.
        (tramp-make-tramp-temp-file): Adapt call of `tramp-get-remote-tmpdir'.
 
        * net/tramp-compat.el (top): Require 'shell.

diff --git a/lisp/window.el b/lisp/window.el
index e0be98d5bd1a22fe4a5d82d74a227594c476aecd..50b8e7345c347880e002e2491f6920d54f95aa18 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4442,10 +4442,7 @@ BUFFER-OR-NAME and return that buffer."
 (defconst display-buffer--action-function-custom-type
   '(choice :tag "Function"
           (const :tag "--" ignore) ; default for insertion
-          (const display-buffer--maybe-same-window)
           (const display-buffer-reuse-window)
-          (const display-buffer--special)
-          (const display-buffer--maybe-pop-up-frame-or-window)
           (const display-buffer-use-some-window)
           (const display-buffer-same-window)
           (const display-buffer-pop-up-frame)