From: Stefan Kangas <stefan@marxist.se>
Date: Sun, 7 Aug 2022 11:43:47 +0000 (+0200)
Subject: Remove workaround for XEmacs bug in ediff-util.el
X-Git-Tag: emacs-29.0.90~1447^2~341
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c6abfb32d7ca10733c971e0fb338291cd56b558e;p=emacs.git

Remove workaround for XEmacs bug in ediff-util.el

* lisp/vc/ediff-util.el (ediff-make-empty-tmp-file): Remove
workaround for XEmacs bug.
---

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 1bfab508f8c..97dfc022012 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -3197,13 +3197,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
                (progn
 		 (if (or (file-exists-p file) (not keep-proposed-name))
 		     (setq file (make-temp-name proposed-name)))
-		 ;; the with-temp-buffer thing is a workaround for an XEmacs
-		 ;; bug: write-region complains that we are trying to visit a
-		 ;; file in an indirect buffer, failing to notice that the
-		 ;; VISIT flag is unset and that we are actually writing from a
-		 ;; string and not from any buffer.
-		 (with-temp-buffer
-		   (write-region "" nil file nil 'silent nil 'excl))
+                 (write-region "" nil file nil 'silent nil 'excl)
                  nil)
             (file-already-exists t))
       ;; the file was somehow created by someone else between