branch: externals/ess
commit cf20fa0a6e204b26a2c61527edac530d6913b2b4
Author: musvaage <[email protected]>
Commit: Martin Mächler <[email protected]>
warnings
---
lisp/ess-bugs-l.el | 4 ++--
lisp/ess-help.el | 2 +-
lisp/ess-r-mode.el | 12 ++++++------
lisp/ess-rdired.el | 2 +-
lisp/ess-sas-d.el | 2 +-
lisp/ess-tracebug.el | 6 +++---
lisp/essd-els.el | 2 +-
test/etest/etest.el | 2 +-
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/lisp/ess-bugs-l.el b/lisp/ess-bugs-l.el
index 5cb707f303..1123ef154b 100644
--- a/lisp/ess-bugs-l.el
+++ b/lisp/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/lisp/ess-help.el b/lisp/ess-help.el
index 0b2ccd13f9..7c9970838f 100644
--- a/lisp/ess-help.el
+++ b/lisp/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/lisp/ess-r-mode.el b/lisp/ess-r-mode.el
index 47165c2bcf..f2f533a7e9 100644
--- a/lisp/ess-r-mode.el
+++ b/lisp/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/lisp/ess-rdired.el b/lisp/ess-rdired.el
index efc7fa1d59..e025a5fd12 100644
--- a/lisp/ess-rdired.el
+++ b/lisp/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"))
diff --git a/lisp/ess-sas-d.el b/lisp/ess-sas-d.el
index 98afed49e7..5cf147b94d 100644
--- a/lisp/ess-sas-d.el
+++ b/lisp/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/lisp/ess-tracebug.el b/lisp/ess-tracebug.el
index 0a17d556f8..f7f2698f73 100644
--- a/lisp/ess-tracebug.el
+++ b/lisp/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.
diff --git a/lisp/essd-els.el b/lisp/essd-els.el
index f1612cd65a..67040a2b91 100644
--- a/lisp/essd-els.el
+++ b/lisp/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/test/etest/etest.el b/test/etest/etest.el
index 4ec51ed868..69e974e7c5 100644
--- a/test/etest/etest.el
+++ b/test/etest/etest.el
@@ -295,7 +295,7 @@ If RESET-STATE is non-nil, `last-command' and
(with-current-buffer buf
(goto-char (point-min))
(when (search-forward "×" nil t)
- (backward-delete-char 1)
+ (delete-char -1)
(set-mark (point))
(when (search-forward "×" nil t)
(error "There can only be one mark cursor")))
