ryuslash/mode-icons
1
0
Fork 0
mirror of https://github.com/ryuslash/mode-icons.git synced 2024-11-24 02:20:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix some calls to mode-icons-propertize-mode

Browse source 
Should Fix Issue #26
This commit is contained in:
Matthew Fidler 2016-04-21 08:08:23 -05:00
parent 2049cc5f19
commit 9241db6f21
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
mode-icons.el
View file

@ -1215,7 +1215,7 @@ ACTIVE represents if the window is active."
(if icon-spec (if icon-spec
(setq ret (setq ret
(if mode-icons-show-mode-name (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))) (mode-icons-propertize-mode mode-name icon-spec face active)))
(setq ret mode-name)) (setq ret mode-name))
;; Don't hide major mode names... ;; 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 (concat " " (eval `(propertize
,(if (setq icon-spec (mode-icons-get-icon-spec (concat " " mode))) ,(if (setq icon-spec (mode-icons-get-icon-spec (concat " " mode)))
(mode-icons--recolor-minor-mode-image (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) active face)
mode) mode)
,@mode-icons-narrow-text-properties)))) ,@mode-icons-narrow-text-properties))))
@ -1433,11 +1433,11 @@ FACE is the face to render the icon in."
(setq ro (or (cond (setq ro (or (cond
((string= "%" ro) ((string= "%" ro)
(if (setq icon-spec (mode-icons-get-icon-spec 'read-only)) (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)) ro))
(t (t
(if (setq icon-spec (mode-icons-get-icon-spec 'writable)) (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)))
"") "")
ro (mode-icons--recolor-minor-mode-image ro active face)) 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)) "") ((not (stringp mod)) "")
((char-equal ?s (aref mod 0)) ((char-equal ?s (aref mod 0))
(if (setq icon-spec (mode-icons-get-icon-spec 'steal)) (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)) mod))
((char-equal ?! (aref mod 0)) ((char-equal ?! (aref mod 0))
(if (setq icon-spec (mode-icons-get-icon-spec 'modified-outside)) (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)) mod))
((char-equal ?* (aref mod 0)) ((char-equal ?* (aref mod 0))
(if (setq icon-spec (mode-icons-get-icon-spec 'save)) (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)) mod))
(t (t
(if (setq icon-spec (mode-icons-get-icon-spec 'saved)) (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))) mod)))
"")) ""))
(setq mod (mode-icons--recolor-minor-mode-image mod active face)) (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) ((string= "(Unix)" str)
(setq lt2 " LF") (setq lt2 " LF")
(if (setq icon-spec (mode-icons-get-icon-spec 'unix)) (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)) str))
((or (string= str "(DOS)") ((or (string= str "(DOS)")
(string= str "\\")) (string= str "\\"))
(setq lt2 " CRLF") (setq lt2 " CRLF")
(if (setq icon-spec (mode-icons-get-icon-spec 'win)) (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)) str))
((string= str "(Mac)") ((string= str "(Mac)")
(setq lt2 " CR") (setq lt2 " CR")
(if (setq icon-spec (mode-icons-get-icon-spec 'apple)) (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)) str))
((string= str ":") ((string= str ":")
(setq lt2 " Undecided") (setq lt2 " Undecided")
(if (setq icon-spec (mode-icons-get-icon-spec '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)) str))
(t str)) (t str))
"")) ""))