From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 10 Aug 2018 08:58:00 +0000 (+0200)
Subject: Another try to fix Bug#32226
X-Git-Tag: emacs-27.0.90~4618
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7fbf1247964cbfbbda207e34bfcd5c1863608e74;p=emacs.git

Another try to fix Bug#32226

* test/lisp/shadowfile-tests.el (shadow-test06-literal-groups)
(shadow-test07-regexp-groups, shadow-test08-shadow-todo)
(shadow-test09-shadow-copy-files): Use `set-visited-file-name'
instead of setting the value in `buffer-file-name' directly.
(Bug#32226)
---

diff --git a/test/lisp/shadowfile-tests.el b/test/lisp/shadowfile-tests.el
index 22f7b2de6ed..c549ad79a4c 100644
--- a/test/lisp/shadowfile-tests.el
+++ b/test/lisp/shadowfile-tests.el
@@ -618,7 +618,7 @@ guaranteed by the originator of a cluster definition."
 		  shadow-test-remote-temporary-file-directory))
 		mocked-input `(,cluster1 ,file1 ,cluster2 ,file2 ,(kbd "RET")))
 	  (with-temp-buffer
-	    (setq-local buffer-file-name file1)
+            (set-visited-file-name file1)
 	    (call-interactively 'shadow-define-literal-group))
 
           ;; `shadow-literal-groups' is a list of lists.
@@ -679,7 +679,7 @@ guaranteed by the originator of a cluster definition."
 		mocked-input `(,(shadow-regexp-superquote file)
                                ,cluster1 ,cluster2 ,(kbd "RET")))
 	  (with-temp-buffer
-	    (setq-local buffer-file-name nil)
+            (set-visited-file-name nil)
 	    (call-interactively 'shadow-define-regexp-group))
 
           ;; `shadow-regexp-groups' is a list of lists.
@@ -756,7 +756,7 @@ guaranteed by the originator of a cluster definition."
           (message "Point 3")
           ;; Save file from "cluster1" definition.
           (with-temp-buffer
-            (setq buffer-file-name file)
+            (set-visited-file-name file)
             (insert "foo")
             (save-buffer))
           (message "%s" file)
@@ -773,7 +773,7 @@ guaranteed by the originator of a cluster definition."
             (message "Point 4.1")
             (message "%s" file)
             (message "%s" (shadow-site-primary cluster2))
-            (setq buffer-file-name (concat (shadow-site-primary cluster2) file))
+            (set-visited-file-name (concat (shadow-site-primary cluster2) file))
             (message "Point 4.2")
             (insert "foo")
             (message "%s" buffer-file-name)
@@ -804,7 +804,7 @@ guaranteed by the originator of a cluster definition."
           (message "Point 6")
           ;; Save file from "cluster1" definition.
           (with-temp-buffer
-            (setq buffer-file-name file)
+            (set-visited-file-name file)
             (insert "foo")
             (save-buffer))
 	  (should
@@ -815,7 +815,7 @@ guaranteed by the originator of a cluster definition."
           (message "Point 7")
           ;; Save file from "cluster2" definition.
           (with-temp-buffer
-            (setq buffer-file-name (concat (shadow-site-primary cluster2) file))
+            (set-visited-file-name (concat (shadow-site-primary cluster2) file))
             (insert "foo")
             (save-buffer))
 	  (should
@@ -892,11 +892,11 @@ guaranteed by the originator of a cluster definition."
 
           ;; Save files.
           (with-temp-buffer
-            (setq buffer-file-name file)
+            (set-visited-file-name file)
             (insert "foo")
             (save-buffer))
           (with-temp-buffer
-            (setq buffer-file-name (concat (shadow-site-primary cluster2) file))
+            (set-visited-file-name (concat (shadow-site-primary cluster2) file))
             (insert "foo")
             (save-buffer))