diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/bindat.el | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cconv.el | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 12 | ||||
| -rw-r--r-- | lisp/emacs-lisp/macroexp.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/oclosure.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/re-builder.el | 2 |
8 files changed, 15 insertions, 15 deletions
diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el index c40cc0d53c8..5d2f206cc5c 100644 --- a/lisp/emacs-lisp/bindat.el +++ b/lisp/emacs-lisp/bindat.el @@ -883,11 +883,11 @@ controlled in the following way: - If the list of fields is preceded with `:pack-var VAR' then the object to be packed is bound to VAR when evaluating the EXPs of `:pack-val'. -All the above BITLEN, LEN, LE, COUNT, and EXP are ELisp expressions evaluated +All the above BITLEN, LEN, LE, COUNT, and EXP are Elisp expressions evaluated in the current lexical context extended with the previous fields. TYPE can additionally be one of the Bindat type macros defined with -`bindat-defmacro' (and listed below) or an ELisp expression which returns +`bindat-defmacro' (and listed below) or an Elisp expression which returns a bindat type expression." (declare (indent 0) (debug (bindat-type))) `(progn diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 9f1b796bdf2..652c79e9c93 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -172,7 +172,7 @@ Earlier variables shadow later ones with the same name.") ;; When the function comes from another file, we byte-compile ;; the inlined function first, and then inline its byte-code. ;; This also has the advantage that the final code does not - ;; depend on the order of compilation of ELisp files, making + ;; depend on the order of compilation of Elisp files, making ;; the build more reproducible. (if (eq fn localfn) ;; From the same file => same mode. diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el index a91489437e9..c6e8db11b16 100644 --- a/lisp/emacs-lisp/cconv.el +++ b/lisp/emacs-lisp/cconv.el @@ -904,7 +904,7 @@ lexically and dynamically bound symbols actually used by FORM." (defun cconv-make-interpreted-closure (args body env docstring iform) "Make a closure for the interpreter. -This is intended to be called at runtime by the ELisp interpreter (when +This is intended to be called at runtime by the Elisp interpreter (when the code has not been compiled). FUN is the closure's source code, must be a lambda form. ENV is the runtime representation of the lexical environment, @@ -950,7 +950,7 @@ for the lexical bindings." (newenv (nconc (mapcar (lambda (fv) (assq fv env)) (car fvs)) (cdr fvs)))) ;; Never return a nil env, since nil means to use the dynbind - ;; dialect of ELisp. + ;; dialect of Elisp. (make-interpreted-closure args expanded-fun-body (or newenv '(t)) docstring iform))))) diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 2a12aa8f7b0..89319a05b27 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2060,7 +2060,7 @@ a `let' form, except that the list of symbols can be computed at run-time." (funcall (cdr found) cl--labels-magic))))) (if (and replacement (eq cl--labels-magic (car replacement))) (nth 1 replacement) - ;; FIXME: Here, we'd like to return the `&whole' form, but since ELisp + ;; FIXME: Here, we'd like to return the `&whole' form, but since Elisp ;; doesn't have that, we approximate it via `cl--labels-convert-cache'. (let ((res `(function ,f))) (setq cl--labels-convert-cache (cons f res)) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index a5769e0815e..006b713ae6e 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -513,10 +513,10 @@ This will generate compile-time constants from BINDINGS." ;; Constant values. (,(lambda (bound) (lisp-mode--search-key ":" bound)) (0 font-lock-builtin-face)) - ;; ELisp and Common Lisp `&' keywords as types. + ;; Elisp and Common Lisp `&' keywords as types. (,(lambda (bound) (lisp-mode--search-key "&" bound)) (0 font-lock-type-face)) - ;; ELisp regexp grouping constructs + ;; Elisp regexp grouping constructs (,(lambda (bound) (catch 'found ;; The following loop is needed to continue searching after matches @@ -568,10 +568,10 @@ This will generate compile-time constants from BINDINGS." ;; Constant values. (,(lambda (bound) (lisp-mode--search-key ":" bound)) (0 font-lock-builtin-face)) - ;; ELisp and Common Lisp `&' keywords as types. + ;; Elisp and Common Lisp `&' keywords as types. (,(lambda (bound) (lisp-mode--search-key "&" bound)) (0 font-lock-type-face)) - ;; ELisp regexp grouping constructs + ;; Elisp regexp grouping constructs ;; This is too general -- rms. ;; A user complained that he has functions whose names start with `do' ;; and that they get the wrong color. @@ -1433,14 +1433,14 @@ Any non-integer value means do not use a different value of :version "30.1") (defvar lisp-fill-paragraphs-as-doc-string t - "Whether `lisp-fill-paragraph' should fill strings as ELisp doc strings. + "Whether `lisp-fill-paragraph' should fill strings as Elisp doc strings. The default behavior of `lisp-fill-paragraph' is tuned for filling Emacs Lisp doc strings, with their special treatment for the first line. Specifically, strings are filled in a narrowed context to avoid filling surrounding code, which means any leading indent is disregarded, which can cause the filled string to extend passed the configured `fill-column' variable value. If you would rather fill the string in -its original context, disregarding the special conventions of ELisp doc +its original context, disregarding the special conventions of Elisp doc strings, and want to ensure the `fill-column' value is more strictly respected, set this variable to nil. Doing so makes `lisp-fill-paragraph' behave as it used to in Emacs 27 and prior diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 897a72d7485..64ec634620a 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -729,7 +729,7 @@ test of free variables in the following ways: - It does not distinguish variables from functions, so it can be used both to detect whether a given variable is used by SEXP and to detect whether a given function is used by SEXP. -- It does not actually know ELisp syntax, so it only looks for the presence +- It does not actually know Elisp syntax, so it only looks for the presence of symbols in SEXP and can't distinguish if those symbols are truly references to the given variable (or function). That can make the result include bindings which actually aren't used. diff --git a/lisp/emacs-lisp/oclosure.el b/lisp/emacs-lisp/oclosure.el index b0b8aa0ce8e..2574c7dac60 100644 --- a/lisp/emacs-lisp/oclosure.el +++ b/lisp/emacs-lisp/oclosure.el @@ -555,7 +555,7 @@ immutable fields are indeed not mutated." (defun cconv--interactive-helper (fun if) "Add interactive \"form\" IF to FUN. Returns a new command that otherwise behaves like FUN. -IF can be an ELisp form to be interpreted or a function of no arguments." +IF can be an Elisp form to be interpreted or a function of no arguments." (oclosure-lambda (cconv--interactive-helper (fun fun) (if if)) (&rest args) (apply (if (called-interactively-p 'any) diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el index 6b4f6c55d7b..849442ff133 100644 --- a/lisp/emacs-lisp/re-builder.el +++ b/lisp/emacs-lisp/re-builder.el @@ -77,7 +77,7 @@ ;; modes. For the `rx' syntax the function `rx-to-string' is applied to ;; the evaluated expression read. So you can use quoted arguments ;; with something like '("findme") or you can construct arguments to -;; your hearts delight with a valid ELisp expression. (The compiled +;; your hearts delight with a valid Elisp expression. (The compiled ;; string form will be copied by `reb-copy') If you want to take ;; a glance at the corresponding string you can temporarily change the ;; input syntax. |