From 2f364dfae63f087c1f2faa11e10fefce2baf452b Mon Sep 17 00:00:00 2001 From: kissge Date: Thu, 12 Jan 2017 14:23:17 +0900 Subject: [PATCH 1/3] Change emojify-image-dir from variable to function See https://github.com/iqbalansari/emacs-emojify/commit/19b9bae79f33fe6c455fa638afb386044c92a1e3 --- mode-icons.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mode-icons.el b/mode-icons.el index 2a6e30c..c8b3de6 100644 --- a/mode-icons.el +++ b/mode-icons.el @@ -733,8 +733,6 @@ everywhere else." (and (image-type-available-p 'xpm) (file-exists-p (mode-icons--get-png-xpm-file icon-spec))))) )) -(defvar emojify-image-dir) - (defvar emojify-emojis) (defvar mode-icons--gimp (executable-find "gimp") @@ -1139,7 +1137,7 @@ ACTIVE is a flag for if the current window is active." (unless emojify-emojis (emojify-set-emoji-data)) (let* ((emoji (ht-get emojify-emojis (nth 1 icon-spec))) - (image-file (expand-file-name (ht-get emoji "image") emojify-image-dir)) + (image-file (expand-file-name (ht-get emoji "image") (emojify-image-dir))) (image-type (intern (upcase (file-name-extension image-file))))) (if (not (file-exists-p image-file)) (propertize (format "%s" mode) From fc15243c9feeb268e3a7f73f852077b6070441ab Mon Sep 17 00:00:00 2001 From: kissge Date: Thu, 12 Jan 2017 14:23:34 +0900 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c020100..da2c795 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - mode-icons now allows for a default icon. This can be turned on with the new option `mode-icons-use-default-icon` - Fix coloring algorithm for xpm images. +- Response to emojify's update. ## [0.4.0] From d6df901acc6c62c4bcf761d8f23f47c85101ef61 Mon Sep 17 00:00:00 2001 From: Fidler Date: Thu, 12 Jan 2017 10:43:26 -0600 Subject: [PATCH 3/3] Make #48 more general --- mode-icons.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mode-icons.el b/mode-icons.el index c8b3de6..a9c635f 100644 --- a/mode-icons.el +++ b/mode-icons.el @@ -1137,7 +1137,9 @@ ACTIVE is a flag for if the current window is active." (unless emojify-emojis (emojify-set-emoji-data)) (let* ((emoji (ht-get emojify-emojis (nth 1 icon-spec))) - (image-file (expand-file-name (ht-get emoji "image") (emojify-image-dir))) + (image-file (expand-file-name (ht-get emoji "image") (if (fboundp 'emojify-image-dir) + (emojify-image-dir) + emojify-image-dir))) (image-type (intern (upcase (file-name-extension image-file))))) (if (not (file-exists-p image-file)) (propertize (format "%s" mode)