diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/window.el | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0c16a44722a..710cbcf8efa 100644 --- 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 e0be98d5bd1..50b8e7345c3 100644 --- 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) |