From 425b9d4ac72bf5f59c7747e8b680b83f863c36ac Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Wed, 21 May 2025 14:04:38 +0200 Subject: [PATCH] update ess --- .../dir | 0 .../ess-autoloads.el | 4 +- .../ess-bugs-d.el | 0 .../ess-bugs-l.el | 4 +- .../ess-custom.el | 30 +-- .../ess-gretl.el | 0 .../ess-help.el | 2 +- .../ess-inf.el | 5 + .../ess-jags-d.el | 0 .../ess-julia.el | 15 +- .../ess-mode.el | 0 .../ess-pkg.el | 8 +- .../ess-r-completion.el | 0 .../ess-r-flymake.el | 10 +- .../ess-r-mode.el | 12 +- .../ess-r-package.el | 0 .../ess-r-syntax.el | 0 .../ess-r-xref.el | 0 .../ess-rd.el | 0 .../ess-rdired.el | 16 +- .../ess-roxy.el | 0 .../ess-s-lang.el | 0 .../ess-sas-a.el | 0 .../ess-sas-d.el | 2 +- .../ess-sas-l.el | 0 .../ess-site.el | 0 .../ess-sp6-d.el | 0 .../ess-toolbar.el | 0 .../ess-tracebug.el | 66 +++++- .../ess-trns.el | 0 .../ess-utils.el | 6 + .../ess.el | 4 +- .../ess.info | 213 +++++++++--------- .../essd-els.el | 2 +- .../etc/ESSR.rds | Bin .../etc/ESSR/BUILDESSR | 0 .../etc/ESSR/LOADREMOTE | 0 .../etc/ESSR/R/.basic.R | 8 +- .../etc/ESSR/R/.load.R | 2 +- .../etc/ESSR/R/completion.R | 0 .../etc/ESSR/R/debug.R | 0 .../etc/ESSR/R/misc.R | 10 +- .../etc/ESSR/R/mpi.R | 0 .../etc/ESSR/R/ns-eval.R | 0 .../etc/ESSR/R/pkg.R | 0 .../etc/Makefile | 0 .../etc/all.txt | 0 .../etc/ess-julia.jl | 0 .../etc/ess-sas-sh-command | 0 .../etc/func.sas | 0 .../etc/proc.sas | 0 .../etc/proc.txt | 0 .../obsolete/ess-eldoc.el | 0 .../obsolete/ess-font-lock.el | 0 .../obsolete/ess-mouse.el | 0 .../obsolete/ess-r-a.el | 0 .../obsolete/mouseme.el | 0 .../obsolete/msdos.el | 0 58 files changed, 254 insertions(+), 165 deletions(-) rename elpa/{ess-20241216.1709 => ess-20250508.735}/dir (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-autoloads.el (99%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-bugs-d.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-bugs-l.el (98%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-custom.el (99%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-gretl.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-help.el (99%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-inf.el (99%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-jags-d.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-julia.el (97%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-mode.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-pkg.el (84%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-r-completion.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-r-flymake.el (97%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-r-mode.el (99%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-r-package.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-r-syntax.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-r-xref.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-rd.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-rdired.el (95%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-roxy.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-s-lang.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-sas-a.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-sas-d.el (99%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-sas-l.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-site.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-sp6-d.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-toolbar.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-tracebug.el (98%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-trns.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess-utils.el (99%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess.el (99%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/ess.info (98%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/essd-els.el (99%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/ESSR.rds (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/ESSR/BUILDESSR (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/ESSR/LOADREMOTE (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/ESSR/R/.basic.R (97%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/ESSR/R/.load.R (98%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/ESSR/R/completion.R (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/ESSR/R/debug.R (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/ESSR/R/misc.R (94%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/ESSR/R/mpi.R (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/ESSR/R/ns-eval.R (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/ESSR/R/pkg.R (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/Makefile (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/all.txt (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/ess-julia.jl (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/ess-sas-sh-command (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/func.sas (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/proc.sas (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/etc/proc.txt (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/obsolete/ess-eldoc.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/obsolete/ess-font-lock.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/obsolete/ess-mouse.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/obsolete/ess-r-a.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/obsolete/mouseme.el (100%) rename elpa/{ess-20241216.1709 => ess-20250508.735}/obsolete/msdos.el (100%) diff --git a/elpa/ess-20241216.1709/dir b/elpa/ess-20250508.735/dir similarity index 100% rename from elpa/ess-20241216.1709/dir rename to elpa/ess-20250508.735/dir diff --git a/elpa/ess-20241216.1709/ess-autoloads.el b/elpa/ess-20250508.735/ess-autoloads.el similarity index 99% rename from elpa/ess-20241216.1709/ess-autoloads.el rename to elpa/ess-20250508.735/ess-autoloads.el index ab4175f6..d7a926d5 100644 --- a/elpa/ess-20241216.1709/ess-autoloads.el +++ b/elpa/ess-20250508.735/ess-autoloads.el @@ -195,7 +195,7 @@ indentation style. See `ess-style-alist' for predefined styles. ;;; Generated autoloads from ess-r-mode.el (autoload 'run-ess-r "ess-r-mode" "\ -Call 'R', the 'GNU S' system from the R Foundation. +Call \\='R\\=', the \\='GNU S\\=' system from the R Foundation. Optional prefix (\\[universal-argument]) allows to set command line arguments, such as --vsize. This should be OS agnostic. If you have certain command line arguments that should always be passed @@ -292,6 +292,8 @@ evaluate the variable `ess-roxy-mode'. The mode's hook is called both when the mode is enabled and when it is disabled. +\\{ess-roxy-mode-map} + (fn &optional ARG)" t) (register-definition-prefixes "ess-roxy" '("ess-")) diff --git a/elpa/ess-20241216.1709/ess-bugs-d.el b/elpa/ess-20250508.735/ess-bugs-d.el similarity index 100% rename from elpa/ess-20241216.1709/ess-bugs-d.el rename to elpa/ess-20250508.735/ess-bugs-d.el diff --git a/elpa/ess-20241216.1709/ess-bugs-l.el b/elpa/ess-20250508.735/ess-bugs-l.el similarity index 98% rename from elpa/ess-20241216.1709/ess-bugs-l.el rename to elpa/ess-20250508.735/ess-bugs-l.el index 5cb707f3..1123ef15 100644 --- a/elpa/ess-20241216.1709/ess-bugs-l.el +++ b/elpa/ess-20250508.735/ess-bugs-l.el @@ -64,8 +64,8 @@ Users whose default is not \\='sh, but are accessing a remote machine with `telnet' or `ssh', should have the following in their init file: (setq-default ess-bugs-batch-method \\='sh)" :group 'ess-bugs - :type '(choice (const sh :tag "Bourne/C-like Unix Shell") - (const dos :tag "DOS-like Windows shell"))) + :type '(choice (const :tag "Bourne/C-like Unix Shell" sh) + (const :tag "DOS-like Windows shell" dos))) (defcustom ess-bugs-batch-post-command (if (equal ess-bugs-batch-method 'sh) "&" " ") diff --git a/elpa/ess-20241216.1709/ess-custom.el b/elpa/ess-20250508.735/ess-custom.el similarity index 99% rename from elpa/ess-20241216.1709/ess-custom.el rename to elpa/ess-20250508.735/ess-custom.el index 67858d40..1276e7f0 100644 --- a/elpa/ess-20241216.1709/ess-custom.el +++ b/elpa/ess-20250508.735/ess-custom.el @@ -1,6 +1,6 @@ ;;; ess-custom.el --- Customize variables for ESS -*- lexical-binding: t; -*- -;; Copyright (C) 1997-2024 Free Software Foundation, Inc. +;; Copyright (C) 1997-2025 Free Software Foundation, Inc. ;; Author: Rodney Sparapani ;; Maintainer: ESS-help @@ -141,7 +141,7 @@ "Directory containing ess-site.el(c) and other ESS Lisp files." :group 'ess :type 'directory - :package-version '(ess . "24.01.1")) + :package-version '(ess . "25.01.1")) (defcustom ess-etc-directory ;; Try to detect the `etc' folder only if not already set up by distribution @@ -156,7 +156,7 @@ The ESS etc directory stores various auxiliary files that are useful for ESS, such as icons." :group 'ess :type 'directory - :package-version '(ess . "24.01.1")) + :package-version '(ess . "25.01.1")) ;; Depending on how ESS is loaded the `load-path' might not contain ;; the `lisp' directory. For this reason we need to add it before we @@ -192,7 +192,7 @@ See `ess-auto-width'. Be warned that ESS can set the width a lot." :group 'ess :type 'boolean - :package-version '(ess . "24.01.1")) + :package-version '(ess . "25.01.1")) (defcustom ess-auto-width nil "When non-nil, set the width option when the window configuration changes. @@ -206,7 +206,7 @@ window's width minus that number. Anything else is treated as (const :tag "Frame width" :value frame) (const :tag "Window width" :value window) (integer :tag "Integer value")) - :package-version '(ess . "24.01.1")) + :package-version '(ess . "25.01.1")) (defcustom ess-handy-commands '(("change-directory" . ess-change-directory) ("install.packages" . ess-install-library) @@ -329,7 +329,7 @@ process. If a symbol, the symbol's value should be a directory. For example, the following setting would always start the process in the directory of the current file: - (setq ess-startup-directory ''default-directory) + (setq ess-startup-directory \\='default-directory) If `ess-startup-directory' is nil (the default) and `ess-startup-directory-function' is non-nil, the value returned @@ -478,7 +478,7 @@ If \\='process, only check if the buffer has an inferior process." :type '(choice (const :tag "Always" t) (const :tag "With running inferior process" process) (const :tag "Never" nil)) - :package-version '(ess . "24.01.1")) + :package-version '(ess . "25.01.1")) (defcustom ess-use-auto-complete t "If non-nil, activate auto-complete support. @@ -562,7 +562,7 @@ contain spaces on either side." ;; them. :type '(repeat string) :group 'ess - :package-version '(ess . "24.01.1")) + :package-version '(ess . "25.01.1")) (defvar ess-S-assign) (make-obsolete-variable 'ess-S-assign 'ess-assign-list "ESS 18.10") @@ -584,7 +584,7 @@ This gets appended to `prettify-symbols-alist', so set it to nil if you want to disable R specific prettification." :group 'ess-R :type '(alist :key-type string :value-type symbol) - :package-version '(ess . "24.01.1")) + :package-version '(ess . "25.01.1")) ;;*;; Variables concerning editing behavior @@ -751,7 +751,7 @@ is non-nil. Affects `ess-save-file'." (const :tag "Use compilation-ask-about-save and auto-save-visited-mode." :value auto) (const :tag "Save without asking." :value t)) - :package-version '(ess . "24.01.1")) + :package-version '(ess . "25.01.1")) ;;*;; Variables controlling editing @@ -1371,7 +1371,7 @@ This always dumps to a sub-directory (\".Src\") of the current ess working directory (i.e. first elt of search list)." :group 'ess-edit :type 'directory - :package-version '(ess . "24.01.1")) + :package-version '(ess . "25.01.1")) (defvar ess-dump-filename-template nil "Internal. Initialized by dialects.") @@ -1533,7 +1533,7 @@ there is no project root in the current directory." (const :tag "*proc:project-root* or *proc*" ess-gen-proc-buffer-name:project-or-simple) (const :tag "*proc:project-root* or *proc:dir*" ess-gen-proc-buffer-name:project-or-directory) function) - :package-version '(ess . "24.01.1")) + :package-version '(ess . "25.01.1")) (defcustom ess-kermit-command "gkermit -T" @@ -1860,7 +1860,7 @@ This variable also affect the evaluation of input code in iESS. The effect is similar to the above. If t then ess waits for the process output, otherwise not." :group 'ess-proc - :package-version '(ess . "24.01.1") + :package-version '(ess . "25.01.1") :type '(choice (const t) (const nowait) (const nil))) (defcustom ess-eval-deactivate-mark (fboundp 'deactivate-mark); was nil till 2010-03-22 @@ -2329,7 +2329,7 @@ This defaults to `default-frame-alist' and is used only when the variable `ess-help-own-frame' is non-nil." :group 'ess-help :type 'alist - :package-version '(ess . "24.01.1")) + :package-version '(ess . "25.01.1")) ; Faces ;;;===================================================== @@ -2475,7 +2475,7 @@ Created for each process." See also `ess-verbose'." :group 'ess-proc :type 'boolean - :package-version '(ess . "24.01.1")) + :package-version '(ess . "25.01.1")) (defcustom ess-verbose nil "Non-nil means write more information to `ess-dribble-buffer' than usual." diff --git a/elpa/ess-20241216.1709/ess-gretl.el b/elpa/ess-20250508.735/ess-gretl.el similarity index 100% rename from elpa/ess-20241216.1709/ess-gretl.el rename to elpa/ess-20250508.735/ess-gretl.el diff --git a/elpa/ess-20241216.1709/ess-help.el b/elpa/ess-20250508.735/ess-help.el similarity index 99% rename from elpa/ess-20241216.1709/ess-help.el rename to elpa/ess-20250508.735/ess-help.el index 0b2ccd13..7c997083 100644 --- a/elpa/ess-20241216.1709/ess-help.el +++ b/elpa/ess-20250508.735/ess-help.el @@ -714,7 +714,7 @@ nil otherwise." (save-excursion (goto-char (point-min)) (while (search-forward "_" nil t) - (backward-delete-char 2) + (delete-char -2) (put-text-property (point) (1+ (point)) 'face 'underline)))) ;;*;; Link to Info diff --git a/elpa/ess-20241216.1709/ess-inf.el b/elpa/ess-20250508.735/ess-inf.el similarity index 99% rename from elpa/ess-20241216.1709/ess-inf.el rename to elpa/ess-20250508.735/ess-inf.el index 964e52c3..32285f32 100644 --- a/elpa/ess-20241216.1709/ess-inf.el +++ b/elpa/ess-20250508.735/ess-inf.el @@ -605,6 +605,11 @@ process-less buffer because it was created with (nconc (list "STATATERM=emacs" (format "PAGER=%s" inferior-ess-pager)) + ;; This lets R code know whether Emacs was running with a + ;; light or dark background at startup time + (let ((bg-mode (frame-parameter nil 'background-mode))) + (when (memq bg-mode '(light dark)) + (list (format "ESS_BACKGROUND_MODE=%s" (symbol-name bg-mode))))) process-environment)) (tramp-remote-process-environment (nconc ;; it contains a pager already, so append diff --git a/elpa/ess-20241216.1709/ess-jags-d.el b/elpa/ess-20250508.735/ess-jags-d.el similarity index 100% rename from elpa/ess-20241216.1709/ess-jags-d.el rename to elpa/ess-20250508.735/ess-jags-d.el diff --git a/elpa/ess-20241216.1709/ess-julia.el b/elpa/ess-20250508.735/ess-julia.el similarity index 97% rename from elpa/ess-20241216.1709/ess-julia.el rename to elpa/ess-20250508.735/ess-julia.el index 43c7b908..27ebed21 100644 --- a/elpa/ess-20241216.1709/ess-julia.el +++ b/elpa/ess-20250508.735/ess-julia.el @@ -42,7 +42,8 @@ ;; Don't require `julia-mode' to compile this file. (when t (require 'julia-mode)) (declare-function julia-mode "julia-mode" ()) -(declare-function julia-latexsub "julia-mode" ()) +(declare-function julia-mode-latexsub-completion-at-point-before "julia-mode" ()) +(declare-function julia-mode-latexsub-completion-at-point-around "julia-mode" ()) (defvar julia-mode-syntax-table) (defvar ac-prefix) @@ -117,12 +118,6 @@ See `comint-input-sender'." ;;; COMPLETION -(defun ess-julia-latexsub-completion () - "Complete latex input in format required by `completion-at-point-functions'." - (if (julia-latexsub) ; julia-latexsub returns nil if it performed a completion, the point otherwise - nil - (lambda () t) ;; bypass other completion methods - )) (defun ess-julia-object-completion () "Return completions in format required by `completion-at-point-functions'." @@ -369,7 +364,8 @@ It makes underscores and dots word constituent chars.") (remove-hook 'completion-at-point-functions #'ess-filename-completion 'local) ;; should be first (add-hook 'completion-at-point-functions #'ess-julia-object-completion nil 'local) (add-hook 'completion-at-point-functions #'ess-filename-completion nil 'local) - (add-hook 'completion-at-point-functions #'ess-julia-latexsub-completion nil 'local) + (add-hook 'completion-at-point-functions #'julia-mode-latexsub-completion-at-point-before nil 'local) + (add-hook 'completion-at-point-functions #'julia-mode-latexsub-completion-at-point-around nil 'local) (if (fboundp 'ess-add-toolbar) (ess-add-toolbar))) ;; Inferior mode @@ -393,7 +389,8 @@ It makes underscores and dots word constituent chars.") (remove-hook 'completion-at-point-functions #'ess-filename-completion 'local) ;; should be first (add-hook 'completion-at-point-functions #'ess-julia-object-completion nil 'local) (add-hook 'completion-at-point-functions #'ess-filename-completion nil 'local) - (add-hook 'completion-at-point-functions #'ess-julia-latexsub-completion nil 'local) + (add-hook 'completion-at-point-functions #'julia-mode-latexsub-completion-at-point-before nil 'local) + (add-hook 'completion-at-point-functions #'julia-mode-latexsub-completion-at-point-around nil 'local) (setq comint-input-sender #'ess-julia-input-sender)) (defvar ess-julia-mode-hook nil) diff --git a/elpa/ess-20241216.1709/ess-mode.el b/elpa/ess-20250508.735/ess-mode.el similarity index 100% rename from elpa/ess-20241216.1709/ess-mode.el rename to elpa/ess-20250508.735/ess-mode.el diff --git a/elpa/ess-20241216.1709/ess-pkg.el b/elpa/ess-20250508.735/ess-pkg.el similarity index 84% rename from elpa/ess-20241216.1709/ess-pkg.el rename to elpa/ess-20250508.735/ess-pkg.el index 3e4d6b7c..209a3782 100644 --- a/elpa/ess-20241216.1709/ess-pkg.el +++ b/elpa/ess-20250508.735/ess-pkg.el @@ -1,10 +1,10 @@ ;; -*- no-byte-compile: t; lexical-binding: nil -*- -(define-package "ess" "20241216.1709" +(define-package "ess" "20250508.735" "Emacs Speaks Statistics." '((emacs "25.1")) - :url "https://github.com/emacs-ess/ESS" - :commit "dda9a9400b2d03b2fdae25045d2af08a37f907ee" - :revdesc "dda9a9400b2d" + :url "https://ess.r-project.org/" + :commit "cf5c97bc68432c6d40b85803a5ce32b4f456fab2" + :revdesc "cf5c97bc6843" :authors '(("David Smith" . "dsmith@stats.adelaide.edu.au") ("A.J. Rossini" . "blindglobe@gmail.com") ("Richard M. Heiberger" . "rmh@temple.edu") diff --git a/elpa/ess-20241216.1709/ess-r-completion.el b/elpa/ess-20250508.735/ess-r-completion.el similarity index 100% rename from elpa/ess-20241216.1709/ess-r-completion.el rename to elpa/ess-20250508.735/ess-r-completion.el diff --git a/elpa/ess-20241216.1709/ess-r-flymake.el b/elpa/ess-20250508.735/ess-r-flymake.el similarity index 97% rename from elpa/ess-20241216.1709/ess-r-flymake.el rename to elpa/ess-20250508.735/ess-r-flymake.el index 9df4402e..a9fedb31 100644 --- a/elpa/ess-20241216.1709/ess-r-flymake.el +++ b/elpa/ess-20250508.735/ess-r-flymake.el @@ -62,7 +62,7 @@ "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'." +each element is passed as argument to `lintr::linters_with_defaults'." :group 'ess-R :type '(choice string (repeat string)) :package-version '(ess . "18.10")) @@ -85,8 +85,8 @@ each element is passed as argument to `lintr::with_defaults'." if (!suppressWarnings(require(lintr, quietly=T))) { cat('@@error: @@`lintr` package not installed') } else { - if (packageVersion('lintr') <= '1.0.3') { - cat('@@error: @@Need `lintr` version > v1.0.3') + if (packageVersion('lintr') <= '3.0.0') { + cat('@@error: @@Need `lintr` version > v3.0.0') } else { tryCatch(lintr::lint(commandArgs(TRUE), ...), error = function(e) { @@ -120,12 +120,12 @@ we couldn't find a .lintr file." (defun ess-r--flymake-linters () "If `ess-r-flymake-linters' is a string, use that. -Otherwise, construct a string to pass to lintr::with_defaults." +Otherwise, construct a string to pass to lintr::linters_with_defaults." (replace-regexp-in-string "[\n\t ]+" " " (if (stringp ess-r-flymake-linters) ess-r-flymake-linters - (concat "lintr::with_defaults(" + (concat "lintr::linters_with_defaults(" (mapconcat #'identity ess-r-flymake-linters ", ") diff --git a/elpa/ess-20241216.1709/ess-r-mode.el b/elpa/ess-20250508.735/ess-r-mode.el similarity index 99% rename from elpa/ess-20241216.1709/ess-r-mode.el rename to elpa/ess-20250508.735/ess-r-mode.el index 47165c2b..f2f533a7 100644 --- a/elpa/ess-20241216.1709/ess-r-mode.el +++ b/elpa/ess-20250508.735/ess-r-mode.el @@ -72,9 +72,9 @@ Fetching happens once per new ESSR version. The archive is stored in ~/.config/ESSR/ESSRv[VERSION].rds file. You can download and place it there manually if the remote has restricted network access." - :type '(choice (const nil :tag "Never") - (const ess-remote :tag "With ess-remote only") - (const t :tag "Always")) + :type '(choice (const :tag "Never" nil) + (const :tag "With ess-remote only" ess-remote) + (const :tag "Always" t)) :group 'ess-R) ;; Silence the byte compiler @@ -573,7 +573,7 @@ blocking commands will throw an error.") ;;;###autoload (defun run-ess-r (&optional start-args) - "Call 'R', the 'GNU S' system from the R Foundation. + "Call \\='R\\=', the \\='GNU S\\=' system from the R Foundation. Optional prefix (\\[universal-argument]) allows to set command line arguments, such as --vsize. This should be OS agnostic. If you have certain command line arguments that should always be passed @@ -2918,10 +2918,10 @@ needed." (defun ess-rutils-html-docs (&optional remote) "Use `browse-url' to navigate R html documentation. Documentation is produced by a modified help.start(), that -returns the URL produced by GNU R's http server. If called with a +returns the URL produced by GNU R\\='s http server. If called with a prefix, the modified help.start() is called with update=TRUE. The optional REMOTE argument should be a string with a valid URL for -the 'R_HOME' directory on a remote server (defaults to NULL)." +the \\='R_HOME\\=' directory on a remote server (defaults to NULL)." (interactive) (let* ((update (if current-prefix-arg "update=TRUE" "update=FALSE")) (remote (if (or (and remote (not (string= "" remote)))) diff --git a/elpa/ess-20241216.1709/ess-r-package.el b/elpa/ess-20250508.735/ess-r-package.el similarity index 100% rename from elpa/ess-20241216.1709/ess-r-package.el rename to elpa/ess-20250508.735/ess-r-package.el diff --git a/elpa/ess-20241216.1709/ess-r-syntax.el b/elpa/ess-20250508.735/ess-r-syntax.el similarity index 100% rename from elpa/ess-20241216.1709/ess-r-syntax.el rename to elpa/ess-20250508.735/ess-r-syntax.el diff --git a/elpa/ess-20241216.1709/ess-r-xref.el b/elpa/ess-20250508.735/ess-r-xref.el similarity index 100% rename from elpa/ess-20241216.1709/ess-r-xref.el rename to elpa/ess-20250508.735/ess-r-xref.el diff --git a/elpa/ess-20241216.1709/ess-rd.el b/elpa/ess-20250508.735/ess-rd.el similarity index 100% rename from elpa/ess-20241216.1709/ess-rd.el rename to elpa/ess-20250508.735/ess-rd.el diff --git a/elpa/ess-20241216.1709/ess-rdired.el b/elpa/ess-20250508.735/ess-rdired.el similarity index 95% rename from elpa/ess-20241216.1709/ess-rdired.el rename to elpa/ess-20250508.735/ess-rdired.el index 35449f33..e025a5fd 100644 --- a/elpa/ess-20241216.1709/ess-rdired.el +++ b/elpa/ess-20250508.735/ess-rdired.el @@ -87,7 +87,7 @@ (defcustom ess-rdired-auto-update-interval 5 "Seconds between refreshes of the `ess-rdired' buffer." - :type '(choice (const nil :tag "No auto updates") (integer :tag "Seconds")) + :type '(choice (const :tag "No auto updates" nil) (integer :tag "Seconds")) :group 'ess-R :package-version '(ess . "19.04")) @@ -115,6 +115,7 @@ can then examine these objects, plot them, and so on." `[("Name" 18 t) ("Class" 10 t) ("Length" 10 ess-rdired--length-predicate) + ("Rows" 10 ess-rdired--rows-predicate) ("Size" 10 ess-rdired--size-predicate)]) (add-hook 'tabulated-list-revert-hook #'ess-rdired-refresh nil t) (when (and (not ess-rdired-auto-update-timer) @@ -173,7 +174,7 @@ details." (defun ess-rdired--tabulated-list-entries (text) "Return a value suitable for `tabulated-list-entries' from TEXT." - (let (name class length size) + (let (name class length rows size) (if (not (string-match-p " +\"" text)) ;; Normal-world (setq text (split-string text " " t) @@ -185,13 +186,15 @@ details." text (split-string (substring text (1+ (match-end 0))) " " t))) (setq class (nth 0 text) length (nth 1 text) - size (nth 2 text)) + rows (nth 2 text) + size (nth 3 text)) (list name `[(,name help-echo "mouse-2, RET: View this object" action ess-rdired-view) ,class ,length + ,rows ,size]))) (defun ess-rdired-edit () @@ -274,6 +277,13 @@ Return t if A's length is < than B's length." (lenB (aref (cadr B) 2))) (< (string-to-number lenA) (string-to-number lenB)))) +(defun ess-rdired--rows-predicate (A B) + "Enable sorting by rows in `ess-rdired' buffers. +Return t if A's length is < than B's length." + (let ((lenA (aref (cadr A) 2)) + (lenB (aref (cadr B) 2))) + (< (string-to-number lenA) (string-to-number lenB)))) + (defun ess-rdired--size-predicate (A B) "Enable sorting by size in `ess-rdired' buffers. Return t if A's size is < than B's size." diff --git a/elpa/ess-20241216.1709/ess-roxy.el b/elpa/ess-20250508.735/ess-roxy.el similarity index 100% rename from elpa/ess-20241216.1709/ess-roxy.el rename to elpa/ess-20250508.735/ess-roxy.el diff --git a/elpa/ess-20241216.1709/ess-s-lang.el b/elpa/ess-20250508.735/ess-s-lang.el similarity index 100% rename from elpa/ess-20241216.1709/ess-s-lang.el rename to elpa/ess-20250508.735/ess-s-lang.el diff --git a/elpa/ess-20241216.1709/ess-sas-a.el b/elpa/ess-20250508.735/ess-sas-a.el similarity index 100% rename from elpa/ess-20241216.1709/ess-sas-a.el rename to elpa/ess-20250508.735/ess-sas-a.el diff --git a/elpa/ess-20241216.1709/ess-sas-d.el b/elpa/ess-20250508.735/ess-sas-d.el similarity index 99% rename from elpa/ess-20241216.1709/ess-sas-d.el rename to elpa/ess-20250508.735/ess-sas-d.el index 98afed49..5cf147b9 100644 --- a/elpa/ess-20241216.1709/ess-sas-d.el +++ b/elpa/ess-20250508.735/ess-sas-d.el @@ -287,7 +287,7 @@ indent line." (SAS))) (defun SAS () - "Call 'SAS', from SAS Institute." + "Call \\='SAS\\=', from SAS Institute." (interactive) (let* ((temp-dialect "SAS")) ;(cdr (rassoc ess-dialect SAS-customize-alist)))) (ess-write-to-dribble-buffer diff --git a/elpa/ess-20241216.1709/ess-sas-l.el b/elpa/ess-20250508.735/ess-sas-l.el similarity index 100% rename from elpa/ess-20241216.1709/ess-sas-l.el rename to elpa/ess-20250508.735/ess-sas-l.el diff --git a/elpa/ess-20241216.1709/ess-site.el b/elpa/ess-20250508.735/ess-site.el similarity index 100% rename from elpa/ess-20241216.1709/ess-site.el rename to elpa/ess-20250508.735/ess-site.el diff --git a/elpa/ess-20241216.1709/ess-sp6-d.el b/elpa/ess-20250508.735/ess-sp6-d.el similarity index 100% rename from elpa/ess-20241216.1709/ess-sp6-d.el rename to elpa/ess-20250508.735/ess-sp6-d.el diff --git a/elpa/ess-20241216.1709/ess-toolbar.el b/elpa/ess-20250508.735/ess-toolbar.el similarity index 100% rename from elpa/ess-20241216.1709/ess-toolbar.el rename to elpa/ess-20250508.735/ess-toolbar.el diff --git a/elpa/ess-20241216.1709/ess-tracebug.el b/elpa/ess-20250508.735/ess-tracebug.el similarity index 98% rename from elpa/ess-20241216.1709/ess-tracebug.el rename to elpa/ess-20250508.735/ess-tracebug.el index 74592dc4..f7f2698f 100644 --- a/elpa/ess-20241216.1709/ess-tracebug.el +++ b/elpa/ess-20250508.735/ess-tracebug.el @@ -555,9 +555,9 @@ If \\='strip, remove all such instances. Otherwise, if non-nil, `+ `ess-long+replacement'. This variable can be process-local but not buffer-local." :group 'ess-tracebug - :type '(choice (const nil :tag "No replacement") - (const strip :tag "Replace all") - (const t :tag "Replace 3 or more +"))) + :type '(choice (const :tag "No replacement" nil) + (const :tag "Replace all" strip) + (const :tag "Replace 3 or more +" t))) (defvar ess-long+replacement ". + " "Replacement used for long + prompt. @@ -1522,6 +1522,11 @@ the output into *ess.dbg* buffer." (define-key map (kbd "M-C") #'ess-debug-command-continue) (define-key map [(control meta ?C)] #'ess-debug-command-continue-multi) (define-key map (kbd "M-N") #'ess-debug-command-next) + (define-key map (kbd "M-S") #'ess-debug-command-step) + (define-key map (kbd "M-W") #'ess-debug-command-where) + (define-key map (kbd "M-F") #'ess-debug-command-finish) + (define-key map (kbd "M-H") #'ess-debug-command-help) + (define-key map (kbd "M-R") #'ess-debug-command-resume) (define-key map [(control meta ?N)] #'ess-debug-command-next-multi) (define-key map (kbd "M-Q") #'ess-debug-command-quit) (define-key map (kbd "M-U") #'ess-debug-command-up) @@ -1785,6 +1790,61 @@ Equivalent to `n' at the R prompt." (ess-send-string (ess-get-process) "0") (ess-send-string (ess-get-process) "n"))) +(defun ess-debug-command-step () + "Step into in debug mode. +Equivalent to `s' at the R prompt." + (interactive) + (ess-force-buffer-current) + (unless (ess--dbg-is-active-p) + (error "Debugger is not active")) + (if (ess--dbg-is-recover-p) + (ess-send-string (ess-get-process) "0") + (ess-send-string (ess-get-process) "s"))) + +(defun ess-debug-command-finish () + "Step next in debug mode. +Equivalent to `f' at the R prompt." + (interactive) + (ess-force-buffer-current) + (unless (ess--dbg-is-active-p) + (error "Debugger is not active")) + (if (ess--dbg-is-recover-p) + (progn (ess-send-string (ess-get-process) "0") + (ess-send-string (ess-get-process) "f")) + (ess-send-string (ess-get-process) "f"))) + + +(defun ess-debug-command-resume () + "Step next in debug mode. +Equivalent to `f' at the R prompt." + (interactive) + (ess-force-buffer-current) + (unless (ess--dbg-is-active-p) + (error "Debugger is not active")) + (if (ess--dbg-is-recover-p) + (progn (ess-send-string (ess-get-process) "0") + (ess-send-string (ess-get-process) "r")) + (ess-send-string (ess-get-process) "r"))) + +(defun ess-debug-command-where () + "Step next in debug mode. +Equivalent to `where' at the R prompt." + (interactive) + (ess-force-buffer-current) + (unless (ess--dbg-is-active-p) + (error "Debugger is not active")) + (ess-send-string (ess-get-process) "where")) + + +(defun ess-debug-command-help () + "Step next in debug mode. +Equivalent to `where' at the R prompt." + (interactive) + (ess-force-buffer-current) + (unless (ess--dbg-is-active-p) + (error "Debugger is not active")) + (ess-send-string (ess-get-process) "help")) + (defun ess-debug-command-next-multi (&optional N) "Ask for N and step (n) N times in debug mode." (interactive) diff --git a/elpa/ess-20241216.1709/ess-trns.el b/elpa/ess-20250508.735/ess-trns.el similarity index 100% rename from elpa/ess-20241216.1709/ess-trns.el rename to elpa/ess-20250508.735/ess-trns.el diff --git a/elpa/ess-20241216.1709/ess-utils.el b/elpa/ess-20250508.735/ess-utils.el similarity index 99% rename from elpa/ess-20241216.1709/ess-utils.el rename to elpa/ess-20250508.735/ess-utils.el index 395e2af5..24cf2804 100644 --- a/elpa/ess-20241216.1709/ess-utils.el +++ b/elpa/ess-20250508.735/ess-utils.el @@ -784,12 +784,18 @@ Copied almost verbatim from gnus-utils.el (but with test for mac added)." ;; FIXME: allow '%foo%' but only when quoted; don't allow [_0-9] at beg. (space "\\(\\s-\\|\n\\)*") ; white space + (S7-method (concat "method(" Symb "," space + "\\(list(\\(" Symb ",?" space "\\)+)\\|" Symb + "\\))")) + (part-1 (concat "\\(" ;;--------outer Either------- "\\(\\(" ; EITHER Q xSymb Q ; any function name between quotes "\\)\\|\\(" Symb ; (beginning of name) + ess-r-symbol-pattern + "\\)\\|\\(" ; Add S7 method as a valid function name + S7-method "\\)\\)")) ; END EITHER OR (set-S4-exp diff --git a/elpa/ess-20241216.1709/ess.el b/elpa/ess-20250508.735/ess.el similarity index 99% rename from elpa/ess-20241216.1709/ess.el rename to elpa/ess-20250508.735/ess.el index d12e7ad3..c58ab83c 100644 --- a/elpa/ess-20241216.1709/ess.el +++ b/elpa/ess-20250508.735/ess.el @@ -17,8 +17,8 @@ ;; ;; Maintainer: ESS Core Team ;; Created: 7 Jan 1994 -;; Package-Version: 20241216.1709 -;; Package-Revision: dda9a9400b2d +;; Package-Version: 20250508.735 +;; Package-Revision: cf5c97bc6843 ;; URL: https://ess.r-project.org/ ;; Package-Requires: ((emacs "25.1")) ;; ESSR-Version: 1.8 diff --git a/elpa/ess-20241216.1709/ess.info b/elpa/ess-20250508.735/ess.info similarity index 98% rename from elpa/ess-20241216.1709/ess.info rename to elpa/ess-20250508.735/ess.info index ac7148f7..d528d46f 100644 --- a/elpa/ess-20241216.1709/ess.info +++ b/elpa/ess-20250508.735/ess.info @@ -14,7 +14,7 @@ File: ess.info, Node: Top, Next: Introduction, Up: (dir) ESS: Emacs Speaks Statistics **************************** -ESS version 24.01.1 +ESS version 25.01.0 by A.J. Rossini, R.M. Heiberger, @@ -249,17 +249,18 @@ File: ess.info, Node: New features, Next: Credits, Prev: Features, Up: Intro 1.2 New features in ESS ======================= -Changes and New Features in 24.12.0: +Changes and New Features in 25.01.0: * polymode: In our transition from literate libraries (such as noweb documented below with respect to 19.04), we now recommend the polymode packages as a more suitable replacement. Furthermore, we suggest the related polymodes including poly-noweb, poly-markdown - and poly-R. The package polymode itself, as well as the polymodes - packages, are all on MELPA rather than ELPA. Therefore, you need to - add MELPA to the list of installation archives as follows. - '(add-to-list 'package-archives '("melpa-stable" . - "https://stable.melpa.org/packages/"))' for 'M-x package-install' + and poly-R (installed in that order). The package polymode itself, + as well as the polymodes packages, are all on MELPA rather than + ELPA. Therefore, you need to add MELPA to the list of installation + archives as follows. '(add-to-list 'package-archives + '("melpa-stable" . "https://stable.melpa.org/packages/"))' for 'M-x + package-install' * ESS[R]: The shorthand notation for lambda functions and the question mark are now fontified as keywords. Contributed by Maxime @@ -5059,105 +5060,105 @@ Node: Introduction2906 Node: Features5660 Node: Current Features6486 Node: New features9937 -Node: Credits36661 -Node: Manual40278 -Node: Installation42944 -Node: Installing from a third-party repository43881 -Node: Installing from source44828 -Node: Activating and Loading ESS46420 -Node: Check Installation47494 -Node: Interactive ESS47714 -Node: Starting up48559 -Node: Multiple ESS processes49303 -Node: ESS processes on Remote Computers50384 -Node: Customizing startup54487 -Node: Controlling buffer display57377 -Node: Entering commands59998 -Node: Command-line editing61156 -Node: Transcript62389 -Node: Last command64158 -Node: Process buffer motion65584 -Node: Transcript resubmit67087 -Node: Saving transcripts69052 -Node: Command History70842 -Node: Saving History74251 -Node: History expansion75012 -Node: Hot keys78223 -Node: Statistical Process running in ESS?82293 -Node: Emacsclient83572 -Node: Other84364 -Node: Evaluating code85383 -Node: Transcript Mode89179 -Node: Resubmit90332 -Node: Clean91395 -Node: Editing objects92391 -Node: Edit buffer93509 -Node: Loading95555 -Node: Error Checking96582 -Node: Indenting97631 -Node: Styles100675 -Node: Other edit buffer commands103049 -Node: Source Files104705 -Node: Source Directories109309 -Node: Help112462 -Node: Completion116908 -Node: Object names117123 -Node: Function arguments119757 -Node: Minibuffer completion120700 -Node: Company121174 -Node: Icicles121561 -Node: Developing with ESS122881 -Node: ESS tracebug123327 -Node: Getting started with tracebug126334 -Node: Editing documentation128492 -Node: R documentation files129044 -Node: roxygen2132747 -Node: Namespaced Evaluation137158 -Node: Extras139156 -Node: ESS ElDoc140180 -Node: ESS Flymake141676 -Node: Handy commands142770 -Node: Highlighting143967 -Node: Parens145002 -Node: Graphics145478 -Node: printer146149 -Node: X11146905 -Node: winjava147244 -Node: Imenu147656 -Node: Toolbar148503 -Node: Xref148911 -Node: Rdired149239 -Node: Package listing150302 -Node: Org151686 -Node: Sweave and AUCTeX152640 -Node: ESS for R155192 -Node: ESS(R)--Editing files155492 -Node: iESS(R)--Inferior ESS processes155993 -Node: Philosophies for using ESS(R)158648 -Node: Example ESS usage159575 -Node: ESS for SAS160980 -Node: ESS(SAS)--Design philosophy161703 -Node: ESS(SAS)--Editing files162636 -Node: ESS(SAS)--TAB key164490 -Node: ESS(SAS)--Batch SAS processes165856 -Node: ESS(SAS)--Function keys for batch processing170884 -Node: iESS(SAS)--Interactive SAS processes180371 -Node: iESS(SAS)--Common problems184125 -Node: ESS(SAS)--Graphics185649 -Node: ESS(SAS)--Windows186432 -Node: ESS for BUGS187010 -Node: ESS for JAGS188766 -Node: Mailing lists/bug reports192118 -Node: Bugs192382 -Node: Reporting Bugs194006 -Node: Mailing Lists194899 -Node: Help with Emacs195626 -Node: Customization196158 -Node: Indices196932 -Node: Key index197107 -Node: Function and program index202239 -Node: Variable index211659 -Node: Concept index215220 +Node: Credits36694 +Node: Manual40311 +Node: Installation42977 +Node: Installing from a third-party repository43914 +Node: Installing from source44861 +Node: Activating and Loading ESS46453 +Node: Check Installation47527 +Node: Interactive ESS47747 +Node: Starting up48592 +Node: Multiple ESS processes49336 +Node: ESS processes on Remote Computers50417 +Node: Customizing startup54520 +Node: Controlling buffer display57410 +Node: Entering commands60031 +Node: Command-line editing61189 +Node: Transcript62422 +Node: Last command64191 +Node: Process buffer motion65617 +Node: Transcript resubmit67120 +Node: Saving transcripts69085 +Node: Command History70875 +Node: Saving History74284 +Node: History expansion75045 +Node: Hot keys78256 +Node: Statistical Process running in ESS?82326 +Node: Emacsclient83605 +Node: Other84397 +Node: Evaluating code85416 +Node: Transcript Mode89212 +Node: Resubmit90365 +Node: Clean91428 +Node: Editing objects92424 +Node: Edit buffer93542 +Node: Loading95588 +Node: Error Checking96615 +Node: Indenting97664 +Node: Styles100708 +Node: Other edit buffer commands103082 +Node: Source Files104738 +Node: Source Directories109342 +Node: Help112495 +Node: Completion116941 +Node: Object names117156 +Node: Function arguments119790 +Node: Minibuffer completion120733 +Node: Company121207 +Node: Icicles121594 +Node: Developing with ESS122914 +Node: ESS tracebug123360 +Node: Getting started with tracebug126367 +Node: Editing documentation128525 +Node: R documentation files129077 +Node: roxygen2132780 +Node: Namespaced Evaluation137191 +Node: Extras139189 +Node: ESS ElDoc140213 +Node: ESS Flymake141709 +Node: Handy commands142803 +Node: Highlighting144000 +Node: Parens145035 +Node: Graphics145511 +Node: printer146182 +Node: X11146938 +Node: winjava147277 +Node: Imenu147689 +Node: Toolbar148536 +Node: Xref148944 +Node: Rdired149272 +Node: Package listing150335 +Node: Org151719 +Node: Sweave and AUCTeX152673 +Node: ESS for R155225 +Node: ESS(R)--Editing files155525 +Node: iESS(R)--Inferior ESS processes156026 +Node: Philosophies for using ESS(R)158681 +Node: Example ESS usage159608 +Node: ESS for SAS161013 +Node: ESS(SAS)--Design philosophy161736 +Node: ESS(SAS)--Editing files162669 +Node: ESS(SAS)--TAB key164523 +Node: ESS(SAS)--Batch SAS processes165889 +Node: ESS(SAS)--Function keys for batch processing170917 +Node: iESS(SAS)--Interactive SAS processes180404 +Node: iESS(SAS)--Common problems184158 +Node: ESS(SAS)--Graphics185682 +Node: ESS(SAS)--Windows186465 +Node: ESS for BUGS187043 +Node: ESS for JAGS188799 +Node: Mailing lists/bug reports192151 +Node: Bugs192415 +Node: Reporting Bugs194039 +Node: Mailing Lists194932 +Node: Help with Emacs195659 +Node: Customization196191 +Node: Indices196965 +Node: Key index197140 +Node: Function and program index202272 +Node: Variable index211692 +Node: Concept index215253  End Tag Table diff --git a/elpa/ess-20241216.1709/essd-els.el b/elpa/ess-20250508.735/essd-els.el similarity index 99% rename from elpa/ess-20241216.1709/essd-els.el rename to elpa/ess-20250508.735/essd-els.el index f1612cd6..67040a2b 100644 --- a/elpa/ess-20241216.1709/essd-els.el +++ b/elpa/ess-20250508.735/essd-els.el @@ -62,7 +62,7 @@ The default value is nil." "Variables to customize for S+elsewhere.") (defun S+elsewhere (&optional _proc-name) - "Call 'S-PLUS 3.x', the 'Real Thing' from StatSci." + "Call \\='S-PLUS 3.x\\=', the \\='Real Thing\\=' from StatSci." ;; git commit 104c4d7c56bc239ea245562763caa317bc3a1a84 (declare (obsolete ess-remote "2000")) (ess-write-to-dribble-buffer diff --git a/elpa/ess-20241216.1709/etc/ESSR.rds b/elpa/ess-20250508.735/etc/ESSR.rds similarity index 100% rename from elpa/ess-20241216.1709/etc/ESSR.rds rename to elpa/ess-20250508.735/etc/ESSR.rds diff --git a/elpa/ess-20241216.1709/etc/ESSR/BUILDESSR b/elpa/ess-20250508.735/etc/ESSR/BUILDESSR similarity index 100% rename from elpa/ess-20241216.1709/etc/ESSR/BUILDESSR rename to elpa/ess-20250508.735/etc/ESSR/BUILDESSR diff --git a/elpa/ess-20241216.1709/etc/ESSR/LOADREMOTE b/elpa/ess-20250508.735/etc/ESSR/LOADREMOTE similarity index 100% rename from elpa/ess-20241216.1709/etc/ESSR/LOADREMOTE rename to elpa/ess-20250508.735/etc/ESSR/LOADREMOTE diff --git a/elpa/ess-20241216.1709/etc/ESSR/R/.basic.R b/elpa/ess-20250508.735/etc/ESSR/R/.basic.R similarity index 97% rename from elpa/ess-20241216.1709/etc/ESSR/R/.basic.R rename to elpa/ess-20250508.735/etc/ESSR/R/.basic.R index b7a41a57..c7cba3bf 100644 --- a/elpa/ess-20241216.1709/etc/ESSR/R/.basic.R +++ b/elpa/ess-20250508.735/etc/ESSR/R/.basic.R @@ -80,7 +80,7 @@ .ess.helpLinks <- function(topic, package) { tryCatch( warning = function(...) NULL, - error = function(...) NULL, + error = function(...) NULL, # needs R >= 2.13.0 { ast <- .ess.fetchParsedRd(topic, package) .ess.findLinks(ast) @@ -156,7 +156,7 @@ } .ess.strip.error <- function(msg, srcfile) { - pattern <- paste0(srcfile, ":[0-9]+:[0-9]+: ") + pattern <- paste(srcfile, ":[0-9]+:[0-9]+: ", sep = "") sub(pattern, "", msg) } @@ -218,12 +218,12 @@ if(.ess.Rversion < "1.8") sink(getConnection(1)) on.exit({ - writeLines(paste0(sentinel, "-END")) + writeLines(paste(sentinel, "-END", sep = "")) if (sinked) sink(NULL) }) - writeLines(paste0(sentinel, "-START")) + writeLines(paste(sentinel, "-START", sep = "")) .ess.environment.state$env <- parent.frame() on.exit(.ess.environment.state$env <- NULL, add = TRUE) diff --git a/elpa/ess-20241216.1709/etc/ESSR/R/.load.R b/elpa/ess-20250508.735/etc/ESSR/R/.load.R similarity index 98% rename from elpa/ess-20241216.1709/etc/ESSR/R/.load.R rename to elpa/ess-20250508.735/etc/ESSR/R/.load.R index 9b38af2b..e6c00143 100644 --- a/elpa/ess-20241216.1709/etc/ESSR/R/.load.R +++ b/elpa/ess-20250508.735/etc/ESSR/R/.load.R @@ -11,7 +11,7 @@ ## load .base.R and all other files into ESSR environment; then attach ESSR .ess.ESSR.load <- function(dir) { - if (nzchar(Sys.getenv("ESSR_TEST_LOAD_ERROR"))) + if (Sys.getenv("ESSR_TEST_LOAD_ERROR") != "") stop('Loading failed with a nice message.') Rver <- .ess.ESSR.get.rver() diff --git a/elpa/ess-20241216.1709/etc/ESSR/R/completion.R b/elpa/ess-20250508.735/etc/ESSR/R/completion.R similarity index 100% rename from elpa/ess-20241216.1709/etc/ESSR/R/completion.R rename to elpa/ess-20250508.735/etc/ESSR/R/completion.R diff --git a/elpa/ess-20241216.1709/etc/ESSR/R/debug.R b/elpa/ess-20250508.735/etc/ESSR/R/debug.R similarity index 100% rename from elpa/ess-20241216.1709/etc/ESSR/R/debug.R rename to elpa/ess-20250508.735/etc/ESSR/R/debug.R diff --git a/elpa/ess-20241216.1709/etc/ESSR/R/misc.R b/elpa/ess-20250508.735/etc/ESSR/R/misc.R similarity index 94% rename from elpa/ess-20241216.1709/etc/ESSR/R/misc.R rename to elpa/ess-20250508.735/etc/ESSR/R/misc.R index 000cf5b7..b34970f7 100644 --- a/elpa/ess-20241216.1709/etc/ESSR/R/misc.R +++ b/elpa/ess-20250508.735/etc/ESSR/R/misc.R @@ -158,7 +158,15 @@ mode <- sapply(objs, data.class) length <- sapply(objs, length) size <- sapply(objs, function(obj) format(object.size(obj))) - d <- data.frame(mode, length, size) + rows <- sapply(objs,nrow) + # sapply returns a list rather than a vector if there are NULLs eg nrow returns NULL for non-dataframes. + # check if list, replace NULLS with NA and convert to vector + if (is.list(rows)) { + rows[sapply(rows,is.null)] <- NA + rows <- unlist(rows) + } + + d <- data.frame(mode, length, rows, size) var.names <- row.names(d) diff --git a/elpa/ess-20241216.1709/etc/ESSR/R/mpi.R b/elpa/ess-20250508.735/etc/ESSR/R/mpi.R similarity index 100% rename from elpa/ess-20241216.1709/etc/ESSR/R/mpi.R rename to elpa/ess-20250508.735/etc/ESSR/R/mpi.R diff --git a/elpa/ess-20241216.1709/etc/ESSR/R/ns-eval.R b/elpa/ess-20250508.735/etc/ESSR/R/ns-eval.R similarity index 100% rename from elpa/ess-20241216.1709/etc/ESSR/R/ns-eval.R rename to elpa/ess-20250508.735/etc/ESSR/R/ns-eval.R diff --git a/elpa/ess-20241216.1709/etc/ESSR/R/pkg.R b/elpa/ess-20250508.735/etc/ESSR/R/pkg.R similarity index 100% rename from elpa/ess-20241216.1709/etc/ESSR/R/pkg.R rename to elpa/ess-20250508.735/etc/ESSR/R/pkg.R diff --git a/elpa/ess-20241216.1709/etc/Makefile b/elpa/ess-20250508.735/etc/Makefile similarity index 100% rename from elpa/ess-20241216.1709/etc/Makefile rename to elpa/ess-20250508.735/etc/Makefile diff --git a/elpa/ess-20241216.1709/etc/all.txt b/elpa/ess-20250508.735/etc/all.txt similarity index 100% rename from elpa/ess-20241216.1709/etc/all.txt rename to elpa/ess-20250508.735/etc/all.txt diff --git a/elpa/ess-20241216.1709/etc/ess-julia.jl b/elpa/ess-20250508.735/etc/ess-julia.jl similarity index 100% rename from elpa/ess-20241216.1709/etc/ess-julia.jl rename to elpa/ess-20250508.735/etc/ess-julia.jl diff --git a/elpa/ess-20241216.1709/etc/ess-sas-sh-command b/elpa/ess-20250508.735/etc/ess-sas-sh-command similarity index 100% rename from elpa/ess-20241216.1709/etc/ess-sas-sh-command rename to elpa/ess-20250508.735/etc/ess-sas-sh-command diff --git a/elpa/ess-20241216.1709/etc/func.sas b/elpa/ess-20250508.735/etc/func.sas similarity index 100% rename from elpa/ess-20241216.1709/etc/func.sas rename to elpa/ess-20250508.735/etc/func.sas diff --git a/elpa/ess-20241216.1709/etc/proc.sas b/elpa/ess-20250508.735/etc/proc.sas similarity index 100% rename from elpa/ess-20241216.1709/etc/proc.sas rename to elpa/ess-20250508.735/etc/proc.sas diff --git a/elpa/ess-20241216.1709/etc/proc.txt b/elpa/ess-20250508.735/etc/proc.txt similarity index 100% rename from elpa/ess-20241216.1709/etc/proc.txt rename to elpa/ess-20250508.735/etc/proc.txt diff --git a/elpa/ess-20241216.1709/obsolete/ess-eldoc.el b/elpa/ess-20250508.735/obsolete/ess-eldoc.el similarity index 100% rename from elpa/ess-20241216.1709/obsolete/ess-eldoc.el rename to elpa/ess-20250508.735/obsolete/ess-eldoc.el diff --git a/elpa/ess-20241216.1709/obsolete/ess-font-lock.el b/elpa/ess-20250508.735/obsolete/ess-font-lock.el similarity index 100% rename from elpa/ess-20241216.1709/obsolete/ess-font-lock.el rename to elpa/ess-20250508.735/obsolete/ess-font-lock.el diff --git a/elpa/ess-20241216.1709/obsolete/ess-mouse.el b/elpa/ess-20250508.735/obsolete/ess-mouse.el similarity index 100% rename from elpa/ess-20241216.1709/obsolete/ess-mouse.el rename to elpa/ess-20250508.735/obsolete/ess-mouse.el diff --git a/elpa/ess-20241216.1709/obsolete/ess-r-a.el b/elpa/ess-20250508.735/obsolete/ess-r-a.el similarity index 100% rename from elpa/ess-20241216.1709/obsolete/ess-r-a.el rename to elpa/ess-20250508.735/obsolete/ess-r-a.el diff --git a/elpa/ess-20241216.1709/obsolete/mouseme.el b/elpa/ess-20250508.735/obsolete/mouseme.el similarity index 100% rename from elpa/ess-20241216.1709/obsolete/mouseme.el rename to elpa/ess-20250508.735/obsolete/mouseme.el diff --git a/elpa/ess-20241216.1709/obsolete/msdos.el b/elpa/ess-20250508.735/obsolete/msdos.el similarity index 100% rename from elpa/ess-20241216.1709/obsolete/msdos.el rename to elpa/ess-20250508.735/obsolete/msdos.el -- 2.47.3