diff options
| author | Kenichi Handa | 2012-08-30 21:07:42 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-08-30 21:07:42 +0900 |
| commit | 31e7d6e0902a895e13833204907dfb86268b5acf (patch) | |
| tree | 445b59dd5e87c8e2a8b969356386f45cae8cd6d9 /src/eval.c | |
| parent | 4eb4de01df384be9b8d811f7ab476eeb37ece748 (diff) | |
| parent | f17e1d00e0513d781d2bd9a80af24bb047d32d5c (diff) | |
| download | emacs-31e7d6e0902a895e13833204907dfb86268b5acf.tar.gz emacs-31e7d6e0902a895e13833204907dfb86268b5acf.zip | |
merge trunk
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/eval.c b/src/eval.c index df44c87dc25..c56be10c5a0 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -544,11 +544,10 @@ thinking of using it for any other purpose, it is quite likely that | |||
| 544 | you're making a mistake. Think: what do you want to do when the | 544 | you're making a mistake. Think: what do you want to do when the |
| 545 | command is called from a keyboard macro? | 545 | command is called from a keyboard macro? |
| 546 | 546 | ||
| 547 | This function is meant for implementing advice and other | 547 | Instead of using this function, it is sometimes cleaner to give your |
| 548 | function-modifying features. Instead of using this, it is sometimes | 548 | function an extra optional argument whose `interactive' spec specifies |
| 549 | cleaner to give your function an extra optional argument whose | 549 | non-nil unconditionally (\"p\" is a good way to do this), or via |
| 550 | `interactive' spec specifies non-nil unconditionally (\"p\" is a good | 550 | \(not (or executing-kbd-macro noninteractive)). */) |
| 551 | way to do this), or via (not (or executing-kbd-macro noninteractive)). */) | ||
| 552 | (Lisp_Object kind) | 551 | (Lisp_Object kind) |
| 553 | { | 552 | { |
| 554 | return ((INTERACTIVE || !EQ (kind, intern ("interactive"))) | 553 | return ((INTERACTIVE || !EQ (kind, intern ("interactive"))) |