diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-08-07 13:43:47 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-08-07 14:50:05 +0200 |
| commit | c6abfb32d7ca10733c971e0fb338291cd56b558e (patch) | |
| tree | cfa37b6d2c29b482f155f931bb12219caa00bd27 | |
| parent | cf98a395d017c16da8126ff689d43de192efc14a (diff) | |
| download | emacs-c6abfb32d7ca10733c971e0fb338291cd56b558e.tar.gz | |
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.el | 8 |
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." (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 |