diff options
| author | Eli Zaretskii | 2025-03-09 15:02:39 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2025-03-09 15:02:39 +0200 |
| commit | 59d1aac49dfdc49e34be5964f547db0cfa7e127b (patch) | |
| tree | d77d8fa81094e38c5117bbe339ee6f13affae12a /src | |
| parent | 35c7837c6616b3a2b845ba06d3ed797bb12fb749 (diff) | |
| download | emacs-59d1aac49dfdc49e34be5964f547db0cfa7e127b.tar.gz emacs-59d1aac49dfdc49e34be5964f547db0cfa7e127b.zip | |
Document return values of the various read-* functions
* lisp/textmodes/string-edit.el (read-string-from-buffer):
* lisp/simple.el (read-from-kill-ring, read-shell-command)
(read-signal-name):
* lisp/replace.el (read-regexp-case-fold-search):
* lisp/auth-source.el (read-passwd):
* lisp/subr.el (read-key, read-number):
* lisp/minibuffer.el (read-file-name, read-no-blanks-input):
* lisp/international/mule-cmds.el (read-multilingual-string):
* lisp/language/japan-util.el (read-hiragana-string):
* lisp/files-x.el (read-file-local-variable)
(read-file-local-variable-mode, read-file-local-variable-value):
* lisp/faces.el (read-face-font, read-face-name):
* lisp/simple.el (read-extended-command):
* lisp/env.el (read-envvar-name):
* lisp/files.el (read-directory-name):
* lisp/faces.el (read-color):
* lisp/international/mule-diag.el (read-charset):
* lisp/emacs-lisp/map-ynp.el (read-answer):
* src/coding.c (Fread_coding_system)
(Fread_non_nil_coding_system):
* src/minibuf.c (Fread_command, Fread_from_minibuffer):
* src/lread.c (Fread_char, Fread_char_exclusive, Fread_event): Doc
fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/coding.c | 5 | ||||
| -rw-r--r-- | src/lread.c | 6 | ||||
| -rw-r--r-- | src/minibuf.c | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/coding.c b/src/coding.c index b8ed3a35957..619a362d328 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -8625,7 +8625,8 @@ about coding-system objects. */) | |||
| 8625 | 8625 | ||
| 8626 | DEFUN ("read-non-nil-coding-system", Fread_non_nil_coding_system, | 8626 | DEFUN ("read-non-nil-coding-system", Fread_non_nil_coding_system, |
| 8627 | Sread_non_nil_coding_system, 1, 1, 0, | 8627 | Sread_non_nil_coding_system, 1, 1, 0, |
| 8628 | doc: /* Read a coding system from the minibuffer, prompting with string PROMPT. */) | 8628 | doc: /* Read a coding system from the minibuffer, prompting with string PROMPT. |
| 8629 | Return the symbol of the coding-system. */) | ||
| 8629 | (Lisp_Object prompt) | 8630 | (Lisp_Object prompt) |
| 8630 | { | 8631 | { |
| 8631 | Lisp_Object val; | 8632 | Lisp_Object val; |
| @@ -8641,6 +8642,8 @@ DEFUN ("read-non-nil-coding-system", Fread_non_nil_coding_system, | |||
| 8641 | DEFUN ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 2, 0, | 8642 | DEFUN ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 2, 0, |
| 8642 | doc: /* Read a coding system from the minibuffer, prompting with string PROMPT. | 8643 | doc: /* Read a coding system from the minibuffer, prompting with string PROMPT. |
| 8643 | If the user enters null input, return second argument DEFAULT-CODING-SYSTEM. | 8644 | If the user enters null input, return second argument DEFAULT-CODING-SYSTEM. |
| 8645 | Return the coding-system's symbol, or nil if both the user input and | ||
| 8646 | DEFAULT-CODING-SYSTEM are empty or null. | ||
| 8644 | Ignores case when completing coding systems (all Emacs coding systems | 8647 | Ignores case when completing coding systems (all Emacs coding systems |
| 8645 | are lower-case). */) | 8648 | are lower-case). */) |
| 8646 | (Lisp_Object prompt, Lisp_Object default_coding_system) | 8649 | (Lisp_Object prompt, Lisp_Object default_coding_system) |
diff --git a/src/lread.c b/src/lread.c index 1d41a9d5cf4..6610f82d927 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -859,7 +859,7 @@ read_filtered_event (bool no_switch_frame, bool ascii_required, | |||
| 859 | 859 | ||
| 860 | DEFUN ("read-char", Fread_char, Sread_char, 0, 3, 0, | 860 | DEFUN ("read-char", Fread_char, Sread_char, 0, 3, 0, |
| 861 | doc: /* Read a character event from the command input (keyboard or macro). | 861 | doc: /* Read a character event from the command input (keyboard or macro). |
| 862 | It is returned as a number. | 862 | Return the character as a number. |
| 863 | If the event has modifiers, they are resolved and reflected in the | 863 | If the event has modifiers, they are resolved and reflected in the |
| 864 | returned character code if possible (e.g. C-SPC yields 0 and C-a yields 97). | 864 | returned character code if possible (e.g. C-SPC yields 0 and C-a yields 97). |
| 865 | If some of the modifiers cannot be reflected in the character code, the | 865 | If some of the modifiers cannot be reflected in the character code, the |
| @@ -907,7 +907,7 @@ If `inhibit-interaction' is non-nil, this function will signal an | |||
| 907 | } | 907 | } |
| 908 | 908 | ||
| 909 | DEFUN ("read-event", Fread_event, Sread_event, 0, 3, 0, | 909 | DEFUN ("read-event", Fread_event, Sread_event, 0, 3, 0, |
| 910 | doc: /* Read an event object from the input stream. | 910 | doc: /* Read and return an event object from the input stream. |
| 911 | 911 | ||
| 912 | If you want to read non-character events, consider calling `read-key' | 912 | If you want to read non-character events, consider calling `read-key' |
| 913 | instead. `read-key' will decode events via `input-decode-map' that | 913 | instead. `read-key' will decode events via `input-decode-map' that |
| @@ -943,7 +943,7 @@ If `inhibit-interaction' is non-nil, this function will signal an | |||
| 943 | 943 | ||
| 944 | DEFUN ("read-char-exclusive", Fread_char_exclusive, Sread_char_exclusive, 0, 3, 0, | 944 | DEFUN ("read-char-exclusive", Fread_char_exclusive, Sread_char_exclusive, 0, 3, 0, |
| 945 | doc: /* Read a character event from the command input (keyboard or macro). | 945 | doc: /* Read a character event from the command input (keyboard or macro). |
| 946 | It is returned as a number. Non-character events are ignored. | 946 | Return the character as a number. Non-character events are ignored. |
| 947 | If the event has modifiers, they are resolved and reflected in the | 947 | If the event has modifiers, they are resolved and reflected in the |
| 948 | returned character code if possible (e.g. C-SPC yields 0 and C-a yields 97). | 948 | returned character code if possible (e.g. C-SPC yields 0 and C-a yields 97). |
| 949 | If some of the modifiers cannot be reflected in the character code, the | 949 | If some of the modifiers cannot be reflected in the character code, the |
diff --git a/src/minibuf.c b/src/minibuf.c index 026a8f4271e..3cb7ff47030 100644 --- a/src/minibuf.c +++ b/src/minibuf.c | |||
| @@ -1292,7 +1292,7 @@ barf_if_interaction_inhibited (void) | |||
| 1292 | 1292 | ||
| 1293 | DEFUN ("read-from-minibuffer", Fread_from_minibuffer, | 1293 | DEFUN ("read-from-minibuffer", Fread_from_minibuffer, |
| 1294 | Sread_from_minibuffer, 1, 7, 0, | 1294 | Sread_from_minibuffer, 1, 7, 0, |
| 1295 | doc: /* Read a string from the minibuffer, prompting with string PROMPT. | 1295 | doc: /* Read and return a string from the minibuffer, prompting with string PROMPT. |
| 1296 | The optional second arg INITIAL-CONTENTS is an obsolete alternative to | 1296 | The optional second arg INITIAL-CONTENTS is an obsolete alternative to |
| 1297 | DEFAULT-VALUE. It normally should be nil in new code, except when | 1297 | DEFAULT-VALUE. It normally should be nil in new code, except when |
| 1298 | HIST is a cons. It is discussed in more detail below. | 1298 | HIST is a cons. It is discussed in more detail below. |
| @@ -1444,7 +1444,7 @@ inherits the current input method and the setting of | |||
| 1444 | } | 1444 | } |
| 1445 | 1445 | ||
| 1446 | DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0, | 1446 | DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0, |
| 1447 | doc: /* Read the name of a command and return as a symbol. | 1447 | doc: /* Read the name of a command and return it as a symbol. |
| 1448 | Prompt with PROMPT. By default, return DEFAULT-VALUE or its first element | 1448 | Prompt with PROMPT. By default, return DEFAULT-VALUE or its first element |
| 1449 | if it is a list. If DEFAULT-VALUE is omitted or nil, and the user enters | 1449 | if it is a list. If DEFAULT-VALUE is omitted or nil, and the user enters |
| 1450 | null input, return a symbol whose name is an empty string. */) | 1450 | null input, return a symbol whose name is an empty string. */) |