1 files changed, 66 insertions, 14 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 677dd35d796..9bca6a03754 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2412,22 +2412,51 @@ This checks also `file-name-as-directory', `file-name-directory',
 	  (with-temp-buffer
 	    (write-region "foo" nil tmp-name)
 	    (let ((point (point)))
-	      (insert-file-contents tmp-name)
+	      (should
+	       (equal
+		(insert-file-contents tmp-name)
+		`(,(expand-file-name tmp-name) 3)))
 	      (should (string-equal (buffer-string) "foo"))
 	      (should (= point (point))))
 	    (goto-char (1+ (point)))
 	    (let ((point (point)))
-	      (insert-file-contents tmp-name)
+	      (should
+	       (equal
+		(insert-file-contents tmp-name)
+		`(,(expand-file-name tmp-name) 3)))
 	      (should (string-equal (buffer-string) "ffoooo"))
 	      (should (= point (point))))
 	    ;; Insert partly.
 	    (let ((point (point)))
-	      (insert-file-contents tmp-name nil 1 3)
+	      (should
+	       (equal
+		(insert-file-contents tmp-name nil 1 3)
+		`(,(expand-file-name tmp-name) 2)))
 	      (should (string-equal (buffer-string) "foofoooo"))
 	      (should (= point (point))))
+	    (let ((point (point)))
+	      (should
+	       (equal
+		(insert-file-contents tmp-name nil 2 5)
+		`(,(expand-file-name tmp-name) 1)))
+	      (should (string-equal (buffer-string) "fooofoooo"))
+	      (should (= point (point))))
 	    ;; Replace.
 	    (let ((point (point)))
-	      (insert-file-contents tmp-name nil nil nil 'replace)
+	      ;; 0 characters replaced, because "foo" is already there.
+	      (should
+	       (equal
+		(insert-file-contents tmp-name nil nil nil 'replace)
+		`(,(expand-file-name tmp-name) 0)))
+	      (should (string-equal (buffer-string) "foo"))
+	      (should (= point (point))))
+	    (let ((point (point)))
+	      (replace-string-in-region "foo" "bar" (point-min) (point-max))
+	      (goto-char point)
+	      (should
+	       (equal
+		(insert-file-contents tmp-name nil nil nil 'replace)
+		`(,(expand-file-name tmp-name) 3)))
 	      (should (string-equal (buffer-string) "foo"))
 	      (should (= point (point))))
 	    ;; Error case.
@@ -6005,22 +6034,42 @@ INPUT, if non-nil, is a string sent to the process."
 	    (should (eq local-variable 'connect))
 	    (kill-buffer (current-buffer)))
 
-	  ;; `local-variable' is dir-local due to existence of .dir-locals.el.
+	  ;; `local-variable' is still connection-local due to Tramp.
+	  ;; `find-file-hook' overrides dir-local settings.
 	  (write-region
 	   "((nil . ((local-variable . dir))))" nil
 	   (expand-file-name ".dir-locals.el" tmp-name1))
 	  (should (file-exists-p (expand-file-name ".dir-locals.el" tmp-name1)))
-	  (with-current-buffer (find-file-noselect tmp-name2)
-	    (should (eq local-variable 'dir))
-	    (kill-buffer (current-buffer)))
-
-	  ;; `local-variable' is file-local due to specifying as file variable.
+	  (when (memq #'tramp-set-connection-local-variables-for-buffer
+		      find-file-hook)
+	    (with-current-buffer (find-file-noselect tmp-name2)
+	      (should (eq local-variable 'connect))
+	      (kill-buffer (current-buffer))))
+	  ;; `local-variable' is dir-local due to existence of .dir-locals.el.
+	  (let ((find-file-hook
+		 (remq #'tramp-set-connection-local-variables-for-buffer
+		       find-file-hook)))
+	    (with-current-buffer (find-file-noselect tmp-name2)
+	      (should (eq local-variable 'dir))
+	      (kill-buffer (current-buffer))))
+
+	  ;; `local-variable' is still connection-local due to Tramp.
+	  ;; `find-file-hook' overrides dir-local settings.
 	  (write-region
 	   "-*- mode: comint; local-variable: file; -*-" nil tmp-name2)
           (should (file-exists-p tmp-name2))
-	  (with-current-buffer (find-file-noselect tmp-name2)
-	    (should (eq local-variable 'file))
-	    (kill-buffer (current-buffer))))
+	  (when (memq #'tramp-set-connection-local-variables-for-buffer
+		      find-file-hook)
+	    (with-current-buffer (find-file-noselect tmp-name2)
+	      (should (eq local-variable 'connect))
+	      (kill-buffer (current-buffer))))
+	  ;; `local-variable' is file-local due to specifying as file variable.
+	  (let ((find-file-hook
+		 (remq #'tramp-set-connection-local-variables-for-buffer
+		       find-file-hook)))
+	    (with-current-buffer (find-file-noselect tmp-name2)
+	      (should (eq local-variable 'file))
+	      (kill-buffer (current-buffer)))))
 
       ;; Cleanup.
       (custom-set-variables
@@ -6394,7 +6443,10 @@ INPUT, if non-nil, is a string sent to the process."
 		(if quoted #'file-name-quote #'identity)
 		(expand-file-name
 		 (format "%s~" (file-name-nondirectory tmp-name1))
-		 ert-remote-temporary-file-directory)))))))
+		 ert-remote-temporary-file-directory))))))
+
+	;; Cleanup.  Nothing to do yet.
+	nil)
 
       (unwind-protect
 	  ;; Map `backup-directory-alist'.