[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 cf33ae0 05/64: Clarify the `interactive' doc stri
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] emacs-25 cf33ae0 05/64: Clarify the `interactive' doc string slightly |
Date: |
Sun, 01 May 2016 18:18:39 +0000 |
branch: emacs-25
commit cf33ae0c1286efb7acee8b1c0076048d5d3e3543
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Clarify the `interactive' doc string slightly
* src/callint.c (Finteractive): Clarify the doc string slightly
(bug#14577).
(cherry picked from commit cd993be60da2d12db0d390001373d486c1091c47)
---
src/callint.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/callint.c b/src/callint.c
index 3bcf2c8..e56f7cd 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -41,20 +41,24 @@ For example, write
(defun foo (arg buf) "Doc string" (interactive "P\\nbbuffer: ") .... )
to make ARG be the raw prefix argument, and set BUF to an existing buffer,
when `foo' is called as a command.
-The "call" to `interactive' is actually a declaration rather than a function;
- it tells `call-interactively' how to read arguments
- to pass to the function.
-When actually called, `interactive' just returns nil.
-
-Usually the argument of `interactive' is a string containing a code letter
- followed optionally by a prompt. (Some code letters do not use I/O to get
- the argument and do not use prompts.) To get several arguments, concatenate
- the individual strings, separating them by newline characters.
-Prompts are passed to format, and may use % escapes to print the
+
+The "call" to `interactive' is actually a declaration rather than a
+ function; it tells `call-interactively' how to read arguments to pass
+ to the function. When actually called, `interactive' just returns
+ nil.
+
+Usually the argument of `interactive' is a string containing a code
+ letter followed optionally by a prompt. (Some code letters do not
+ use I/O to get the argument and do not use prompts.) To pass several
+ arguments to the command, concatenate the individual strings,
+ separating them by newline characters.
+
+Prompts are passed to `format', and may use % escapes to print the
arguments that have already been read.
If the argument is not a string, it is evaluated to get a list of
- arguments to pass to the function.
-Just `(interactive)' means pass no args when calling interactively.
+ arguments to pass to the command.
+Just `(interactive)' means pass no arguments to the command when
+ calling interactively.
Code letters available are:
a -- Function name: symbol with a function definition.
@@ -99,7 +103,7 @@ If the string begins with `^' and `shift-select-mode' is
non-nil,
Emacs first calls the function `handle-shift-selection'.
You may use `@', `*', and `^' together. They are processed in the
order that they appear, before reading any arguments.
-usage: (interactive &optional ARGS) */
+usage: (interactive &optional ARG-DESCRIPTOR) */
attributes: const)
(Lisp_Object args)
{
- [Emacs-diffs] emacs-25 updated (d8affa3 -> 8aa4147), Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 3fc1ed8 02/64: Mention `lisp-indent-function' in the lispref manual, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 0a14d84 04/64: Clarify some doc strings, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 cf33ae0 05/64: Clarify the `interactive' doc string slightly,
Lars Ingebrigtsen <=
- [Emacs-diffs] emacs-25 de8349e 06/64: Doc string change to enable-recursive-minibuffers, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 9bd2af8 01/64: Clarify doc string of internal compilation function, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 4a2f33d 20/64: Doc fixes for menu-bar.el, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 7b85885 22/64: Doc fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 cc00738 09/64: find-lisp doc touchups, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 651182d 24/64: Doc fixed for next-error-buffer-p, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 351c079 03/64: Add some concept index entries for custom types, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 c355774 21/64: delsel doc touch ups, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 05194cb 26/64: Doc fix for font-lock-remove-keywords, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 28ef870 11/64: Doc tweak, Lars Ingebrigtsen, 2016/05/01