Merge from origin/emacs-28

cb911febc6 ; Fix typos

# Conflicts:
#	test/lisp/net/tramp-tests.el

ChangeLog.3

@@ -77358,7 +77358,7 @@
 	still don't work).
 	(tramp-crypt-handle-access-file): New defun.
 	(tramp-crypt-do-copy-or-rename-file): Short track if both files
-	are on a crypted remote dir.
+	are on an encrypted remote dir.
 
 	* lisp/net/tramp.el (file-notify-rm-watch): Declare.
 	(tramp-inhibit-progress-reporter): New defvar.

doc/misc/texinfo.tex

@@ -1002,7 +1002,7 @@
   \global\everypar = {}%
 }
 
-% leave vertical mode without cancelling any first paragraph indent
+% leave vertical mode without canceling any first paragraph indent
 \gdef\imageindent{%
   \toks0=\everypar
   \everypar={}%

lisp/ChangeLog.5

@@ -8998,7 +8998,7 @@
 
 	* startup.el (inhibit-startup-echo-area-message): Doc fix.
 
-	* avoid.el (mouse-avoidance-threshold): Renamed from ...threshhold.
+	* avoid.el (mouse-avoidance-threshold): Fix typo in name.
 
 1994-06-13  Richard Stallman  (rms@albert.gnu.ai.mit.edu)
 
@@ -9010,7 +9010,7 @@
 
 	* startup.el (inhibit-startup-echo-area-message): Doc fix.
 
-	* avoid.el (mouse-avoidance-threshold): Renamed from ...threshhold.
+	* avoid.el (mouse-avoidance-threshold): Fix typo in name.
 
 	* simple.el (end-of-buffer): Recenter overlay lists.
 

lisp/net/tramp.el

@@ -4315,7 +4315,7 @@ Return nil when there is no lockfile."
 	       (buffer-string))))))
 
 (defvar tramp-lock-pid nil
-  "A random nunber local for every connection.
+  "A random number local for every connection.
 Do not set it manually, it is used buffer-local in `tramp-get-lock-pid'.")
 
 (defun tramp-get-lock-pid (file)

test/lisp/net/tramp-tests.el

@@ -2325,8 +2325,8 @@ This checks also `file-name-as-directory', `file-name-directory',
       (should-not (file-exists-p tmp-name))
 
       ;; Trashing files doesn't work when `system-move-file-to-trash'
-      ;; is defined (on MS Windows and macOS), and for crypted remote
-      ;; files.
+      ;; is defined (on MS-Windows and macOS), and for encrypted
+      ;; remote files.
       (unless (or (fboundp 'system-move-file-to-trash) (tramp--test-crypt-p))
 	(let ((trash-directory (tramp--test-make-temp-name 'local quoted))
 	      (delete-by-moving-to-trash t))
@@ -2901,7 +2901,7 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
 
       ;; Trashing directories works only since Emacs 27.1.  It doesn't
       ;; work when `system-move-file-to-trash' is defined (on MS
-      ;; Windows and macOS), for crypted remote directories and for
+      ;; Windows and macOS), for encrypted remote directories and for
       ;; ange-ftp.
       (when (and (not (fboundp 'system-move-file-to-trash))
 		 (not (tramp--test-crypt-p)) (not (tramp--test-ftp-p))
@@ -3174,8 +3174,8 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
   ;; (this is performed by `dired').  If FULL is nil, it shows just
   ;; one file.  So we refrain from testing.
   (skip-unless (not (tramp--test-ange-ftp-p)))
-  ;; `insert-directory' of crypted remote directories works only since
-  ;; Emacs 27.1.
+  ;; `insert-directory' of encrypted remote directories works only
+  ;; since Emacs 27.1.
   (skip-unless (or (not (tramp--test-crypt-p)) (tramp--test-emacs27-p)))
 
   (dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
@@ -6547,7 +6547,7 @@ This is used in tests which we don't want to tag
 	     (string-match-p "[[:multibyte:]]" default-directory)))))
 
 (defun tramp--test-crypt-p ()
-  "Check, whether the remote directory is crypted."
+  "Check, whether the remote directory is encrypted."
   (tramp-crypt-file-name-p ert-remote-temporary-file-directory))
 
 (defun tramp--test-docker-p ()