[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master c6abfb32d7 2/6: Remove workaround for XEmacs bug in ediff-util.el
From: |
Stefan Kangas |
Subject: |
master c6abfb32d7 2/6: Remove workaround for XEmacs bug in ediff-util.el |
Date: |
Sun, 7 Aug 2022 08:52:35 -0400 (EDT) |
branch: master
commit c6abfb32d7ca10733c971e0fb338291cd56b558e
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Remove workaround for XEmacs bug in ediff-util.el
* lisp/vc/ediff-util.el (ediff-make-empty-tmp-file): Remove
workaround for XEmacs bug.
---
lisp/vc/ediff-util.el | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 1bfab508f8..97dfc02201 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
- master updated (4252cea163 -> b65a2d1d99), Stefan Kangas, 2022/08/07
- master c6abfb32d7 2/6: Remove workaround for XEmacs bug in ediff-util.el,
Stefan Kangas <=
- master e672cad231 5/6: ; Improve obsoletions in ediff-init.el, Stefan Kangas, 2022/08/07
- master cf98a395d0 1/6: * lib-src/etags.c: Remove XEmacs support., Stefan Kangas, 2022/08/07
- master b65a2d1d99 6/6: Make ediff-file-remote-p obsolete in favor of file-remote-p, Stefan Kangas, 2022/08/07
- master 4439a80407 3/6: Make compat function custom-reset-variables obsolete, Stefan Kangas, 2022/08/07
- master 1f4f1358e6 4/6: Declare unused function ediff-user-grabbed-mouse obsolete, Stefan Kangas, 2022/08/07