Merge from origin/emacs-26

02d114d6b8 * lisp/tree-widget.el (tree-widget-end-guide): Escape it. ...
0a85d12474 Fix ELisp "Warning Tips"
06d05fec84 Fix Bug#29163
ac64fdb248 Harden exec_byte_code against redefining 'error'
700f74e4c8 Fix Edebug specs for if-let* and and-let* (Bug#29236)
0ded1b41a9 Fix Edebug's handling of dotted specs (bug#6415)
16358d4fcb Improve documentation of "constant" symbols

1 files changed, 2 insertions, 4 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index ebaf3c3a7fc..8746568f166 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1346,10 +1346,8 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
           /* Actually this is Bstack_ref with offset 0, but we use Bdup
              for that instead.  */
           /* CASE (Bstack_ref): */
-          call3 (Qerror,
-                 build_string ("Invalid byte opcode: op=%s, ptr=%d"),
-                 make_number (op),
-                 make_number (pc - 1 - bytestr_data));
+          error ("Invalid byte opcode: op=%d, ptr=%"pD"d",
+                 op, pc - 1 - bytestr_data);
 
           /* Handy byte-codes for lexical binding.  */
         CASE (Bstack_ref1):