emacs-emojify

commit bb0cd85cc16328474519c6eeb65d20124de9605d
parent c74deb3a4755758f070592a1c5df08cce76658e5
Author: Iqbal Ansari <iqbalansari02@yahoo.com>
Date:   Wed, 28 Oct 2015 08:42:24 +0530

Make sure core customizations do not depend on other customizations

Diffstat:
M
emojify.el
 | 
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/emojify.el b/emojify.el
@@ -63,11 +63,11 @@
     help-mode
     magit-popup-mode)
   "Major modes where emojify mode should not be enabled."
-  :type 'list
+  :type '(repeat symbol)
   :group 'emojify)
 
 (defcustom emojify-inhibit-in-buffer-functions
-  '(minibufferp emojify-ephemeral-buffer-p emojify-inhibit-major-mode-p emojify-helm-buffer-p)
+  '(minibufferp emojify-helm-buffer-p)
   "Functions used to determine emojify-mode should be enabled in a buffer.
 
 These functions are called with one argument, the buffer where emojify-mode
@@ -205,6 +205,8 @@ BEG and END are the beginning and end of the region respectively"
                    (emojify-valid-text-context-p match-beginning
                                             match-end)
                    ;; Allow user to inhibit display
+                   (not (emojify-ephemeral-buffer-p (current-buffer)))
+                   (not (emojify-inhibit-major-mode-p (current-buffer)))
                    (not (run-hook-with-args-until-success 'emojify-inhibit-hooks)))
 
           ;; TODO: Remove double checks