ryuslash/mode-icons
1
0
Fork 0
mirror of https://github.com/ryuslash/mode-icons.git synced 2024-11-21 17:40:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into fix-bash-icon

Browse source
This commit is contained in:
Matthew Fidler 2017-01-12 10:45:59 -06:00 committed by GitHub
commit add216cf29
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -36,6 +36,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
with the new option `mode-icons-use-default-icon` with the new option `mode-icons-use-default-icon`
- Fix coloring algorithm for xpm images. - Fix coloring algorithm for xpm images.
- Fix icon for Shell-script. - Fix icon for Shell-script.
- Response to emojify's update.
## [0.4.0] ## [0.4.0]

6
mode-icons.el
View file

@ -733,8 +733,6 @@ everywhere else."
(and (image-type-available-p 'xpm) (and (image-type-available-p 'xpm)
(file-exists-p (mode-icons--get-png-xpm-file icon-spec))))) )) (file-exists-p (mode-icons--get-png-xpm-file icon-spec))))) ))
(defvar emojify-image-dir)
(defvar emojify-emojis) (defvar emojify-emojis)
(defvar mode-icons--gimp (executable-find "gimp") (defvar mode-icons--gimp (executable-find "gimp")
@ -1139,7 +1137,9 @@ ACTIVE is a flag for if the current window is active."
(unless emojify-emojis (unless emojify-emojis
(emojify-set-emoji-data)) (emojify-set-emoji-data))
(let* ((emoji (ht-get emojify-emojis (nth 1 icon-spec))) (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))))) (image-type (intern (upcase (file-name-extension image-file)))))
(if (not (file-exists-p image-file)) (if (not (file-exists-p image-file))
(propertize (format "%s" mode) (propertize (format "%s" mode)