diff options
| author | Glenn Morris | 2019-04-10 09:07:16 -0700 |
|---|---|---|
| committer | Glenn Morris | 2019-04-10 09:07:16 -0700 |
| commit | 7f88eecd7cd0054a83f5cad61ddde1830f3539a3 (patch) | |
| tree | d7d0853b1619ac284ae14538dda1499864f0ebe9 /src/window.c | |
| parent | 0cef057b02b088ded8b46e3453ac0d891888423a (diff) | |
| parent | a5da653319a3018074debfc7b4fdd90ac7ea838c (diff) | |
| download | emacs-7f88eecd7cd0054a83f5cad61ddde1830f3539a3.tar.gz emacs-7f88eecd7cd0054a83f5cad61ddde1830f3539a3.zip | |
Merge from origin/emacs-26
a5da653 * src/editfns.c (Fnarrow_to_region): Doc fix. (Bug#35163)
646d33d Fix doc strings of 'vc-version-diff' and 'vc-version-ediff'
a30a6c3 Improve documentation of set-window-start
92ce2dd Improve documentation of window parameters
6dc42c5 Improve commentary in frame.el
a8cffcf Fix typo in a doc string
9e79f19 (emacs-26) ; * src/fontset.c (set-fontset-font): Use uppercas...
# Conflicts:
# lisp/vc/vc.el
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index f911c0c7d44..ef2ed638508 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -1796,7 +1796,12 @@ DEFUN ("set-window-start", Fset_window_start, Sset_window_start, 2, 3, 0, | |||
| 1796 | doc: /* Make display in WINDOW start at position POS in WINDOW's buffer. | 1796 | doc: /* Make display in WINDOW start at position POS in WINDOW's buffer. |
| 1797 | WINDOW must be a live window and defaults to the selected one. Return | 1797 | WINDOW must be a live window and defaults to the selected one. Return |
| 1798 | POS. Optional third arg NOFORCE non-nil inhibits next redisplay from | 1798 | POS. Optional third arg NOFORCE non-nil inhibits next redisplay from |
| 1799 | overriding motion of point in order to display at this exact start. */) | 1799 | overriding motion of point in order to display at this exact start. |
| 1800 | |||
| 1801 | For reliable setting of WINDOW start position, make sure point is | ||
| 1802 | at a position that will be visible when that start is in effect, | ||
| 1803 | otherwise there's a chance POS will be disregarded, e.g., if point | ||
| 1804 | winds up in a partially-visible line. */) | ||
| 1800 | (Lisp_Object window, Lisp_Object pos, Lisp_Object noforce) | 1805 | (Lisp_Object window, Lisp_Object pos, Lisp_Object noforce) |
| 1801 | { | 1806 | { |
| 1802 | register struct window *w = decode_live_window (window); | 1807 | register struct window *w = decode_live_window (window); |