From: João Távora <joaotavora@gmail.com>
Date: Sun, 2 Apr 2023 23:33:03 +0000 (+0100)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c108132d3bb69d0cc8d2e0222a781dff9abca087;p=emacs.git

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...
---

c108132d3bb69d0cc8d2e0222a781dff9abca087
diff --cc lisp/emacs-lisp/comp.el
index a5ed5df117d,e97832455b9..841b0ebf29d
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@@ -1762,8 -1761,14 +1762,14 @@@ Return value is the fall-through block 
            do (puthash ff-bb-name ff-bb (comp-func-blocks comp-func))
               (setf (comp-limplify-curr-block comp-pass) ff-bb))))
      (_ (signal 'native-ice
 -               "missing previous setimm while creating a switch"))))
 +               '("missing previous setimm while creating a switch")))))
  
+ (defun comp--func-arity (subr-name)
+   "Like `func-arity' but invariant against primitive redefinitions.
+ SUBR-NAME is the name of function."
+   (or (gethash subr-name comp-subr-arities-h)
+       (func-arity subr-name)))
+ 
  (defun comp-emit-set-call-subr (subr-name sp-delta)
      "Emit a call for SUBR-NAME.
  SP-DELTA is the stack adjustment."