diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2025-06-14 11:23:54 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2025-06-14 11:23:54 -0400 |
| commit | 336253ddd398fed75d3e404f860691171de4d9d3 (patch) | |
| tree | 986c5575c45a1db7d6b93a85ed218da7d5033191 /src/eval.c | |
| parent | 4cc6cdcf9d408407c69cdd9d468ec0de58038a44 (diff) | |
| parent | df3fb94f09143285980348a3c6264ace913d3c73 (diff) | |
Merge from origin/emacs-30
df3fb94f091 Insert missing step to make use of directory tracking OSC...
1bed2949583 * lisp/keymap.el (keymap-set): Refer to 'key-description'...
941158fc133 Support new tree-sitter grammar filename format (bug#78754)
888f846d377 Fix crash when evaluating "(signal nil 5)" (bug#78738)
51b9e92ab8e Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
c0a913ea4f3 ; * doc/lispref/modes.texi (Font Lock Basics): Remove old...
37de076017a Adapt emba integration (don't merge)
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index fbb881d682d..46705dc4543 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1888,7 +1888,7 @@ See also the function `condition-case'. */ (Lisp_Object error_symbol, Lisp_Object data) { /* If they call us with nonsensical arguments, produce "peculiar error". */ - if (NILP (error_symbol) && NILP (data)) + if (NILP (error_symbol) && !CONSP (data)) error_symbol = Qerror; signal_or_quit (error_symbol, data, false); eassume (false); |