[Emacs-diffs] /srv/bzr/emacs/trunk r105860: * lisp/window.el (display-buffer--action-function-custom-type):

[Stefan Monnier]

------------------------------------------------------------
revno: 105860
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2011-09-20 21:30:35 -0400
message:
  * lisp/window.el (display-buffer--action-function-custom-type):
  Don't include internal functions in the Custom interface.
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-20 20:16:42 +0000
+++ b/lisp/ChangeLog    2011-09-21 01:30:35 +0000
@@ -1,3 +1,8 @@
+2011-09-21  Stefan Monnier  <address@hidden>
+
+       * window.el (display-buffer--action-function-custom-type):
+       Don't include internal functions in the Custom interface.
+
 2011-09-20  Juri Linkov  <address@hidden>
 
        * 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.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-09-17 00:46:59 +0000
+++ b/lisp/window.el    2011-09-21 01:30:35 +0000
@@ -4442,10 +4442,7 @@
 (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)