From 82faff8072a2e5f0bfd5648a21721edb9c522683 Mon Sep 17 00:00:00 2001
From: 10sr <8.slashes@gmail.com>
Date: Tue, 9 Apr 2019 13:42:04 +0900
Subject: [PATCH] Update

---
 emacs.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/emacs.el b/emacs.el
index d167c36..b73be9b 100644
--- a/emacs.el
+++ b/emacs.el
@@ -1054,15 +1054,17 @@ found, otherwise returns nil."
   (define-key company-active-map (kbd "C-i") 'company-complete-selection)
   (define-key company-active-map (kbd "C-f") 'company-complete-selection)
 
+  (defvar company-mode)
   (defvar company-candidates)
   (defvar company-candidates-length)
   ;; (popup-tip "Hello, World!")
-  (require 'popup nil t)
   (defun my-company-length-popup-tip ()
     "Show tooltip of candidate length."
     (interactive)
-    ;; Do nothing when already in company completion
-    (unless company-candidates
+    (when (and (require 'popup nil t)
+               company-mode
+               ;; Do nothing when already in company completion
+               (not company-candidates))
       (let ((l nil))
         (unwind-protect
             (progn