commit e72019ab2006bc1d0d69339098d318a1350b7af1 parent 4eda4c63c952bfe66ed5fc009f0dca368771cb09 Author: Iqbal Ansari <iqbal.ansari@ignitesol.com> Date: Wed, 28 Sep 2016 18:16:18 +0530 Merge branch 'develop' Diffstat:
| M | emojify.el | | | 15 | ++++++++++++--- |
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/emojify.el b/emojify.el @@ -1084,9 +1084,7 @@ Redisplay emojis in the visible region if BEG and END are not specified" (end (save-excursion (goto-char (or end (cdr area))) (line-end-position)))) - (save-excursion - (goto-char 1) - (line-beginning-position)) + (emojify-execute-ignoring-errors-unless-debug (emojify-undisplay-emojis-in-region beg end) (emojify-display-emojis-in-region beg end)))) @@ -1354,6 +1352,17 @@ run the command `emojify-download-emoji'"))) emojify-mode emojify-mode :init-value nil) +(defadvice set-buffer-multibyte (after emojify-disable-for-unibyte-buffers (&rest ignored)) + "Disable emojify when buffer changes to a unibyte encoding, reenable it when +buffer changes back to multibyte encoding." + (ignore-errors + (if enable-multibyte-characters + (emojify-mode -1) + (when global-emojify-mode + (emojify-mode +1))))) + +(ad-activate #'set-buffer-multibyte) + ;; Searching and inserting emojis