From 60c0524ad28eaeae968603010831bcacca2a5180 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 12 Mar 2025 09:36:25 +0800 Subject: [PATCH] Fix capitalization ELisp -> Elisp * configure.ac (libgccjit_not_found_err) (libgccjit_dev_not_found_err): * doc/emacs/buffers.texi (List Buffers): * doc/lispref/elisp.texi (Tree-sitter C API): * doc/lispref/functions.texi (What Is a Function): * doc/lispref/parsing.texi (Parsing Program Source) (Tree-sitter C API): * doc/misc/gnus.texi (The Gnus Registry): * etc/DEBUG: * etc/NEWS: * etc/NEWS.25: * etc/NEWS.26: * etc/NEWS.28: * etc/NEWS.30: * etc/TODO: * lib-src/emacsclient.c (print_help_and_exit): * lisp/auth-source.el (auth-source-search): * lisp/cedet/semantic/bovine/el.el (emacs-lisp-mode): * lisp/cedet/semantic/wisent/comp.el (wisent-automaton-lisp-form): * lisp/cedet/srecode/el.el (srecode-semantic-apply-tag-to-dict): * lisp/editorconfig.el (editorconfig-get-local-variables-functions): * lisp/emacs-lisp/bindat.el (bindat-type): * lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand): * lisp/emacs-lisp/cconv.el (cconv-make-interpreted-closure): * lisp/emacs-lisp/cl-macs.el (cl--labels-convert): * lisp/emacs-lisp/lisp-mode.el (lisp-fdefs) (lisp-fill-paragraphs-as-doc-string): * lisp/emacs-lisp/macroexp.el (macroexp--fgrep): * lisp/emacs-lisp/oclosure.el (cconv--interactive-helper): * lisp/emacs-lisp/re-builder.el: * lisp/erc/erc-button.el (erc-emacswiki-lisp-url): * lisp/help-fns.el (help-fns--describe-function-or-command-prompt): * lisp/menu-bar.el (menu-bar-search-documentation-menu): * lisp/net/tramp-message.el (tramp-debug-font-lock-keywords): * lisp/org/org-capture.el (org-capture): * lisp/org/org.el (org-category, org-todo): * lisp/org/ox.el (org-export-async-start): * lisp/progmodes/elisp-mode.el (emacs-lisp-mode): * lisp/progmodes/peg.el (peg-translate-exp): * lisp/progmodes/ruby-ts-mode.el: * lisp/woman.el (woman-mode, woman-parse-numeric-arg): * src/chartab.c (map_char_table_for_charset): * src/fns.c (extract_data_from_object): * src/frame.c (do_switch_frame): * src/keyboard.c (make_lispy_event): * test/lisp/emacs-lisp/cl-macs-tests.el (cl-&key-arguments): * test/lisp/emacs-lisp/shortdoc-tests.el (shortdoc-help-fns-examples-function-test): * test/manual/etags/c-src/emacs/src/keyboard.c (make_lispy_event): Fix capitalization ELisp -> Elisp. --- configure.ac | 8 +++---- doc/emacs/buffers.texi | 2 +- doc/lispref/elisp.texi | 2 +- doc/lispref/functions.texi | 2 +- doc/lispref/parsing.texi | 6 +++--- doc/misc/gnus.texi | 2 +- etc/DEBUG | 4 ++-- etc/NEWS | 2 +- etc/NEWS.25 | 6 +++--- etc/NEWS.26 | 22 ++++++++++---------- etc/NEWS.28 | 2 +- etc/NEWS.30 | 2 +- etc/TODO | 6 +++--- lib-src/emacsclient.c | 2 +- lisp/auth-source.el | 2 +- lisp/cedet/semantic/bovine/el.el | 2 +- lisp/cedet/semantic/wisent/comp.el | 4 ++-- lisp/cedet/srecode/el.el | 2 +- lisp/editorconfig.el | 2 +- lisp/emacs-lisp/bindat.el | 4 ++-- lisp/emacs-lisp/byte-opt.el | 2 +- lisp/emacs-lisp/cconv.el | 4 ++-- lisp/emacs-lisp/cl-macs.el | 2 +- lisp/emacs-lisp/lisp-mode.el | 12 +++++------ lisp/emacs-lisp/macroexp.el | 2 +- lisp/emacs-lisp/oclosure.el | 2 +- lisp/emacs-lisp/re-builder.el | 2 +- lisp/erc/erc-button.el | 2 +- lisp/help-fns.el | 2 +- lisp/menu-bar.el | 2 +- lisp/net/tramp-message.el | 2 +- lisp/org/org-capture.el | 2 +- lisp/org/org.el | 8 +++---- lisp/org/ox.el | 2 +- lisp/progmodes/elisp-mode.el | 2 +- lisp/progmodes/peg.el | 2 +- lisp/progmodes/ruby-ts-mode.el | 2 +- lisp/woman.el | 4 ++-- src/chartab.c | 2 +- src/fns.c | 2 +- src/frame.c | 2 +- src/keyboard.c | 4 ++-- test/lisp/emacs-lisp/cl-macs-tests.el | 2 +- test/lisp/emacs-lisp/shortdoc-tests.el | 2 +- test/manual/etags/c-src/emacs/src/keyboard.c | 2 +- 45 files changed, 78 insertions(+), 78 deletions(-) diff --git a/configure.ac b/configure.ac index a3fc4e9fe5b..22082cf737b 100644 --- a/configure.ac +++ b/configure.ac @@ -5078,16 +5078,16 @@ AC_DEFUN([libgccjit_smoke_test], [ }]])]) AC_DEFUN([libgccjit_not_found_err], [ - AC_MSG_ERROR([ELisp native compiler was requested, but libgccjit was not found. + AC_MSG_ERROR([Elisp native compiler was requested, but libgccjit was not found. Please try installing libgccjit or a similar package. -If you are sure you want Emacs be compiled without ELisp native compiler, +If you are sure you want Emacs be compiled without Elisp native compiler, pass the --without-native-compilation option to configure.])]) AC_DEFUN([libgccjit_dev_not_found_err], [ - AC_MSG_ERROR([ELisp native compiler was requested, but libgccjit header files were + AC_MSG_ERROR([Elisp native compiler was requested, but libgccjit header files were not found. Please try installing libgccjit-dev or a similar package. -If you are sure you want Emacs be compiled without ELisp native compiler, +If you are sure you want Emacs be compiled without Elisp native compiler, pass the --without-native-compilation option to configure.])]) AC_DEFUN([libgccjit_broken_err], [ diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index 9c735f6158b..2bcf0c318b5 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi @@ -205,7 +205,7 @@ Here is an example of a buffer list: @smallexample CRM Buffer Size Mode File -. * .emacs 3294 ELisp/l ~/.emacs +. * .emacs 3294 Elisp/l ~/.emacs % *Help* 101 Help search.c 86055 C ~/cvs/emacs/src/search.c % src 20959 Dired by name ~/cvs/emacs/src/ diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index d92d82c896f..ee73d50e8ce 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -1388,7 +1388,7 @@ Parsing Program Source * Pattern Matching:: Pattern matching with query patterns. * Multiple Languages:: Parse text written in multiple languages. * Tree-sitter Major Modes:: Develop major modes using tree-sitter. -* Tree-sitter C API:: Compare the C API and the ELisp API. +* Tree-sitter C API:: Compare the C API and the Elisp API. Syntax Descriptors diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 99dfca217c2..122b6f52a8e 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -219,7 +219,7 @@ function. For example: @defun compiled-function-p object This function returns @code{t} if @var{object} is a function object -that is not in the form of ELisp source code but something like +that is not in the form of Elisp source code but something like machine code or byte code instead. More specifically it returns @code{t} if the function is built-in (a.k.a.@: ``primitive'', @pxref{What Is a Function}), or byte-compiled (@pxref{Byte diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi index ade7b819756..8968eafd91b 100644 --- a/doc/lispref/parsing.texi +++ b/doc/lispref/parsing.texi @@ -48,7 +48,7 @@ source files that mix multiple programming languages. * User-defined Things:: User-defined ``Things'' and Navigation. * Multiple Languages:: Parse text written in multiple languages. * Tree-sitter Major Modes:: Develop major modes using tree-sitter. -* Tree-sitter C API:: Compare the C API and the ELisp API. +* Tree-sitter C API:: Compare the C API and the Elisp API. @end menu @node Language Grammar @@ -2305,8 +2305,8 @@ Null nodes are converted to @code{nil}. @end itemize Below is the correspondence between all C API functions and their -ELisp counterparts. Sometimes one ELisp function corresponds to -multiple C functions, and many C functions don't have an ELisp +Elisp counterparts. Sometimes one Elisp function corresponds to +multiple C functions, and many C functions don't have an Elisp counterpart. @example diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 7624f1831cc..0ef3afb7f7c 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -26271,7 +26271,7 @@ etc.@: backends. @item Store arbitrary data -Through a simple ELisp API, the registry can remember any data for a +Through a simple Elisp API, the registry can remember any data for a message. A built-in inverse map, when activated, allows quick lookups of all messages matching a particular set of criteria. @end enumerate diff --git a/etc/DEBUG b/etc/DEBUG index b95ea7e7e8c..5409be95a7f 100644 --- a/etc/DEBUG +++ b/etc/DEBUG @@ -260,7 +260,7 @@ from a shell prompt, like this: where Emacs-PID is the process ID of Emacs being debugged. Other useful signals to send are SIGUSR1 and SIGUSR2; see "Error Debugging" -in the ELisp manual for how to use those. +in the Elisp manual for how to use those. When Emacs is displaying on a text terminal, it is useful to have a separate terminal for the debug session. This can be done by starting @@ -805,7 +805,7 @@ not exit when it should. On GNU and Unix systems, you can also try sending Emacs SIGUSR2, which, if 'debug-on-event' has its default value, will cause Emacs to attempt to break out of its current loop and enter the Lisp -debugger. (See the node "Debugging" in the ELisp manual for the +debugger. (See the node "Debugging" in the Elisp manual for the details about the Lisp debugger.) This feature is useful when a C-level debugger is not conveniently available. diff --git a/etc/NEWS b/etc/NEWS index 468eca02d52..af7a5e38b73 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1564,7 +1564,7 @@ for writing code that can work across different Emacs versions. --- ** You can change the default value of 'lexical-binding'. -While the default is still the use dynamic binding dialect of ELisp +While the default is still the use dynamic binding dialect of Elisp in those places that don't explicitly set 'lexical-binding' you can change it globally with: diff --git a/etc/NEWS.25 b/etc/NEWS.25 index ca79b0dcbbb..0aa49c68153 100644 --- a/etc/NEWS.25 +++ b/etc/NEWS.25 @@ -275,7 +275,7 @@ to produce its authentication key. *** Successive single-char deletions are collapsed in the undo-log just like successive char insertions. Which commands invoke this behavior is controlled by the new 'undo-auto-amalgamate' function. See the node -"Undo" in the ELisp manual for more details. +"Undo" in the Elisp manual for more details. *** The heuristic used to insert 'undo-boundary' after each command has changed, so that if a command causes changes in more than just the @@ -1418,10 +1418,10 @@ continued to the next line. ** New macro 'define-advice'. ** Emacs Lisp now supports generators. -See the "Generators" section of the ELisp manual for the details. +See the "Generators" section of the Elisp manual for the details. ** New finalizer facility for running code when objects become unreachable. -See the "Finalizer Type" subsection in the ELisp manual for the +See the "Finalizer Type" subsection in the Elisp manual for the details. ** Lexical closures can use '(:documentation FORM)' to build their docstring. diff --git a/etc/NEWS.26 b/etc/NEWS.26 index 33d96571101..471c48f1eb6 100644 --- a/etc/NEWS.26 +++ b/etc/NEWS.26 @@ -309,7 +309,7 @@ explicitly yields. Global variables are shared among all threads, but a 'let' binding is thread-local. Each thread also has its own current buffer and its own match data. -See the chapter "(elisp) Threads" in the ELisp manual for full +See the chapter "(elisp) Threads" in the Elisp manual for full documentation of these facilities. ** The new user variable 'electric-quote-chars' provides a list @@ -471,7 +471,7 @@ See the doc string of 'dir-locals-file' for more information. ** Connection-local variables can be used to specify local variables with a value depending on the connected remote server. For details, -see the node "(elisp) Connection Local Variables" in the ELisp manual. +see the node "(elisp) Connection Local Variables" in the Elisp manual. ** International domain names (IDNA) are now encoded via the new puny.el library, so that one can visit Web sites with non-ASCII URLs. @@ -946,7 +946,7 @@ rotation, as well as saving the image to a file. These commands are also available in 'image-mode'. *** A new library for creating and manipulating SVG images has been -added. See the "(elisp) SVG Images" section in the ELisp reference +added. See the "(elisp) SVG Images" section in the Elisp reference manual for details. *** New setf-able function to access and set image parameters is @@ -1106,7 +1106,7 @@ environments or ANTLR programs with embedded Python code. A major mode can provide indentation context for a sub-mode. To support this, modes should use 'prog-first-column' instead of a literal zero and avoid calling 'widen' in their indentation functions. -See the node "(elisp) Mode-Specific Indent" in the ELisp manual for +See the node "(elisp) Mode-Specific Indent" in the Elisp manual for more details. ** ERC @@ -1441,7 +1441,7 @@ It has been renamed as internal function 'window--make-major-side-window', however applications should instead call 'display-buffer-in-side-window' (passing the SIDE and SLOT parameters as elements of ALIST). This approach is backwards-compatible with versions of Emacs in which the old function -exists. See the node "Displaying Buffers in Side Windows" in the ELisp +exists. See the node "Displaying Buffers in Side Windows" in the Elisp manual for more details. * Lisp Changes in Emacs 26.1 @@ -1493,13 +1493,13 @@ range of indentation. ** New function 'secure-hash-algorithms' to list the algorithms that 'secure-hash' supports. -See the node "(elisp) Checksum/Hash" in the ELisp manual for details. +See the node "(elisp) Checksum/Hash" in the Elisp manual for details. ** Emacs now exposes the GnuTLS cryptographic API with the functions 'gnutls-macs' and 'gnutls-hash-mac'; 'gnutls-digests' and 'gnutls-hash-digest'; 'gnutls-ciphers' and 'gnutls-symmetric-encrypt' and 'gnutls-symmetric-decrypt'. -See the node "(elisp) GnuTLS Cryptography" in the ELisp manual for details. +See the node "(elisp) GnuTLS Cryptography" in the Elisp manual for details. ** The function 'gnutls-available-p' now returns a list of capabilities supported by the GnuTLS library used by Emacs. @@ -1707,7 +1707,7 @@ frame's outer border. frame. **** 'parent-frame' makes a frame the child frame of another Emacs -frame. The section "(elisp) Child Frames" in the ELisp manual +frame. The section "(elisp) Child Frames" in the Elisp manual describes the intrinsics of that relationship. **** 'delete-before' triggers deletion of one frame before that of @@ -1782,12 +1782,12 @@ function 'display-buffer-in-side-window' will display its buffer in a side window. Functions for toggling all side windows on a frame, changing and reversing the layout of side windows and returning the main (major non-side) window of a frame are provided. For details -consult the section "(elisp) Side Windows" in the ELisp manual. +consult the section "(elisp) Side Windows" in the Elisp manual. *** Support for atomic windows - rectangular compositions of windows treated by 'split-window', 'delete-window' and 'delete-other-windows' like a single live window - is now official. For details consult the -section "(elisp) Atomic Windows" in the ELisp manual. +section "(elisp) Atomic Windows" in the Elisp manual. *** New 'display-buffer' alist entry 'window-parameters' allows the assignment of window parameters to the window used for displaying the @@ -1826,7 +1826,7 @@ window's body. *** The semantics of 'mouse-autoselect-window' has changed slightly. For details see the section "(elisp) Mouse Window Auto-selection" in -the ELisp manual. +the Elisp manual. *** 'select-frame-by-name' now may return a frame on another display if it does not find a suitable one on the current display. diff --git a/etc/NEWS.28 b/etc/NEWS.28 index f8f8664f00b..924003d8ed6 100644 --- a/etc/NEWS.28 +++ b/etc/NEWS.28 @@ -3906,7 +3906,7 @@ support these coding-systems. This new system is provided by the new macro 'bindat-type' and obsoletes the old data layout specifications. It supports arbitrary-size integers, recursive types, and more. See the Info node -"(elisp) Byte Packing" in the ELisp manual for more details. +"(elisp) Byte Packing" in the Elisp manual for more details. ** New macro 'with-environment-variables'. This macro allows setting environment variables temporarily when diff --git a/etc/NEWS.30 b/etc/NEWS.30 index 906deb07212..dfe4c65f1dd 100644 --- a/etc/NEWS.30 +++ b/etc/NEWS.30 @@ -2390,7 +2390,7 @@ This line typically looks something like ;;; My little pony mode -*- lexical-binding: t -*- -It is needed to inform the compiler about which dialect of ELisp +It is needed to inform the compiler about which dialect of Elisp your code is using: the modern dialect with lexical binding or the old dialect with only dynamic binding. diff --git a/etc/TODO b/etc/TODO index ecd3bc6ded4..77c1a276cd5 100644 --- a/etc/TODO +++ b/etc/TODO @@ -105,7 +105,7 @@ longer)." ** Do interactive mode tagging for commands Change "(interactive)" to "(interactive nil foo-mode)" for command -completion purposes. Pick a major mode or ELisp library, and check +completion purposes. Pick a major mode or Elisp library, and check all interactive commands to see if they are only relevant in one particular mode. This requires care as some commands might be useful outside of the mode they were written for. @@ -730,9 +730,9 @@ H-S-C-M-s-double-wheel-up, ... *** Support for the $ (paired delimiter) in parse-partial-sexp -*** Support for hook-chars whose effect is specified by ELisp code +*** Support for hook-chars whose effect is specified by Elisp code Hook-chars could have their effect on the parsing-state specified by -ELisp code. Thus a character could both close a string and open a +Elisp code. Thus a character could both close a string and open a comment at the same time and do it in a context-sensitive way. *** Ability to add mode-specific data to the partial-parse-state diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 21e8d171574..eb98ef6c6e7 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -700,7 +700,7 @@ The following OPTIONS are accepted:\n\ ", "\ -F ALIST, --frame-parameters=ALIST\n\ Set the parameters of a new frame\n\ --e, --eval Evaluate the FILE arguments as ELisp expressions\n\ +-e, --eval Evaluate the FILE arguments as Elisp expressions\n\ -n, --no-wait Don't wait for the server to return\n\ -w, --timeout=SECONDS Seconds to wait before timing out\n\ -q, --quiet Don't display messages on success\n\ diff --git a/lisp/auth-source.el b/lisp/auth-source.el index 2d4fd396942..6d53960e9a0 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -638,7 +638,7 @@ will ensure that any results will actually have a :secret property. :delete t means to delete any found entries. nil by default. -Use `auth-source-delete' in ELisp code instead of calling +Use `auth-source-delete' in Elisp code instead of calling `auth-source-search' directly with this parameter. :type (X Y Z) will check only those backend types. `netrc' and diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el index 2f1e818e079..f27bb479c48 100644 --- a/lisp/cedet/semantic/bovine/el.el +++ b/lisp/cedet/semantic/bovine/el.el @@ -926,7 +926,7 @@ See `semantic-format-tag-prototype' for Emacs Lisp for more details." (defvar-mode-local emacs-lisp-mode semantic-stickyfunc-sticky-classes '(function type variable) "Add variables. -ELisp variables can be pretty long, so track this one too.") +Elisp variables can be pretty long, so track this one too.") (with-suppressed-warnings ((obsolete define-child-mode)) ;; FIXME: We should handle this some other way! diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el index ed7115a8c0e..9e41a9cd3da 100644 --- a/lisp/cedet/semantic/wisent/comp.el +++ b/lisp/cedet/semantic/wisent/comp.el @@ -3461,12 +3461,12 @@ Automatically called by the Emacs Lisp byte compiler as a ;; `wisent--compile-grammar' generates the actual parse table ;; we need at run-time, but in order to be able to compile the code it -;; contains, we need to "reify" it back into a piece of ELisp code +;; contains, we need to "reify" it back into a piece of Elisp code ;; which (re)builds it. ;; This is needed for 2 reasons: ;; - The parse tables include an obarray and these don't survive the print+read ;; steps involved in generating a `.elc' file and reading it back in. -;; - Within the parse table vectors/obarrays we have ELisp functions which +;; - Within the parse table vectors/obarrays we have Elisp functions which ;; we want to byte-compile, but if we were to just `quote' the table ;; we'd get them with the same non-compiled functions. (defun wisent-automaton-lisp-form (automaton) diff --git a/lisp/cedet/srecode/el.el b/lisp/cedet/srecode/el.el index 2bd8d256d02..8f2865338a4 100644 --- a/lisp/cedet/srecode/el.el +++ b/lisp/cedet/srecode/el.el @@ -89,7 +89,7 @@ Calls `srecode-semantic-apply-tag-to-dict-default' first." (let* ((tag (oref tagobj prime)) (doc (semantic-tag-docstring tag))) - ;; It is much more common to have doc on ELisp. + ;; It is much more common to have doc on Elisp. (srecode-dictionary-set-value dict "DOC" doc) (cond diff --git a/lisp/editorconfig.el b/lisp/editorconfig.el index 7ac3324e971..bf29f34e2db 100644 --- a/lisp/editorconfig.el +++ b/lisp/editorconfig.el @@ -604,7 +604,7 @@ This function also removes `unset' properties and calls Every function is called with one argument, a hash-table indexed by EditorConfig settings represented as symbols and whose corresponding value is represented as a string. It should return a list of (VAR . VAL) settings -where VAR is an ELisp variable and VAL is the value to which it should be set.") +where VAR is an Elisp variable and VAL is the value to which it should be set.") (defun editorconfig--get-local-variables (props) "Get variables settings according to EditorConfig PROPS." 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. diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index e6ed0e2f75f..77aec20c40f 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -219,7 +219,7 @@ PAR is a number of a regexp grouping whose text will be passed to :version "28.1") (defcustom erc-emacswiki-lisp-url "https://www.emacswiki.org/elisp/" - "URL of the EmacsWiki ELisp area." + "URL of the EmacsWiki Elisp area." :type 'string) (defvar erc-button-highlight-nick-once '(QUIT PART JOIN) diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 5f02b4ae777..2d0da178a4c 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -254,7 +254,7 @@ interactive command." (setq fn (intern val))) ;; These error messages are intended to be less technical for the ;; `describe-command' case, as they are directed at users that are - ;; not necessarily ELisp programmers. + ;; not necessarily Elisp programmers. (unless (and fn (symbolp fn)) (user-error (if want-command "You didn't specify a command's symbol" diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 1b2a4f21a8b..27238d5c266 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -2087,7 +2087,7 @@ key, a click, or a menu-item")) '(menu-item "Look Up Key in User Manual..." Info-goto-emacs-key-command-node :help "Display manual section that describes a key")) (define-key menu [lookup-subject-in-elisp-manual] - '(menu-item "Look Up Subject in ELisp Manual..." elisp-index-search + '(menu-item "Look Up Subject in Elisp Manual..." elisp-index-search :help "Find description of a subject in Emacs Lisp manual")) (define-key menu [lookup-subject-in-emacs-manual] '(menu-item "Look Up Subject in User Manual..." emacs-index-search diff --git a/lisp/net/tramp-message.el b/lisp/net/tramp-message.el index 570f4349b92..00d20e31edc 100644 --- a/lisp/net/tramp-message.el +++ b/lisp/net/tramp-message.el @@ -109,7 +109,7 @@ When it is used for regexp matching, the regexp groups are 3 for the verbosity level.") (defconst tramp-debug-font-lock-keywords - ;; FIXME: Make it a function instead of an ELisp expression, so you + ;; FIXME: Make it a function instead of an Elisp expression, so you ;; can evaluate it with `funcall' rather than `eval'! ;; Also, in `font-lock-defaults' you can specify a function name for ;; the "KEYWORDS" part, so font-lock calls it to get the actual keywords! diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el index d4ae0207c36..9f737893e6a 100644 --- a/lisp/org/org-capture.el +++ b/lisp/org/org-capture.el @@ -658,7 +658,7 @@ When called with a `C-0' (zero) prefix, insert a template at point. When called with a `C-1' (one) prefix, force prompting for a date when a datetree entry is made. -ELisp programs can set KEYS to a string associated with a template +Elisp programs can set KEYS to a string associated with a template in `org-capture-templates'. In this case, interactive selection will be bypassed. diff --git a/lisp/org/org.el b/lisp/org/org.el index 56a8d11e1ab..9051bf6c8c9 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -3157,16 +3157,16 @@ There are multiple ways to set the category. One way is to set it in the document property drawer. For example: :PROPERTIES: -:CATEGORY: ELisp +:CATEGORY: Elisp :END: Other ways to define it is as an Emacs file variable, for example -# -*- mode: org; org-category: \"ELisp\" +# -*- mode: org; org-category: \"Elisp\" or for the file to contain a special line: -#+CATEGORY: ELisp +#+CATEGORY: Elisp If the file does not specify a category, then file's base name is used instead.") @@ -9422,7 +9422,7 @@ With numeric prefix arg, switch to the Nth state. With a numeric prefix arg of 0, inhibit note taking for the change. With a numeric prefix arg of -1, cancel repeater to allow marking as DONE. -When called through ELisp, arg is also interpreted in the following way: +When called through Elisp, arg is also interpreted in the following way: `none' -> empty state \"\" -> switch to empty state `done' -> switch to DONE diff --git a/lisp/org/ox.el b/lisp/org/ox.el index a2a21a72c42..6b62d8bae7f 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el @@ -6660,7 +6660,7 @@ to `:default' encoding. If it fails, return S." "Call function FUN on the results returned by BODY evaluation. FUN is an anonymous function of one argument. BODY should be a valid -ELisp source expression. BODY evaluation happens in an asynchronous process, +Elisp source expression. BODY evaluation happens in an asynchronous process, from a buffer which is an exact copy of the current one. Use `org-export-add-to-stack' in FUN in order to register results diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 934f095f988..a34f29bffea 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -325,7 +325,7 @@ happens in interactive invocations." ;;;###autoload (define-derived-mode emacs-lisp-mode lisp-data-mode - `("ELisp" + `("Elisp" (lexical-binding (:propertize "/l" help-echo "Using lexical-binding mode") (:propertize "/d" diff --git a/lisp/progmodes/peg.el b/lisp/progmodes/peg.el index 405b92c53b0..aa32624436b 100644 --- a/lisp/progmodes/peg.el +++ b/lisp/progmodes/peg.el @@ -659,7 +659,7 @@ rulesets defined previously with `define-peg-ruleset'." ;; This is the main translation function. (defun peg-translate-exp (exp) - "Return the ELisp code to match the PE EXP." + "Return the Elisp code to match the PE EXP." ;; FIXME: This expansion basically duplicates `exp' in the output, which is ;; a serious problem because it's done recursively, so it makes the output ;; code's size exponentially larger than the input! diff --git a/lisp/progmodes/ruby-ts-mode.el b/lisp/progmodes/ruby-ts-mode.el index 6fb71a75a58..1594f301641 100644 --- a/lisp/progmodes/ruby-ts-mode.el +++ b/lisp/progmodes/ruby-ts-mode.el @@ -35,7 +35,7 @@ ;; This file defines ruby-ts-mode which is a major mode for editing ;; Ruby files that uses Tree Sitter to parse the language. More -;; information about Tree Sitter can be found in the ELisp Info pages +;; information about Tree Sitter can be found in the Elisp Info pages ;; as well as this website: https://tree-sitter.github.io/tree-sitter/ ;; For this major mode to work, Emacs has to be compiled with diff --git a/lisp/woman.el b/lisp/woman.el index 5056d2c4dfd..a5ab82be40d 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -1861,7 +1861,7 @@ Argument EVENT is the invoking mouse event." (define-derived-mode woman-mode man-common "WoMan" "Turn on (most of) Man mode to browse a buffer formatted by WoMan. -WoMan is an ELisp emulation of much of the functionality of the Emacs +WoMan is an Elisp emulation of much of the functionality of the Emacs `man' command running the standard UN*X man and ?roff programs. WoMan author: F.J.Wright@Maths.QMW.ac.uk See `Man-mode' for additional details. @@ -3508,7 +3508,7 @@ The expression may be an argument in quotes." ((memq (setq op (following-char)) '(?& ?:)) ; Boolean and / or (forward-char) (setq value - ;; and / or are special forms, not functions, in ELisp + ;; and / or are special forms, not functions, in Elisp (if (eq op ?&) ;; and (if (> value 0) diff --git a/src/chartab.c b/src/chartab.c index dbb6a717213..3076f72c06e 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -1066,7 +1066,7 @@ map_char_table_for_charset (void (*c_function) (Lisp_Object, Lisp_Object), vector of property values (symbols nil, L, R, etc). The full list of Unicode character properties supported by Emacs is - documented in the ELisp manual, in the node "Character Properties". + documented in the Elisp manual, in the node "Character Properties". A table for Unicode character property has these characteristics: diff --git a/src/fns.c b/src/fns.c index dcbcd2aa40e..3f109a81836 100644 --- a/src/fns.c +++ b/src/fns.c @@ -6196,7 +6196,7 @@ extract_data_from_object (Lisp_Object spec, /* Format: (iv-auto REQUIRED-LENGTH). */ if (! FIXNATP (start)) - error ("Without a length, `iv-auto' can't be used; see ELisp manual"); + error ("Without a length, `iv-auto' can't be used; see Elisp manual"); else { EMACS_INT start_hold = XFIXNAT (start); diff --git a/src/frame.c b/src/frame.c index bd175c0f860..decb92bca21 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1892,7 +1892,7 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor /* After setting `selected_frame`, we're temporarily in an inconsistent state where (selected-window) != (frame-selected-window). Until this - invariant is restored we should be very careful not to run ELisp code. + invariant is restored we should be very careful not to run Elisp code. (bug#58343) */ selected_frame = frame; diff --git a/src/keyboard.c b/src/keyboard.c index b22814d702d..21a3b3bcf4e 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -6349,7 +6349,7 @@ make_lispy_event (struct input_event *event) if (NILP (item)) return Qnil; - /* ELisp manual 2.4b says (x y) are window + /* Elisp manual 2.4b says (x y) are window relative but code says they are frame-relative. */ position = list4 (event->frame_or_window, @@ -6836,7 +6836,7 @@ make_lispy_event (struct input_event *event) if (NILP (item)) return Qnil; - /* ELisp manual 2.4b says (x y) are window + /* Elisp manual 2.4b says (x y) are window relative but code says they are frame-relative. */ position = list4 (event->frame_or_window, diff --git a/test/lisp/emacs-lisp/cl-macs-tests.el b/test/lisp/emacs-lisp/cl-macs-tests.el index 64ccdd2d1ce..b4b939d3d31 100644 --- a/test/lisp/emacs-lisp/cl-macs-tests.el +++ b/test/lisp/emacs-lisp/cl-macs-tests.el @@ -930,7 +930,7 @@ See Bug#57915." (cl-flet ((fn (&key x) x)) (should-error (fn :x)) (should (eq (fn :x :a) :a))) - ;; In ELisp function arguments are always statically scoped (bug#47552). + ;; In Elisp function arguments are always statically scoped (bug#47552). (let ((cl--test-a 'dyn) ;; FIXME: How do we silence the "Lexical argument shadows" warning? (f diff --git a/test/lisp/emacs-lisp/shortdoc-tests.el b/test/lisp/emacs-lisp/shortdoc-tests.el index 560221f5533..d826d596951 100644 --- a/test/lisp/emacs-lisp/shortdoc-tests.el +++ b/test/lisp/emacs-lisp/shortdoc-tests.el @@ -90,7 +90,7 @@ (shortdoc-function-examples 'string-match-p))))) (ert-deftest shortdoc-help-fns-examples-function-test () - "Test that `shortdoc-help-fns-examples-function' correctly prints ELisp function examples." + "Test that `shortdoc-help-fns-examples-function' correctly prints Elisp function examples." (with-temp-buffer (shortdoc-help-fns-examples-function 'string-fill) (should (equal "\n Examples:\n\n (string-fill \"Three short words\" 12)\n => \"Three short\\nwords\"\n (string-fill \"Long-word\" 3)\n => \"Long-word\"\n\n" diff --git a/test/manual/etags/c-src/emacs/src/keyboard.c b/test/manual/etags/c-src/emacs/src/keyboard.c index e531036f826..feb2baef4b3 100644 --- a/test/manual/etags/c-src/emacs/src/keyboard.c +++ b/test/manual/etags/c-src/emacs/src/keyboard.c @@ -5670,7 +5670,7 @@ make_lispy_event (struct input_event *event) } } - /* ELisp manual 2.4b says (x y) are window + /* Elisp manual 2.4b says (x y) are window relative but code says they are frame-relative. */ position = list4 (event->frame_or_window,