From 4a0549ffc6612f0b2490e552120ece5d24b70b09 Mon Sep 17 00:00:00 2001 From: Jean-Marc Eurin Date: Wed, 13 Jun 2012 16:25:00 -0400 Subject: [PATCH] [release-branch.go1] misc/emacs: Fix a failure when /tmp/.go exists. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ««« backport 903a3cdd92cf misc/emacs: Fix a failure when /tmp/.go exists. R=sameer CC=golang-dev https://golang.org/cl/6296060 »»» --- misc/emacs/go-mode.el | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/misc/emacs/go-mode.el b/misc/emacs/go-mode.el index c750696512..214c196850 100644 --- a/misc/emacs/go-mode.el +++ b/misc/emacs/go-mode.el @@ -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) -- 2.50.0