diff options
| author | Eli Zaretskii | 2024-03-26 14:24:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2024-03-26 14:24:16 +0200 |
| commit | 351d98535dc10f8338b8a418e331cc0af488087b (patch) | |
| tree | c998d926a72be2ec626efe3fc82d36f8d077cbe2 | |
| parent | 8cc67dbcec0753c5579e63bf82bfe247debe222c (diff) | |
| download | emacs-351d98535dc10f8338b8a418e331cc0af488087b.tar.gz emacs-351d98535dc10f8338b8a418e331cc0af488087b.zip | |
; Fix recently-changed documentation
* src/buffer.c (syms_of_buffer) <text-conversion-style>:
* doc/lispref/commands.texi (Misc Events): Fix wording and
punctuation of the documentation.
| -rw-r--r-- | doc/lispref/commands.texi | 8 | ||||
| -rw-r--r-- | src/buffer.c | 21 |
2 files changed, 16 insertions, 13 deletions
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 9ecdd23716c..4fe4969c0db 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi | |||
| @@ -2477,10 +2477,10 @@ be sent whenever the input method wants to insert a new line. | |||
| 2477 | 2477 | ||
| 2478 | @item password | 2478 | @item password |
| 2479 | This is largely identical to @code{action}, but also requests an input | 2479 | This is largely identical to @code{action}, but also requests an input |
| 2480 | method capable of inserting ASCII characters and instructs it not to | 2480 | method capable of inserting ASCII characters, and instructs it not to |
| 2481 | save input in locations from whence it might be subsequently retrieved | 2481 | save input in locations from which it might be subsequently retrieved |
| 2482 | by features of the input method unfit to handle sensitive information, | 2482 | by features of the input method that cannot handle sensitive |
| 2483 | such as text suggestions. | 2483 | information, such as text suggestions. |
| 2484 | 2484 | ||
| 2485 | @item t | 2485 | @item t |
| 2486 | This, or any other value, means that the input method will be enabled | 2486 | This, or any other value, means that the input method will be enabled |
diff --git a/src/buffer.c b/src/buffer.c index 9f954e1aba9..291c7d3f911 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -5901,24 +5901,27 @@ Use Custom to set this variable and update the display. */); | |||
| 5901 | Qnil, | 5901 | Qnil, |
| 5902 | doc: /* How the on screen keyboard's input method should insert in this buffer. | 5902 | doc: /* How the on screen keyboard's input method should insert in this buffer. |
| 5903 | 5903 | ||
| 5904 | When nil, the input method will be disabled and an ordinary keyboard | 5904 | If nil, the input method will be disabled and an ordinary keyboard |
| 5905 | will be displayed in its place. | 5905 | will be displayed in its place. |
| 5906 | 5906 | ||
| 5907 | When the symbol `action', the input method will insert text directly, but | 5907 | If the value is the symbol `action', the input method will insert text |
| 5908 | will send `return' key events instead of inserting new line characters. | 5908 | directly, but will send `return' key events instead of inserting new |
| 5909 | Any other value means that the input method will insert text directly. | 5909 | line characters. |
| 5910 | |||
| 5911 | If the value is the symbol `password', an input method capable of ASCII | ||
| 5912 | input will be enabled, and will not save the entered text where it will | ||
| 5913 | be retrieved for text suggestions or other features not suitable for | ||
| 5914 | handling sensitive information, in addition to reporting `return' as | ||
| 5915 | when `action'. | ||
| 5910 | 5916 | ||
| 5911 | When the symbol `password', an input method capable of ASCII input will | 5917 | Any other value means that the input method will insert text directly. |
| 5912 | be enabled, and will not save entered text where it will be retrieved | ||
| 5913 | for text suggestions or other features not suited to handling sensitive | ||
| 5914 | information, in addition to reporting `return' as when `action'. | ||
| 5915 | 5918 | ||
| 5916 | If you need to make non-buffer local changes to this variable, use | 5919 | If you need to make non-buffer local changes to this variable, use |
| 5917 | `overriding-text-conversion-style', which see. | 5920 | `overriding-text-conversion-style', which see. |
| 5918 | 5921 | ||
| 5919 | This variable does not take immediate effect when set; rather, it | 5922 | This variable does not take immediate effect when set; rather, it |
| 5920 | takes effect upon the next redisplay after the selected window or | 5923 | takes effect upon the next redisplay after the selected window or |
| 5921 | buffer changes. */); | 5924 | its buffer changes. */); |
| 5922 | 5925 | ||
| 5923 | DEFVAR_LISP ("kill-buffer-query-functions", Vkill_buffer_query_functions, | 5926 | DEFVAR_LISP ("kill-buffer-query-functions", Vkill_buffer_query_functions, |
| 5924 | doc: /* List of functions called with no args to query before killing a buffer. | 5927 | doc: /* List of functions called with no args to query before killing a buffer. |