aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2022-08-07 13:43:47 +0200
committerStefan Kangas2022-08-07 14:50:05 +0200
commitc6abfb32d7ca10733c971e0fb338291cd56b558e (patch)
treecfa37b6d2c29b482f155f931bb12219caa00bd27
parentcf98a395d017c16da8126ff689d43de192efc14a (diff)
downloademacs-c6abfb32d7ca10733c971e0fb338291cd56b558e.tar.gz
emacs-c6abfb32d7ca10733c971e0fb338291cd56b558e.zip
Remove workaround for XEmacs bug in ediff-util.el
* lisp/vc/ediff-util.el (ediff-make-empty-tmp-file): Remove workaround for XEmacs bug.
-rw-r--r--lisp/vc/ediff-util.el8
1 files changed, 1 insertions, 7 deletions
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."
3197 (progn 3197 (progn
3198 (if (or (file-exists-p file) (not keep-proposed-name)) 3198 (if (or (file-exists-p file) (not keep-proposed-name))
3199 (setq file (make-temp-name proposed-name))) 3199 (setq file (make-temp-name proposed-name)))
3200 ;; the with-temp-buffer thing is a workaround for an XEmacs 3200 (write-region "" nil file nil 'silent nil 'excl)
3201 ;; bug: write-region complains that we are trying to visit a
3202 ;; file in an indirect buffer, failing to notice that the
3203 ;; VISIT flag is unset and that we are actually writing from a
3204 ;; string and not from any buffer.
3205 (with-temp-buffer
3206 (write-region "" nil file nil 'silent nil 'excl))
3207 nil) 3201 nil)
3208 (file-already-exists t)) 3202 (file-already-exists t))
3209 ;; the file was somehow created by someone else between 3203 ;; the file was somehow created by someone else between