From 9241db6f21c3439aaf605980dc7c539601de3852 Mon Sep 17 00:00:00 2001 From: Matthew Fidler Date: Thu, 21 Apr 2016 08:08:23 -0500 Subject: [PATCH] Fix some calls to mode-icons-propertize-mode Should Fix Issue #26 --- mode-icons.el | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mode-icons.el b/mode-icons.el index 7fa05ae..de9b3e0 100644 --- a/mode-icons.el +++ b/mode-icons.el @@ -1215,7 +1215,7 @@ ACTIVE represents if the window is active." (if icon-spec (setq ret (if mode-icons-show-mode-name - (concat (mode-icons-propertize-mode mode-name icon-spec active) " " mode-name) + (concat (mode-icons-propertize-mode mode-name icon-spec face active) " " mode-name) (mode-icons-propertize-mode mode-name icon-spec face active))) (setq ret mode-name)) ;; Don't hide major mode names... @@ -1411,7 +1411,7 @@ When FACE is non-nil, use FACE to render the narrow indicator." (concat " " (eval `(propertize ,(if (setq icon-spec (mode-icons-get-icon-spec (concat " " mode))) (mode-icons--recolor-minor-mode-image - (mode-icons-propertize-mode (concat " " mode) icon-spec active) + (mode-icons-propertize-mode (concat " " mode) icon-spec face active) active face) mode) ,@mode-icons-narrow-text-properties)))) @@ -1433,11 +1433,11 @@ FACE is the face to render the icon in." (setq ro (or (cond ((string= "%" ro) (if (setq icon-spec (mode-icons-get-icon-spec 'read-only)) - (mode-icons-propertize-mode 'read-only icon-spec active) + (mode-icons-propertize-mode 'read-only icon-spec face active) ro)) (t (if (setq icon-spec (mode-icons-get-icon-spec 'writable)) - (mode-icons-propertize-mode 'writable icon-spec active) + (mode-icons-propertize-mode 'writable icon-spec face active) ro))) "") ro (mode-icons--recolor-minor-mode-image ro active face)) @@ -1470,19 +1470,19 @@ FACE is the face to render the icon in." ((not (stringp mod)) "") ((char-equal ?s (aref mod 0)) (if (setq icon-spec (mode-icons-get-icon-spec 'steal)) - (mode-icons-propertize-mode 'steal icon-spec active) + (mode-icons-propertize-mode 'steal icon-spec face active) mod)) ((char-equal ?! (aref mod 0)) (if (setq icon-spec (mode-icons-get-icon-spec 'modified-outside)) - (mode-icons-propertize-mode 'modified-outside icon-spec active) + (mode-icons-propertize-mode 'modified-outside icon-spec face active) mod)) ((char-equal ?* (aref mod 0)) (if (setq icon-spec (mode-icons-get-icon-spec 'save)) - (mode-icons-propertize-mode 'save icon-spec active) + (mode-icons-propertize-mode 'save icon-spec face active) mod)) (t (if (setq icon-spec (mode-icons-get-icon-spec 'saved)) - (mode-icons-propertize-mode 'saved icon-spec active) + (mode-icons-propertize-mode 'saved icon-spec face active) mod))) "")) (setq mod (mode-icons--recolor-minor-mode-image mod active face)) @@ -1555,23 +1555,23 @@ FACE is the face that will be used to render the segment." ((string= "(Unix)" str) (setq lt2 " LF") (if (setq icon-spec (mode-icons-get-icon-spec 'unix)) - (mode-icons-propertize-mode 'unix icon-spec active) + (mode-icons-propertize-mode 'unix icon-spec face active) str)) ((or (string= str "(DOS)") (string= str "\\")) (setq lt2 " CRLF") (if (setq icon-spec (mode-icons-get-icon-spec 'win)) - (mode-icons-propertize-mode 'win icon-spec active) + (mode-icons-propertize-mode 'win icon-spec face active) str)) ((string= str "(Mac)") (setq lt2 " CR") (if (setq icon-spec (mode-icons-get-icon-spec 'apple)) - (mode-icons-propertize-mode 'apple icon-spec active) + (mode-icons-propertize-mode 'apple icon-spec face active) str)) ((string= str ":") (setq lt2 " Undecided") (if (setq icon-spec (mode-icons-get-icon-spec 'undecided)) - (mode-icons-propertize-mode 'undecided icon-spec active) + (mode-icons-propertize-mode 'undecided icon-spec face active) str)) (t str)) ""))