aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorMartin Rudalics2015-05-20 10:35:13 +0200
committerMartin Rudalics2015-05-20 10:35:13 +0200
commit0c5fa361e14fc5a52da62939178b720224aaa4fe (patch)
tree3cb215fe6c8f69d8c314ef47b2df118cac49b146 /src/buffer.c
parent31d58d45249b3fb13a0a9a2c921f04cd9b42ff3f (diff)
downloademacs-0c5fa361e14fc5a52da62939178b720224aaa4fe.tar.gz
emacs-0c5fa361e14fc5a52da62939178b720224aaa4fe.zip
Fix handling and doc-string of FRAME arg of `other-buffer' (Bug#20533)
* src/buffer.c (Fother_buffer): Argument FRAME must denote a live frame. Fix doc-string (Bug#20533).
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/buffer.c b/src/buffer.c
index b09676c438d..148d077ec21 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1467,15 +1467,15 @@ DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0,
1467Buffers not visible in windows are preferred to visible buffers, unless 1467Buffers not visible in windows are preferred to visible buffers, unless
1468optional second argument VISIBLE-OK is non-nil. Ignore the argument 1468optional second argument VISIBLE-OK is non-nil. Ignore the argument
1469BUFFER unless it denotes a live buffer. If the optional third argument 1469BUFFER unless it denotes a live buffer. If the optional third argument
1470FRAME is non-nil, use that frame's buffer list instead of the selected 1470FRAME specifies a live frame, then use that frame's buffer list instead
1471frame's buffer list. 1471of the selected frame's buffer list.
1472 1472
1473The buffer is found by scanning the selected or specified frame's buffer 1473The buffer is found by scanning the selected or specified frame's buffer
1474list first, followed by the list of all buffers. If no other buffer 1474list first, followed by the list of all buffers. If no other buffer
1475exists, return the buffer `*scratch*' (creating it if necessary). */) 1475exists, return the buffer `*scratch*' (creating it if necessary). */)
1476 (Lisp_Object buffer, Lisp_Object visible_ok, Lisp_Object frame) 1476 (Lisp_Object buffer, Lisp_Object visible_ok, Lisp_Object frame)
1477{ 1477{
1478 struct frame *f = decode_any_frame (frame); 1478 struct frame *f = decode_live_frame (frame);
1479 Lisp_Object tail = f->buffer_list, pred = f->buffer_predicate; 1479 Lisp_Object tail = f->buffer_list, pred = f->buffer_predicate;
1480 Lisp_Object buf, notsogood = Qnil; 1480 Lisp_Object buf, notsogood = Qnil;
1481 1481