diff options
| author | Glenn Morris | 2012-11-16 09:20:23 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-11-16 09:20:23 -0800 |
| commit | 96e055075d7c73cf189038db1b15f9369888ea41 (patch) | |
| tree | 000f5ac37801ff324fa5a79c1af23bd762d826dc /src/eval.c | |
| parent | 3d082a269ece18058ed82957f8a056822b39789e (diff) | |
| parent | cdc5d88cf68f232a71560937b557af8fa36d50c5 (diff) | |
| download | emacs-96e055075d7c73cf189038db1b15f9369888ea41.tar.gz emacs-96e055075d7c73cf189038db1b15f9369888ea41.zip | |
Merge from emacs-24; up to 2012-11-13T18:57:26Z!dgutov@yandex.ru
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 c9f27ea8d77..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 | ||