diff options
| author | Eli Zaretskii | 2012-11-17 20:00:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-11-17 20:00:16 +0200 |
| commit | cf2d22b874ca2df0072e32ee641e8efffe4abd6d (patch) | |
| tree | 1795142ec7861fc85c61adc90f03265b69041556 /src/eval.c | |
| parent | 3c4ca7155293ffc2d04708007131bcbc882d8913 (diff) | |
| parent | 6ad30855c02908fdd99d9b11943719e185e65ee3 (diff) | |
| download | emacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.tar.gz emacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.zip | |
Merge from trunk.
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index dcd48cb7250..f8a76646352 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -508,7 +508,7 @@ spec that specifies non-nil unconditionally (such as \"p\"); or (ii) | |||
| 508 | use `called-interactively-p'. */) | 508 | use `called-interactively-p'. */) |
| 509 | (void) | 509 | (void) |
| 510 | { | 510 | { |
| 511 | return interactive_p () ? Qt : Qnil; | 511 | return (INTERACTIVE && interactive_p ()) ? Qt : Qnil; |
| 512 | } | 512 | } |
| 513 | 513 | ||
| 514 | 514 | ||
| @@ -3369,7 +3369,7 @@ mark_backtrace (void) | |||
| 3369 | 3369 | ||
| 3370 | for (backlist = backtrace_list; backlist; backlist = backlist->next) | 3370 | for (backlist = backtrace_list; backlist; backlist = backlist->next) |
| 3371 | { | 3371 | { |
| 3372 | mark_object (*backlist->function); | 3372 | mark_object (backlist->function); |
| 3373 | 3373 | ||
| 3374 | if (backlist->nargs == UNEVALLED | 3374 | if (backlist->nargs == UNEVALLED |
| 3375 | || backlist->nargs == MANY) /* FIXME: Can this happen? */ | 3375 | || backlist->nargs == MANY) /* FIXME: Can this happen? */ |