diff options
| author | João Távora <joaotavora@gmail.com> | 2023-04-03 00:33:03 +0100 |
|---|---|---|
| committer | João Távora <joaotavora@gmail.com> | 2023-04-03 00:33:03 +0100 |
| commit | c108132d3bb69d0cc8d2e0222a781dff9abca087 (patch) | |
| tree | f2bd600bfcf0f9f06dd36b7f08bfcc605da352fe /src | |
| parent | f886ae5cf07bb40ad3fd0262942bdc74efca0277 (diff) | |
| parent | 3bdbb66efb9895b8ed55270075fa7d8329f8d36b (diff) | |
| download | emacs-c108132d3bb69d0cc8d2e0222a781dff9abca087.tar.gz | |
Merge from origin/emacs-29
3bdbb66efb9 ; CONTRIBUTE: Minor stylistic changes.
d0eb12e8d3c Fix typo in section 14.1 of Emacs Manual
b2fbec37f39 ; * etc/EGLOT-NEWS: Clarify scope of topmost section
131ec049db0 Eglot: unbreak eglot-extend-to-xref on w32
0622e1f29f6 Eglot: ensure server shutdown turns off eglot-inlay-hints...
59f66ea3027 ; * lisp/emacs-lisp/package-vc.el: Remove completed item ...
d23dc3dd7e3 ; * lisp/emacs-lisp/package-vc.el (package-vc): Fix manua...
4508a024e81 ; Clarify documentation of 'cursor' text property
d2e82817a3f Add two typescript-ts-mode faces (bug#62429)
10918fc9d24 Fix scrolling window when point moves up
9b32bc134c4 Improve documentation of 'defcustom's :set keyword
ab4273056e0 Comp fix calls to redefined primtives with op-bytecode (b...
c98929c7e18 ; Fix last change
a14c3f62a67 ; Fix last change
09fece5722f Fix duplicate defcustom in eww.el
e45bd10a3d9 Fix indentation regression in 'C-h l'
46fd10a7600 * doc/misc/tramp.texi (Remote shell setup): Clarify use o...
Diffstat (limited to 'src')
| -rw-r--r-- | src/comp.c | 8 | ||||
| -rw-r--r-- | src/xdisp.c | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/comp.c b/src/comp.c index 5cbe441dd7f..9ff3efedbdd 100644 --- a/src/comp.c +++ b/src/comp.c @@ -5910,6 +5910,14 @@ For internal use. */); Vcomp_loaded_comp_units_h = CALLN (Fmake_hash_table, QCweakness, Qvalue, QCtest, Qequal); + DEFVAR_LISP ("comp-subr-arities-h", Vcomp_subr_arities_h, + doc: /* Hash table recording the arity of Lisp primitives. +This is in case they are redefined so the compiler still knows how to +compile calls to them. +subr-name -> arity +For internal use. */); + Vcomp_subr_arities_h = CALLN (Fmake_hash_table, QCtest, Qequal); + Fprovide (intern_c_string ("native-compile"), Qnil); #endif /* #ifdef HAVE_NATIVE_COMP */ diff --git a/src/xdisp.c b/src/xdisp.c index 754a7c16c76..76d6592bf00 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -18546,8 +18546,9 @@ try_scrolling (Lisp_Object window, bool just_this_one_p, start_display (&it, w, startp); if (arg_scroll_conservatively) - amount_to_scroll = max (dy, frame_line_height - * max (scroll_step, temp_scroll_step)); + amount_to_scroll + = min (max (dy, frame_line_height), + frame_line_height * arg_scroll_conservatively); else if (scroll_step || temp_scroll_step) amount_to_scroll = scroll_max; else |