From 3ad96b4d0afa2e8bebd4a31fbf3b9a30fdf50226 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Sat, 22 Nov 2008 11:42:00 +0000 Subject: [PATCH] (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. --- lisp/ChangeLog | 15 +++++++++++---- lisp/files.el | 45 +++++++++++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 45ce93ecde1..4646adc3627 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,12 +1,19 @@ +2008-11-22 Martin Rudalics + + * files.el (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. + 2008-11-22 Michael Kifer - + * viper.el: date change. - + * viper-cmd.el (viper-envelop-ESC-key): viper-translate-all-ESC-keysequences is now a function. - + * viper-init (viper-translate-all-ESC-keysequences): make this variable - + 2008-11-22 Stefan Monnier * vc-hooks.el (vc-follow-link, vc-find-file-hook): diff --git a/lisp/files.el b/lisp/files.el index 68f41115f05..f501e14b5f2 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1120,40 +1120,49 @@ and default values." (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))) + (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'. -(defun switch-to-buffer-other-frame (buffer &optional norecord) - "Switch to buffer BUFFER in another frame. 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. -- 2.39.2