diff options
| author | Glenn Morris | 2012-08-14 14:43:08 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-08-14 14:43:08 -0400 |
| commit | 8c95e664530b0287a4755f6a945d8ac624bf6bd9 (patch) | |
| tree | 18e873a55523926ed3f2cd48c366d72072659bee /src | |
| parent | 6bdcb2b28f1efc5d7116a3e41e5da845a7eeda33 (diff) | |
| download | emacs-8c95e664530b0287a4755f6a945d8ac624bf6bd9.tar.gz emacs-8c95e664530b0287a4755f6a945d8ac624bf6bd9.zip | |
* src/eval.c (Fcalled_interactively_p): Doc fix. (Bug#11747)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/eval.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 28e053be63f..26369903c33 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-08-14 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * eval.c (Fcalled_interactively_p): Doc fix. (Bug#11747) | ||
| 4 | |||
| 1 | 2012-08-14 Ulrich Mueller <ulm@gentoo.org> | 5 | 2012-08-14 Ulrich Mueller <ulm@gentoo.org> |
| 2 | 6 | ||
| 3 | * systime.h (EMACS_TIME_CMP): Don't cast time_t values to long | 7 | * systime.h (EMACS_TIME_CMP): Don't cast time_t values to long |
diff --git a/src/eval.c b/src/eval.c index 4a3f5083b3b..a2df5bfcff5 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -560,11 +560,10 @@ thinking of using it for any other purpose, it is quite likely that | |||
| 560 | you're making a mistake. Think: what do you want to do when the | 560 | you're making a mistake. Think: what do you want to do when the |
| 561 | command is called from a keyboard macro? | 561 | command is called from a keyboard macro? |
| 562 | 562 | ||
| 563 | This function is meant for implementing advice and other | 563 | Instead of using this function, it is sometimes cleaner to give your |
| 564 | function-modifying features. Instead of using this, it is sometimes | 564 | function an extra optional argument whose `interactive' spec specifies |
| 565 | cleaner to give your function an extra optional argument whose | 565 | non-nil unconditionally (\"p\" is a good way to do this), or via |
| 566 | `interactive' spec specifies non-nil unconditionally (\"p\" is a good | 566 | \(not (or executing-kbd-macro noninteractive)). */) |
| 567 | way to do this), or via (not (or executing-kbd-macro noninteractive)). */) | ||
| 568 | (Lisp_Object kind) | 567 | (Lisp_Object kind) |
| 569 | { | 568 | { |
| 570 | return ((INTERACTIVE || !EQ (kind, intern ("interactive"))) | 569 | return ((INTERACTIVE || !EQ (kind, intern ("interactive"))) |