daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

pkg update and first config fix

Browse Source 
org-brain not working, add org-roam
This commit is contained in:
Daniel Weschke
2022-12-19 23:02:34 +01:00
parent 02b3e07185
commit 82f05baffe
885 changed files with 356098 additions and 36993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lisp/ess/ess-r-flymake.el
View File

@@ -40,6 +40,8 @@
(declare-function flymake-diag-region "flymake")
(declare-function flymake-make-diagnostic "flymake")
(declare-function flymake--overlays "flymake")
(declare-function ess-r-project "ess-r-mode")
(declare-function ess-r-package-project "ess-r-package")
(defcustom ess-r-flymake-linters
'("closed_curly_linter = NULL"
@@ -59,8 +61,8 @@
"trailing_whitespace_linter = NULL")
"Default linters to use.
Can be either a string with R expression to be used as
is (e.g. 'lintr::default_linters'). Or a list of strings where
each element is passed as argument to 'lintr::with_defaults'."
is (e.g. `lintr::default_linters'). Or a list of strings where
each element is passed as argument to `lintr::with_defaults'."
:group 'ess-R
:type '(choice string (repeat string))
:package-version '(ess . "18.10"))
@@ -97,26 +99,22 @@ each element is passed as argument to 'lintr::with_defaults'."
(defun ess-r--find-lintr-file ()
"Return the absolute path to the .lintr file.
Check first the current directory, then the project root, then
the user's home directory. Return nil if we couldn't find a .lintr file."
(let ((cur-dir-file (expand-file-name ".lintr" default-directory))
(ess-proj-file (and (fboundp 'ess-r-package-project)
(ess-r-package-project)
(expand-file-name ".lintr" (cdr (ess-r-package-project)))))
(proj-file (and (project-current)
(ess--project-root (project-current))
(expand-file-name ".lintr" (ess--project-root (project-current)))))
(home-file (expand-file-name ".lintr" (getenv "HOME"))))
(cond (;; current directory
(file-readable-p cur-dir-file)
cur-dir-file)
;; Project root according to `ess-r-package-project'
((and ess-proj-file
(file-readable-p ess-proj-file))
ess-proj-file)
;; Project root according to `ess--project-root'
((and proj-file
(file-readable-p proj-file)))
;; Home directory
the package root, then the user's home directory. Return nil if
we couldn't find a .lintr file."
;; VS[2022-01-26]: Can't this entire thing be replaced by
;; `(locate-dominating-file ".lintr")`?
(let* ((cur-file (expand-file-name ".lintr" default-directory))
(pkg (cdr (ess-r-package-project)))
(pkg-file (and pkg (expand-file-name ".lintr" pkg)))
(proj (ess-r-project))
(proj-file (and proj (expand-file-name ".lintr" proj)))
(home-file (expand-file-name ".lintr" (getenv "HOME"))))
(cond ((file-readable-p cur-file)
cur-file)
((and proj-file (file-readable-p proj-file))
proj-file)
((and pkg-file (file-readable-p pkg-file))
pkg-file)
((file-readable-p home-file)
home-file))))