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

Fix #29: Handle project root is nil.

Browse source 
Exception: (wrong-type-argument stringp nil)
This commit is contained in:
Vincent Zhang 2018-09-26 17:20:04 +08:00
parent f7a573906d
commit 92b5bf5c79
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doom-modeline.el
View file

@ -402,8 +402,8 @@ active.")
(defun doom-modeline-update-env () (defun doom-modeline-update-env ()
"Update environment info on mode-line." "Update environment info on mode-line."
(when doom-modeline-env-command (when doom-modeline-env-command
(let* ((default-directory (doom-modeline-project-root)) (let ((default-directory (or (doom-modeline-project-root) ""))
(s (shell-command-to-string doom-modeline-env-command))) (s (shell-command-to-string doom-modeline-env-command)))
(setq doom-modeline-env-version (if (string-match "[ \t\n\r]+\\'" s) (setq doom-modeline-env-version (if (string-match "[ \t\n\r]+\\'" s)
(replace-match "" t t s) (replace-match "" t t s)
s))))) s)))))
@ -530,8 +530,8 @@ fish-shell style.
Example: Example:
~/Projects/FOSS/emacs/lisp/comint.el => ~/P/F/emacs/lisp/comint.el" ~/Projects/FOSS/emacs/lisp/comint.el => ~/P/F/emacs/lisp/comint.el"
(let* ((project-root (doom-modeline-project-root)) (let* ((project-root (or (doom-modeline-project-root) ""))
(file-name-split (shrink-path-file-mixed (or project-root "") (file-name-split (shrink-path-file-mixed project-root
(file-name-directory file-path) (file-name-directory file-path)
file-path)) file-path))
(active (doom-modeline--active))) (active (doom-modeline--active)))