diff options
| author | Eli Zaretskii | 2021-07-15 12:23:50 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2021-07-15 12:23:50 +0300 |
| commit | 07392da96d608b525529e15f1d04ebc6c0e4d15b (patch) | |
| tree | a3899b5c422b7c7b1294c5d2e73aaab988232d33 /src | |
| parent | 0c28223bb2dc5f6aafaaee88c5a7f723f618484a (diff) | |
| parent | 0848af9f6633fa997fd6390aee62e64cb226b06e (diff) | |
| download | emacs-07392da96d608b525529e15f1d04ebc6c0e4d15b.tar.gz emacs-07392da96d608b525529e15f1d04ebc6c0e4d15b.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/window.c b/src/window.c index db324effcce..a6e8ee0d534 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -1723,14 +1723,16 @@ have been if redisplay had finished, do this: | |||
| 1723 | 1723 | ||
| 1724 | DEFUN ("window-end", Fwindow_end, Swindow_end, 0, 2, 0, | 1724 | DEFUN ("window-end", Fwindow_end, Swindow_end, 0, 2, 0, |
| 1725 | doc: /* Return position at which display currently ends in WINDOW. | 1725 | doc: /* Return position at which display currently ends in WINDOW. |
| 1726 | WINDOW must be a live window and defaults to the selected one. | 1726 | This is the position after the final character in WINDOW. |
| 1727 | This is updated by redisplay, when it runs to completion. | 1727 | |
| 1728 | Simply changing the buffer text or setting `window-start' | 1728 | WINDOW must be a live window and defaults to the selected one. This |
| 1729 | does not update this value. | 1729 | is updated by redisplay, when it runs to completion. Simply changing |
| 1730 | the buffer text or setting `window-start' does not update this value. | ||
| 1731 | |||
| 1730 | Return nil if there is no recorded value. (This can happen if the | 1732 | Return nil if there is no recorded value. (This can happen if the |
| 1731 | last redisplay of WINDOW was preempted, and did not finish.) | 1733 | last redisplay of WINDOW was preempted, and did not finish.) If |
| 1732 | If UPDATE is non-nil, compute the up-to-date position | 1734 | UPDATE is non-nil, compute the up-to-date position if it isn't already |
| 1733 | if it isn't already recorded. */) | 1735 | recorded. */) |
| 1734 | (Lisp_Object window, Lisp_Object update) | 1736 | (Lisp_Object window, Lisp_Object update) |
| 1735 | { | 1737 | { |
| 1736 | Lisp_Object value; | 1738 | Lisp_Object value; |