From: Dominik Honnef <dominik.honnef@gmail.com>
Date: Fri, 6 Sep 2013 20:08:11 +0000 (-0400)
Subject: misc/emacs: use built-in buffer-base-buffer instead of own variable
X-Git-Tag: go1.2rc2~329
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b7a609b660a0d656b32a3a2a1e2e0e4420b7f049;p=gostls13.git

misc/emacs: use built-in buffer-base-buffer instead of own variable

R=adonovan
CC=golang-dev
https://golang.org/cl/13476043
---

diff --git a/misc/emacs/go-mode.el b/misc/emacs/go-mode.el
index f13651a666..02582756f3 100644
--- a/misc/emacs/go-mode.el
+++ b/misc/emacs/go-mode.el
@@ -129,7 +129,6 @@
 
 (defvar go-dangling-cache)
 (defvar go-godoc-history nil)
-(defvar go--coverage-origin-buffer)
 (defvar go--coverage-current-file-name)
 
 (defgroup go nil
@@ -1033,9 +1032,7 @@ current coverage buffer or by prompting for it."
 
 (defun go--coverage-origin-buffer ()
   "Return the buffer to base the coverage on."
-  (if (boundp 'go--coverage-origin-buffer)
-      go--coverage-origin-buffer
-    (current-buffer)))
+  (or (buffer-base-buffer) (current-buffer)))
 
 (defun go--coverage-face (count divisor)
   "Return the intensity face for COUNT when using DIVISOR
@@ -1129,7 +1126,6 @@ for."
 
     (with-current-buffer (or (get-buffer gocov-buffer-name)
                              (make-indirect-buffer origin-buffer gocov-buffer-name t))
-      (set (make-local-variable 'go--coverage-origin-buffer) origin-buffer)
       (set (make-local-variable 'go--coverage-current-file-name) coverage-file)
 
       (save-excursion