Merge branch 'master' of github.com:emacs-ess/ESS

Author: mmaechler

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) "&" " ")

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

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))))

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"))
 

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

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.

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

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")))