update packages

lisp/ess/ess-utils.el

@@ -30,6 +30,7 @@
 
 (require 'cl-lib)
 (require 'comint)
+(require 'project)
 (eval-when-compile
   (require 'tramp))
 ;; The only ESS file this file should depend on is ess-custom.el
@@ -266,7 +267,7 @@ process to avoid excessive requests."
            out)))))
 
 
-;;; Emacs Integration
+;;*;; Emacs Integration
 
 (defun ess-derived-mode-p ()
   "Non-nil if the current major mode is an ESS major mode."
@@ -364,7 +365,7 @@ ess-[dialect]-font-lock-keywords variable."
                  t])))
 
 
-;;; External modes
+;;*;; External modes
 
 ;; Define these here for the byte compiler since ido dynamically
 ;; let-binds them:
@@ -489,7 +490,7 @@ formats: one for directory and another for the output file."
   nil)
 
 
-;;; Emacs itself
+;;*;; Emacs itself
 
 (defun ess-yank-cleaned-commands ()
   "Yank and strip the code, leaving only (R/S/Lsp/..) commands.
@@ -569,7 +570,7 @@ GTags file (default TAGS): ")
         (message "Building tags .. ok!")))))
 
 
-;;; UI
+;;*;; UI
 
 (defvar ess-current-region-overlay
   (let ((overlay (make-overlay (point) (point))))
@@ -668,7 +669,7 @@ Copied almost verbatim from gnus-utils.el (but with test for mac added)."
 (define-obsolete-function-alias 'ess-do-auto-fill 'do-auto-fill "ESS 19.04")
 
 
-;;; Syntax
+;;*;; Syntax
 
 (defun ess-containing-sexp-position ()
   "Return the `cadr' of `syntax-ppss'."
@@ -848,7 +849,7 @@ also return t if inside curly brackets."
       r)))
 
 
-;;; String manipulation
+;;*;; String manipulation
 
 (defun ess-quote-special-chars (string)
   "Quote special characters in STRING."
@@ -994,8 +995,11 @@ nil and not t, query for each instance."
     ;; always return nil, in case this is on write-file-hooks.
     nil))
 
+(defun ess--strip-final-newlines (string)
+  (replace-regexp-in-string "\n+" "" string))
+
 
-;;; Debugging tools
+;;*;; Debugging tools
 
 (defun ess-write-to-dribble-buffer (text)
   "Write TEXT to `ess-dribble-buffer'."
@@ -1028,12 +1032,28 @@ nil and not t, query for each instance."
             (put (car pair) 'permanent-local t))) ;; hack for Rnw
         alist))
 
+(defmacro ess--alist (vars)
+  "Build a self-named alist from VARS.
+VARS must be a list of symbols."
+  (declare (debug 0))
+  `(list ,@(mapcar (lambda (var) `(cons ',var ,var)) vars)))
+
 (defvar ess-error-regexp   "^\\(Syntax error: .*\\) at line \\([0-9]*\\), file \\(.*\\)$"
   "Regexp to search for errors.")
 
 (define-obsolete-function-alias 'ess-beginning-of-function 'beginning-of-defun "ESS 19.04")
 (define-obsolete-function-alias 'ess-end-of-function 'end-of-defun "ESS 19.04")
 
+(with-no-warnings
+  (defalias 'ess-project-root
+    ;; TODO: Remove once we drop support for Emacs 27
+    (if (and (fboundp 'project-root)
+             ;; Issues caused unless we confirm `project-roots' is obsolete, see bug#1052
+             (get 'project-roots 'byte-obsolete-info))
+        'project-root
+      (lambda (project) "See `project-roots'."
+        (car (project-roots project))))))
+
 (provide 'ess-utils)
 
 ;;; ess-utils.el ends here