diff options
| author | Stefan Kangas | 2023-03-02 06:30:15 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2023-03-02 06:30:15 +0100 |
| commit | c9b0f1df0d372a0b10094146913f4c2657721c36 (patch) | |
| tree | a6a67dc134332fad2e80d1f5c1b2b5235325e775 /src/bytecode.c | |
| parent | a1cb77771a29b97ac3a256322129d12368ec4e4b (diff) | |
| parent | 07f3236133b01cb65806eb1a6bf2ebaecbdd2d81 (diff) | |
| download | emacs-c9b0f1df0d372a0b10094146913f4c2657721c36.tar.gz emacs-c9b0f1df0d372a0b10094146913f4c2657721c36.zip | |
Merge from origin/emacs-29
07f3236133b * src/profiler.c (malloc_probe): Make it safe for GC (bug...
1f1d36fa808 * lisp/emacs-lisp/debug-early.el (debug-early-backtrace):...
99df815c153 Revert "Don't disable eldoc when doing edebug"
0a4b1c0102d ; Eglot: improve bug-reference-url-format/bug-reference-u...
40c9fc8e3b3 Eglot: work around Tramp instability bug#61350
4a6db125b9e Fix treesit-indent-region
7ef9a8210c9 Replace C++ comments with C style equivalents
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index 124348e5b35..74a94859aba 100644 --- a/src/bytecode.c +++ b/src/bytecode.c | |||
| @@ -789,10 +789,10 @@ exec_byte_code (Lisp_Object fun, ptrdiff_t args_template, | |||
| 789 | Lisp_Object template; | 789 | Lisp_Object template; |
| 790 | Lisp_Object bytecode; | 790 | Lisp_Object bytecode; |
| 791 | if (COMPILEDP (call_fun) | 791 | if (COMPILEDP (call_fun) |
| 792 | // Lexical binding only. | 792 | /* Lexical binding only. */ |
| 793 | && (template = AREF (call_fun, COMPILED_ARGLIST), | 793 | && (template = AREF (call_fun, COMPILED_ARGLIST), |
| 794 | FIXNUMP (template)) | 794 | FIXNUMP (template)) |
| 795 | // No autoloads. | 795 | /* No autoloads. */ |
| 796 | && (bytecode = AREF (call_fun, COMPILED_BYTECODE), | 796 | && (bytecode = AREF (call_fun, COMPILED_BYTECODE), |
| 797 | !CONSP (bytecode))) | 797 | !CONSP (bytecode))) |
| 798 | { | 798 | { |