# HG changeset patch # User Martin Rudalics # Date 1227354091 0 # Node ID e8c67eb9dcf13299fa840ff20da085bf25cb6f29 # Parent 806c4d7db55dd1da950ac019f09f82b5f1820db6 (switch-to-buffer-other-window, switch-to-buffer-other-frame): Rename buffer argument to buffer-or-name. Reword and mention new option confirm-nonexistent-file-or-buffer in doc-string. diff -r 806c4d7db55d -r e8c67eb9dcf1 lisp/files.el --- a/lisp/files.el Sat Nov 22 11:35:45 2008 +0000 +++ b/lisp/files.el Sat Nov 22 11:41:31 2008 +0000 @@ -1120,40 +1120,49 @@ (read-buffer prompt (other-buffer (current-buffer)) (if confirm-nonexistent-file-or-buffer 'confirm-only))))) -(defun switch-to-buffer-other-window (buffer &optional norecord) - "Select buffer BUFFER in another window. -If BUFFER does not identify an existing buffer, then this function -creates a buffer with that name. - -When called from Lisp, BUFFER can be a buffer, a string \(a buffer name), -or nil. If BUFFER is nil, then this function chooses a buffer -using `other-buffer'. -Optional second arg NORECORD non-nil means do not put this +(defun switch-to-buffer-other-window (buffer-or-name &optional norecord) + "Select the buffer specified by BUFFER-OR-NAME in another window. +BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or +nil. Return the buffer switched to. + +If BUFFER-OR-NAME is a string and does not identify an existing +buffer, create a new buffer with that name. Interactively, if +`confirm-nonexistent-file-or-buffer' is non-nil, request +confirmation before creating a new buffer. If BUFFER-OR-NAME is +nil, switch to buffer returned by `other-buffer'. + +Optional second argument NORECORD non-nil means do not put this buffer at the front of the list of recently selected ones. -This function returns the buffer it switched to. This uses the function `display-buffer' as a subroutine; see its documentation for additional customization information." (interactive (list (read-buffer-to-switch "Switch to buffer in other window: "))) (let ((pop-up-windows t) - ;; Don't let these interfere. same-window-buffer-names same-window-regexps) - (pop-to-buffer buffer t norecord))) - -(defun switch-to-buffer-other-frame (buffer &optional norecord) - "Switch to buffer BUFFER in another frame. + (pop-to-buffer buffer-or-name t norecord))) + +(defun switch-to-buffer-other-frame (buffer-or-name &optional norecord) + "Switch to buffer BUFFER-OR-NAME in another frame. +BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or +nil. Return the buffer switched to. + +If BUFFER-OR-NAME is a string and does not identify an existing +buffer, create a new buffer with that name. Interactively, if +`confirm-nonexistent-file-or-buffer' is non-nil, request +confirmation before creating a new buffer. If BUFFER-OR-NAME is +nil, switch to buffer returned by `other-buffer'. + Optional second arg NORECORD non-nil means do not put this buffer at the front of the list of recently selected ones. -This function returns the buffer it switched to. - -This uses the function `display-buffer' as a subroutine; see -its documentation for additional customization information." + +This uses the function `display-buffer' as a subroutine; see its +documentation for additional customization information." (interactive (list (read-buffer-to-switch "Switch to buffer in other frame: "))) (let ((pop-up-frames t) same-window-buffer-names same-window-regexps) - (pop-to-buffer buffer t norecord))) + (pop-to-buffer buffer-or-name t norecord))) (defun display-buffer-other-frame (buffer) "Display buffer BUFFER in another frame.