emacs-emojify

fork of https://github.com/iqbalansari/emacs-emojify
Log | Files | Refs | LICENSE

commit f791ad4c741218668dad4ba8db65161da9a5b010
parent 9e487aff8465002645b1168d88b367c0a7f441bd
Author: Iqbal Ansari <iqbalansari02@yahoo.com>
Date:   Mon,  5 Sep 2016 12:14:56 +0530

Merge branch 'develop'

Diffstat:
Memojify.el | 6++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/emojify.el b/emojify.el @@ -258,6 +258,7 @@ Possible values are (defcustom emojify-inhibit-major-modes '(dired-mode doc-view-mode + debugger-mode pdf-view-mode image-mode help-mode @@ -321,10 +322,7 @@ Returns non-nil if the buffer's major mode is part of `emojify-inhibit-major-mod can customize `emojify-inhibit-major-modes' and `emojify-inhibit-in-buffer-functions' to disabled emojify in additional buffers." (not (or emojify-inhibit-emojify-in-current-buffer-p - ;; Even though `emojify-apropos-mode' buffers are ephemeral - ;; we want to display emojis in them - (and (equal major-mode 'emojify-apropos-mode) - (emojify-ephemeral-buffer-p (current-buffer))) + (emojify-ephemeral-buffer-p (current-buffer)) (emojify-inhibit-major-mode-p (current-buffer)) (buffer-base-buffer buffer) (run-hook-with-args-until-success 'emojify-inhibit-in-buffer-functions buffer))))