1
0
mirror of https://github.com/golang/go synced 2024-11-21 15:54:43 -07:00

misc/emacs: Fix a failure when /tmp/<file>.go exists.

R=sameer
CC=golang-dev
https://golang.org/cl/6296060
This commit is contained in:
Jean-Marc Eurin 2012-06-13 10:25:00 -04:00 committed by Sameer Ajmani
parent bb3af7554a
commit 44a3a58e45

View File

@ -817,13 +817,10 @@ Replace the current buffer on success; display errors on failure."
(defun gofmt-apply-patch (filename srcbuf patchbuf)
(require 'diff-mode)
;; apply all the patch hunks and restore the mark and point
;; apply all the patch hunks
(with-current-buffer patchbuf
(let ((filename (file-name-nondirectory filename))
(min (point-min)))
(replace-string gofmt-stdin-tag filename nil min (point-max))
(replace-regexp "^--- /tmp/gofmt[0-9]*" (concat "--- /tmp/" filename)
nil min (point-max)))
(replace-regexp "^--- /tmp/gofmt[0-9]*" (concat "--- " filename)
nil (point-min) (point-max))
(condition-case nil
(while t
(diff-hunk-next)