master 38db41d 1/3: Merge from origin/emacs-27

[Paul Eggert]

branch: master
commit 38db41ddb3c0a0be2c898f560245b962e4611dc2
Merge: 26fde48 05c5bf4
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-27
    
    05c5bf4d38 * lisp/net/tramp.el: Fix typos.
---
 lisp/net/tramp.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 85330e9..52c6a9e 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1033,7 +1033,7 @@ initial value is overwritten by the car of 
`tramp-file-name-structure'.")
 
 ;;;###autoload
 (defcustom tramp-ignored-file-name-regexp nil
-  "Regular expression matching file names that are not under Tramp’s control."
+  "Regular expression matching file names that are not under Tramp's control."
   :version "27.1"
   :type '(choice (const nil) regexp))
 
@@ -1341,8 +1341,8 @@ This function removes from NAME the specification of the 
remote
 host and the method of accessing the host, leaving only the part
 that identifies NAME locally on the remote system.  NAME must be
 a string that matches `tramp-file-name-regexp'.  The returned
-file name can be used directly as argument of ‘process-file’,
-‘start-file-process’, or ‘shell-command’."
+file name can be used directly as argument of `process-file',
+`start-file-process', or `shell-command'."
   (save-match-data
     (and (tramp-tramp-file-p name)
          (string-match (nth 0 tramp-file-name-structure) name)
@@ -3799,10 +3799,10 @@ support symbolic links."
        filename))))
 
 (defconst tramp-time-dont-know '(0 0 0 1000)
-  "An invalid time value, used as \"Don’t know\" value.")
+  "An invalid time value, used as \"Don't know\" value.")
 
 (defconst tramp-time-doesnt-exist '(-1 65535)
-  "An invalid time value, used as \"Doesn’t exist\" value.")
+  "An invalid time value, used as \"Doesn't exist\" value.")
 
 (defun tramp-handle-set-visited-file-modtime (&optional time-list)
   "Like `set-visited-file-modtime' for Tramp files."