; Fix documentation of recent commits.

* lisp/touch-screen.el (touch-screen-handle-point-up): Fix
comments.

* lisp/net/eww.el (eww-check-text-conversion, eww-select-file)
(eww-toggle-checkbox, eww-submit): Doc fixes.

* doc/emacs/input.texi (On-Screen Keyboards): Fix punctuation and
wording.

(cherry picked from commit f6ae5939b950bdec86471b02e81d1b3827546a2d)

diff --git a/doc/emacs/input.texi b/doc/emacs/input.texi
index d48c13355b3d87771b605b4cf77aab354deb5e71..b553c0895cdfa87798e015a7674212f473a927cf 100644 (file)
--- a/doc/emacs/input.texi
+++ b/doc/emacs/input.texi
@@ -127,9 +127,9 @@ minibuffer being brought into use (@pxref{Minibuffer}).
 @vindex touch-screen-set-point-commands
   When a ``tap'' gesture results in a command being executed, Emacs
 checks whether the command is meant to set the point by searching for it
-in the list @code{touch-screen-set-point-commands}.  If it is and the
+in the list @code{touch-screen-set-point-commands}.  If it is, and the
 text beneath the new point is not read-only, the virtual keyboard is
-activated, in anticipation of the user entering text there.
+activated, in anticipation of the user input there.
 
   The default value of @code{touch-screen-set-point-commands} holds only
 the command @code{mouse-set-point} (@pxref{Mouse Commands}), which is

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 4bb491b9970f8722a1bb23459bb7307b8e59ba9c..5a138dcc46a26a58396cdf494538cd95eaf153f2 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1304,10 +1304,11 @@ This consults the entries in `eww-readable-urls' (which see)."
 
 (defun eww-check-text-conversion ()
   "Check if point is within a field and toggle text conversion.
-If `text-conversion-style' is not `action' if point is within the
-prompt or `nil' otherwise, set it to such a value, so as to
-guarantee that the input method functions properly for the
-purpose of typing within the ERC prompt."
+Set `text-conversion-style' to the value `action' if it isn't
+already and point is within the prompt field, or if
+`text-conversion-style' is `nil', so as to guarantee that
+the input method functions properly for the purpose of typing
+within the ERC prompt."
   (when (and (eq major-mode 'eww-mode)
              (fboundp 'set-text-conversion-style))
     (if (eq (car-safe (get-text-property (point) 'field))
@@ -1649,7 +1650,8 @@ just re-display the HTML already fetched."
 
 (defun eww-select-file (&optional event)
   "Change the value of the upload file menu under point.
-EVENT, if non-nil, is the mouse event that preceded this command."
+EVENT, if non-nil, is the mouse event that preceded this command.
+Interactively, EVENT is the value of `last-nonmenu-event'."
   (interactive (list last-nonmenu-event) eww-mode)
   (when (and event (setq event (event-start event)))
     (goto-char (posn-point event)))
@@ -1904,7 +1906,8 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.")
 
 (defun eww-toggle-checkbox (&optional event)
   "Toggle the value of the checkbox under point.
-EVENT, if non-nil, is the mouse event that preceded this command."
+EVENT, if non-nil, is the mouse event that preceded this command.
+Interactively, EVENT is the value of `last-nonmenu-event'."
   (interactive (list last-nonmenu-event) eww-mode)
   (when (and event (setq event (event-start event)))
     (goto-char (posn-point event)))
@@ -1977,7 +1980,8 @@ EVENT, if non-nil, is the mouse event that preceded this command."
 
 (defun eww-submit (&optional event)
   "Submit the form under point or EVENT.
-EVENT, if non-nil, is the mouse event that preceded this command."
+EVENT, if non-nil, is the mouse event that preceded this command.
+Interactively, EVENT is the value of `last-nonmenu-event'."
   (interactive (list last-nonmenu-event) eww-mode)
   (when (and event (setq event (event-start event)))
     (goto-char (posn-point event)))

diff --git a/lisp/touch-screen.el b/lisp/touch-screen.el
index 537780eb70866c80866072fa15c836865730d7c1..e44b266a617cc81d405b3f2117bd370a2a03184a 100644 (file)
--- a/lisp/touch-screen.el
+++ b/lisp/touch-screen.el
@@ -1360,18 +1360,19 @@ is not read-only."
                    (when command
                      (if (or (memq command touch-screen-set-point-commands)
                              ;; Users of packages that redefine
-                             ;; mouse-set-point, or other commands
+                             ;; `mouse-set-point', or other commands
                              ;; recognized as defining the point, should
                              ;; not find the on screen keyboard
-                             ;; inaccessible even with t-s-d-k enabled.
+                             ;; inaccessible even with
+                             ;; `touch-screen-display-keyboard' enabled.
                              touch-screen-display-keyboard)
                          (if touch-screen-translate-prompt
                              ;; Forgo displaying the virtual keyboard
-                             ;; should touch-screen-translate-prompt be
+                             ;; should `touch-screen-translate-prompt' be
                              ;; set, for then the key won't be delivered
                              ;; to the command loop, but rather to a
-                             ;; caller of read-key-sequence such as
-                             ;; describe-key.
+                             ;; caller of `read-key-sequence' such as
+                             ;; `describe-key'.
                              (throw 'input-event event)
                            (if (and (or (not buffer-read-only)
                                         ;; Display the on screen