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-help.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-help.el')
| -rw-r--r-- | lisp/ess-help.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/ess-help.el b/lisp/ess-help.el index c10bb8a..d666ab8 100644 --- a/lisp/ess-help.el +++ b/lisp/ess-help.el @@ -1,6 +1,6 @@ ;;; ess-help.el --- Support for viewing ESS help files -*- lexical-binding: t; -*- -;; Copyright (C) 1989-2020 Free Software Foundation, Inc. +;; Copyright (C) 1989-2022 Free Software Foundation, Inc. ;; Author: David Smith <dsmith@stats.adelaide.edu.au> ;; Created: 7 Jan 1994 @@ -168,7 +168,7 @@ ignored." (ess-process-put 'sp-for-help-changed? t) (ess-display-help-on-object ess-help-object)) -(defalias 'ess-help 'ess-display-help-on-object) +(defalias 'ess-help #'ess-display-help-on-object) (cl-defgeneric ess-build-help-command (object) "Build a string command for retrieving help on OBJECT." @@ -282,7 +282,7 @@ REG-START gives the start location from where to search linkifying, (delete-region (point-min) (point-max)) (setq ess-local-process-name pname) (ess--help-major-mode) - (ess-setq-vars-local (eval alist)) + (ess-setq-vars-local (eval alist t)) (setq ess-help-object help-object ess-help-sec-regex "\\(^\\s-.*\n\\)\\|\\(^\n\\)") (ess--foreground-command command buff) @@ -376,7 +376,7 @@ See `ess-display-vignettes' for ALL." (get-text-property pos 'vignette) (get-text-property pos 'package)))) -(defalias 'ess-help-quit 'quit-window) +(defalias 'ess-help-quit #'quit-window) (make-obsolete 'ess-help-quit 'quit-window "16.04") (defun ess-display-help (buff) @@ -659,7 +659,7 @@ nil otherwise." (defun ess-get-help-files-list () "Return a list of files which have help available." - (apply 'nconc + (apply #'nconc (mapcar (lambda (str) (let ((dirname (concat str "/.Help"))) (and (file-directory-p dirname) @@ -758,7 +758,8 @@ other dialects)." (ess-symbol-at-point))) ess--descr-o-a-p-commands) ;; used in ess--describe-object-at-point (unless objname (error "No object at point ")) - (define-key map (vector last-command-event) 'ess--describe-object-at-point) + (define-key map (vector last-command-event) + #'ess--describe-object-at-point) ;; todo: put digits into the map (let* ((inhibit-quit t) ;; C-g removes the buffer (buf (ess--execute-electric-command |
