github/doom-modeline
1
0
Fork 0
mirror of https://github.com/correl/doom-modeline.git synced 2024-11-23 19:19:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix #180: Error for TRAMP python in doom-modeline-env.

Browse source
This commit is contained in:
Vincent Zhang 2019-05-31 22:04:16 +08:00
parent 97dba610f8
commit 59c81a0d81
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
doom-modeline-core.el
View file

@ -542,15 +542,13 @@ If the actual char height is larger, it respects the actual char height.")
Return `default-directory' if no project was found." Return `default-directory' if no project was found."
(or doom-modeline-project-root (or doom-modeline-project-root
(setq doom-modeline-project-root (setq doom-modeline-project-root
(file-local-name (or (and (bound-and-true-p projectile-mode)
(or (ignore-errors (projectile-project-root)))
(when (bound-and-true-p projectile-mode) (and (fboundp 'project-current)
(ignore-errors (projectile-project-root))) (ignore-errors
(when (fboundp 'project-current) (when-let ((project (project-current)))
(ignore-errors (expand-file-name (car (project-roots project))))))
(when-let ((project (project-current))) default-directory))))
(expand-file-name (car (project-roots project))))))
default-directory)))))
(defun doom-modeline--make-xpm (face width height) (defun doom-modeline--make-xpm (face width height)
"Create an XPM bitmap via FACE, WIDTH and HEIGHT. Inspired by `powerline''s `pl/make-xpm'." "Create an XPM bitmap via FACE, WIDTH and HEIGHT. Inspired by `powerline''s `pl/make-xpm'."
@ -663,7 +661,7 @@ If TRUNCATE-TAIL is t also truncate the parent directory of the file."
(defun doom-modeline--buffer-file-name-relative (_file-path true-file-path &optional include-project) (defun doom-modeline--buffer-file-name-relative (_file-path true-file-path &optional include-project)
"Propertized variable `buffer-file-name' showing directories relative to project's root only." "Propertized variable `buffer-file-name' showing directories relative to project's root only."
(let ((root (doom-modeline-project-root)) (let ((root (file-local-name (doom-modeline-project-root)))
(active (doom-modeline--active))) (active (doom-modeline--active)))
(if (null root) (if (null root)
(propertize "%b" 'face (if active 'doom-modeline-buffer-file)) (propertize "%b" 'face (if active 'doom-modeline-buffer-file))
@ -695,7 +693,7 @@ If HIDE-PROJECT-ROOT-PARENT is non-nil will hide project root parent.
Example: Example:
~/Projects/FOSS/emacs/lisp/comint.el => emacs/lisp/comint.el" ~/Projects/FOSS/emacs/lisp/comint.el => emacs/lisp/comint.el"
(let ((project-root (doom-modeline-project-root)) (let ((project-root (file-local-name (doom-modeline-project-root)))
(active (doom-modeline--active)) (active (doom-modeline--active))
(modified-faces (if (buffer-modified-p) 'doom-modeline-buffer-modified))) (modified-faces (if (buffer-modified-p) 'doom-modeline-buffer-modified)))
(let ((sp-faces (or modified-faces (if active 'doom-modeline-project-parent-dir))) (let ((sp-faces (or modified-faces (if active 'doom-modeline-project-parent-dir)))