diff options
| author | Stefan Kangas | 2022-07-09 06:30:38 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2022-07-09 06:30:38 +0200 |
| commit | f400c60237f04781b60423492c583beea6c77e8e (patch) | |
| tree | 9b4105f9ac41e47fe1e8a098f9ed1eddb5b1f02f /src | |
| parent | 29c8866c7fcd325995c6fc9b2b18537855fee52c (diff) | |
| parent | 3442de2edd8770bae8541257dc5a65fcb932d8da (diff) | |
| download | emacs-f400c60237f04781b60423492c583beea6c77e8e.tar.gz emacs-f400c60237f04781b60423492c583beea6c77e8e.zip | |
Merge from origin/emacs-28
3442de2edd Doc fix; don't mention obsolete variable
c4e251103b ; * lisp/textmodes/rst.el: Update URLs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index 70438b70b8f..10373f8a2bf 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -1289,7 +1289,7 @@ WINDOW must be a live window and defaults to the selected one. | |||
| 1289 | Clip the number to a reasonable value if out of range. | 1289 | Clip the number to a reasonable value if out of range. |
| 1290 | Return the new number. NCOL should be zero or positive. | 1290 | Return the new number. NCOL should be zero or positive. |
| 1291 | 1291 | ||
| 1292 | Note that if `automatic-hscrolling' is non-nil, you cannot scroll the | 1292 | Note that if `auto-hscroll-mode' is non-nil, you cannot scroll the |
| 1293 | window so that the location of point moves off-window. */) | 1293 | window so that the location of point moves off-window. */) |
| 1294 | (Lisp_Object window, Lisp_Object ncol) | 1294 | (Lisp_Object window, Lisp_Object ncol) |
| 1295 | { | 1295 | { |