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

Make sure the functions return a string (not nil)

Browse source
This commit is contained in:
Matthew L. Fidler 2016-02-22 19:15:16 -06:00
parent d2c9926a8e
commit 3ffef2230f
1 changed files with 44 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
mode-icons.el
View file

@ -528,15 +528,16 @@ ICON-SPEC should be a specification from `mode-icons'."
(eval `(propertize (eval `(propertize
,(let ((ro (format-mode-line "%1*")) ,(let ((ro (format-mode-line "%1*"))
icon-spec) icon-spec)
(setq ro (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) (mode-icons-propertize-mode 'read-only icon-spec)
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) (mode-icons-propertize-mode 'writable icon-spec)
ro)))) ro)))
""))
(when (and mode-icons-read-only-space (when (and mode-icons-read-only-space
(not (string= ro ""))) (not (string= ro "")))
(setq ro (concat ro " "))) (setq ro (concat ro " ")))
@ -553,15 +554,16 @@ ICON-SPEC should be a specification from `mode-icons'."
(eval `(propertize (eval `(propertize
,(let ((mod (format-mode-line "%1+")) ,(let ((mod (format-mode-line "%1+"))
icon-spec) icon-spec)
(setq mod (cond (setq mod (or (cond
((string= "*" mod) ((string= "*" mod)
(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) (mode-icons-propertize-mode 'save icon-spec)
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) (mode-icons-propertize-mode 'saved icon-spec)
mod)))) mod)))
""))
(when (and mode-icons-modified-status-space (when (and mode-icons-modified-status-space
(not (string= mod ""))) (not (string= mod "")))
(setq mod (concat mod " ")))) (setq mod (concat mod " "))))
@ -620,29 +622,30 @@ STRING is the string to modify, or if absent, the value from `mode-line-eol-desc
(props (text-properties-at 0 str)) (props (text-properties-at 0 str))
(lt2 "") (lt2 "")
icon-spec) icon-spec)
(setq str (cond (setq str (or (cond
((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) (mode-icons-propertize-mode 'unix icon-spec)
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) (mode-icons-propertize-mode 'win icon-spec)
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) (mode-icons-propertize-mode 'apple icon-spec)
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) (mode-icons-propertize-mode 'undecided icon-spec)
str)) str))
(t str))) (t str))
""))
(when mode-icons-eol-text (when mode-icons-eol-text
(setq str (concat str lt2))) (setq str (concat str lt2)))
(when (and mode-icons-eol-space (when (and mode-icons-eol-space