aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2014-03-15 12:16:12 +0100
committerJuanma Barranquero2014-03-15 12:16:12 +0100
commitb6d8543cd590fee31ecdef84a625a1e1d06e61c8 (patch)
tree1ec56284f1e75aa891029038e98e62c7ece9455d /src
parent480d4f5784c64a3d379a3ebfe302612a7f63a77d (diff)
downloademacs-b6d8543cd590fee31ecdef84a625a1e1d06e61c8.tar.gz
emacs-b6d8543cd590fee31ecdef84a625a1e1d06e61c8.zip
src/buffer.c (Fset_buffer): Document return value (bug#17015).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/buffer.c7
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0512b0d9b68..424416398e8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-03-15 Juanma Barranquero <lekktu@gmail.com>
2
3 * buffer.c (Fset_buffer): Document return value (bug#17015).
4
12014-03-14 Martin Rudalics <rudalics@gmx.at> 52014-03-14 Martin Rudalics <rudalics@gmx.at>
2 6
3 * w32term.c (x_set_window_size): When frame-resize-pixelwise is 7 * w32term.c (x_set_window_size): When frame-resize-pixelwise is
diff --git a/src/buffer.c b/src/buffer.c
index 028ef76ff71..daafbcef0e4 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2187,11 +2187,12 @@ set_buffer_temp (struct buffer *b)
2187 2187
2188DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, 2188DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0,
2189 doc: /* Make buffer BUFFER-OR-NAME current for editing operations. 2189 doc: /* Make buffer BUFFER-OR-NAME current for editing operations.
2190BUFFER-OR-NAME may be a buffer or the name of an existing buffer. See 2190BUFFER-OR-NAME may be a buffer or the name of an existing buffer.
2191also `with-current-buffer' when you want to make a buffer current 2191See also `with-current-buffer' when you want to make a buffer current
2192temporarily. This function does not display the buffer, so its effect 2192temporarily. This function does not display the buffer, so its effect
2193ends when the current command terminates. Use `switch-to-buffer' or 2193ends when the current command terminates. Use `switch-to-buffer' or
2194`pop-to-buffer' to switch buffers permanently. */) 2194`pop-to-buffer' to switch buffers permanently.
2195The return value is the buffer made current. */)
2195 (register Lisp_Object buffer_or_name) 2196 (register Lisp_Object buffer_or_name)
2196{ 2197{
2197 register Lisp_Object buffer; 2198 register Lisp_Object buffer;