diff options
| author | Chong Yidong | 2011-09-24 18:51:36 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-09-24 18:51:36 -0400 |
| commit | 94e0933e1f0465f5f9a2e9d92e828a1380296bd0 (patch) | |
| tree | c5f32e035848010d5c3d4b39422e0cb9c17fce39 /src | |
| parent | 0e406a72ede9743069440dd605abd5fbf12d92c5 (diff) | |
| download | emacs-94e0933e1f0465f5f9a2e9d92e828a1380296bd0.tar.gz emacs-94e0933e1f0465f5f9a2e9d92e828a1380296bd0.zip | |
Minor doc fixes for some window functions.
Minor doc fixes for switch-to-buffer, window-prev-buffers,
set-window-prev-buffers, set-window-next-buffers.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/window.c | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index aaa200054c5..eff52db15a2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-09-24 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * window.c (Fwindow_prev_buffers, Fset_window_prev_buffers) | ||
| 4 | (Fset_window_next_buffers): Doc fix. | ||
| 5 | |||
| 1 | 2011-09-24 Glenn Morris <rgm@gnu.org> | 6 | 2011-09-24 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * minibuf.c (read_minibuf): Disable line truncation. (Bug#5715) | 8 | * minibuf.c (read_minibuf): Disable line truncation. (Bug#5715) |
diff --git a/src/window.c b/src/window.c index 39210b91616..ba06779846a 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -1665,8 +1665,9 @@ DEFUN ("window-prev-buffers", Fwindow_prev_buffers, Swindow_prev_buffers, | |||
| 1665 | doc: /* Return buffers previously shown in WINDOW. | 1665 | doc: /* Return buffers previously shown in WINDOW. |
| 1666 | WINDOW must be a live window and defaults to the selected one. | 1666 | WINDOW must be a live window and defaults to the selected one. |
| 1667 | 1667 | ||
| 1668 | The return value is either nil or a list of <buffer, window-start, | 1668 | The return value is a list of elements (BUFFER WINDOW-START POS), |
| 1669 | window-point> triples where buffer was previously shown in WINDOW. */) | 1669 | where BUFFER is a buffer, WINDOW-START is the start position of the |
| 1670 | window for that buffer, and POS is a window-specific point value. */) | ||
| 1670 | (Lisp_Object window) | 1671 | (Lisp_Object window) |
| 1671 | { | 1672 | { |
| 1672 | return decode_window (window)->prev_buffers; | 1673 | return decode_window (window)->prev_buffers; |
| @@ -1675,11 +1676,11 @@ window-point> triples where buffer was previously shown in WINDOW. */) | |||
| 1675 | DEFUN ("set-window-prev-buffers", Fset_window_prev_buffers, | 1676 | DEFUN ("set-window-prev-buffers", Fset_window_prev_buffers, |
| 1676 | Sset_window_prev_buffers, 2, 2, 0, | 1677 | Sset_window_prev_buffers, 2, 2, 0, |
| 1677 | doc: /* Set WINDOW's previous buffers to PREV-BUFFERS. | 1678 | doc: /* Set WINDOW's previous buffers to PREV-BUFFERS. |
| 1678 | WINDOW must be a live window and defaults to the selected one. Return | 1679 | WINDOW must be a live window and defaults to the selected one. |
| 1679 | PREV-BUFFERS. | ||
| 1680 | 1680 | ||
| 1681 | PREV-BUFFERS should be either nil or a list of <buffer, window-start, | 1681 | PREV-BUFFERS should be a list of elements (BUFFER WINDOW-START POS), |
| 1682 | window-point> triples where buffer was previously shown in WINDOW. */) | 1682 | where BUFFER is a buffer, WINDOW-START is the start position of the |
| 1683 | window for that buffer, and POS is a window-specific point value. */) | ||
| 1683 | (Lisp_Object window, Lisp_Object prev_buffers) | 1684 | (Lisp_Object window, Lisp_Object prev_buffers) |
| 1684 | { | 1685 | { |
| 1685 | return decode_window (window)->prev_buffers = prev_buffers; | 1686 | return decode_window (window)->prev_buffers = prev_buffers; |
| @@ -1697,11 +1698,8 @@ WINDOW must be a live window and defaults to the selected one. */) | |||
| 1697 | DEFUN ("set-window-next-buffers", Fset_window_next_buffers, | 1698 | DEFUN ("set-window-next-buffers", Fset_window_next_buffers, |
| 1698 | Sset_window_next_buffers, 2, 2, 0, | 1699 | Sset_window_next_buffers, 2, 2, 0, |
| 1699 | doc: /* Set WINDOW's next buffers to NEXT-BUFFERS. | 1700 | doc: /* Set WINDOW's next buffers to NEXT-BUFFERS. |
| 1700 | WINDOW must be a live window and defaults to the selected one. Return | 1701 | WINDOW must be a live window and defaults to the selected one. |
| 1701 | NEXT-BUFFERS. | 1702 | NEXT-BUFFERS should be a list of buffers. */) |
| 1702 | |||
| 1703 | NEXT-BUFFERS should be either nil or a list of buffers that have been | ||
| 1704 | recently re-shown in WINDOW. */) | ||
| 1705 | (Lisp_Object window, Lisp_Object next_buffers) | 1703 | (Lisp_Object window, Lisp_Object next_buffers) |
| 1706 | { | 1704 | { |
| 1707 | return decode_window (window)->next_buffers = next_buffers; | 1705 | return decode_window (window)->next_buffers = next_buffers; |