diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-11-01 10:47:17 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-11-01 10:47:17 -0400 |
| commit | fbc2ef3606243c4f86021af8c097470a98847969 (patch) | |
| tree | 5e09863605ccb0844444189494e0c83a474661d1 /lisp/ess-rd.el | |
| parent | 60e9790b35fdac1b254b66438fedaeebb8a82c91 (diff) | |
Fix compilation of package installed from Git; plus cosmeticsscratch/ess
In `test/*.el`: Provide "test/etest/etest" to `require` so Emacs can find
the file when the package is compiled.
In `*.el`: Prefer #' to quote named functions.
Use `lexical-binding` in all the remaining files.
Use lexical-binding also in `eval`.
Remove redundant let-bindings of obsolete variable
`inhibit-point-motion-hooks`.
Replace uses of `point-at-bol` and `point-at-eol`, both marked obsolete
in Emacs-29. Use `defalias` rather than `fset` to define a function.
Fix occasional incorrect uses of ' in docstrings.
Remove some redundant `:group` arguments.
Add leading `_` to unused args.
In addition to the above, a few, more specifc, tweaks:
* lisp/ess-r-mode.el (ess-offset, ess-offset-type): Strength-reduce
`eval` to `symbol-value`.
(ess-rutils-rsitesearch): Hoist the common `browse-url` out of the `if`.
* lisp/ess-r-package.el: Don't test `fboundp` before `advice-add` since
we require Emacsā„25. Don't require `shell` since `advice-add` also
works when the function is not yet defined.
* lisp/ess-r-syntax.el (ess-parser--backward): Give it a global nil
value, both to declare it as dynamically scoped and to simplify
the code. All users adjusted not to bother with `bound-and-true-p`.
(ess-node): Hoist common `gethash` out of the `if`.
* lisp/ess-sas-a.el (ess-sas-rtf-portrait, ess-sas-rtf-landscape):
Add FIXME.
* lisp/ess-sas-d.el (ess-electric-run-semicolon): Re-indent. Add FIXME.
* lisp/ess-sas-l.el (beginning-of-sas-statement): Rename statically
scoped arg to avoid conflict with dynamically scoped var.
(sas-prev-line): Make (unused) arg optional.
(ess-imenu-SAS): Use [:alpha:] and [:alnum:].
* lisp/ess-tracebug.el (ess--tb-start, ess--tb-stop):
Use `advice-add/remove` to redefine `ess-parse-errors`.
* lisp/ess.el (ess-version-string): Don't presume `point-min` is `1`.
* lisp/obsolete/ess-mouse.el (ess-mouse-me-eval-expanded):
Remove unused var `page-scommand`.
* lisp/obsolete/mouseme.el (mouse-me-get-string, mouse-me-find-grep):
Remove unnused vars `p`, `beg`, and `end`.
* test/ess-test-inf.el (ess-test-inferior-local-start-args):
Use `*proc*` rather than undocumented `*inf-buf*`.
(ess-inf-send-fn-test, ess-inf-send-cat-some.text-test): Remove unused
var `output-nowait`.
* test/ess-test-literate.el (chunk-end): Remove `defvar`.
(elt-process-next-chunk, elt-process-next-subchunk, elt-process-case)
(elt-process-code): Pass/take `chunk-end` as argument instead.
* test/ess-test-org.el (test-org-R-ouput): Remove unused var `inf-proc`.
* test/ess-test-r-utils.el (with-ess-test-file): Add FIXME.
(ess-test-sleep-while, ess-test-unwind-protect): Move before first use.
Split the bulk of the code into a function, to ease debugging, avoid
name captures, and improve error messages.
(with-r-running): Split the bulk of the code into a function.
Document the `*proc*` var. Add FIXME.
(output, face-at, token=): Add FIXME.
(output=): Remove redundant `eval`.
* test/ess-test-r.el (ess-r-inherits-prog-mode-test): Turn global
`ess-test-prog-hook` var into local `pmh-was-run`.
* test/literate/fontification.el (face-at-point): Remove unused function.
* test/literate/roxy.el (face-at-point, faces-at-point):
Remove unused functions.
Diffstat (limited to 'lisp/ess-rd.el')
| -rw-r--r-- | lisp/ess-rd.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/ess-rd.el b/lisp/ess-rd.el index d891ed7..05252b2 100644 --- a/lisp/ess-rd.el +++ b/lisp/ess-rd.el @@ -1,6 +1,6 @@ ;; ess-rd.el --- Support for editing R documentation (Rd) source -*- lexical-binding: t; -*- -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2022 Free Software Foundation, Inc. ;; Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ;; Created: 25 July 1997 ;; Maintainer: ESS-core <ESS-core@r-project.org> @@ -150,12 +150,12 @@ All Rd mode abbrevs start with a grave accent (`)." (list (cons (concat "\\\\\\(" - (mapconcat 'identity Rd-section-names "\\|") + (mapconcat #'identity Rd-section-names "\\|") "\\>\\)") 'font-lock-reference-face) ; Rd-bold-face (cons (concat "\\\\\\(" - (mapconcat 'identity Rd-keywords "\\|") + (mapconcat #'identity Rd-keywords "\\|") "\\>\\)") 'font-lock-keyword-face) '("^#\\(ifn?def\\)\\s-+\\(\\sw+\\)" @@ -241,12 +241,12 @@ Type \\[list-abbrevs] to display the built-in abbrevs for Rd keywords.To automatically turn on the abbrev(iate) features, add the following to your Emacs configuration file: - (add-hook 'Rd-mode-hook #'abbrev-mode)" + (add-hook \\='Rd-mode-hook #\\='abbrev-mode)" (setq ess-language "S" ess-dialect "R") (require 'ess-r-mode) (ess-setq-vars-local ess-r-customize-alist) - (setq-local indent-line-function 'Rd-mode-indent-line) + (setq-local indent-line-function #'Rd-mode-indent-line) (setq fill-column 72) (setq-local comment-start-skip "\\s<+\\s-*") (setq-local comment-start "% ") @@ -306,7 +306,7 @@ the following to your Emacs configuration file: 0) (t (let ((p (progn - (re-search-forward "[ \t]*\\s)*" (point-at-eol) t) + (re-search-forward "[ \t]*\\s)*" (line-end-position) t) (point)))) (if (or (< (forward-line -1) 0) (Rd-mode-in-verbatim-p)) @@ -316,7 +316,7 @@ the following to your Emacs configuration file: (Rd-mode-in-preprocessor-line-p)) (not (bobp))) (forward-line -1)) - (re-search-forward "[ \t]*\\s)*" (point-at-eol) t) + (re-search-forward "[ \t]*\\s)*" (line-end-position) t) (prog1 (+ (current-indentation) (* (car (parse-partial-sexp (point) p)) @@ -478,7 +478,7 @@ temporary one in variable `temporary-file-directory'." (unless (get-buffer-window pbuf 'visible) (display-buffer pbuf t)))) -(define-obsolete-function-alias 'Rd-submit-bug-report 'ess-submit-bug-report "2018-08-16") +(define-obsolete-function-alias 'Rd-submit-bug-report #'ess-submit-bug-report "2018-08-16") (provide 'ess-rd) |
