Merge from origin/emacs-26

408862f02a (origin/emacs-26) ; * lisp/emacs-lisp/bytecomp.el: Tweak m...
9964db4c34 Restore obsolete method of changing byte-compile-dest-file
3dd25aeecb Some minor Tramp corrections
d670a15f25 * doc/misc/url.texi (http/https): Fix typo
99d07e8d5e Remove some bogus definition-prefixes from loaddefs
6067f0c702 Shell-quote wildcards when invoking 'vc-git-grep'
0540df10e6 Update documentation of '.dir-locals-2.el'
f2441ab320 ; Fix some tiny doc and comment typos
22ff46e6d8 ; Fix some comment typos

# Conflicts:
#	etc/NEWS

16 files changed, 45 insertions, 31 deletions

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 27426c45307..7299ae9d203 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -761,6 +761,7 @@ FILE's modification time."
                                      "def-edebug-spec"
                                      ;; Hmm... this is getting ugly:
                                      "define-widget"
+                                     "define-erc-module"
                                      "define-erc-response-handler"
                                      "defun-rcirc-command"))))
                     (push (match-string 2) defs))
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index e4d8a202a3b..e5a1ea782e8 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -172,6 +172,12 @@ are found in the same directory is hard-coded in various places in Emacs.)"
         (funcall handler 'byte-compiler-base-file-name filename)
       filename)))
 
+;; Sadly automake relies on this misfeature up to at least version 1.15.1.
+(if (fboundp 'byte-compile-dest-file)
+    (or (featurep 'bytecomp)
+        (display-warning 'bytecomp (format-message "\
+Changing `byte-compile-dest-file' is obsolete (as of 23.2);
+set `byte-compile-dest-file-function' instead.")))
 (defun byte-compile-dest-file (filename)
   "Convert an Emacs Lisp source file name to a compiled file name.
 If `byte-compile-dest-file-function' is non-nil, uses that
@@ -186,6 +192,7 @@ otherwise adds \".elc\"."
     (cond ((string-match emacs-lisp-file-regexp filename)
            (concat (substring filename 0 (match-beginning 0)) ".elc"))
           (t (concat filename ".elc")))))
+)
 
 ;; This can be the 'byte-compile property of any symbol.
 (autoload 'byte-compile-inline-expand "byte-opt")
diff --git a/lisp/files.el b/lisp/files.el
index 5d78cd07b6e..25746094d2a 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3905,16 +3905,16 @@ VARIABLES list of the class.  The list is processed in order.
   "File that contains directory-local variables.
 It has to be constant to enforce uniform values across different
 environments and users.
-See also `dir-locals-file-2', whose values override this one's.
-See Info node `(elisp)Directory Local Variables' for details.")
 
-(defconst dir-locals-file-2 ".dir-locals-2.el"
-  "File that contains directory-local variables.
-This essentially a second file that can be used like
-`dir-locals-file', so that users can have specify their personal
-dir-local variables even if the current directory already has a
-`dir-locals-file' that is shared with other users (such as in a
-git repository).
+A second dir-locals file can be used by a user to specify their
+personal dir-local variables even if the current directory
+already has a `dir-locals-file' that is shared with other
+users (such as in a git repository).  The name of this second
+file is derived by appending \"-2\" to the base name of
+`dir-locals-file'.  With the default value of `dir-locals-file',
+a \".dir-locals-2.el\" file in the same directory will override
+the \".dir-locals.el\".
+
 See Info node `(elisp)Directory Local Variables' for details.")
 
 (defun dir-locals--all-files (directory)
diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el
index c22c9c1d5ac..f698d806171 100644
--- a/lisp/gnus/gnus-cus.el
+++ b/lisp/gnus/gnus-cus.el
@@ -454,7 +454,7 @@ Set variables local to the group you are entering.
 If you want to turn threading off in `news.answers', you could put
 `(gnus-show-threads nil)' in the group parameters of that group.
 `gnus-show-threads' will be made into a local variable in the summary
-buffer you enter, and the form nil will be `eval'ed there.
+buffer you enter, and the form nil will be `eval'uated there.
 
 This can also be used as a group-specific hook function, if you'd
 like.  If you want to hear a beep when you enter a group, you could
@@ -535,7 +535,7 @@ These files will not be loaded, even though they would normally be so,
 for some reason or other.")
 
     (eval (sexp :tag "Eval" :value nil) "\
-The value of this entry will be `eval'el.
+The value of this entry will be `eval'uated.
 This element will be ignored when handling global score files.")
 
     (read-only (boolean :tag "Read-only" :value t) "\
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 1f1302e3fc8..8e3d299ee80 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4774,7 +4774,7 @@ to find out how to use this."
          message-qmail-inject-program nil nil nil
          ;; qmail-inject's default behavior is to look for addresses on the
          ;; command line; if there're none, it scans the headers.
-         ;; yes, it does The Right Thing w.r.t. Resent-To and it's kin.
+         ;; yes, it does The Right Thing w.r.t. Resent-To and its kin.
          ;;
          ;; in general, ALL of qmail-inject's defaults are perfect for simply
          ;; reading a formatted (i. e., at least a To: or Resent-To header)
@@ -4792,7 +4792,7 @@ to find out how to use this."
          (if (functionp message-qmail-inject-args)
              (funcall message-qmail-inject-args)
            message-qmail-inject-args)))
-    ;; qmail-inject doesn't say anything on it's stdout/stderr,
+    ;; qmail-inject doesn't say anything on its stdout/stderr,
     ;; we have to look at the retval instead
     (0 nil)
     (100 (error "qmail-inject reported permanent failure"))
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index c6ac0567fbb..82b378e6270 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -676,7 +676,7 @@ MIME-Version header before proceeding."
                                   (mm-alist-to-plist (cdr ctl)) (car ctl))
 
              ;; what really needs to be done here is a way to link a
-             ;; MIME handle back to it's parent MIME handle (in a multilevel
+             ;; MIME handle back to its parent MIME handle (in a multilevel
              ;; MIME article).  That would probably require changing
              ;; the mm-handle API so we simply store the multipart buffer
              ;; name as a text property of the "multipart/whatever" string.
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index f62b65a0661..21f8c09e1cb 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -67,7 +67,7 @@
 ;;
 ;; To be able to verify messages you need to build up trust with
 ;; someone.  Perhaps you trust the CA that issued your certificate, at
-;; least I did, so I export it's certificates from my PKCS#12
+;; least I did, so I export its certificates from my PKCS#12
 ;; certificate with:
 ;;
 ;; $ openssl pkcs12 -in mykey.p12 -cacerts -nodes > cacert.pem
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index a4c68d329b7..cb4c83d33e0 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -461,7 +461,7 @@ and so on."
                        optimization - If on, preserve overlay highlighting
                        (cf ediff or goo-font-lock) as well as basic faces.\n
   body-text-only     : Emit only body-text. In concrete terms,
-                       1. Suppress calls to `hfy-page-header'and
+                       1. Suppress calls to `hfy-page-header' and
                           `hfy-page-footer'
                        2. Pretend that `div-wrapper' option above is
                           turned off
diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el
index 86587466ef5..b4b38707c89 100644
--- a/lisp/net/mailcap.el
+++ b/lisp/net/mailcap.el
@@ -323,7 +323,7 @@ means the viewer is always valid.  If it is a Lisp function, it is
 called with a list of items from any extra fields from the
 Content-Type header as argument to return a boolean value for the
 validity.  Otherwise, if it is a non-function Lisp symbol or list
-whose car is a symbol, it is `eval'led to yield the validity.  If it
+whose car is a symbol, it is `eval'uated to yield the validity.  If it
 is a string or list of strings, it represents a shell command to run
 to return a true or false shell value for the validity.")
 (put 'mailcap-mime-data 'risky-local-variable t)
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index bf21db2e8d8..8399c02923d 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -137,7 +137,7 @@ It is used for TCP/IP devices."
     (file-readable-p . tramp-handle-file-exists-p)
     (file-regular-p . tramp-handle-file-regular-p)
     (file-remote-p . tramp-handle-file-remote-p)
-    (file-selinux-context . ignore)
+    (file-selinux-context . tramp-handle-file-selinux-context)
     (file-symlink-p . tramp-handle-file-symlink-p)
     (file-system-info . tramp-adb-handle-file-system-info)
     (file-truename . tramp-adb-handle-file-truename)
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 404af983b50..fe5a98909e0 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -517,7 +517,7 @@ Every entry is a list (NAME ADDRESS).")
     (file-readable-p . tramp-gvfs-handle-file-readable-p)
     (file-regular-p . tramp-handle-file-regular-p)
     (file-remote-p . tramp-handle-file-remote-p)
-    (file-selinux-context . ignore)
+    (file-selinux-context . tramp-handle-file-selinux-context)
     (file-symlink-p . tramp-handle-file-symlink-p)
     (file-system-info . tramp-gvfs-handle-file-system-info)
     (file-truename . tramp-handle-file-truename)
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index f35c10b58ab..eb0d6b50731 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -253,7 +253,7 @@ See `tramp-actions-before-shell' for more info.")
     (file-readable-p . tramp-handle-file-exists-p)
     (file-regular-p . tramp-handle-file-regular-p)
     (file-remote-p . tramp-handle-file-remote-p)
-    ;; `file-selinux-context' performed by default handler.
+    (file-selinux-context . tramp-handle-file-selinux-context)
     (file-symlink-p . tramp-handle-file-symlink-p)
     (file-system-info . tramp-smb-handle-file-system-info)
     (file-truename . tramp-handle-file-truename)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index cf2218dd1ec..d41ae82e1be 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2937,14 +2937,13 @@ User is always nil."
   "Like `directory-file-name' for Tramp files."
   ;; If localname component of filename is "/", leave it unchanged.
   ;; Otherwise, remove any trailing slash from localname component.
-  ;; Method, host, etc, are unchanged.  Does it make sense to try
-  ;; to avoid parsing the filename?
-  (with-parsed-tramp-file-name directory nil
-    (if (and (not (zerop (length localname)))
-             (eq (aref localname (1- (length localname))) ?/)
-             (not (string= localname "/")))
-        (substring directory 0 -1)
-      directory)))
+  ;; Method, host, etc, are unchanged.
+  (while (with-parsed-tramp-file-name directory nil
+           (and (not (zerop (length localname)))
+                (eq (aref localname (1- (length localname))) ?/)
+                (not (string= localname "/"))))
+    (setq directory (substring directory 0 -1)))
+  directory)
 
 (defun tramp-handle-directory-files (directory &optional full match nosort)
   "Like `directory-files' for Tramp files."
@@ -3172,6 +3171,11 @@ User is always nil."
                 (t (tramp-make-tramp-file-name
                     method user domain host port "" hop)))))))))
 
+(defun tramp-handle-file-selinux-context (_filename)
+  "Like `file-selinux-context' for Tramp files."
+  ;; Return nil context.
+  '(nil nil nil nil))
+
 (defun tramp-handle-file-symlink-p (filename)
   "Like `file-symlink-p' for Tramp files."
   (let ((x (tramp-compat-file-attribute-type (file-attributes filename))))
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 5c9a106d41a..e40104353ac 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -1135,7 +1135,7 @@ Please send all bug fixes and enhancements to
 ;; Thanks to Drew Adams <drew.adams@oracle.com> for suggestions:
 ;;    - `ebnf-arrow-extra-width', `ebnf-arrow-scale',
 ;;      `ebnf-production-name-p', `ebnf-stop-on-error',
-;;      `ebnf-file-suffix-regexp'and `ebnf-special-show-delimiter' variables.
+;;      `ebnf-file-suffix-regexp' and `ebnf-special-show-delimiter' variables.
 ;;    - `ebnf-delete-style', `ebnf-eps-file' and `ebnf-eps-directory'
 ;;      commands.
 ;;    - some docs fix.
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index aac167357ec..15a36175970 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -125,7 +125,7 @@ If nil, never start checking buffer automatically like this."
                         "it no longer has any effect." "26.1")
 
 (defcustom flymake-start-on-flymake-mode t
-  "Start syntax check when `flymake-mode'is enabled.
+  "Start syntax check when `flymake-mode' is enabled.
 Specifically, start it when the buffer is actually displayed."
   :type 'boolean)
 
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 2c807a38cd5..ab8b358cf2c 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1431,7 +1431,9 @@ This command shares argument histories with \\[rgrep] and \\[grep]."
                                    nil nil 'grep-history)
              nil))
       (t (let* ((regexp (grep-read-regexp))
-                (files (grep-read-files regexp))
+                (files
+                 (mapconcat #'shell-quote-argument
+                            (split-string (grep-read-files regexp)) " "))
                 (dir (read-directory-name "In directory: "
                                           nil default-directory t)))
            (list regexp files dir))))))