From: Glenn Morris <rgm@gnu.org>
Date: Fri, 2 Oct 2020 16:33:53 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~5765
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0a769f4832d6f8bf208c005a5f00c345d441cb08;p=emacs.git

Merge from origin/emacs-27

2af6b3147d Clarification in Tramp manual
8fbaca7d41 Check Emacs version used for Tramp compilation
90e5549f02 Don't signal an error when saving files on WdebDAV volumes
6f73cc3579 ; * lisp/net/eww.el (eww-search-words): Doc fix.
ce0842a165 * lisp/hi-lock.el (hi-lock-find-patterns): Autoload it.  (...
---

0a769f4832d6f8bf208c005a5f00c345d441cb08
diff --cc lisp/net/tramp-compat.el
index 218594b551c,b7a7cc4f003..c554a8d0c2d
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@@ -43,8 -43,15 +43,16 @@@
  
  ;; `temporary-file-directory' as function is introduced with Emacs 26.1.
  (declare-function tramp-handle-temporary-file-directory "tramp")
 +(defvar tramp-temp-name-prefix)
  
+ (defconst tramp-compat-emacs-compiled-version (eval-when-compile emacs-version)
+   "The Emacs version used for compilation.")
+ 
+ (unless (= emacs-major-version
+ 	   (car (version-to-list tramp-compat-emacs-compiled-version)))
+   (warn "Tramp has been compiled with Emacs %s, this is Emacs %s"
+ 	tramp-compat-emacs-compiled-version emacs-version))
+ 
  ;; For not existing functions, obsolete functions, or functions with a
  ;; changed argument list, there are compiler warnings.  We want to
  ;; avoid them in cases we know what we do.