From 04f49981d73afa63909d0e12bb6a4688f86627d9 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 23 Jun 2016 01:31:38 -0400
Subject: [PATCH] Remove popup when following help buffer links

---
 core/core-popup.el | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/core/core-popup.el b/core/core-popup.el
index 181966002..9eeb80399 100644
--- a/core/core-popup.el
+++ b/core/core-popup.el
@@ -72,12 +72,11 @@
                      (when (eq file 'C-source)
                        (setq file (help-C-file-name (indirect-function fun) 'fun)))
                      (let ((location (find-function-search-for-symbol fun nil file)))
-                       (doom/popup-save
-                        (switch-to-buffer (car location) nil t)
-                        (if (cdr location)
-                            (goto-char (cdr location))
-                          (message "Unable to find location in file")))
-                       (select-window (get-buffer-window (car location))))))
+                       (doom/popup-close)
+                       (switch-to-buffer (car location) nil t)
+                       (if (cdr location)
+                           (goto-char (cdr location))
+                         (message "Unable to find location in file")))))
 
   (define-button-type 'help-variable-def
     :supertype 'help-xref
@@ -85,12 +84,11 @@
                      (when (eq file 'C-source)
                        (setq file (help-C-file-name var 'var)))
                      (let ((location (find-variable-noselect var file)))
-                       (doom/popup-save
-                        (switch-to-buffer (car location) nil t)
-                        (if (cdr location)
-                            (goto-char (cdr location))
-                          (message "Unable to find location in file")))
-                       (select-window (get-buffer-window (car location))))))
+                       (doom/popup-close)
+                       (switch-to-buffer (car location) nil t)
+                       (if (cdr location)
+                           (goto-char (cdr location))
+                         (message "Unable to find location in file")))))
 
   (define-button-type 'help-face-def
     :supertype 'help-xref
@@ -98,12 +96,11 @@
                      (require 'find-func)
                      (let ((location
                             (find-function-search-for-symbol fun 'defface file)))
-                       (doom/popup-save
-                        (switch-to-buffer (car location) nil t)
-                        (if (cdr location)
-                            (goto-char (cdr location))
-                          (message "Unable to find location in file")))
-                       (select-window (get-buffer-window (car location)))))))
+                       (doom/popup-close)
+                       (switch-to-buffer (car location) nil t)
+                       (if (cdr location)
+                           (goto-char (cdr location))
+                         (message "Unable to find location in file"))))))
 
 (provide 'core-popup)
 ;;; core-popup.el ends here