summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2024-03-26 14:24:16 +0200
committerEli Zaretskii <eliz@gnu.org>2024-03-26 14:24:16 +0200
commit351d98535dc10f8338b8a418e331cc0af488087b (patch)
treec998d926a72be2ec626efe3fc82d36f8d077cbe2
parent8cc67dbcec0753c5579e63bf82bfe247debe222c (diff)
downloademacs-351d98535dc10f8338b8a418e331cc0af488087b.tar.gz
; 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.texi8
-rw-r--r--src/buffer.c21
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.
@item password
This is largely identical to @code{action}, but also requests an input
-method capable of inserting ASCII characters and instructs it not to
-save input in locations from whence it might be subsequently retrieved
-by features of the input method unfit to handle sensitive information,
-such as text suggestions.
+method capable of inserting ASCII characters, and instructs it not to
+save input in locations from which it might be subsequently retrieved
+by features of the input method that cannot handle sensitive
+information, such as text suggestions.
@item t
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. */);
Qnil,
doc: /* How the on screen keyboard's input method should insert in this buffer.
-When nil, the input method will be disabled and an ordinary keyboard
+If nil, the input method will be disabled and an ordinary keyboard
will be displayed in its place.
-When the symbol `action', the input method will insert text directly, but
-will send `return' key events instead of inserting new line characters.
-Any other value means that the input method will insert text directly.
+If the value is the symbol `action', the input method will insert text
+directly, but will send `return' key events instead of inserting new
+line characters.
+
+If the value is the symbol `password', an input method capable of ASCII
+input will be enabled, and will not save the entered text where it will
+be retrieved for text suggestions or other features not suitable for
+handling sensitive information, in addition to reporting `return' as
+when `action'.
-When the symbol `password', an input method capable of ASCII input will
-be enabled, and will not save entered text where it will be retrieved
-for text suggestions or other features not suited to handling sensitive
-information, in addition to reporting `return' as when `action'.
+Any other value means that the input method will insert text directly.
If you need to make non-buffer local changes to this variable, use
`overriding-text-conversion-style', which see.
This variable does not take immediate effect when set; rather, it
takes effect upon the next redisplay after the selected window or
-buffer changes. */);
+its buffer changes. */);
DEFVAR_LISP ("kill-buffer-query-functions", Vkill_buffer_query_functions,
doc: /* List of functions called with no args to query before killing a buffer.