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

Take out tabs; Add local variable that forbids tabs

Browse source
This commit is contained in:
Matthew L. Fidler 2016-01-22 12:09:51 -06:00
parent 9131e57b24
commit c4080009b2
1 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
mode-icons.el
View file

@ -81,16 +81,16 @@ Each specificatioun is a list with the first element being the
name of the major mode. The second the name of the icon file, name of the major mode. The second the name of the icon file,
without the extension. And the third being the type of icon." without the extension. And the third being the type of icon."
:type '(repeat :type '(repeat
(list (string :tag "Regular Expression") (list (string :tag "Regular Expression")
(choice (choice
(string :tag "Icon Name") (string :tag "Icon Name")
(const :tag "Suppress" nil)) (const :tag "Suppress" nil))
(choice (choice
(const :tag "png" png) (const :tag "png" png)
(const :tag "gif" gif) (const :tag "gif" gif)
(const :tag "jpeg" jpeg) (const :tag "jpeg" jpeg)
(const :tag "xbm" xbm) (const :tag "xbm" xbm)
(const :tag "xpm" xpm)))) (const :tag "xpm" xpm))))
:group 'mode-icons) :group 'mode-icons)
(defun mode-icons-get-icon-display (icon type) (defun mode-icons-get-icon-display (icon type)
@ -118,7 +118,7 @@ ICON-SPEC should be a specification from `mode-icons'."
(catch 'found-mode (catch 'found-mode
(dolist (item mode-icons) (dolist (item mode-icons)
(when (string-match-p (car item) mode) (when (string-match-p (car item) mode)
(throw 'found-mode item))) (throw 'found-mode item)))
nil)) nil))
(defun mode-icons-get-mode-icon (mode) (defun mode-icons-get-mode-icon (mode)
@ -136,7 +136,7 @@ ICON-SPEC should be a specification from `mode-icons'."
"Set the icon for MODE." "Set the icon for MODE."
(unless mode-icons-cached-mode-name (unless mode-icons-cached-mode-name
(set (make-local-variable 'mode-icons-cached-mode-name) (set (make-local-variable 'mode-icons-cached-mode-name)
mode-name) mode-name)
(setq mode-name (mode-icons-get-mode-icon mode)))) (setq mode-name (mode-icons-get-mode-icon mode))))
(defun mode-icons-major-mode-icons-undo () (defun mode-icons-major-mode-icons-undo ()
@ -144,8 +144,8 @@ ICON-SPEC should be a specification from `mode-icons'."
(dolist (b (buffer-list)) (dolist (b (buffer-list))
(with-current-buffer b (with-current-buffer b
(when mode-icons-cached-mode-name (when mode-icons-cached-mode-name
(setq mode-name mode-icons-cached-mode-name (setq mode-name mode-icons-cached-mode-name
mode-icons-cached-mode-name nil))))) mode-icons-cached-mode-name nil)))))
(defun mode-icons-major-mode-icons () (defun mode-icons-major-mode-icons ()
"Apply mode name changes on all buffers." "Apply mode name changes on all buffers."
@ -164,7 +164,7 @@ ICON-SPEC should be a specification from `mode-icons'."
(dolist (mode mode-icons-set-minor-mode-icon-alist) (dolist (mode mode-icons-set-minor-mode-icon-alist)
(setq minor (assq (car mode) minor-mode-alist)) (setq minor (assq (car mode) minor-mode-alist))
(when minor (when minor
(setcdr minor (cdr mode))))) (setcdr minor (cdr mode)))))
(setq mode-icons-set-minor-mode-icon-alist nil)) (setq mode-icons-set-minor-mode-icon-alist nil))
(defcustom mode-icons-separate-images-with-spaces t (defcustom mode-icons-separate-images-with-spaces t
@ -177,16 +177,16 @@ ICON-SPEC should be a specification from `mode-icons'."
(let (icon-spec mode-name minor) (let (icon-spec mode-name minor)
(dolist (mode minor-mode-alist) (dolist (mode minor-mode-alist)
(unless (assq (car mode) mode-icons-set-minor-mode-icon-alist) (unless (assq (car mode) mode-icons-set-minor-mode-icon-alist)
(setq mode-name (format-mode-line mode) (setq mode-name (format-mode-line mode)
icon-spec (mode-icons-get-icon-spec mode-name)) icon-spec (mode-icons-get-icon-spec mode-name))
(when icon-spec (when icon-spec
(setq minor (assq (car mode) minor-mode-alist)) (setq minor (assq (car mode) minor-mode-alist))
(when minor (when minor
(or (assq (car mode) mode-icons-set-minor-mode-icon-alist) (or (assq (car mode) mode-icons-set-minor-mode-icon-alist)
(push (copy-sequence minor) mode-icons-set-minor-mode-icon-alist)) (push (copy-sequence minor) mode-icons-set-minor-mode-icon-alist))
(setq mode-name (replace-regexp-in-string "^ " "" mode-name)) (setq mode-name (replace-regexp-in-string "^ " "" mode-name))
(setcdr minor (list (concat (or (and mode-icons-separate-images-with-spaces " ") "") (setcdr minor (list (concat (or (and mode-icons-separate-images-with-spaces " ") "")
(mode-icons-propertize-mode mode-name icon-spec))))))))) (mode-icons-propertize-mode mode-name icon-spec)))))))))
(force-mode-line-update)) (force-mode-line-update))
;;;###autoload ;;;###autoload
@ -196,9 +196,9 @@ ICON-SPEC should be a specification from `mode-icons'."
(if mode-icons-mode (if mode-icons-mode
(progn (progn
(add-hook 'after-change-major-mode-hook 'mode-icons-set-current-mode-icon) (add-hook 'after-change-major-mode-hook 'mode-icons-set-current-mode-icon)
(add-hook 'after-change-major-mode-hook 'mode-icons-set-minor-mode-icon) (add-hook 'after-change-major-mode-hook 'mode-icons-set-minor-mode-icon)
(mode-icons-set-minor-mode-icon) (mode-icons-set-minor-mode-icon)
(mode-icons-major-mode-icons)) (mode-icons-major-mode-icons))
(remove-hook 'after-change-major-mode-hook 'mode-icons-set-minor-mode-icon) (remove-hook 'after-change-major-mode-hook 'mode-icons-set-minor-mode-icon)
(remove-hook 'after-change-major-mode-hook 'mode-icons-set-current-mode-icon) (remove-hook 'after-change-major-mode-hook 'mode-icons-set-current-mode-icon)
(mode-icons-set-minor-mode-icon-undo) (mode-icons-set-minor-mode-icon-undo)
@ -206,3 +206,6 @@ ICON-SPEC should be a specification from `mode-icons'."
(provide 'mode-icons) (provide 'mode-icons)
;;; mode-icons.el ends here ;;; mode-icons.el ends here
;; Local Variables:
;; indent-tabs-mode: nil
;; End: