update packages
This commit is contained in:
@@ -108,6 +108,10 @@ is searched from that directory instead of `default-directory'."
|
||||
"Return the project root for ESS R packages"
|
||||
(list (cdr project)))
|
||||
|
||||
(cl-defmethod project-root ((project (head ess-r-package)))
|
||||
"Return the project root for ESS R packages"
|
||||
(cdr project))
|
||||
|
||||
(defun ess-r-package-name (&optional dir)
|
||||
"Return the name of the current package as a string."
|
||||
(plist-get (ess-r-package-info dir) :name))
|
||||
@@ -122,9 +126,12 @@ efficiency reasons."
|
||||
(let* ((path (ess-r-package--find-package-path (or dir default-directory)))
|
||||
(name (when path
|
||||
(ess-r-package--find-package-name path)))
|
||||
(local (if (and path (file-remote-p path))
|
||||
(tramp-file-name-localname (tramp-dissect-file-name path))
|
||||
path))
|
||||
(info (if name
|
||||
(list :name name
|
||||
:root path)
|
||||
:root local)
|
||||
'(nil))))
|
||||
;; If DIR was supplied we cannot cache in the current buffer.
|
||||
(if dir
|
||||
@@ -169,8 +176,7 @@ return all physically present directories."
|
||||
"Get the root of R package in directory DIR.
|
||||
DIR defaults to the current buffer's file name (if non-nil) or
|
||||
`default-directory'. Root is determined by locating
|
||||
`ess-r-package-root-file'. If the path looks like a tramp file,
|
||||
remove the remote information."
|
||||
`ess-r-package-root-file'."
|
||||
(when-let ((path (cond
|
||||
(dir)
|
||||
((buffer-file-name)
|
||||
@@ -194,9 +200,7 @@ remove the remote information."
|
||||
(setq presumptive-path known-path)
|
||||
(setq path (ess--parent-dir path 1))))
|
||||
presumptive-path)))))
|
||||
(if (file-remote-p pkg-path)
|
||||
(tramp-file-name-localname (tramp-dissect-file-name pkg-path))
|
||||
(directory-file-name pkg-path))))
|
||||
(directory-file-name pkg-path)))
|
||||
|
||||
(defun ess-r-package--find-package-name (path)
|
||||
(let ((file (expand-file-name ess-r-package-root-file path))
|
||||
@@ -573,7 +577,7 @@ package mode. Use this function if state of the buffer such as
|
||||
(error "As of ESS 16.04, `ess-developer' is deprecated. Use `ess-r-set-evaluation-env' instead"))
|
||||
|
||||
(defalias 'ess-toggle-developer 'ess-developer)
|
||||
(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder)
|
||||
(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder "18.04")
|
||||
(define-obsolete-function-alias 'ess-r-devtools-ask 'ess-r-devtools-execute-command "18.04")
|
||||
|
||||
(make-obsolete-variable 'ess-developer "Please use `ess-developer-select-package' and `ess-r-set-evaluation-env' instead." "16.04")
|
||||
|
||||
Reference in New Issue
Block a user