Support find-file-in-project.

This commit is contained in:
Vincent Zhang 2019-09-09 17:09:52 +08:00
parent 2553e8cf06
commit b117f2e869
3 changed files with 11 additions and 7 deletions

View file

@ -39,8 +39,8 @@ The `doom-modeline` was designed for minimalism, and offers:
- A workspace number segment for `eyebrowse` - A workspace number segment for `eyebrowse`
- A perspective name segment for `persp-mode` - A perspective name segment for `persp-mode`
- A window number segment for `ace-window`, `winum` and `window-numbering` - A window number segment for `ace-window`, `winum` and `window-numbering`
- An indicator for modal editing state, including `evil`, `overwrite`, `god`, - An indicator for modal editing state, including `evil`, `overwrite`, `god`, `ryo` and
`ryo` and `xah-fly-keys`, etc. `xah-fly-keys`, etc.
- An indicator for remote host - An indicator for remote host
- An indicator for debug state - An indicator for debug state
- An indicator for current input method - An indicator for current input method
@ -53,8 +53,8 @@ The `doom-modeline` was designed for minimalism, and offers:
- An indicator for PDF page number with `pdf-tools` - An indicator for PDF page number with `pdf-tools`
- An indicator for markdown/org preview with `grip` - An indicator for markdown/org preview with `grip`
- An indicator for battery status with `fancy-battery` - An indicator for battery status with `fancy-battery`
- Truncated file name, file icon, buffer state and project name in buffer - Truncated file name, file icon, buffer state and project name in buffer information segment, which
information segment, which is compatible with `projectile` and `project` is compatible with `project`, `find-file-in-project` and `projectile`.
- New mode-line for `Info-mode` buffers - New mode-line for `Info-mode` buffers
- New package mode-line for `paradox` - New package mode-line for `paradox`
- New mode-line for `helm` buffers - New mode-line for `helm` buffers

View file

@ -438,6 +438,7 @@ If the actual char height is larger, it respects the actual char height."
;; ;;
(declare-function face-remap-remove-relative 'face-remap) (declare-function face-remap-remove-relative 'face-remap)
(declare-function ffip-get-project-root-directory 'find-file-in-project)
(declare-function project-roots 'project) (declare-function project-roots 'project)
(declare-function projectile-project-root 'projectile) (declare-function projectile-project-root 'projectile)
@ -682,6 +683,8 @@ If the actual char height is larger, it respects the actual char height."
(ignore-errors (ignore-errors
(when-let ((project (project-current))) (when-let ((project (project-current)))
(expand-file-name (car (project-roots project)))))) (expand-file-name (car (project-roots project))))))
(and (fboundp 'ffip-get-project-root-directory)
(ignore-errors (ffip-get-project-root-directory)))
(and (bound-and-true-p projectile-mode) (and (bound-and-true-p projectile-mode)
(ignore-errors (projectile-project-root))) (ignore-errors (projectile-project-root)))
default-directory)))) default-directory))))

View file

@ -45,8 +45,8 @@
;; - A workspace number segment for eyebrowse ;; - A workspace number segment for eyebrowse
;; - A perspective name segment for persp-mode ;; - A perspective name segment for persp-mode
;; - A window number segment for winum and window-numbering ;; - A window number segment for winum and window-numbering
;; - An indicator for modal editing state, including evil, overwrite, god, ryo and ;; - An indicator for modal editing state, including evil, overwrite, god, ryo
;; xah-fly-keys, etc. ;; and xah-fly-keys, etc.
;; - An indicator for remote host ;; - An indicator for remote host
;; - An indicator for current input method ;; - An indicator for current input method
;; - An indicator for debug state ;; - An indicator for debug state
@ -60,7 +60,8 @@
;; - An indicator for markdown/org preivews with grip ;; - An indicator for markdown/org preivews with grip
;; - An indicator for battery status with fancy-battery ;; - An indicator for battery status with fancy-battery
;; - Truncated file name, file icon, buffer state and project name in buffer ;; - Truncated file name, file icon, buffer state and project name in buffer
;; information segment, which is compatible with projectile and project ;; information segment, which is compatible with project, find-file-in-project
;; and projectile
;; - New mode-line for Info-mode buffers ;; - New mode-line for Info-mode buffers
;; - New package mode-line for paradox ;; - New package mode-line for paradox
;; - New mode-line for helm buffers ;; - New mode-line for helm buffers